Show More
@@ -16,7 +16,7 b' map from a changeset hash to its hash in' | |||
|
16 | 16 | |
|
17 | 17 | from mercurial.i18n import _ |
|
18 | 18 | import os, tempfile |
|
19 |
from mercurial |
|
|
19 | from mercurial import node as nodemod | |
|
20 | 20 | from mercurial import bundlerepo, hg, merge, match |
|
21 | 21 | from mercurial import patch, revlog, scmutil, util, error, cmdutil |
|
22 | 22 | from mercurial import registrar, revset, templatekw, exchange |
@@ -64,7 +64,7 b' class transplants(object):' | |||
|
64 | 64 | fp = self.opener(self.transplantfile, 'w') |
|
65 | 65 | for list in self.transplants.itervalues(): |
|
66 | 66 | for t in list: |
|
67 |
l, r = map( |
|
|
67 | l, r = map(nodemod.hex, (t.lnode, t.rnode)) | |
|
68 | 68 | fp.write(l + ':' + r + '\n') |
|
69 | 69 | fp.close() |
|
70 | 70 | self.dirty = False |
@@ -133,7 +133,7 b' class transplanter(object):' | |||
|
133 | 133 | tr = repo.transaction('transplant') |
|
134 | 134 | for rev in revs: |
|
135 | 135 | node = revmap[rev] |
|
136 | revstr = '%s:%s' % (rev, short(node)) | |
|
136 | revstr = '%s:%s' % (rev, nodemod.short(node)) | |
|
137 | 137 | |
|
138 | 138 | if self.applied(repo, node, p1): |
|
139 | 139 | self.ui.warn(_('skipping already applied revision %s\n') % |
@@ -168,13 +168,14 b' class transplanter(object):' | |||
|
168 | 168 | if parents[1] != revlog.nullid: |
|
169 | 169 | if not opts.get('parent'): |
|
170 | 170 | self.ui.note(_('skipping merge changeset %s:%s\n') |
|
171 | % (rev, short(node))) | |
|
171 | % (rev, nodemod.short(node))) | |
|
172 | 172 | skipmerge = True |
|
173 | 173 | else: |
|
174 | 174 | parent = source.lookup(opts['parent']) |
|
175 | 175 | if parent not in parents: |
|
176 | 176 | raise error.Abort(_('%s is not a parent of %s') % |
|
177 |
(short(parent), |
|
|
177 | (nodemod.short(parent), | |
|
178 | nodemod.short(node))) | |
|
178 | 179 | else: |
|
179 | 180 | parent = parents[0] |
|
180 | 181 | |
@@ -204,11 +205,11 b' class transplanter(object):' | |||
|
204 | 205 | raise |
|
205 | 206 | if n and domerge: |
|
206 | 207 | self.ui.status(_('%s merged at %s\n') % (revstr, |
|
207 | short(n))) | |
|
208 | nodemod.short(n))) | |
|
208 | 209 | elif n: |
|
209 | 210 | self.ui.status(_('%s transplanted to %s\n') |
|
210 | % (short(node), | |
|
211 | short(n))) | |
|
211 | % (nodemod.short(node), | |
|
212 | nodemod.short(n))) | |
|
212 | 213 | finally: |
|
213 | 214 | if patchfile: |
|
214 | 215 | os.unlink(patchfile) |
@@ -241,7 +242,7 b' class transplanter(object):' | |||
|
241 | 242 | self.ui.system('%s %s %s' % (filter, util.shellquote(headerfile), |
|
242 | 243 | util.shellquote(patchfile)), |
|
243 | 244 | environ={'HGUSER': changelog[1], |
|
244 |
'HGREVISION': |
|
|
245 | 'HGREVISION': nodemod.hex(node), | |
|
245 | 246 | }, |
|
246 | 247 | onerr=error.Abort, errprefix=_('filter failed')) |
|
247 | 248 | user, date, msg = self.parselog(file(headerfile))[1:4] |
@@ -261,9 +262,9 b' class transplanter(object):' | |||
|
261 | 262 | |
|
262 | 263 | if log: |
|
263 | 264 | # we don't translate messages inserted into commits |
|
264 |
message += '\n(transplanted from %s)' % |
|
|
265 | message += '\n(transplanted from %s)' % nodemod.hex(node) | |
|
265 | 266 | |
|
266 | self.ui.status(_('applying %s\n') % short(node)) | |
|
267 | self.ui.status(_('applying %s\n') % nodemod.short(node)) | |
|
267 | 268 | self.ui.note('%s %s\n%s\n' % (user, date, message)) |
|
268 | 269 | |
|
269 | 270 | if not patchfile and not merge: |
@@ -295,7 +296,8 b' class transplanter(object):' | |||
|
295 | 296 | n = repo.commit(message, user, date, extra=extra, match=m, |
|
296 | 297 | editor=self.getcommiteditor()) |
|
297 | 298 | if not n: |
|
298 |
self.ui.warn(_('skipping emptied changeset %s\n') % |
|
|
299 | self.ui.warn(_('skipping emptied changeset %s\n') % | |
|
300 | nodemod.short(node)) | |
|
299 | 301 | return None |
|
300 | 302 | if not merge: |
|
301 | 303 | self.transplants.set(n, node) |
@@ -310,11 +312,12 b' class transplanter(object):' | |||
|
310 | 312 | if os.path.exists(os.path.join(self.path, 'journal')): |
|
311 | 313 | n, node = self.recover(repo, source, opts) |
|
312 | 314 | if n: |
|
313 |
self.ui.status(_('%s transplanted as %s\n') % |
|
|
314 |
|
|
|
315 | self.ui.status(_('%s transplanted as %s\n') % | |
|
316 | (nodemod.short(node), | |
|
317 | nodemod.short(n))) | |
|
315 | 318 | else: |
|
316 | 319 | self.ui.status(_('%s skipped due to empty diff\n') |
|
317 | % (short(node),)) | |
|
320 | % (nodemod.short(node),)) | |
|
318 | 321 | seriespath = os.path.join(self.path, 'series') |
|
319 | 322 | if not os.path.exists(seriespath): |
|
320 | 323 | self.transplants.write() |
@@ -341,7 +344,8 b' class transplanter(object):' | |||
|
341 | 344 | parent = source.lookup(opts['parent']) |
|
342 | 345 | if parent not in parents: |
|
343 | 346 | raise error.Abort(_('%s is not a parent of %s') % |
|
344 |
(short(parent), |
|
|
347 | (nodemod.short(parent), | |
|
348 | nodemod.short(node))) | |
|
345 | 349 | else: |
|
346 | 350 | merge = True |
|
347 | 351 | |
@@ -350,7 +354,7 b' class transplanter(object):' | |||
|
350 | 354 | p1, p2 = repo.dirstate.parents() |
|
351 | 355 | if p1 != parent: |
|
352 | 356 | raise error.Abort(_('working directory not at transplant ' |
|
353 |
'parent %s') % |
|
|
357 | 'parent %s') % nodemod.hex(parent)) | |
|
354 | 358 | if merge: |
|
355 | 359 | repo.setparents(p1, parents[1]) |
|
356 | 360 | modified, added, removed, deleted = repo.status()[:4] |
@@ -391,11 +395,11 b' class transplanter(object):' | |||
|
391 | 395 | os.mkdir(self.path) |
|
392 | 396 | series = self.opener('series', 'w') |
|
393 | 397 | for rev in sorted(revmap): |
|
394 |
series.write( |
|
|
398 | series.write(nodemod.hex(revmap[rev]) + '\n') | |
|
395 | 399 | if merges: |
|
396 | 400 | series.write('# Merges\n') |
|
397 | 401 | for m in merges: |
|
398 |
series.write( |
|
|
402 | series.write(nodemod.hex(m) + '\n') | |
|
399 | 403 | series.close() |
|
400 | 404 | |
|
401 | 405 | def parselog(self, fp): |
@@ -431,10 +435,10 b' class transplanter(object):' | |||
|
431 | 435 | fp = self.opener('journal', 'w') |
|
432 | 436 | fp.write('# User %s\n' % user) |
|
433 | 437 | fp.write('# Date %s\n' % date) |
|
434 |
fp.write('# Node ID %s\n' % |
|
|
435 |
fp.write('# Parent ' + |
|
|
438 | fp.write('# Node ID %s\n' % nodemod.hex(p2)) | |
|
439 | fp.write('# Parent ' + nodemod.hex(p1) + '\n') | |
|
436 | 440 | if merge: |
|
437 |
fp.write('# Parent ' + |
|
|
441 | fp.write('# Parent ' + nodemod.hex(p2) + '\n') | |
|
438 | 442 | fp.write(message.rstrip() + '\n') |
|
439 | 443 | fp.close() |
|
440 | 444 | |
@@ -711,7 +715,7 b' def kwtransplanted(repo, ctx, **args):' | |||
|
711 | 715 | """:transplanted: String. The node identifier of the transplanted |
|
712 | 716 | changeset if any.""" |
|
713 | 717 | n = ctx.extra().get('transplant_source') |
|
714 |
return n and |
|
|
718 | return n and nodemod.hex(n) or '' | |
|
715 | 719 | |
|
716 | 720 | def extsetup(ui): |
|
717 | 721 | templatekw.keywords['transplanted'] = kwtransplanted |
General Comments 0
You need to be logged in to leave comments.
Login now