Remove the --force flag to "stg rebase" and "stg pull"
[stgit] / stgit / commands / patches.py
1 __copyright__ = """
2 Copyright (C) 2005, 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 optparse import OptionParser, make_option
20 from pydoc import pager
21
22 from stgit.commands.common import *
23 from stgit.utils import *
24 from stgit.out import *
25 from stgit import stack, git
26
27
28 help = 'show the applied patches modifying a file'
29 usage = """%prog [options] [<files...>]
30
31 Show the applied patches modifying the given files. Without arguments,
32 it shows the patches affected by the local tree modifications. The
33 '--diff' option also lists the patch log and the diff for the given
34 files."""
35
36 options = [make_option('-d', '--diff',
37 help = 'show the diff for the given files',
38 action = 'store_true'),
39 make_option('-b', '--branch',
40 help = 'use BRANCH instead of the default one')]
41
42 diff_tmpl = \
43 '-------------------------------------------------------------------------------\n' \
44 '%s\n' \
45 '-------------------------------------------------------------------------------\n' \
46 '%s' \
47 '---\n\n' \
48 '%s'
49
50 def func(parser, options, args):
51 """Show the patches modifying a file
52 """
53 if not args:
54 files = [path for (stat,path) in git.tree_status(verbose = True)]
55 else:
56 files = args
57
58 if not files:
59 raise CmdException, 'No files specified or no local changes'
60
61 applied = crt_series.get_applied()
62 if not applied:
63 raise CmdException, 'No patches applied'
64
65 revs = git.modifying_revs(files, crt_series.get_base(),
66 crt_series.get_head())
67 revs.reverse()
68
69 # build the patch/revision mapping
70 rev_patch = dict()
71 for name in applied:
72 patch = crt_series.get_patch(name)
73 rev_patch[patch.get_top()] = patch
74
75 # print the patch names
76 diff_output = ''
77 for rev in revs:
78 if rev in rev_patch:
79 patch = rev_patch[rev]
80 if options.diff:
81 diff_output += diff_tmpl \
82 % (patch.get_name(), patch.get_description(),
83 git.diff(files, patch.get_bottom(),
84 patch.get_top()))
85 else:
86 out.stdout(patch.get_name())
87
88 if options.diff:
89 pager(diff_output)