Commit | Line | Data |
---|---|---|
8847a11b CM |
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 | |
52f3900c | 19 | from pydoc import pager |
575bbdae | 20 | from stgit.argparse import opt |
8847a11b | 21 | from stgit.commands.common import * |
20a52e06 | 22 | from stgit import argparse, git |
88753c5a | 23 | from stgit.lib import git as gitlib |
8847a11b | 24 | |
575bbdae | 25 | help = 'Show the commit corresponding to a patch' |
33ff9cdd | 26 | kind = 'patch' |
575bbdae KH |
27 | usage = ['[options] [<patch1>] [<patch2>] [<patch3>..<patch4>]'] |
28 | description = """ | |
29 | Show the commit log and the diff corresponding to the given patches. | |
30 | The output is similar to that generated by 'git show'.""" | |
8847a11b | 31 | |
6c8a90e1 KH |
32 | args = [argparse.patch_range(argparse.applied_patches, |
33 | argparse.unapplied_patches, | |
34 | argparse.hidden_patches)] | |
575bbdae | 35 | options = [ |
6c8a90e1 | 36 | opt('-b', '--branch', args = [argparse.stg_branches], |
575bbdae KH |
37 | short = 'Use BRANCH instead of the default branch'), |
38 | opt('-a', '--applied', action = 'store_true', | |
39 | short = 'Show the applied patches'), | |
40 | opt('-u', '--unapplied', action = 'store_true', | |
41 | short = 'Show the unapplied patches'), | |
88753c5a CM |
42 | opt('-s', '--stat', action = 'store_true', |
43 | short = 'Show a diffstat summary of the specified patches'), | |
575bbdae | 44 | ] + argparse.diff_opts_option() |
8847a11b | 45 | |
117ed129 | 46 | directory = DirectoryHasRepository(log = False) |
8847a11b CM |
47 | |
48 | def func(parser, options, args): | |
49 | """Show commit log and diff | |
50 | """ | |
7c47eea5 | 51 | if options.applied: |
d679e110 | 52 | patches = crt_series.get_applied() |
7c47eea5 | 53 | elif options.unapplied: |
d679e110 | 54 | patches = crt_series.get_unapplied() |
7c47eea5 CM |
55 | elif len(args) == 0: |
56 | patches = ['HEAD'] | |
d3b31eea CM |
57 | elif '..' in ' '.join(args): |
58 | # patch ranges | |
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)) | |
8847a11b | 63 | else: |
d3b31eea CM |
64 | # individual patches or commit ids |
65 | patches = args | |
7c47eea5 | 66 | |
88753c5a CM |
67 | if not options.stat: |
68 | options.diff_flags.extend(color_diff_flags()) | |
6972fd6b | 69 | commit_ids = [git_id(crt_series, patch) for patch in patches] |
bdf72d71 KH |
70 | commit_str = '\n'.join([git.pretty_commit(commit_id, |
71 | flags = options.diff_flags) | |
7c47eea5 | 72 | for commit_id in commit_ids]) |
88753c5a CM |
73 | if options.stat: |
74 | commit_str = gitlib.diffstat(commit_str) | |
fdf4cb43 CM |
75 | if commit_str: |
76 | pager(commit_str) |