Refactor message printing
[stgit] / stgit / commands / pick.py
CommitLineData
0618ea9c
CM
1__copyright__ = """
2Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
3
4This program is free software; you can redistribute it and/or modify
5it under the terms of the GNU General Public License version 2 as
6published by the Free Software Foundation.
7
8This program is distributed in the hope that it will be useful,
9but WITHOUT ANY WARRANTY; without even the implied warranty of
10MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11GNU General Public License for more details.
12
13You should have received a copy of the GNU General Public License
14along with this program; if not, write to the Free Software
15Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16"""
17
18import sys, os
19from optparse import OptionParser, make_option
20
21from stgit.commands.common import *
22from stgit.utils import *
23from stgit import stack, git
8fce9909 24from stgit.stack import Series
0618ea9c
CM
25
26
27help = 'import a patch from a different branch or a commit object'
28usage = """%prog [options] [<patch@branch>|<commit>]
29
30Import a patch from a different branch or a commit object into the
31current series. By default, the name of the imported patch is used as
388f63b6 32the name of the current patch. It can be overridden with the '--name'
0618ea9c
CM
33option. A commit object can be reverted with the '--reverse'
34option. The log and author information are those of the commit object."""
35
36options = [make_option('-n', '--name',
37 help = 'use NAME as the patch name'),
38 make_option('-r', '--reverse',
39 help = 'reverse the commit object before importing',
ba524d4c 40 action = 'store_true'),
89e3bc51
YD
41 make_option('-p', '--parent', metavar = 'COMMITID',
42 help = 'use COMMITID as parent'),
ba524d4c
CM
43 make_option('--fold',
44 help = 'fold the commit object into the current patch',
d0bfda1a
CM
45 action = 'store_true'),
46 make_option('--update',
47 help = 'like fold but only update the current patch files',
7829d19d
CM
48 action = 'store_true'),
49 make_option('--unapplied',
50 help = 'keep the patch unapplied',
0618ea9c
CM
51 action = 'store_true')]
52
53
54def func(parser, options, args):
55 """Import a commit object as a new patch
56 """
57 if len(args) != 1:
58 parser.error('incorrect number of arguments')
59
7829d19d
CM
60 if not options.unapplied:
61 check_local_changes()
62 check_conflicts()
63 check_head_top_equal()
0618ea9c
CM
64
65 commit_str = args[0]
fff9bce5
CM
66 commit_id = git_id(commit_str)
67 commit = git.Commit(commit_id)
0618ea9c 68
d0bfda1a 69 if options.fold or options.update:
ba524d4c
CM
70 if not crt_series.get_current():
71 raise CmdException, 'No patches applied'
0618ea9c 72 else:
ba524d4c 73 patch_branch = commit_str.split('@')
9a6e2cc3 74 if options.name:
2e88afce 75 patchname = options.name
9a6e2cc3 76 elif len(patch_branch) == 2:
2e88afce 77 patchname = patch_branch[0]
ba524d4c 78 else:
9060d420 79 patchname = None
0618ea9c 80
89e3bc51
YD
81 if options.parent:
82 parent = git_id(options.parent)
83 else:
84 parent = commit.get_parent()
85
0618ea9c 86 if not options.reverse:
89e3bc51 87 bottom = parent
0618ea9c
CM
88 top = commit_id
89 else:
90 bottom = commit_id
89e3bc51 91 top = parent
0618ea9c 92
ba524d4c 93 if options.fold:
27ac2b7e 94 out.start('Folding commit %s' % commit_id)
0618ea9c 95
d218d2f8
CM
96 # try a direct git-apply first
97 if not git.apply_diff(bottom, top):
f3b4fbff 98 git.merge(bottom, git.get_head(), top, recursive = True)
5f9ce587 99
27ac2b7e 100 out.done()
d0bfda1a
CM
101 elif options.update:
102 rev1 = git_id('//bottom')
103 rev2 = git_id('//top')
104 files = git.barefiles(rev1, rev2).split('\n')
105
27ac2b7e 106 out.start('Updating with commit %s' % commit_id)
d0bfda1a
CM
107
108 if not git.apply_diff(bottom, top, files = files):
109 raise CmdException, 'Patch updating failed'
110
27ac2b7e 111 out.done()
ba524d4c
CM
112 else:
113 message = commit.get_log()
114 author_name, author_email, author_date = \
115 name_email_date(commit.get_author())
116
27ac2b7e 117 out.start('Importing commit %s' % commit_id)
0618ea9c 118
8fce9909
YD
119 newpatch = crt_series.new_patch(patchname, message = message, can_edit = False,
120 unapplied = True, bottom = bottom, top = top,
121 author_name = author_name,
122 author_email = author_email,
123 author_date = author_date)
124 # find a patchlog to fork from
125 (refpatchname, refbranchname, refpatchid) = parse_rev(commit_str)
126 if refpatchname and not refpatchid and \
127 (not refpatchid or refpatchid == 'top'):
128 # FIXME: should also support picking //top.old
129 if refbranchname:
130 # assume the refseries is OK, since we already resolved
131 # commit_str to a git_id
132 refseries = Series(refbranchname)
133 else:
134 refseries = crt_series
135 patch = refseries.get_patch(refpatchname)
136 if patch.get_log():
27ac2b7e
KH
137 out.info("Log was %s" % newpatch.get_log())
138 out.info("Setting log to %s\n" % patch.get_log())
8fce9909 139 newpatch.set_log(patch.get_log())
27ac2b7e 140 out.info("Log is now %s" % newpatch.get_log())
8fce9909 141 else:
27ac2b7e
KH
142 out.info("No log for %s\n" % patchname)
143
7829d19d 144 if not options.unapplied:
2e88afce 145 modified = crt_series.push_patch(patchname)
7829d19d
CM
146 else:
147 modified = False
0618ea9c 148
2e88afce 149 if crt_series.empty_patch(patchname):
27ac2b7e 150 out.done('empty patch')
5f9ce587 151 elif modified:
27ac2b7e 152 out.done('modified')
5f9ce587 153 else:
27ac2b7e
KH
154 out.done()
155
0618ea9c 156 print_crt_patch()