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 pydoc
import pager
21 from stgit
.argparse
import opt
22 from stgit
.commands
.common
import *
23 from stgit
.utils
import *
24 from stgit
.out
import *
25 from stgit
import argparse
, stack
, git
26 from stgit
.lib
import git
as gitlib
28 help = 'Show the tree diff'
30 usage
= ['[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 (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.
39 rev = '[branch:](<patch>|{base}) | <tree-ish>'"""
41 args
= [argparse
.known_files
, argparse
.dirty_files
]
43 opt('-r', '--range', metavar
= 'rev1[..[rev2]]', dest
= 'revs',
44 args
= [argparse
.patch_range(argparse
.applied_patches
,
45 argparse
.unapplied_patches
,
46 argparse
.hidden_patches
)],
47 short
= 'Show the diff between revisions'),
48 opt('-s', '--stat', action
= 'store_true',
49 short
= 'Show the stat instead of the diff'),
50 ] + argparse
.diff_opts_option()
52 directory
= DirectoryHasRepository(log
= False)
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
)
66 elif rev_list_len
== 2:
70 parser
.error('incorrect parameters to -r')
75 diff_str
= git
.diff(args
, git_id(crt_series
, rev1
),
76 rev2
and git_id(crt_series
, rev2
),
77 diff_flags
= options
.diff_flags
)
79 out
.stdout_raw(gitlib
.diffstat(diff_str
) + '\n')