equal
deleted
inserted
replaced
229 |
229 |
230 def resume(self, repo, source, opts=None): |
230 def resume(self, repo, source, opts=None): |
231 '''recover last transaction and apply remaining changesets''' |
231 '''recover last transaction and apply remaining changesets''' |
232 if os.path.exists(os.path.join(self.path, 'journal')): |
232 if os.path.exists(os.path.join(self.path, 'journal')): |
233 n, node = self.recover(repo) |
233 n, node = self.recover(repo) |
234 self.ui.status(_('%s transplanted as %s\n') % (revlog.short(node), |
234 self.ui.status(_('%s transplanted as %s\n') % (revlog.short(node), |
235 revlog.short(n))) |
235 revlog.short(n))) |
236 seriespath = os.path.join(self.path, 'series') |
236 seriespath = os.path.join(self.path, 'series') |
237 if not os.path.exists(seriespath): |
237 if not os.path.exists(seriespath): |
238 return |
238 return |
239 nodes, merges = self.readseries() |
239 nodes, merges = self.readseries() |
240 revmap = {} |
240 revmap = {} |
508 else: |
508 else: |
509 source = repo |
509 source = repo |
510 |
510 |
511 try: |
511 try: |
512 if opts.get('continue'): |
512 if opts.get('continue'): |
513 n, node = tp.resume(repo, source, opts) |
513 tp.resume(repo, source, opts) |
514 return |
514 return |
515 |
515 |
516 tf=tp.transplantfilter(repo, source, p1) |
516 tf=tp.transplantfilter(repo, source, p1) |
517 if opts.get('prune'): |
517 if opts.get('prune'): |
518 prune = [source.lookup(r) |
518 prune = [source.lookup(r) |