3 Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
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.
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.
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
20 from optparse
import OptionParser
, make_option
21 from pydoc
import pager
23 from stgit
.commands
.common
import *
24 from stgit
.utils
import *
25 from stgit
.out
import *
26 from stgit
import stack
, git
29 help = 'show the tree diff'
30 usage
= """%prog [options] [<files or dirs>]
32 Show the diff (default) or diffstat between the current working copy
33 or a tree-ish object and another tree-ish object. File names can also
34 be given to restrict the diff output. The tree-ish object can be a
35 standard git commit, tag or tree. In addition to these, the command
36 also supports 'base', representing the bottom of the current stack,
37 and '[patch][//[bottom | top]]' for the patch boundaries (defaulting to
40 rev = '([patch][//[bottom | top]]) | <tree-ish> | base'
42 If neither bottom nor top are given but a '//' is present, the command
43 shows the specified patch (defaulting to the current one)."""
45 directory
= DirectoryHasRepository()
46 options
= [make_option('-r', '--range',
47 metavar
= 'rev1[..[rev2]]', dest
= 'revs',
48 help = 'show the diff between revisions'),
49 make_option('-s', '--stat',
50 help = 'show the stat instead of the diff',
51 action
= 'store_true')
52 ] + make_diff_opts_option()
54 def func(parser
, options
, args
):
57 args
= git
.ls_files(args
)
58 directory
.cd_to_topdir()
61 rev_list
= options
.revs
.split('..')
62 rev_list_len
= len(rev_list
)
67 rev
= strip_suffix('/', rev
)
69 rev
= strip_suffix('/', rev
)
70 rev1
= rev
+ '//bottom'
75 elif rev_list_len
== 2:
79 parser
.error('incorrect parameters to -r')
84 diff_str
= git
.diff(args
, git_id(crt_series
, rev1
),
85 git_id(crt_series
, rev2
),
86 diff_flags
= options
.diff_flags
)
88 out
.stdout_raw(git
.diffstat(diff_str
) + '\n')