Mercurial > public > mercurial-scm > hg

comparison mercurial/filelog.py @ 30584: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
comparison
equal deleted inserted replaced
30583:8f8211903b83 30584: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