Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filelog.py @ 49213:c577d394ed6b
branching: merge with stable
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 12 May 2022 07:36:37 -0700 |
parents | 5b65721a75eb 77b5a190571c |
children | 8960d8eb747b |
line wrap: on
line diff
--- a/mercurial/filelog.py Thu Apr 21 10:39:52 2022 -0700 +++ b/mercurial/filelog.py Thu May 12 07:36:37 2022 -0700 @@ -202,10 +202,10 @@ # for revisions with renames, we have to go the slow way node = self.node(rev) + if self.iscensored(rev): + return 0 if self.renamed(node): return len(self.read(node)) - if self.iscensored(rev): - return 0 # XXX if self.read(node).startswith("\1\n"), this returns (size+4) # XXX See also basefilectx.cmp.