Comments
Patch
@@ -83,11 +83,11 @@ class filelog(revlog.revlog):
samehashes = not super(filelog, self).cmp(node, t)
if samehashes:
return False
# censored files compare against the empty file
- if self._iscensored(node):
+ if self._iscensored(self.rev(node)):
return text != ''
# renaming a file produces a different hash, even if the data
# remains unchanged. Check if it's the case (slow):
if self.renamed(node):
@@ -105,12 +105,8 @@ class filelog(revlog.revlog):
raise
def _file(self, f):
return filelog(self.opener, f)
- def _iscensored(self, revornode):
+ def _iscensored(self, rev):
"""Check if a file revision is censored."""
- try:
- self.revision(revornode)
- return False
- except error.CensoredNodeError:
- return True
+ return self.flags(rev) & revlog.REVIDX_ISCENSORED