Mercurial > hg > mercurial-crew-with-dirclash
annotate hgext/transplant.py @ 3783:a8725ae15c7c
update test-debugcomplete
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 04 Dec 2006 01:21:53 -0600 |
parents | e96f97ca0358 |
children | 2db191165e9a |
rev | line source |
---|---|
3714 | 1 # Patch transplanting extension for Mercurial |
2 # | |
3 # Copyright 2006 Brendan Cully <brendan@kublai.com> | |
4 # | |
5 # This software may be used and distributed according to the terms | |
6 # of the GNU General Public License, incorporated herein by reference. | |
7 | |
8 from mercurial.demandload import * | |
9 from mercurial.i18n import gettext as _ | |
10 demandload(globals(), 'os tempfile') | |
11 demandload(globals(), 'mercurial:bundlerepo,cmdutil,commands,hg,merge,patch') | |
12 demandload(globals(), 'mercurial:revlog,util') | |
13 | |
14 '''patch transplanting tool | |
15 | |
16 This extension allows you to transplant patches from another branch. | |
17 | |
18 Transplanted patches are recorded in .hg/transplant/transplants, as a map | |
19 from a changeset hash to its hash in the source repository. | |
20 ''' | |
21 | |
22 class transplantentry: | |
23 def __init__(self, lnode, rnode): | |
24 self.lnode = lnode | |
25 self.rnode = rnode | |
26 | |
27 class transplants: | |
28 def __init__(self, path=None, transplantfile=None, opener=None): | |
29 self.path = path | |
30 self.transplantfile = transplantfile | |
31 self.opener = opener | |
32 | |
33 if not opener: | |
34 self.opener = util.opener(self.path) | |
35 self.transplants = [] | |
36 self.dirty = False | |
37 self.read() | |
38 | |
39 def read(self): | |
40 abspath = os.path.join(self.path, self.transplantfile) | |
41 if self.transplantfile and os.path.exists(abspath): | |
42 for line in self.opener(self.transplantfile).read().splitlines(): | |
43 lnode, rnode = map(revlog.bin, line.split(':')) | |
44 self.transplants.append(transplantentry(lnode, rnode)) | |
45 | |
46 def write(self): | |
47 if self.dirty and self.transplantfile: | |
48 if not os.path.isdir(self.path): | |
49 os.mkdir(self.path) | |
50 fp = self.opener(self.transplantfile, 'w') | |
51 for c in self.transplants: | |
52 l, r = map(revlog.hex, (c.lnode, c.rnode)) | |
53 fp.write(l + ':' + r + '\n') | |
54 fp.close() | |
55 self.dirty = False | |
56 | |
57 def get(self, rnode): | |
58 return [t for t in self.transplants if t.rnode == rnode] | |
59 | |
60 def set(self, lnode, rnode): | |
61 self.transplants.append(transplantentry(lnode, rnode)) | |
62 self.dirty = True | |
63 | |
64 def remove(self, transplant): | |
65 del self.transplants[self.transplants.index(transplant)] | |
66 self.dirty = True | |
67 | |
68 class transplanter: | |
69 def __init__(self, ui, repo): | |
70 self.ui = ui | |
71 self.path = repo.join('transplant') | |
72 self.opener = util.opener(self.path) | |
73 self.transplants = transplants(self.path, 'transplants', opener=self.opener) | |
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''' | |
92 revs = revmap.keys() | |
93 revs.sort() | |
94 | |
95 p1, p2 = repo.dirstate.parents() | |
96 pulls = [] | |
97 diffopts = patch.diffopts(self.ui, opts) | |
98 diffopts.git = True | |
99 | |
100 lock = repo.lock() | |
101 wlock = repo.wlock() | |
102 try: | |
103 for rev in revs: | |
104 node = revmap[rev] | |
105 revstr = '%s:%s' % (rev, revlog.short(node)) | |
106 | |
107 if self.applied(repo, node, p1): | |
108 self.ui.warn(_('skipping already applied revision %s\n') % | |
109 revstr) | |
110 continue | |
111 | |
112 parents = source.changelog.parents(node) | |
113 if not opts.get('filter'): | |
114 # If the changeset parent is the same as the wdir's parent, | |
115 # just pull it. | |
116 if parents[0] == p1: | |
117 pulls.append(node) | |
118 p1 = node | |
119 continue | |
120 if pulls: | |
121 if source != repo: | |
122 repo.pull(source, heads=pulls, lock=lock) | |
123 merge.update(repo, pulls[-1], wlock=wlock) | |
124 p1, p2 = repo.dirstate.parents() | |
125 pulls = [] | |
126 | |
127 domerge = False | |
128 if node in merges: | |
129 # pulling all the merge revs at once would mean we couldn't | |
130 # transplant after the latest even if transplants before them | |
131 # fail. | |
132 domerge = True | |
133 if not hasnode(repo, node): | |
134 repo.pull(source, heads=[node], lock=lock) | |
135 | |
136 if parents[1] != revlog.nullid: | |
137 self.ui.note(_('skipping merge changeset %s:%s\n') | |
138 % (rev, revlog.short(node))) | |
139 patchfile = None | |
140 else: | |
141 fd, patchfile = tempfile.mkstemp(prefix='hg-transplant-') | |
142 fp = os.fdopen(fd, 'w') | |
3759
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
143 patch.diff(source, parents[0], node, fp=fp, opts=diffopts) |
3714 | 144 fp.close() |
145 | |
146 del revmap[rev] | |
147 if patchfile or domerge: | |
148 try: | |
149 n = self.applyone(repo, node, source.changelog.read(node), | |
150 patchfile, merge=domerge, | |
151 log=opts.get('log'), | |
152 filter=opts.get('filter'), | |
153 lock=lock, wlock=wlock) | |
154 if domerge: | |
155 self.ui.status(_('%s merged at %s\n') % (revstr, | |
156 revlog.short(n))) | |
157 else: | |
158 self.ui.status(_('%s transplanted to %s\n') % (revlog.short(node), | |
159 revlog.short(n))) | |
160 finally: | |
161 if patchfile: | |
162 os.unlink(patchfile) | |
163 if pulls: | |
164 repo.pull(source, heads=pulls, lock=lock) | |
165 merge.update(repo, pulls[-1], wlock=wlock) | |
166 finally: | |
167 self.saveseries(revmap, merges) | |
168 self.transplants.write() | |
169 | |
170 def filter(self, filter, changelog, patchfile): | |
171 '''arbitrarily rewrite changeset before applying it''' | |
172 | |
3752
f902f409cd81
transplant: "filtering %s\n"
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
173 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
|
174 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
|
175 |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
176 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
|
177 fp = os.fdopen(fd, 'w') |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
178 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
|
179 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
|
180 fp.write("# Date %d %d\n" % date) |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
181 fp.write(changelog[4].rstrip()) |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
182 fp.write("\n\n") |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
183 fp.close() |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
184 |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
185 try: |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
186 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
|
187 util.shellquote(patchfile)), |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
188 environ={'HGUSER': changelog[1]}, |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
189 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
|
190 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
|
191 finally: |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
192 os.unlink(headerfile) |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
193 |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
194 return (user, date, msg) |
3714 | 195 |
196 def applyone(self, repo, node, cl, patchfile, merge=False, log=False, | |
197 filter=None, lock=None, wlock=None): | |
198 '''apply the patch in patchfile to the repository as a transplant''' | |
199 (manifest, user, (time, timezone), files, message) = cl[:5] | |
200 date = "%d %d" % (time, timezone) | |
201 extra = {'transplant_source': node} | |
202 if filter: | |
3759
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
203 (user, date, message) = self.filter(filter, cl, patchfile) |
3714 | 204 |
205 if log: | |
206 message += '\n(transplanted from %s)' % revlog.hex(node) | |
207 | |
208 self.ui.status(_('applying %s\n') % revlog.short(node)) | |
209 self.ui.note('%s %s\n%s\n' % (user, date, message)) | |
210 | |
211 if not patchfile and not merge: | |
212 raise util.Abort(_('can only omit patchfile if merging')) | |
213 if patchfile: | |
214 try: | |
215 files = {} | |
3726
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3725
diff
changeset
|
216 try: |
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3725
diff
changeset
|
217 fuzz = patch.patch(patchfile, self.ui, cwd=repo.root, |
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3725
diff
changeset
|
218 files=files) |
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3725
diff
changeset
|
219 if not files: |
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3725
diff
changeset
|
220 self.ui.warn(_('%s: empty changeset') % revlog.hex(node)) |
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3725
diff
changeset
|
221 return |
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3725
diff
changeset
|
222 finally: |
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3725
diff
changeset
|
223 files = patch.updatedir(self.ui, repo, files, wlock=wlock) |
3714 | 224 except Exception, inst: |
225 if filter: | |
226 os.unlink(patchfile) | |
3757
faed44bab17b
transplant: clobber old series when transplant fails
Brendan Cully <brendan@kublai.com>
parents:
3752
diff
changeset
|
227 seriespath = os.path.join(self.path, 'series') |
faed44bab17b
transplant: clobber old series when transplant fails
Brendan Cully <brendan@kublai.com>
parents:
3752
diff
changeset
|
228 if os.path.exists(seriespath): |
faed44bab17b
transplant: clobber old series when transplant fails
Brendan Cully <brendan@kublai.com>
parents:
3752
diff
changeset
|
229 os.unlink(seriespath) |
3714 | 230 p1 = repo.dirstate.parents()[0] |
231 p2 = node | |
3725
ccc7a9eb0e5e
transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
232 self.log(user, date, message, p1, p2, merge=merge) |
3714 | 233 self.ui.write(str(inst) + '\n') |
234 raise util.Abort(_('Fix up the merge and run hg transplant --continue')) | |
235 else: | |
236 files = None | |
237 if merge: | |
238 p1, p2 = repo.dirstate.parents() | |
239 repo.dirstate.setparents(p1, node) | |
240 | |
241 n = repo.commit(files, message, user, date, lock=lock, wlock=wlock, | |
242 extra=extra) | |
243 if not merge: | |
244 self.transplants.set(n, node) | |
245 | |
246 return n | |
247 | |
248 def resume(self, repo, source, opts=None): | |
249 '''recover last transaction and apply remaining changesets''' | |
250 if os.path.exists(os.path.join(self.path, 'journal')): | |
251 n, node = self.recover(repo) | |
3724
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3723
diff
changeset
|
252 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
|
253 revlog.short(n))) |
3714 | 254 seriespath = os.path.join(self.path, 'series') |
255 if not os.path.exists(seriespath): | |
3758
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3757
diff
changeset
|
256 self.transplants.write() |
3714 | 257 return |
258 nodes, merges = self.readseries() | |
259 revmap = {} | |
260 for n in nodes: | |
261 revmap[source.changelog.rev(n)] = n | |
262 os.unlink(seriespath) | |
263 | |
264 self.apply(repo, source, revmap, merges, opts) | |
265 | |
266 def recover(self, repo): | |
267 '''commit working directory using journal metadata''' | |
268 node, user, date, message, parents = self.readlog() | |
269 merge = len(parents) == 2 | |
270 | |
271 if not user or not date or not message or not parents[0]: | |
272 raise util.Abort(_('transplant log file is corrupt')) | |
273 | |
3758
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3757
diff
changeset
|
274 extra = {'transplant_source': node} |
3714 | 275 wlock = repo.wlock() |
276 p1, p2 = repo.dirstate.parents() | |
277 if p1 != parents[0]: | |
278 raise util.Abort(_('working dir not at transplant parent %s') % | |
279 revlog.hex(parents[0])) | |
280 if merge: | |
281 repo.dirstate.setparents(p1, parents[1]) | |
3758
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3757
diff
changeset
|
282 n = repo.commit(None, message, user, date, wlock=wlock, extra=extra) |
3714 | 283 if not n: |
284 raise util.Abort(_('commit failed')) | |
285 if not merge: | |
286 self.transplants.set(n, node) | |
287 self.unlog() | |
288 | |
289 return n, node | |
290 | |
291 def readseries(self): | |
292 nodes = [] | |
293 merges = [] | |
294 cur = nodes | |
295 for line in self.opener('series').read().splitlines(): | |
296 if line.startswith('# Merges'): | |
297 cur = merges | |
298 continue | |
299 cur.append(revlog.bin(line)) | |
300 | |
301 return (nodes, merges) | |
302 | |
303 def saveseries(self, revmap, merges): | |
304 if not revmap: | |
305 return | |
306 | |
307 if not os.path.isdir(self.path): | |
308 os.mkdir(self.path) | |
309 series = self.opener('series', 'w') | |
310 revs = revmap.keys() | |
311 revs.sort() | |
312 for rev in revs: | |
313 series.write(revlog.hex(revmap[rev]) + '\n') | |
314 if merges: | |
315 series.write('# Merges\n') | |
316 for m in merges: | |
317 series.write(revlog.hex(m) + '\n') | |
318 series.close() | |
319 | |
3759
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
320 def parselog(self, fp): |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
321 parents = [] |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
322 message = [] |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
323 node = revlog.nullid |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
324 inmsg = False |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
325 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
|
326 if inmsg: |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
327 message.append(line) |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
328 elif line.startswith('# User '): |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
329 user = line[7:] |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
330 elif line.startswith('# Date '): |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
331 date = line[7:] |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
332 elif line.startswith('# Node ID '): |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
333 node = revlog.bin(line[10:]) |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
334 elif line.startswith('# Parent '): |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
335 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
|
336 elif not line.startswith('#'): |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
337 inmsg = True |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
338 message.append(line) |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
339 return (node, user, date, '\n'.join(message), parents) |
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
340 |
3725
ccc7a9eb0e5e
transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
341 def log(self, user, date, message, p1, p2, merge=False): |
3714 | 342 '''journal changelog metadata for later recover''' |
343 | |
344 if not os.path.isdir(self.path): | |
345 os.mkdir(self.path) | |
346 fp = self.opener('journal', 'w') | |
3725
ccc7a9eb0e5e
transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
347 fp.write('# User %s\n' % user) |
ccc7a9eb0e5e
transplant: preserve filter changes in --continue log
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
348 fp.write('# Date %s\n' % date) |
3714 | 349 fp.write('# Node ID %s\n' % revlog.hex(p2)) |
350 fp.write('# Parent ' + revlog.hex(p1) + '\n') | |
351 if merge: | |
352 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
|
353 fp.write(message.rstrip() + '\n') |
3714 | 354 fp.close() |
355 | |
356 def readlog(self): | |
3759
e96f97ca0358
transplant: split filter args into changelog entry and patch
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
357 return self.parselog(self.opener('journal')) |
3714 | 358 |
359 def unlog(self): | |
360 '''remove changelog journal''' | |
361 absdst = os.path.join(self.path, 'journal') | |
362 if os.path.exists(absdst): | |
363 os.unlink(absdst) | |
364 | |
365 def transplantfilter(self, repo, source, root): | |
366 def matchfn(node): | |
367 if self.applied(repo, node, root): | |
368 return False | |
369 if source.changelog.parents(node)[1] != revlog.nullid: | |
370 return False | |
371 extra = source.changelog.read(node)[5] | |
372 cnode = extra.get('transplant_source') | |
373 if cnode and self.applied(repo, cnode, root): | |
374 return False | |
375 return True | |
376 | |
377 return matchfn | |
378 | |
379 def hasnode(repo, node): | |
380 try: | |
381 return repo.changelog.rev(node) != None | |
382 except revlog.RevlogError: | |
383 return False | |
384 | |
385 def browserevs(ui, repo, nodes, opts): | |
386 '''interactively transplant changesets''' | |
387 def browsehelp(ui): | |
388 ui.write('y: transplant this changeset\n' | |
389 'n: skip this changeset\n' | |
390 'm: merge at this changeset\n' | |
391 'p: show patch\n' | |
392 'c: commit selected changesets\n' | |
393 'q: cancel transplant\n' | |
394 '?: show this help\n') | |
395 | |
3723
c828fca6f38a
transplant: show_changeset moved to cmdutil
Brendan Cully <brendan@kublai.com>
parents:
3714
diff
changeset
|
396 displayer = cmdutil.show_changeset(ui, repo, opts) |
3714 | 397 transplants = [] |
398 merges = [] | |
399 for node in nodes: | |
400 displayer.show(changenode=node) | |
401 action = None | |
402 while not action: | |
403 action = ui.prompt(_('apply changeset? [ynmpcq?]:')) | |
404 if action == '?': | |
405 browsehelp(ui) | |
406 action = None | |
407 elif action == 'p': | |
408 parent = repo.changelog.parents(node)[0] | |
409 patch.diff(repo, parent, node) | |
410 action = None | |
411 elif action not in ('y', 'n', 'm', 'c', 'q'): | |
412 ui.write('no such option\n') | |
413 action = None | |
414 if action == 'y': | |
415 transplants.append(node) | |
416 elif action == 'm': | |
417 merges.append(node) | |
418 elif action == 'c': | |
419 break | |
420 elif action == 'q': | |
421 transplants = () | |
422 merges = () | |
423 break | |
424 return (transplants, merges) | |
425 | |
426 def transplant(ui, repo, *revs, **opts): | |
427 '''transplant changesets from another branch | |
428 | |
429 Selected changesets will be applied on top of the current working | |
430 directory with the log of the original changeset. If --log is | |
431 specified, log messages will have a comment appended of the form: | |
432 | |
433 (transplanted from CHANGESETHASH) | |
434 | |
435 You can rewrite the changelog message with the --filter option. | |
436 Its argument will be invoked with the current changelog message | |
437 as $1 and the patch as $2. | |
438 | |
439 If --source is specified, selects changesets from the named | |
440 repository. If --branch is specified, selects changesets from the | |
441 branch holding the named revision, up to that revision. If --all | |
442 is specified, all changesets on the branch will be transplanted, | |
443 otherwise you will be prompted to select the changesets you want. | |
444 | |
445 hg transplant --branch REVISION --all will rebase the selected branch | |
446 (up to the named revision) onto your current working directory. | |
447 | |
448 You can optionally mark selected transplanted changesets as | |
449 merge changesets. You will not be prompted to transplant any | |
450 ancestors of a merged transplant, and you can merge descendants | |
451 of them normally instead of transplanting them. | |
452 | |
453 If no merges or revisions are provided, hg transplant will start | |
454 an interactive changeset browser. | |
455 | |
456 If a changeset application fails, you can fix the merge by hand and | |
457 then resume where you left off by calling hg transplant --continue. | |
458 ''' | |
459 def getoneitem(opts, item, errmsg): | |
460 val = opts.get(item) | |
461 if val: | |
462 if len(val) > 1: | |
463 raise util.Abort(errmsg) | |
464 else: | |
465 return val[0] | |
466 | |
467 def getremotechanges(repo, url): | |
468 sourcerepo = ui.expandpath(url) | |
469 source = hg.repository(ui, sourcerepo) | |
470 incoming = repo.findincoming(source, force=True) | |
471 if not incoming: | |
472 return (source, None, None) | |
473 | |
474 bundle = None | |
475 if not source.local(): | |
476 cg = source.changegroup(incoming, 'incoming') | |
477 bundle = commands.write_bundle(cg, compress=False) | |
478 source = bundlerepo.bundlerepository(ui, repo.root, bundle) | |
479 | |
480 return (source, incoming, bundle) | |
481 | |
482 def incwalk(repo, incoming, branches, match=util.always): | |
483 if not branches: | |
484 branches=None | |
485 for node in repo.changelog.nodesbetween(incoming, branches)[0]: | |
486 if match(node): | |
487 yield node | |
488 | |
489 def transplantwalk(repo, root, branches, match=util.always): | |
490 if not branches: | |
491 branches = repo.heads() | |
492 ancestors = [] | |
493 for branch in branches: | |
494 ancestors.append(repo.changelog.ancestor(root, branch)) | |
495 for node in repo.changelog.nodesbetween(ancestors, branches)[0]: | |
496 if match(node): | |
497 yield node | |
498 | |
499 def checkopts(opts, revs): | |
500 if opts.get('continue'): | |
501 if filter(lambda opt: opts.get(opt), ('branch', 'all', 'merge')): | |
502 raise util.Abort(_('--continue is incompatible with branch, all or merge')) | |
503 return | |
504 if not (opts.get('source') or revs or | |
505 opts.get('merge') or opts.get('branch')): | |
506 raise util.Abort(_('no source URL, branch tag or revision list provided')) | |
507 if opts.get('all'): | |
508 if not opts.get('branch'): | |
509 raise util.Abort(_('--all requires a branch revision')) | |
510 if revs: | |
511 raise util.Abort(_('--all is incompatible with a revision list')) | |
512 | |
513 checkopts(opts, revs) | |
514 | |
515 if not opts.get('log'): | |
516 opts['log'] = ui.config('transplant', 'log') | |
517 if not opts.get('filter'): | |
518 opts['filter'] = ui.config('transplant', 'filter') | |
519 | |
520 tp = transplanter(ui, repo) | |
521 | |
522 p1, p2 = repo.dirstate.parents() | |
523 if p1 == revlog.nullid: | |
524 raise util.Abort(_('no revision checked out')) | |
525 if not opts.get('continue'): | |
526 if p2 != revlog.nullid: | |
527 raise util.Abort(_('outstanding uncommitted merges')) | |
528 m, a, r, d = repo.status()[:4] | |
529 if m or a or r or d: | |
530 raise util.Abort(_('outstanding local changes')) | |
531 | |
532 bundle = None | |
533 source = opts.get('source') | |
534 if source: | |
535 (source, incoming, bundle) = getremotechanges(repo, source) | |
536 else: | |
537 source = repo | |
538 | |
539 try: | |
540 if opts.get('continue'): | |
3724
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3723
diff
changeset
|
541 tp.resume(repo, source, opts) |
3714 | 542 return |
543 | |
544 tf=tp.transplantfilter(repo, source, p1) | |
545 if opts.get('prune'): | |
546 prune = [source.lookup(r) | |
547 for r in cmdutil.revrange(source, opts.get('prune'))] | |
548 matchfn = lambda x: tf(x) and x not in prune | |
549 else: | |
550 matchfn = tf | |
551 branches = map(source.lookup, opts.get('branch', ())) | |
552 merges = map(source.lookup, opts.get('merge', ())) | |
553 revmap = {} | |
554 if revs: | |
555 for r in cmdutil.revrange(source, revs): | |
556 revmap[int(r)] = source.lookup(r) | |
557 elif opts.get('all') or not merges: | |
558 if source != repo: | |
559 alltransplants = incwalk(source, incoming, branches, match=matchfn) | |
560 else: | |
561 alltransplants = transplantwalk(source, p1, branches, match=matchfn) | |
562 if opts.get('all'): | |
563 revs = alltransplants | |
564 else: | |
565 revs, newmerges = browserevs(ui, source, alltransplants, opts) | |
566 merges.extend(newmerges) | |
567 for r in revs: | |
568 revmap[source.changelog.rev(r)] = r | |
569 for r in merges: | |
570 revmap[source.changelog.rev(r)] = r | |
571 | |
572 revs = revmap.keys() | |
573 revs.sort() | |
574 pulls = [] | |
575 | |
576 tp.apply(repo, source, revmap, merges, opts) | |
577 finally: | |
578 if bundle: | |
579 os.unlink(bundle) | |
580 | |
581 cmdtable = { | |
582 "transplant": | |
583 (transplant, | |
584 [('s', 'source', '', _('pull patches from REPOSITORY')), | |
585 ('b', 'branch', [], _('pull patches from branch BRANCH')), | |
586 ('a', 'all', None, _('pull all changesets up to BRANCH')), | |
587 ('p', 'prune', [], _('skip over REV')), | |
588 ('m', 'merge', [], _('merge at REV')), | |
589 ('', 'log', None, _('append transplant info to log message')), | |
590 ('c', 'continue', None, _('continue last transplant session after repair')), | |
591 ('', 'filter', '', _('filter changesets through FILTER'))], | |
592 _('hg transplant [-s REPOSITORY] [-b BRANCH] [-p REV] [-m REV] [-n] REV...')) | |
593 } |