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 * | |
25 | from stgit import stack, git | |
26 | ||
27 | ||
28 | help = 'show the tree diff' | |
29 | usage = """%prog [options] [<files...>] | |
30 | ||
26aab5b0 CM |
31 | Show the diff (default) or diffstat between the current working copy |
32 | or a tree-ish object and another tree-ish object. File names can also | |
33 | be given to restrict the diff output. The tree-ish object can be a | |
34 | standard git commit, tag or tree. In addition to these, the command | |
35 | also supports 'base', representing the bottom of the current stack, | |
36 | and '[patch]/[bottom | top]' for the patch boundaries (defaulting to | |
37 | the current one): | |
38 | ||
39 | rev = '([patch]/[bottom | top]) | <tree-ish> | base' | |
40 | ||
41 | If neither bottom or top are given but a '/' is present, the command | |
42 | shows the specified patch (defaulting to the current one).""" | |
fcee87cf CM |
43 | |
44 | options = [make_option('-r', metavar = 'rev1[:[rev2]]', dest = 'revs', | |
45 | help = 'show the diff between revisions'), | |
46 | make_option('-s', '--stat', | |
47 | help = 'show the stat instead of the diff', | |
48 | action = 'store_true')] | |
49 | ||
50 | ||
51 | def func(parser, options, args): | |
52 | """Show the tree diff | |
53 | """ | |
54 | if options.revs: | |
55 | rev_list = options.revs.split(':') | |
56 | rev_list_len = len(rev_list) | |
57 | if rev_list_len == 1: | |
58 | if rev_list[0][-1] == '/': | |
59 | # the whole patch | |
60 | rev1 = rev_list[0] + 'bottom' | |
61 | rev2 = rev_list[0] + 'top' | |
62 | else: | |
63 | rev1 = rev_list[0] | |
64 | rev2 = None | |
65 | elif rev_list_len == 2: | |
66 | rev1 = rev_list[0] | |
67 | rev2 = rev_list[1] | |
fcee87cf CM |
68 | else: |
69 | parser.error('incorrect parameters to -r') | |
70 | else: | |
71 | rev1 = 'HEAD' | |
72 | rev2 = None | |
73 | ||
74 | if options.stat: | |
75 | print git.diffstat(args, git_id(rev1), git_id(rev2)) | |
76 | else: | |
52f3900c | 77 | pager(git.diff(args, git_id(rev1), git_id(rev2))) |