Mercurial > hg-stable

changeset 18919:cdf764a2f7a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
repoview: remove unreachable code Found using Cython.
author Bryan O'Sullivan <bryano@fb.com>
date Fri, 12 Apr 2013 17:18:52 -0700
parents 6edb0e18b83c
children 67f3f02df144
files hgext/transplant.py mercurial/repoview.py
diffstat 2 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
--- a/mercurial/repoview.py	Fri Apr 12 17:17:35 2013 -0700
+++ b/mercurial/repoview.py	Fri Apr 12 17:18:52 2013 -0700
@@ -55,7 +55,6 @@
         return frozenset(hiddens | secrets)
     else:
         return hiddens
-    return frozenset()
 
 def computemutable(repo):
     """compute the set of revision that should be filtered when used a server