This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10858

revlogv2: fix `hg verify` with revlog v2
ClosedPublic

Authored by marmoute on Jun 9 2021, 10:38 AM.

Details

Reviewers
indygreg
Alphare
Group Reviewers
hg-reviewers
Commits
rHG9cecc222c536: revlogv2: fix `hg verify` with revlog v2
Summary

We added a bunch of new files but we never teached some internal about it. This
is now fixed.

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

marmoute created this revision.Jun 9 2021, 10:38 AM
baymax updated this revision to Diff 28580.Jun 15 2021, 10:24 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Jun 16 2021, 5:43 AM
This revision is now accepted and ready to land.Jun 16 2021, 5:43 AM
baymax updated this revision to Diff 28628.Jun 21 2021, 1:09 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHG9cecc222c536: revlogv2: fix `hg verify` with revlog v2.Jun 21 2021, 11:15 AM
Closed by commit rHG9cecc222c536: revlogv2: fix `hg verify` with revlog v2 (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (11 lines)
Mtests/test-revlog-v2.t (18 lines)

Diff 28658

mercurial/revlog.py

if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT:
raise raise
di = 0 di = 0
return (dd, di) return (dd, di)
def files(self): def files(self):
res = [self._indexfile] res = [self._indexfile]
if self._docket_file is None:
if not self._inline: if not self._inline:
res.append(self._datafile) res.append(self._datafile)
else:
res.append(self._docket_file)
if self._docket.data_end:
res.append(self._datafile)
if self._docket.sidedata_end:
res.append(self._sidedatafile)
return res return res
def emitrevisions( def emitrevisions(
self, self,
nodes, nodes,
nodesorder=None, nodesorder=None,
revisiondata=False, revisiondata=False,
assumehaveparentrevisions=False, assumehaveparentrevisions=False,

tests/test-revlog-v2.t

user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: initial summary: initial
The two repository should be identical, this diff MUST be empty The two repository should be identical, this diff MUST be empty
$ cmp ../tip-new ../tip-cloned || diff -U8 ../tip-new ../tip-cloned $ cmp ../tip-new ../tip-cloned || diff -U8 ../tip-new ../tip-cloned
hg verify should be happy
-------------------------
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
checked 1 changesets with 1 changes to 1 files
$ hg verify -R ../cloned-repo
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
checked 1 changesets with 1 changes to 1 files