Commit | Line | Data |
---|---|---|
fcee87cf CM |
1 | |
2 | __copyright__ = """ | |
3 | Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com> | |
4 | ||
5 | This program is free software; you can redistribute it and/or modify | |
6 | it under the terms of the GNU General Public License version 2 as | |
7 | published by the Free Software Foundation. | |
8 | ||
9 | This program is distributed in the hope that it will be useful, | |
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
12 | GNU General Public License for more details. | |
13 | ||
14 | You should have received a copy of the GNU General Public License | |
15 | along with this program; if not, write to the Free Software | |
16 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
17 | """ | |
18 | ||
19 | import sys, os | |
20 | from optparse import OptionParser, make_option | |
52f3900c | 21 | from pydoc import pager |
fcee87cf CM |
22 | |
23 | from stgit.commands.common import * | |
24 | from stgit.utils import * | |
5e888f30 | 25 | from stgit.out import * |
fcee87cf CM |
26 | from stgit import stack, git |
27 | ||
28 | ||
29 | help = 'show the tree diff' | |
d4356ac6 | 30 | usage = """%prog [options] [<files or dirs>] |
fcee87cf | 31 | |
26aab5b0 | 32 | Show the diff (default) or diffstat between the current working copy |
e4560d7e CM |
33 | or a tree-ish object and another tree-ish object (defaulting to HEAD). |
34 | File names can also be given to restrict the diff output. The | |
35 | tree-ish object can be an StGIT patch, a standard git commit, tag or | |
36 | tree. In addition to these, the command also supports '{base}', | |
37 | representing the bottom of the current stack. | |
26aab5b0 | 38 | |
e4560d7e CM |
39 | rev = '[branch:](<patch>|{base}) | <tree-ish>' |
40 | """ | |
fcee87cf | 41 | |
6dd8fafa | 42 | directory = DirectoryHasRepository() |
ebbd6f00 CM |
43 | options = [make_option('-r', '--range', |
44 | metavar = 'rev1[..[rev2]]', dest = 'revs', | |
fcee87cf CM |
45 | help = 'show the diff between revisions'), |
46 | make_option('-s', '--stat', | |
47 | help = 'show the stat instead of the diff', | |
0b635fe6 KH |
48 | action = 'store_true') |
49 | ] + make_diff_opts_option() | |
fcee87cf CM |
50 | |
51 | def func(parser, options, args): | |
52 | """Show the tree diff | |
53 | """ | |
d4356ac6 CM |
54 | args = git.ls_files(args) |
55 | directory.cd_to_topdir() | |
56 | ||
fcee87cf | 57 | if options.revs: |
6b1e0111 | 58 | rev_list = options.revs.split('..') |
fcee87cf CM |
59 | rev_list_len = len(rev_list) |
60 | if rev_list_len == 1: | |
e4560d7e CM |
61 | rev1 = rev_list[0] |
62 | rev2 = None | |
fcee87cf CM |
63 | elif rev_list_len == 2: |
64 | rev1 = rev_list[0] | |
65 | rev2 = rev_list[1] | |
fcee87cf CM |
66 | else: |
67 | parser.error('incorrect parameters to -r') | |
68 | else: | |
69 | rev1 = 'HEAD' | |
70 | rev2 = None | |
71 | ||
a45cea15 | 72 | diff_str = git.diff(args, git_id(crt_series, rev1), |
e4560d7e | 73 | rev2 and git_id(crt_series, rev2), |
a45cea15 | 74 | diff_flags = options.diff_flags) |
fcee87cf | 75 | if options.stat: |
a45cea15 | 76 | out.stdout_raw(git.diffstat(diff_str) + '\n') |
fcee87cf | 77 | else: |
fdf4cb43 CM |
78 | if diff_str: |
79 | pager(diff_str) |