equal
deleted
inserted
replaced
292 if not merge: |
292 if not merge: |
293 self.transplants.set(n, node) |
293 self.transplants.set(n, node) |
294 |
294 |
295 return n |
295 return n |
296 |
296 |
297 def resume(self, repo, source, opts=None): |
297 def resume(self, repo, source, opts): |
298 '''recover last transaction and apply remaining changesets''' |
298 '''recover last transaction and apply remaining changesets''' |
299 if os.path.exists(os.path.join(self.path, 'journal')): |
299 if os.path.exists(os.path.join(self.path, 'journal')): |
300 n, node = self.recover(repo) |
300 n, node = self.recover(repo, opts) |
301 self.ui.status(_('%s transplanted as %s\n') % (short(node), |
301 self.ui.status(_('%s transplanted as %s\n') % (short(node), |
302 short(n))) |
302 short(n))) |
303 seriespath = os.path.join(self.path, 'series') |
303 seriespath = os.path.join(self.path, 'series') |
304 if not os.path.exists(seriespath): |
304 if not os.path.exists(seriespath): |
305 self.transplants.write() |
305 self.transplants.write() |
310 revmap[source.changelog.rev(n)] = n |
310 revmap[source.changelog.rev(n)] = n |
311 os.unlink(seriespath) |
311 os.unlink(seriespath) |
312 |
312 |
313 self.apply(repo, source, revmap, merges, opts) |
313 self.apply(repo, source, revmap, merges, opts) |
314 |
314 |
315 def recover(self, repo): |
315 def recover(self, repo, opts): |
316 '''commit working directory using journal metadata''' |
316 '''commit working directory using journal metadata''' |
317 node, user, date, message, parents = self.readlog() |
317 node, user, date, message, parents = self.readlog() |
318 merge = False |
318 merge = False |
319 |
319 |
320 if not user or not date or not message or not parents[0]: |
320 if not user or not date or not message or not parents[0]: |