Make diff flags handling more modular.
[stgit] / stgit / commands / diff.py
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
21 from pydoc import pager
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
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 nor top are given but a '//' is present, the command
42 shows the specified patch (defaulting to the current one)."""
43
44 options = [make_option('-r', '--range',
45 metavar = 'rev1[..[rev2]]', dest = 'revs',
46 help = 'show the diff between revisions'),
47 make_option('--binary',
48 help = 'output a diff even for binary files',
49 action = 'store_true'),
50 make_option('-s', '--stat',
51 help = 'show the stat instead of the diff',
52 action = 'store_true')]
53
54
55 def func(parser, options, args):
56 """Show the tree diff
57 """
58 if options.revs:
59 rev_list = options.revs.split('..')
60 rev_list_len = len(rev_list)
61 if rev_list_len == 1:
62 rev = rev_list[0]
63 if rev.endswith('/'):
64 # the whole patch
65 rev = strip_suffix('/', rev)
66 if rev.endswith('/'):
67 rev = strip_suffix('/', rev)
68 rev1 = rev + '//bottom'
69 rev2 = rev + '//top'
70 else:
71 rev1 = rev_list[0]
72 rev2 = None
73 elif rev_list_len == 2:
74 rev1 = rev_list[0]
75 rev2 = rev_list[1]
76 else:
77 parser.error('incorrect parameters to -r')
78 else:
79 rev1 = 'HEAD'
80 rev2 = None
81
82 if options.binary:
83 diff_flags = [ '--binary' ]
84 else:
85 diff_flags = []
86
87 if options.stat:
88 out.stdout_raw(git.diffstat(args, git_id(rev1), git_id(rev2)) + '\n')
89 else:
90 diff_str = git.diff(args, git_id(rev1), git_id(rev2),
91 diff_flags = diff_flags )
92 if diff_str:
93 pager(diff_str)