Mercurial > hg
annotate hgext/transplant.py @ 8781:385a2d94885e
hgrc.5: fix quoting of literal strings
The quotes would go wrong in many places due to differences between
asciidoc version 8.2.7 used by Benoit and 8.4.5 used by me. Between
those versions asciidoc stopped interpreting the content of `quoted
strings`, and so `*` would start bold text in the old version, but do
nothing in the new version.
To complicate things further, `\*` would escape the bold tag in the
old version, but in the new version the backslash was inserted
literally into the output (because the backtick quotes it).
I've now replaced backticks with non-quoting plusses and escaped
backslashes as appropriate.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Thu, 11 Jun 2009 17:19:48 +0200 |
parents | c5f36402daad |
children | 8b35b08724eb |
rev | line source |
---|---|
3714 | 1 # Patch transplanting extension for Mercurial |
2 # | |
4635
63b9d2deed48
Updated copyright notices and add "and others" to "hg version"
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4516
diff
changeset
|
3 # Copyright 2006, 2007 Brendan Cully <brendan@kublai.com> |
3714 | 4 # |
8225
46293a0c7e9f
updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents:
8209
diff
changeset
|
5 # This software may be used and distributed according to the terms of the |
46293a0c7e9f
updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents:
8209
diff
changeset
|
6 # GNU General Public License version 2, incorporated herein by reference. |
3714 | 7 |
8 '''patch transplanting tool | |
9 | |
10 This extension allows you to transplant patches from another branch. | |
11 | |
8000
83d7c9cfb065
transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7874
diff
changeset
|
12 Transplanted patches are recorded in .hg/transplant/transplants, as a |
83d7c9cfb065
transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7874
diff
changeset
|
13 map from a changeset hash to its hash in the source repository. |
3714 | 14 ''' |
15 | |
7629
97253bcb44a8
transplant: move docstrings before imports (see issue1466)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7415
diff
changeset
|
16 from mercurial.i18n import _ |
97253bcb44a8
transplant: move docstrings before imports (see issue1466)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7415
diff
changeset
|
17 import os, tempfile |
8703
8676dd819444
transplant: use match object rather than files for commit
Matt Mackall <mpm@selenic.com>
parents:
8615
diff
changeset
|
18 from mercurial import bundlerepo, changegroup, cmdutil, hg, merge, match |
7633 | 19 from mercurial import patch, revlog, util, error |
7629
97253bcb44a8
transplant: move docstrings before imports (see issue1466)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7415
diff
changeset
|
20 |
8778
c5f36402daad
use new style classes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8706
diff
changeset
|
21 class transplantentry(object): |
3714 | 22 def __init__(self, lnode, rnode): |
23 self.lnode = lnode | |
24 self.rnode = rnode | |
25 | |
8778
c5f36402daad
use new style classes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8706
diff
changeset
|
26 class transplants(object): |
3714 | 27 def __init__(self, path=None, transplantfile=None, opener=None): |
28 self.path = path | |
29 self.transplantfile = transplantfile | |
30 self.opener = opener | |
31 | |
32 if not opener: | |
33 self.opener = util.opener(self.path) | |
34 self.transplants = [] | |
35 self.dirty = False | |
36 self.read() | |
37 | |
38 def read(self): | |
39 abspath = os.path.join(self.path, self.transplantfile) | |
40 if self.transplantfile and os.path.exists(abspath): | |
41 for line in self.opener(self.transplantfile).read().splitlines(): | |
42 lnode, rnode = map(revlog.bin, line.split(':')) | |
43 self.transplants.append(transplantentry(lnode, rnode)) | |
44 | |
45 def write(self): | |
46 if self.dirty and self.transplantfile: | |
47 if not os.path.isdir(self.path): | |
48 os.mkdir(self.path) | |
49 fp = self.opener(self.transplantfile, 'w') | |
50 for c in self.transplants: | |
51 l, r = map(revlog.hex, (c.lnode, c.rnode)) | |
52 fp.write(l + ':' + r + '\n') | |
53 fp.close() | |
54 self.dirty = False | |
55 | |
56 def get(self, rnode): | |
57 return [t for t in self.transplants if t.rnode == rnode] | |
58 | |
59 def set(self, lnode, rnode): | |
60 self.transplants.append(transplantentry(lnode, rnode)) | |
61 self.dirty = True | |
62 | |
63 def remove(self, transplant): | |
64 del self.transplants[self.transplants.index(transplant)] | |
65 self.dirty = True | |
66 | |
8778
c5f36402daad
use new style classes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8706
diff
changeset
|
67 class transplanter(object): |
3714 | 68 def __init__(self, ui, repo): |
69 self.ui = ui | |
70 self.path = repo.join('transplant') | |
71 self.opener = util.opener(self.path) | |
7744
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
72 self.transplants = transplants(self.path, 'transplants', |
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
73 opener=self.opener) |
3714 | 74 |
75 def applied(self, repo, node, parent): | |
76 '''returns True if a node is already an ancestor of parent | |
77 or has already been transplanted''' | |
78 if hasnode(repo, node): | |
79 if node in repo.changelog.reachable(parent, stop=node): | |
80 return True | |
81 for t in self.transplants.get(node): | |
82 # it might have been stripped | |
83 if not hasnode(repo, t.lnode): | |
84 self.transplants.remove(t) | |
85 return False | |
86 if t.lnode in repo.changelog.reachable(parent, stop=t.lnode): | |
87 return True | |
88 return False | |
89 | |
90 def apply(self, repo, source, revmap, merges, opts={}): | |
91 '''apply the revisions in revmap one by one in revision order''' | |
8209
a1a5a57efe90
replace util.sort with sorted built-in
Matt Mackall <mpm@selenic.com>
parents:
8176
diff
changeset
|
92 revs = sorted(revmap) |
3714 | 93 p1, p2 = repo.dirstate.parents() |
94 pulls = [] | |
95 diffopts = patch.diffopts(self.ui, opts) | |
96 diffopts.git = True | |
97 | |
4915
97b734fb9c6f
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents:
4680
diff
changeset
|
98 lock = wlock = None |
3714 | 99 try: |
4915
97b734fb9c6f
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents:
4680
diff
changeset
|
100 wlock = repo.wlock() |
97b734fb9c6f
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents:
4680
diff
changeset
|
101 lock = repo.lock() |
3714 | 102 for rev in revs: |
103 node = revmap[rev] | |
104 revstr = '%s:%s' % (rev, revlog.short(node)) | |
105 | |
106 if self.applied(repo, node, p1): | |
107 self.ui.warn(_('skipping already applied revision %s\n') % | |
108 revstr) | |
109 continue | |
110 | |
111 parents = source.changelog.parents(node) | |
112 if not opts.get('filter'): | |
7744
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
113 # If the changeset parent is the same as the |
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
114 # wdir's parent, just pull it. |
3714 | 115 if parents[0] == p1: |
116 pulls.append(node) | |
117 p1 = node | |
118 continue | |
119 if pulls: | |
120 if source != repo: | |
4917
126f527b3ba3
Make repo locks recursive, eliminate all passing of lock/wlock
Matt Mackall <mpm@selenic.com>
parents:
4915
diff
changeset
|
121 repo.pull(source, heads=pulls) |
126f527b3ba3
Make repo locks recursive, eliminate all passing of lock/wlock
Matt Mackall <mpm@selenic.com>
parents:
4915
diff
changeset
|
122 merge.update(repo, pulls[-1], False, False, None) |
3714 | 123 p1, p2 = repo.dirstate.parents() |
124 pulls = [] | |
125 | |
126 domerge = False | |
127 if node in merges: | |
7744
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
128 # pulling all the merge revs at once would mean we |
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
129 # couldn't transplant after the latest even if |
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
130 # transplants before them fail. |
3714 | 131 domerge = True |
132 if not hasnode(repo, node): | |
4917
126f527b3ba3
Make repo locks recursive, eliminate all passing of lock/wlock
Matt Mackall <mpm@selenic.com>
parents:
4915
diff
changeset
|
133 repo.pull(source, heads=[node]) |
3714 | 134 |
135 if parents[1] != revlog.nullid: | |
136 self.ui.note(_('skipping merge changeset %s:%s\n') | |
137 % (rev, revlog.short(node))) | |
138 patchfile = None | |
139 else: | |
140 fd, patchfile = tempfile.mkstemp(prefix='hg-transplant-') | |
141 fp = os.fdopen(fd, 'w') | |
7308
b6f5490effbf
patch: turn patch.diff() into a generator
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7280
diff
changeset
|
142 gen = patch.diff(source, parents[0], node, opts=diffopts) |
b6f5490effbf
patch: turn patch.diff() into a generator
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7280
diff
changeset
|
143 for chunk in gen: |
b6f5490effbf
patch: turn patch.diff() into a generator
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7280
diff
changeset
|
144 fp.write(chunk) |
3714 | 145 fp.close() |
146 | |
147 del revmap[rev] | |
148 if patchfile or domerge: | |
149 try: | |
4917
126f527b3ba3
Make repo locks recursive, eliminate all passing of lock/wlock
Matt Mackall <mpm@selenic.com>
parents:
4915
diff
changeset
|
150 n = self.applyone(repo, node, |
126f527b3ba3
Make repo locks recursive, eliminate all passing of lock/wlock
Matt Mackall <mpm@selenic.com>
parents:
4915
diff
changeset
|
151 source.changelog.read(node), |
3714 | 152 patchfile, merge=domerge, |
153 log=opts.get('log'), | |
4917
126f527b3ba3
Make repo locks recursive, eliminate all passing of lock/wlock
Matt Mackall <mpm@selenic.com>
parents:
4915
diff
changeset
|
154 filter=opts.get('filter')) |
4251
e76e52145c3d
transplant: fix ignoring empty changesets (eg after filter)
Brendan Cully <brendan@kublai.com>
parents:
4072
diff
changeset
|
155 if n and domerge: |
3714 | 156 self.ui.status(_('%s merged at %s\n') % (revstr, |
157 revlog.short(n))) | |
4251
e76e52145c3d
transplant: fix ignoring empty changesets (eg after filter)
Brendan Cully <brendan@kublai.com>
parents:
4072
diff
changeset
|
158 elif n: |
7744
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
159 self.ui.status(_('%s transplanted to %s\n') |
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
160 % (revlog.short(node), |
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
161 revlog.short(n))) |
3714 | 162 finally: |
163 if patchfile: | |
164 os.unlink(patchfile) | |
165 if pulls: | |
4917
126f527b3ba3
Make repo locks recursive, eliminate all passing of lock/wlock
Matt Mackall <mpm@selenic.com>
parents:
4915
diff
changeset
|
166 repo.pull(source, heads=pulls) |
126f527b3ba3
Make repo locks recursive, eliminate all passing of lock/wlock
Matt Mackall <mpm@selenic.com>
parents:
4915
diff
changeset
|
167 merge.update(repo, pulls[-1], False, False, None) |
3714 | 168 finally: |
169 self.saveseries(revmap, merges) | |
170 self.transplants.write() | |
8112
6ee71f78497c
switch lock releasing in the extensions from gc to explicit
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
8076
diff
changeset
|
171 lock.release() |
6ee71f78497c
switch lock releasing in the extensions from gc to explicit
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
8076
diff
changeset
|
172 wlock.release() |
3714 | 173 |
174 def filter(self, filter, changelog, patchfile): | |
175 '''arbitrarily rewrite changeset before applying it''' | |
176 | |
6966
057ced2b8543
i18n: mark strings for translation in transplant extension
Martin Geisler <mg@daimi.au.dk>
parents:
6762
diff
changeset
|
177 self.ui.status(_('filtering %s\n') % patchfile) |
3759
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
178 user, date, msg = (changelog[1], changelog[2], changelog[4]) |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
179 |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
180 fd, headerfile = tempfile.mkstemp(prefix='hg-transplant-') |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
181 fp = os.fdopen(fd, 'w') |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
182 fp.write("# HG changeset patch\n") |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
183 fp.write("# User %s\n" % user) |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
184 fp.write("# Date %d %d\n" % date) |
3831
2db191165e9a
transplant: don't add extra newlines to changelog entry in filter
Brendan Cully <brendan@kublai.com>
parents:
3759
diff
changeset
|
185 fp.write(changelog[4]) |
3759
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
186 fp.close() |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
187 |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
188 try: |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
189 util.system('%s %s %s' % (filter, util.shellquote(headerfile), |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
190 util.shellquote(patchfile)), |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
191 environ={'HGUSER': changelog[1]}, |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
192 onerr=util.Abort, errprefix=_('filter failed')) |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
193 user, date, msg = self.parselog(file(headerfile))[1:4] |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
194 finally: |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
195 os.unlink(headerfile) |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
196 |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
197 return (user, date, msg) |
3714 | 198 |
199 def applyone(self, repo, node, cl, patchfile, merge=False, log=False, | |
4917
126f527b3ba3
Make repo locks recursive, eliminate all passing of lock/wlock
Matt Mackall <mpm@selenic.com>
parents:
4915
diff
changeset
|
200 filter=None): |
3714 | 201 '''apply the patch in patchfile to the repository as a transplant''' |
202 (manifest, user, (time, timezone), files, message) = cl[:5] | |
203 date = "%d %d" % (time, timezone) | |
204 extra = {'transplant_source': node} | |
205 if filter: | |
3759
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
206 (user, date, message) = self.filter(filter, cl, patchfile) |
3714 | 207 |
208 if log: | |
209 message += '\n(transplanted from %s)' % revlog.hex(node) | |
210 | |
211 self.ui.status(_('applying %s\n') % revlog.short(node)) | |
212 self.ui.note('%s %s\n%s\n' % (user, date, message)) | |
213 | |
214 if not patchfile and not merge: | |
215 raise util.Abort(_('can only omit patchfile if merging')) | |
216 if patchfile: | |
217 try: | |
218 files = {} | |
3726
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3725
diff
changeset
|
219 try: |
7874
d812029cda85
cleanup: drop variables for unused return values
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7744
diff
changeset
|
220 patch.patch(patchfile, self.ui, cwd=repo.root, |
d812029cda85
cleanup: drop variables for unused return values
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7744
diff
changeset
|
221 files=files) |
3726
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3725
diff
changeset
|
222 if not files: |
7744
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
223 self.ui.warn(_('%s: empty changeset') |
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
224 % revlog.hex(node)) |
4251
e76e52145c3d
transplant: fix ignoring empty changesets (eg after filter)
Brendan Cully <brendan@kublai.com>
parents:
4072
diff
changeset
|
225 return None |
3726
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3725
diff
changeset
|
226 finally: |
4917
126f527b3ba3
Make repo locks recursive, eliminate all passing of lock/wlock
Matt Mackall <mpm@selenic.com>
parents:
4915
diff
changeset
|
227 files = patch.updatedir(self.ui, repo, files) |
3714 | 228 except Exception, inst: |
229 if filter: | |
230 os.unlink(patchfile) | |
3757
faed44bab17b
transplant: clobber old series when transplant fails
Brendan Cully <brendan@kublai.com>
parents:
3752
diff
changeset
|
231 seriespath = os.path.join(self.path, 'series') |
faed44bab17b
transplant: clobber old series when transplant fails
Brendan Cully <brendan@kublai.com>
parents:
3752
diff
changeset
|
232 if os.path.exists(seriespath): |
faed44bab17b
transplant: clobber old series when transplant fails
Brendan Cully <brendan@kublai.com>
parents:
3752
diff
changeset
|
233 os.unlink(seriespath) |
3714 | 234 p1 = repo.dirstate.parents()[0] |
235 p2 = node | |
3725
ccc7a9eb0e5e
transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
236 self.log(user, date, message, p1, p2, merge=merge) |
3714 | 237 self.ui.write(str(inst) + '\n') |
7744
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
238 raise util.Abort(_('Fix up the merge and run ' |
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
239 'hg transplant --continue')) |
3714 | 240 else: |
241 files = None | |
242 if merge: | |
243 p1, p2 = repo.dirstate.parents() | |
244 repo.dirstate.setparents(p1, node) | |
8703
8676dd819444
transplant: use match object rather than files for commit
Matt Mackall <mpm@selenic.com>
parents:
8615
diff
changeset
|
245 m = match.always(repo.root, '') |
8676dd819444
transplant: use match object rather than files for commit
Matt Mackall <mpm@selenic.com>
parents:
8615
diff
changeset
|
246 else: |
8676dd819444
transplant: use match object rather than files for commit
Matt Mackall <mpm@selenic.com>
parents:
8615
diff
changeset
|
247 m = match.exact(repo.root, '', files) |
3714 | 248 |
8706
25e9c71b89de
commit: drop the now-unused files parameter
Matt Mackall <mpm@selenic.com>
parents:
8703
diff
changeset
|
249 n = repo.commit(message, user, date, extra=extra, match=m) |
3714 | 250 if not merge: |
251 self.transplants.set(n, node) | |
252 | |
253 return n | |
254 | |
255 def resume(self, repo, source, opts=None): | |
256 '''recover last transaction and apply remaining changesets''' | |
257 if os.path.exists(os.path.join(self.path, 'journal')): | |
258 n, node = self.recover(repo) | |
3724
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3723
diff
changeset
|
259 self.ui.status(_('%s transplanted as %s\n') % (revlog.short(node), |
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3723
diff
changeset
|
260 revlog.short(n))) |
3714 | 261 seriespath = os.path.join(self.path, 'series') |
262 if not os.path.exists(seriespath): | |
3758
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3757
diff
changeset
|
263 self.transplants.write() |
3714 | 264 return |
265 nodes, merges = self.readseries() | |
266 revmap = {} | |
267 for n in nodes: | |
268 revmap[source.changelog.rev(n)] = n | |
269 os.unlink(seriespath) | |
270 | |
271 self.apply(repo, source, revmap, merges, opts) | |
272 | |
273 def recover(self, repo): | |
274 '''commit working directory using journal metadata''' | |
275 node, user, date, message, parents = self.readlog() | |
276 merge = len(parents) == 2 | |
277 | |
278 if not user or not date or not message or not parents[0]: | |
279 raise util.Abort(_('transplant log file is corrupt')) | |
280 | |
3758
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3757
diff
changeset
|
281 extra = {'transplant_source': node} |
3714 | 282 wlock = repo.wlock() |
4915
97b734fb9c6f
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents:
4680
diff
changeset
|
283 try: |
97b734fb9c6f
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents:
4680
diff
changeset
|
284 p1, p2 = repo.dirstate.parents() |
97b734fb9c6f
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents:
4680
diff
changeset
|
285 if p1 != parents[0]: |
97b734fb9c6f
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents:
4680
diff
changeset
|
286 raise util.Abort( |
97b734fb9c6f
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents:
4680
diff
changeset
|
287 _('working dir not at transplant parent %s') % |
97b734fb9c6f
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents:
4680
diff
changeset
|
288 revlog.hex(parents[0])) |
97b734fb9c6f
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents:
4680
diff
changeset
|
289 if merge: |
97b734fb9c6f
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents:
4680
diff
changeset
|
290 repo.dirstate.setparents(p1, parents[1]) |
8706
25e9c71b89de
commit: drop the now-unused files parameter
Matt Mackall <mpm@selenic.com>
parents:
8703
diff
changeset
|
291 n = repo.commit(message, user, date, extra=extra) |
4915
97b734fb9c6f
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents:
4680
diff
changeset
|
292 if not n: |
97b734fb9c6f
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents:
4680
diff
changeset
|
293 raise util.Abort(_('commit failed')) |
97b734fb9c6f
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents:
4680
diff
changeset
|
294 if not merge: |
97b734fb9c6f
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents:
4680
diff
changeset
|
295 self.transplants.set(n, node) |
97b734fb9c6f
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents:
4680
diff
changeset
|
296 self.unlog() |
3714 | 297 |
4915
97b734fb9c6f
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents:
4680
diff
changeset
|
298 return n, node |
97b734fb9c6f
Use try/finally pattern to cleanup locks and transactions
Matt Mackall <mpm@selenic.com>
parents:
4680
diff
changeset
|
299 finally: |
8112
6ee71f78497c
switch lock releasing in the extensions from gc to explicit
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
8076
diff
changeset
|
300 wlock.release() |
3714 | 301 |
302 def readseries(self): | |
303 nodes = [] | |
304 merges = [] | |
305 cur = nodes | |
306 for line in self.opener('series').read().splitlines(): | |
307 if line.startswith('# Merges'): | |
308 cur = merges | |
309 continue | |
310 cur.append(revlog.bin(line)) | |
311 | |
312 return (nodes, merges) | |
313 | |
314 def saveseries(self, revmap, merges): | |
315 if not revmap: | |
316 return | |
317 | |
318 if not os.path.isdir(self.path): | |
319 os.mkdir(self.path) | |
320 series = self.opener('series', 'w') | |
8209
a1a5a57efe90
replace util.sort with sorted built-in
Matt Mackall <mpm@selenic.com>
parents:
8176
diff
changeset
|
321 for rev in sorted(revmap): |
3714 | 322 series.write(revlog.hex(revmap[rev]) + '\n') |
323 if merges: | |
324 series.write('# Merges\n') | |
325 for m in merges: | |
326 series.write(revlog.hex(m) + '\n') | |
327 series.close() | |
328 | |
3759
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
329 def parselog(self, fp): |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
330 parents = [] |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
331 message = [] |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
332 node = revlog.nullid |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
333 inmsg = False |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
334 for line in fp.read().splitlines(): |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
335 if inmsg: |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
336 message.append(line) |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
337 elif line.startswith('# User '): |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
338 user = line[7:] |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
339 elif line.startswith('# Date '): |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
340 date = line[7:] |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
341 elif line.startswith('# Node ID '): |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
342 node = revlog.bin(line[10:]) |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
343 elif line.startswith('# Parent '): |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
344 parents.append(revlog.bin(line[9:])) |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
345 elif not line.startswith('#'): |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
346 inmsg = True |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
347 message.append(line) |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
348 return (node, user, date, '\n'.join(message), parents) |
4516
96d8a56d4ef9
Removed trailing whitespace and tabs from python files
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4251
diff
changeset
|
349 |
3725
ccc7a9eb0e5e
transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
350 def log(self, user, date, message, p1, p2, merge=False): |
3714 | 351 '''journal changelog metadata for later recover''' |
352 | |
353 if not os.path.isdir(self.path): | |
354 os.mkdir(self.path) | |
355 fp = self.opener('journal', 'w') | |
3725
ccc7a9eb0e5e
transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
356 fp.write('# User %s\n' % user) |
ccc7a9eb0e5e
transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
357 fp.write('# Date %s\n' % date) |
3714 | 358 fp.write('# Node ID %s\n' % revlog.hex(p2)) |
359 fp.write('# Parent ' + revlog.hex(p1) + '\n') | |
360 if merge: | |
361 fp.write('# Parent ' + revlog.hex(p2) + '\n') | |
3725
ccc7a9eb0e5e
transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
362 fp.write(message.rstrip() + '\n') |
3714 | 363 fp.close() |
364 | |
365 def readlog(self): | |
3759
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
366 return self.parselog(self.opener('journal')) |
3714 | 367 |
368 def unlog(self): | |
369 '''remove changelog journal''' | |
370 absdst = os.path.join(self.path, 'journal') | |
371 if os.path.exists(absdst): | |
372 os.unlink(absdst) | |
373 | |
374 def transplantfilter(self, repo, source, root): | |
375 def matchfn(node): | |
376 if self.applied(repo, node, root): | |
377 return False | |
378 if source.changelog.parents(node)[1] != revlog.nullid: | |
379 return False | |
380 extra = source.changelog.read(node)[5] | |
381 cnode = extra.get('transplant_source') | |
382 if cnode and self.applied(repo, cnode, root): | |
383 return False | |
384 return True | |
385 | |
386 return matchfn | |
387 | |
388 def hasnode(repo, node): | |
389 try: | |
390 return repo.changelog.rev(node) != None | |
7633 | 391 except error.RevlogError: |
3714 | 392 return False |
393 | |
394 def browserevs(ui, repo, nodes, opts): | |
395 '''interactively transplant changesets''' | |
396 def browsehelp(ui): | |
397 ui.write('y: transplant this changeset\n' | |
398 'n: skip this changeset\n' | |
399 'm: merge at this changeset\n' | |
400 'p: show patch\n' | |
401 'c: commit selected changesets\n' | |
402 'q: cancel transplant\n' | |
403 '?: show this help\n') | |
404 | |
3723
c828fca6f38a
transplant: show_changeset moved to cmdutil
Brendan Cully <brendan@kublai.com>
parents:
3714
diff
changeset
|
405 displayer = cmdutil.show_changeset(ui, repo, opts) |
3714 | 406 transplants = [] |
407 merges = [] | |
408 for node in nodes: | |
7369
87158be081b8
cmdutil: use change contexts for cset-printer and cset-templater
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7308
diff
changeset
|
409 displayer.show(repo[node]) |
3714 | 410 action = None |
411 while not action: | |
412 action = ui.prompt(_('apply changeset? [ynmpcq?]:')) | |
413 if action == '?': | |
414 browsehelp(ui) | |
415 action = None | |
416 elif action == 'p': | |
417 parent = repo.changelog.parents(node)[0] | |
7308
b6f5490effbf
patch: turn patch.diff() into a generator
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7280
diff
changeset
|
418 for chunk in patch.diff(repo, parent, node): |
8615
94ca38e63576
use ui instead of repo.ui when the former is in scope
Martin Geisler <mg@lazybytes.net>
parents:
8225
diff
changeset
|
419 ui.write(chunk) |
3714 | 420 action = None |
421 elif action not in ('y', 'n', 'm', 'c', 'q'): | |
422 ui.write('no such option\n') | |
423 action = None | |
424 if action == 'y': | |
425 transplants.append(node) | |
426 elif action == 'm': | |
427 merges.append(node) | |
428 elif action == 'c': | |
429 break | |
430 elif action == 'q': | |
431 transplants = () | |
432 merges = () | |
433 break | |
434 return (transplants, merges) | |
435 | |
436 def transplant(ui, repo, *revs, **opts): | |
437 '''transplant changesets from another branch | |
438 | |
439 Selected changesets will be applied on top of the current working | |
440 directory with the log of the original changeset. If --log is | |
441 specified, log messages will have a comment appended of the form: | |
442 | |
443 (transplanted from CHANGESETHASH) | |
444 | |
445 You can rewrite the changelog message with the --filter option. | |
8000
83d7c9cfb065
transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7874
diff
changeset
|
446 Its argument will be invoked with the current changelog message as |
83d7c9cfb065
transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7874
diff
changeset
|
447 $1 and the patch as $2. |
3714 | 448 |
8076
5ec526c1a32f
help texts: write command line switches as -a/--abc
Martin Geisler <mg@lazybytes.net>
parents:
8000
diff
changeset
|
449 If --source/-s is specified, selects changesets from the named |
5ec526c1a32f
help texts: write command line switches as -a/--abc
Martin Geisler <mg@lazybytes.net>
parents:
8000
diff
changeset
|
450 repository. If --branch/-b is specified, selects changesets from |
5ec526c1a32f
help texts: write command line switches as -a/--abc
Martin Geisler <mg@lazybytes.net>
parents:
8000
diff
changeset
|
451 the branch holding the named revision, up to that revision. If |
5ec526c1a32f
help texts: write command line switches as -a/--abc
Martin Geisler <mg@lazybytes.net>
parents:
8000
diff
changeset
|
452 --all/-a is specified, all changesets on the branch will be |
5ec526c1a32f
help texts: write command line switches as -a/--abc
Martin Geisler <mg@lazybytes.net>
parents:
8000
diff
changeset
|
453 transplanted, otherwise you will be prompted to select the |
5ec526c1a32f
help texts: write command line switches as -a/--abc
Martin Geisler <mg@lazybytes.net>
parents:
8000
diff
changeset
|
454 changesets you want. |
3714 | 455 |
8000
83d7c9cfb065
transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7874
diff
changeset
|
456 hg transplant --branch REVISION --all will rebase the selected |
83d7c9cfb065
transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7874
diff
changeset
|
457 branch (up to the named revision) onto your current working |
83d7c9cfb065
transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7874
diff
changeset
|
458 directory. |
3714 | 459 |
8000
83d7c9cfb065
transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7874
diff
changeset
|
460 You can optionally mark selected transplanted changesets as merge |
83d7c9cfb065
transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7874
diff
changeset
|
461 changesets. You will not be prompted to transplant any ancestors |
83d7c9cfb065
transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7874
diff
changeset
|
462 of a merged transplant, and you can merge descendants of them |
83d7c9cfb065
transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7874
diff
changeset
|
463 normally instead of transplanting them. |
3714 | 464 |
465 If no merges or revisions are provided, hg transplant will start | |
466 an interactive changeset browser. | |
467 | |
8000
83d7c9cfb065
transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7874
diff
changeset
|
468 If a changeset application fails, you can fix the merge by hand |
83d7c9cfb065
transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7874
diff
changeset
|
469 and then resume where you left off by calling hg transplant |
8076
5ec526c1a32f
help texts: write command line switches as -a/--abc
Martin Geisler <mg@lazybytes.net>
parents:
8000
diff
changeset
|
470 --continue/-c. |
3714 | 471 ''' |
472 def getremotechanges(repo, url): | |
473 sourcerepo = ui.expandpath(url) | |
474 source = hg.repository(ui, sourcerepo) | |
7415
6163ef936a00
protocol: use changegroupsubset() if possible (issue1389)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7369
diff
changeset
|
475 common, incoming, rheads = repo.findcommonincoming(source, force=True) |
3714 | 476 if not incoming: |
477 return (source, None, None) | |
478 | |
479 bundle = None | |
480 if not source.local(): | |
7415
6163ef936a00
protocol: use changegroupsubset() if possible (issue1389)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7369
diff
changeset
|
481 if source.capable('changegroupsubset'): |
6163ef936a00
protocol: use changegroupsubset() if possible (issue1389)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7369
diff
changeset
|
482 cg = source.changegroupsubset(incoming, rheads, 'incoming') |
6163ef936a00
protocol: use changegroupsubset() if possible (issue1389)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7369
diff
changeset
|
483 else: |
6163ef936a00
protocol: use changegroupsubset() if possible (issue1389)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7369
diff
changeset
|
484 cg = source.changegroup(incoming, 'incoming') |
4049
863465381028
transplant: update to current writebundle API
Brendan Cully <brendan@kublai.com>
parents:
4035
diff
changeset
|
485 bundle = changegroup.writebundle(cg, None, 'HG10UN') |
3714 | 486 source = bundlerepo.bundlerepository(ui, repo.root, bundle) |
487 | |
488 return (source, incoming, bundle) | |
489 | |
490 def incwalk(repo, incoming, branches, match=util.always): | |
491 if not branches: | |
492 branches=None | |
493 for node in repo.changelog.nodesbetween(incoming, branches)[0]: | |
494 if match(node): | |
495 yield node | |
496 | |
497 def transplantwalk(repo, root, branches, match=util.always): | |
498 if not branches: | |
499 branches = repo.heads() | |
500 ancestors = [] | |
501 for branch in branches: | |
502 ancestors.append(repo.changelog.ancestor(root, branch)) | |
503 for node in repo.changelog.nodesbetween(ancestors, branches)[0]: | |
504 if match(node): | |
505 yield node | |
506 | |
507 def checkopts(opts, revs): | |
508 if opts.get('continue'): | |
509 if filter(lambda opt: opts.get(opt), ('branch', 'all', 'merge')): | |
7744
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
510 raise util.Abort(_('--continue is incompatible with ' |
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
511 'branch, all or merge')) |
3714 | 512 return |
513 if not (opts.get('source') or revs or | |
514 opts.get('merge') or opts.get('branch')): | |
7744
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
515 raise util.Abort(_('no source URL, branch tag or revision ' |
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
516 'list provided')) |
3714 | 517 if opts.get('all'): |
518 if not opts.get('branch'): | |
519 raise util.Abort(_('--all requires a branch revision')) | |
520 if revs: | |
7744
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
521 raise util.Abort(_('--all is incompatible with a ' |
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
522 'revision list')) |
3714 | 523 |
524 checkopts(opts, revs) | |
525 | |
526 if not opts.get('log'): | |
527 opts['log'] = ui.config('transplant', 'log') | |
528 if not opts.get('filter'): | |
529 opts['filter'] = ui.config('transplant', 'filter') | |
530 | |
531 tp = transplanter(ui, repo) | |
532 | |
533 p1, p2 = repo.dirstate.parents() | |
8176
2660e7002413
transplant: forbid transplant to nonempty repositories with no working directory.
Brendan Cully <brendan@kublai.com>
parents:
8173
diff
changeset
|
534 if len(repo) > 0 and p1 == revlog.nullid: |
2660e7002413
transplant: forbid transplant to nonempty repositories with no working directory.
Brendan Cully <brendan@kublai.com>
parents:
8173
diff
changeset
|
535 raise util.Abort(_('no revision checked out')) |
3714 | 536 if not opts.get('continue'): |
537 if p2 != revlog.nullid: | |
538 raise util.Abort(_('outstanding uncommitted merges')) | |
539 m, a, r, d = repo.status()[:4] | |
540 if m or a or r or d: | |
541 raise util.Abort(_('outstanding local changes')) | |
542 | |
543 bundle = None | |
544 source = opts.get('source') | |
545 if source: | |
546 (source, incoming, bundle) = getremotechanges(repo, source) | |
547 else: | |
548 source = repo | |
549 | |
550 try: | |
551 if opts.get('continue'): | |
3724
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3723
diff
changeset
|
552 tp.resume(repo, source, opts) |
3714 | 553 return |
554 | |
555 tf=tp.transplantfilter(repo, source, p1) | |
556 if opts.get('prune'): | |
557 prune = [source.lookup(r) | |
558 for r in cmdutil.revrange(source, opts.get('prune'))] | |
559 matchfn = lambda x: tf(x) and x not in prune | |
560 else: | |
561 matchfn = tf | |
562 branches = map(source.lookup, opts.get('branch', ())) | |
563 merges = map(source.lookup, opts.get('merge', ())) | |
564 revmap = {} | |
565 if revs: | |
566 for r in cmdutil.revrange(source, revs): | |
567 revmap[int(r)] = source.lookup(r) | |
568 elif opts.get('all') or not merges: | |
569 if source != repo: | |
7744
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
570 alltransplants = incwalk(source, incoming, branches, |
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
571 match=matchfn) |
3714 | 572 else: |
7744
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
573 alltransplants = transplantwalk(source, p1, branches, |
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
574 match=matchfn) |
3714 | 575 if opts.get('all'): |
576 revs = alltransplants | |
577 else: | |
578 revs, newmerges = browserevs(ui, source, alltransplants, opts) | |
579 merges.extend(newmerges) | |
580 for r in revs: | |
581 revmap[source.changelog.rev(r)] = r | |
582 for r in merges: | |
583 revmap[source.changelog.rev(r)] = r | |
584 | |
585 tp.apply(repo, source, revmap, merges, opts) | |
586 finally: | |
587 if bundle: | |
4072
e916bc0dfdd6
transplant: remote bundle source was not closed before deleting the fetched bundle.
Patrick Mezard <pmezard@gmail.com>
parents:
4049
diff
changeset
|
588 source.close() |
3714 | 589 os.unlink(bundle) |
590 | |
591 cmdtable = { | |
592 "transplant": | |
593 (transplant, | |
594 [('s', 'source', '', _('pull patches from REPOSITORY')), | |
595 ('b', 'branch', [], _('pull patches from branch BRANCH')), | |
596 ('a', 'all', None, _('pull all changesets up to BRANCH')), | |
597 ('p', 'prune', [], _('skip over REV')), | |
598 ('m', 'merge', [], _('merge at REV')), | |
599 ('', 'log', None, _('append transplant info to log message')), | |
7744
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
600 ('c', 'continue', None, _('continue last transplant session ' |
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
601 'after repair')), |
3714 | 602 ('', 'filter', '', _('filter changesets through FILTER'))], |
7744
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
603 _('hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] ' |
b44dbb95f07f
transplant: wrapped long lines
Martin Geisler <mg@daimi.au.dk>
parents:
7633
diff
changeset
|
604 '[-m REV] [REV]...')) |
3714 | 605 } |