This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4704

revlog: use proper version comparison during verify
ClosedPublic

Authored by indygreg on Sep 24 2018, 12:12 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe6d3d39cc1c7: revlog: use proper version comparison during verify
Summary

Verify appears to want to compare the changelog's revlog version
number with the version number of filelogs and error if they are
different. But what it was actually doing was comparing the full
32-bit header integer, which contains 2 shorts: 1 for the revlog
version number and 1 for feature flags.

This commit tweaks the verification code so it only looks at the
version number component of the header and emits a warning if they
differ.

The new code is more robust because it accounts for future revlog
version numbers without them needing to be special cased.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Sep 24 2018, 12:12 PM
Closed by commit rHGe6d3d39cc1c7: revlog: use proper version comparison during verify (authored by indygreg). · Explain WhySep 26 2018, 1:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (14 lines)
Mmercurial/verify.py (3 lines)

Diff 11312

mercurial/revlog.py

found. found.
""" """
dd, di = self.checksize() dd, di = self.checksize()
if dd: if dd:
yield revlogproblem(error=_('data length off by %d bytes') % dd) yield revlogproblem(error=_('data length off by %d bytes') % dd)
if di: if di:
yield revlogproblem(error=_('index contains %d extra bytes') % di) yield revlogproblem(error=_('index contains %d extra bytes') % di)
if self.version != REVLOGV0: version = self.version & 0xFFFF
if not state['revlogv1']:
yield revlogproblem(warning=_("warning: `%s' uses revlog " # The verifier tells us what version revlog we should be.
"format 1") % self.indexfile) if version != state['expectedversion']:
elif state['revlogv1']: yield revlogproblem(
yield revlogproblem(warning=_("warning: `%s' uses revlog " warning=_("warning: '%s' uses revlog format %d; expected %d") %
"format 0") % self.indexfile) (self.indexfile, version, state['expectedversion']))

mercurial/verify.py

storefiles = set() storefiles = set()
for f, f2, size in repo.store.datafiles(): for f, f2, size in repo.store.datafiles():
if not f: if not f:
self.err(None, _("cannot decode filename '%s'") % f2) self.err(None, _("cannot decode filename '%s'") % f2)
elif (size > 0 or not revlogv1) and f.startswith('data/'): elif (size > 0 or not revlogv1) and f.startswith('data/'):
storefiles.add(_normpath(f)) storefiles.add(_normpath(f))
state = { state = {
'revlogv1': self.revlogv1, # TODO this assumes revlog storage for changelog.
'expectedversion': self.repo.changelog.version & 0xFFFF
} }
files = sorted(set(filenodes) | set(filelinkrevs)) files = sorted(set(filenodes) | set(filelinkrevs))
revisions = 0 revisions = 0
progress = ui.makeprogress(_('checking'), unit=_('files'), progress = ui.makeprogress(_('checking'), unit=_('files'),
total=len(files)) total=len(files))
for i, f in enumerate(files): for i, f in enumerate(files):
progress.update(i, item=f) progress.update(i, item=f)