Add "stg id" support for "{public}" ref
[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
ef954fe6 26from stgit.lib import git as gitlib
fcee87cf 27
575bbdae 28help = 'Show the tree diff'
33ff9cdd 29kind = 'wc'
575bbdae
KH
30usage = ['[options] [<files or dirs>]']
31description = """
26aab5b0 32Show the diff (default) or diffstat between the current working copy
e4560d7e
CM
33or a tree-ish object and another tree-ish object (defaulting to HEAD).
34File names can also be given to restrict the diff output. The
5660771c 35tree-ish object has the format accepted by the linkstg:id[] command."""
575bbdae 36
6c8a90e1 37args = [argparse.known_files, argparse.dirty_files]
575bbdae
KH
38options = [
39 opt('-r', '--range', metavar = 'rev1[..[rev2]]', dest = 'revs',
6c8a90e1
KH
40 args = [argparse.patch_range(argparse.applied_patches,
41 argparse.unapplied_patches,
42 argparse.hidden_patches)],
575bbdae
KH
43 short = 'Show the diff between revisions'),
44 opt('-s', '--stat', action = 'store_true',
45 short = 'Show the stat instead of the diff'),
46 ] + argparse.diff_opts_option()
fcee87cf 47
117ed129 48directory = DirectoryHasRepository(log = False)
fcee87cf
CM
49
50def func(parser, options, args):
51 """Show the tree diff
52 """
d4356ac6
CM
53 args = git.ls_files(args)
54 directory.cd_to_topdir()
55
fcee87cf 56 if options.revs:
6b1e0111 57 rev_list = options.revs.split('..')
fcee87cf
CM
58 rev_list_len = len(rev_list)
59 if rev_list_len == 1:
e4560d7e
CM
60 rev1 = rev_list[0]
61 rev2 = None
fcee87cf
CM
62 elif rev_list_len == 2:
63 rev1 = rev_list[0]
64 rev2 = rev_list[1]
fcee87cf
CM
65 else:
66 parser.error('incorrect parameters to -r')
67 else:
68 rev1 = 'HEAD'
69 rev2 = None
70
a45cea15 71 diff_str = git.diff(args, git_id(crt_series, rev1),
e4560d7e 72 rev2 and git_id(crt_series, rev2),
a45cea15 73 diff_flags = options.diff_flags)
fcee87cf 74 if options.stat:
ef954fe6 75 out.stdout_raw(gitlib.diffstat(diff_str) + '\n')
fcee87cf 76 else:
fdf4cb43
CM
77 if diff_str:
78 pager(diff_str)