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 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
  27 help = 'Show the tree diff'
  28 usage = ['[options] [<files or dirs>]']
  29 description = """
  30 Show the diff (default) or diffstat between the current working copy
  31 or a tree-ish object and another tree-ish object (defaulting to HEAD).
  32 File names can also be given to restrict the diff output. The
  33 tree-ish object can be an StGIT patch, a standard git commit, tag or
  34 tree. In addition to these, the command also supports '{base}',
  35 representing the bottom of the current stack.
  36
  37 rev = '[branch:](<patch>|{base}) | <tree-ish>'"""
  38
  39 options = [
  40     opt('-r', '--range', metavar = 'rev1[..[rev2]]', dest = 'revs',
  41         short = 'Show the diff between revisions'),
  42     opt('-s', '--stat', action = 'store_true',
  43         short = 'Show the stat instead of the diff'),
  44     ] + argparse.diff_opts_option()
  45
  46 directory = DirectoryHasRepository()
  47
  48 def func(parser, options, args):
  49     """Show the tree diff
  50     """
  51     args = git.ls_files(args)
  52     directory.cd_to_topdir()
  53
  54     if options.revs:
  55         rev_list = options.revs.split('..')
  56         rev_list_len = len(rev_list)
  57         if rev_list_len == 1:
  58             rev1 = rev_list[0]
  59             rev2 = None
  60         elif rev_list_len == 2:
  61             rev1 = rev_list[0]
  62             rev2 = rev_list[1]
  63         else:
  64             parser.error('incorrect parameters to -r')
  65     else:
  66         rev1 = 'HEAD'
  67         rev2 = None
  68
  69     diff_str = git.diff(args, git_id(crt_series, rev1),
  70                         rev2 and git_id(crt_series, rev2),
  71                         diff_flags = options.diff_flags)
  72     if options.stat:
  73         out.stdout_raw(git.diffstat(diff_str) + '\n')
  74     else:
  75         if diff_str:
  76             pager(diff_str)