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
import stack
, git
28 help = 'show the tree diff'
29 usage
= """%prog [options] [<files...>]
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
39 rev = '([patch][//[bottom | top]]) | <tree-ish> | base'
41 If neither bottom nor top are given but a '//' is present, the command
42 shows the specified patch (defaulting to the current one)."""
44 options
= [make_option('-r', '--range',
45 metavar
= 'rev1[..[rev2]]', dest
= 'revs',
46 help = 'show the diff between revisions'),
47 make_option('-s', '--stat',
48 help = 'show the stat instead of the diff',
49 action
= 'store_true')]
52 def func(parser
, options
, args
):
56 rev_list
= options
.revs
.split('..')
57 rev_list_len
= len(rev_list
)
62 rev
= strip_suffix('/', rev
)
64 rev
= strip_suffix('/', rev
)
65 rev1
= rev
+ '//bottom'
70 elif rev_list_len
== 2:
74 parser
.error('incorrect parameters to -r')
80 print git
.diffstat(args
, git_id(rev1
), git_id(rev2
))
82 diff_str
= git
.diff(args
, git_id(rev1
), git_id(rev2
))