mdw@git.distorted.org.uk Git - stgit/blob - 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.out import *
  26 from stgit import stack, git
  27
  28
  29 help = 'show the tree diff'
  30 usage = """%prog [options] [<files...>]
  31
  32 Show the diff (default) or diffstat between the current working copy
  33 or a tree-ish object and another tree-ish object. File names can also
  34 be given to restrict the diff output. The tree-ish object can be a
  35 standard git commit, tag or tree. In addition to these, the command
  36 also supports 'base', representing the bottom of the current stack,
  37 and '[patch][//[bottom | top]]' for the patch boundaries (defaulting to
  38 the current one):
  39
  40 rev = '([patch][//[bottom | top]]) | <tree-ish> | base'
  41
  42 If neither bottom nor top are given but a '//' is present, the command
  43 shows the specified patch (defaulting to the current one)."""
  44
  45 directory = DirectoryHasRepository()
  46 options = [make_option('-r', '--range',
  47                        metavar = 'rev1[..[rev2]]', dest = 'revs',
  48                        help = 'show the diff between revisions'),
  49            make_option('-O', '--diff-opts',
  50                        help = 'options to pass to git-diff'),
  51            make_option('-s', '--stat',
  52                        help = 'show the stat instead of the diff',
  53                        action = 'store_true')]
  54
  55
  56 def func(parser, options, args):
  57     """Show the tree diff
  58     """
  59     if options.revs:
  60         rev_list = options.revs.split('..')
  61         rev_list_len = len(rev_list)
  62         if rev_list_len == 1:
  63             rev = rev_list[0]
  64             if rev.endswith('/'):
  65                 # the whole patch
  66                 rev = strip_suffix('/', rev)
  67                 if rev.endswith('/'):
  68                     rev = strip_suffix('/', rev)
  69                 rev1 = rev + '//bottom'
  70                 rev2 = rev + '//top'
  71             else:
  72                 rev1 = rev_list[0]
  73                 rev2 = None
  74         elif rev_list_len == 2:
  75             rev1 = rev_list[0]
  76             rev2 = rev_list[1]
  77         else:
  78             parser.error('incorrect parameters to -r')
  79     else:
  80         rev1 = 'HEAD'
  81         rev2 = None
  82
  83     if options.diff_opts:
  84         diff_flags = options.diff_opts.split()
  85     else:
  86         diff_flags = []
  87
  88     if options.stat:
  89         out.stdout_raw(git.diffstat(args, git_id(crt_series, rev1),
  90                                     git_id(crt_series, rev2)) + '\n')
  91     else:
  92         diff_str = git.diff(args, git_id(crt_series, rev1),
  93                             git_id(crt_series, rev2), diff_flags = diff_flags )
  94         if diff_str:
  95             pager(diff_str)