hgext/transplant.py
changeset 18919 cdf764a2f7a5
parent 18082 40f0c0748cfc
child 18926 8deaa703a622
--- a/hgext/transplant.py	Fri Apr 12 17:17:35 2013 -0700
+++ b/hgext/transplant.py	Fri Apr 12 17:18:52 2013 -0700
@@ -294,10 +294,10 @@
 
         return n
 
-    def resume(self, repo, source, opts=None):
+    def resume(self, repo, source, opts):
         '''recover last transaction and apply remaining changesets'''
         if os.path.exists(os.path.join(self.path, 'journal')):
-            n, node = self.recover(repo)
+            n, node = self.recover(repo, opts)
             self.ui.status(_('%s transplanted as %s\n') % (short(node),
                                                            short(n)))
         seriespath = os.path.join(self.path, 'series')
@@ -312,7 +312,7 @@
 
         self.apply(repo, source, revmap, merges, opts)
 
-    def recover(self, repo):
+    def recover(self, repo, opts):
         '''commit working directory using journal metadata'''
         node, user, date, message, parents = self.readlog()
         merge = False