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