Comments
Patch
@@ -64,7 +64,7 @@
node = self.node(rev)
if self.renamed(node):
return len(self.read(node))
- if self._iscensored(rev):
+ if self.iscensored(rev):
return 0
# XXX if self.read(node).startswith("\1\n"), this returns (size+4)
@@ -85,7 +85,7 @@
return False
# censored files compare against the empty file
- if self._iscensored(self.rev(node)):
+ if self.iscensored(self.rev(node)):
return text != ''
# renaming a file produces a different hash, even if the data
@@ -104,9 +104,9 @@
raise error.CensoredNodeError(self.indexfile, node)
raise
+ def iscensored(self, rev):
+ """Check if a file revision is censored."""
+ return self.flags(rev) & revlog.REVIDX_ISCENSORED
+
def _file(self, f):
return filelog(self.opener, f)
-
- def _iscensored(self, rev):
- """Check if a file revision is censored."""
- return self.flags(rev) & revlog.REVIDX_ISCENSORED
@@ -1417,6 +1417,10 @@
return content
+ def iscensored(self, rev):
+ """Check if a file revision is censored."""
+ return False
+
def getstrippoint(self, minlink):
"""find the minimum rev that must be stripped to strip the linkrev
@@ -163,6 +163,12 @@
def _file(self, f):
self._repo.file(f)
+ def iscensored(self, rev):
+ """Check if a revision is censored."""
+ if rev <= self.repotiprev:
+ return filelog.filelog.iscensored(self, rev)
+ return self.revlog2.iscensored(rev)
+
class unionpeer(localrepo.localpeer):
def canpush(self):
return False