Mercurial > hg-stable

diff mercurial/filelog.py @ 30589:be5b2098a817

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: merge hash checking subfunctions This patch factors the behavior of both methods into 'checkhash'.
author Remi Chaintron <remi@fb.com>
date Tue, 13 Dec 2016 14:21:36 +0000
parents 34bd1a5eef5b
children 8ac7ac714e92
line wrap: on
line diff
--- a/mercurial/filelog.py	Fri Dec 09 03:22:26 2016 -0800
+++ b/mercurial/filelog.py	Tue Dec 13 14:21:36 2016 +0000
@@ -104,9 +104,9 @@
 
         return True
 
-    def checkhash(self, text, p1, p2, node, rev=None):
+    def checkhash(self, text, node, p1=None, p2=None, rev=None):
         try:
-            super(filelog, self).checkhash(text, p1, p2, node, rev=rev)
+            super(filelog, self).checkhash(text, node, p1=p1, p2=p2, rev=rev)
         except error.RevlogError:
             if _censoredtext(text):
                 raise error.CensoredNodeError(self.indexfile, node, text)