This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4719

upgrade: use rawsize() instead of revlog index
ClosedPublic

Authored by indygreg on Sep 24 2018, 1:15 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG32d3ed3023bb: upgrade: use rawsize() instead of revlog index
Summary

The revlog index is a very low-level data structure and it shouldn't
be exposed to the storage interface - at least not in its current
form.

upgrade.py is the only consumer of the index attribute on file storage
in the repository.

This commit rewrites that final consumer to use rawsize() instead of
going through the index. This is actually the more proper API to use,
as rawsize() will accurately report the size of revisions which have
a negative size in the index.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Sep 24 2018, 1:15 PM
Closed by commit rHG32d3ed3023bb: upgrade: use rawsize() instead of revlog index (authored by indygreg). · Explain WhySep 26 2018, 1:25 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filelog.py (2 lines)
Mmercurial/upgrade.py (5 lines)

Diff 11389

mercurial/filelog.py

return self._revlog.children(node) return self._revlog.children(node)
def deltaparent(self, rev): def deltaparent(self, rev):
return self._revlog.deltaparent(rev) return self._revlog.deltaparent(rev)
def iscensored(self, rev): def iscensored(self, rev):
return self._revlog.iscensored(rev) return self._revlog.iscensored(rev)
# Used by verify. # Used by repo upgrade, verify.
def rawsize(self, rev): def rawsize(self, rev):
return self._revlog.rawsize(rev) return self._revlog.rawsize(rev)
# Might be unused. # Might be unused.
def checkhash(self, text, node, p1=None, p2=None, rev=None): def checkhash(self, text, node, p1=None, p2=None, rev=None):
return self._revlog.checkhash(text, node, p1=p1, p2=p2, rev=rev) return self._revlog.checkhash(text, node, p1=p1, p2=p2, rev=rev)
def revision(self, node, _df=None, raw=False): def revision(self, node, _df=None, raw=False):

mercurial/upgrade.py

revcount += len(rl) revcount += len(rl)
datasize = 0 datasize = 0
rawsize = 0 rawsize = 0
for path in rl.files(): for path in rl.files():
datasize += rl.opener.stat(path).st_size datasize += rl.opener.stat(path).st_size
idx = rl.index rawsize += sum(map(rl.rawsize, iter(rl)))
for rev in rl:
e = idx[rev]
rawsize += e[2]
srcsize += datasize srcsize += datasize
srcrawsize += rawsize srcrawsize += rawsize
# This is for the separate progress bars. # This is for the separate progress bars.
if isinstance(rl, changelog.changelog): if isinstance(rl, changelog.changelog):
crevcount += len(rl) crevcount += len(rl)
csrcsize += datasize csrcsize += datasize