mercurial/filelog.py
changeset 30589 be5b2098a817
parent 25948 34bd1a5eef5b
child 32177 8ac7ac714e92
equal deleted inserted replaced
30588:8f8211903b83 30589:be5b2098a817
   102             t2 = self.read(node)
   102             t2 = self.read(node)
   103             return t2 != text
   103             return t2 != text
   104 
   104 
   105         return True
   105         return True
   106 
   106 
   107     def checkhash(self, text, p1, p2, node, rev=None):
   107     def checkhash(self, text, node, p1=None, p2=None, rev=None):
   108         try:
   108         try:
   109             super(filelog, self).checkhash(text, p1, p2, node, rev=rev)
   109             super(filelog, self).checkhash(text, node, p1=p1, p2=p2, rev=rev)
   110         except error.RevlogError:
   110         except error.RevlogError:
   111             if _censoredtext(text):
   111             if _censoredtext(text):
   112                 raise error.CensoredNodeError(self.indexfile, node, text)
   112                 raise error.CensoredNodeError(self.indexfile, node, text)
   113             raise
   113             raise
   114 
   114