chiark / gitweb /
Fix "show" to allow multiple branch:patch arguments
[stgit] / stgit / commands / show.py
1 __copyright__ = """
2 Copyright (C) 2006, Catalin Marinas <catalin.marinas@gmail.com>
3
4 This program is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License version 2 as
6 published by the Free Software Foundation.
7
8 This program is distributed in the hope that it will be useful,
9 but WITHOUT ANY WARRANTY; without even the implied warranty of
10 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11 GNU General Public License for more details.
12
13 You should have received a copy of the GNU General Public License
14 along with this program; if not, write to the Free Software
15 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16 """
17
18 import sys, os
19 from pydoc import pager
20 from stgit.argparse import opt
21 from stgit.commands.common import *
22 from stgit import argparse, git
23
24 help = 'Show the commit corresponding to a patch'
25 kind = 'patch'
26 usage = ['[options] [<patch1>] [<patch2>] [<patch3>..<patch4>]']
27 description = """
28 Show the commit log and the diff corresponding to the given patches.
29 The output is similar to that generated by 'git show'."""
30
31 args = [argparse.patch_range(argparse.applied_patches,
32                              argparse.unapplied_patches,
33                              argparse.hidden_patches)]
34 options = [
35     opt('-b', '--branch', args = [argparse.stg_branches],
36         short = 'Use BRANCH instead of the default branch'),
37     opt('-a', '--applied', action = 'store_true',
38         short = 'Show the applied patches'),
39     opt('-u', '--unapplied', action = 'store_true',
40         short = 'Show the unapplied patches'),
41     ] + argparse.diff_opts_option()
42
43 directory = DirectoryHasRepository(log = False)
44
45 def func(parser, options, args):
46     """Show commit log and diff
47     """
48     if options.applied:
49         patches = crt_series.get_applied()
50     elif options.unapplied:
51         patches = crt_series.get_unapplied()
52     elif len(args) == 0:
53         patches = ['HEAD']
54     else:
55         if len(args) == 1 or args[0].find('..') == -1:
56             # single patch or one/more commit ids
57             patches = args
58         else:
59             applied = crt_series.get_applied()
60             unapplied = crt_series.get_unapplied()
61             patches = parse_patches(args, applied + unapplied + \
62                                     crt_series.get_hidden(), len(applied))
63
64     commit_ids = [git_id(crt_series, patch) for patch in patches]
65     commit_str = '\n'.join([git.pretty_commit(commit_id,
66                                               flags = options.diff_flags)
67                             for commit_id in commit_ids])
68     if commit_str:
69         pager(commit_str)