Mercurial > public > mercurial-scm > hg
comparison mercurial/filelog.py @ 49166:77b5a190571c stable
censor: fix [hg update] away from a revision with censored files
Differential Revision: https://phab.mercurial-scm.org/D12604
author | Arseniy Alekseyev <aalekseyev@janestreet.com> |
---|---|
date | Wed, 04 May 2022 17:40:23 +0100 |
parents | c514936d92b4 |
children | c577d394ed6b |
comparison
equal
deleted
inserted
replaced
49165:72936be2a21b | 49166:77b5a190571c |
---|---|
200 def size(self, rev): | 200 def size(self, rev): |
201 """return the size of a given revision""" | 201 """return the size of a given revision""" |
202 | 202 |
203 # for revisions with renames, we have to go the slow way | 203 # for revisions with renames, we have to go the slow way |
204 node = self.node(rev) | 204 node = self.node(rev) |
205 if self.iscensored(rev): | |
206 return 0 | |
205 if self.renamed(node): | 207 if self.renamed(node): |
206 return len(self.read(node)) | 208 return len(self.read(node)) |
207 if self.iscensored(rev): | |
208 return 0 | |
209 | 209 |
210 # XXX if self.read(node).startswith("\1\n"), this returns (size+4) | 210 # XXX if self.read(node).startswith("\1\n"), this returns (size+4) |
211 return self._revlog.size(rev) | 211 return self._revlog.size(rev) |
212 | 212 |
213 def cmp(self, node, text): | 213 def cmp(self, node, text): |