This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7950

verify: avoid spurious integrity warnings in verbose mode (issue6172)
ClosedPublic

Authored by mharbison72 on Jan 18 2020, 7:37 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe77b57e09bfa: verify: avoid spurious integrity warnings in verbose mode (issue6172)
Summary

The issue seems to revolve around renames in filtered commits, and only occurred
in verbose mode. The problem occurs in the # check renames stage, around line

  1. Without using the unfiltered repo, this test would have printed:

    $ hg verify -v repository uses revlog format 1 checking changesets checking manifests crosschecking files in changesets and manifests checking files foo@25: checking rename of 71ec0570c325: filtered revision '25' foobar@26: checking rename of 1b549296015b: filtered revision '26' checked 28 changesets with 16 changes to 11 files 2 integrity errors encountered! (first damaged changeset appears to be 25) [1]

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

mharbison72 created this revision.Jan 18 2020, 7:37 PM
pulkit added a subscriber: pulkit.Jan 20 2020, 11:36 AM

TBH it feels not correct that some code path of hg verify needs unfiltered repository and that too around renames. Reading tests, I first thought it's some bug in unamend and then checked the issue to realize it's a general problem.

mharbison72 added a comment.Jan 20 2020, 12:30 PM
In D7950#116781, @pulkit wrote:

TBH it feels not correct that some code path of hg verify needs unfiltered repository and that too around renames. Reading tests, I first thought it's some bug in unamend and then checked the issue to realize it's a general problem.

The verify.verifier class uses an unfiltered repo, which I assume is why sometimes it can stray off into filtered revisions. FWIW, I've got a repo at work that also prints:

subrepo '$subrepo' is hidden in revision $hash

This doesn't purport to fix that (and I struggled coming up with a test repro a few years ago). Just mentioning that there are other filtering problems around verify.

pulkit accepted this revision.Jan 21 2020, 7:03 AM
This revision is now accepted and ready to land.Jan 21 2020, 7:03 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/verify.py (2 lines)
Mtests/test-unamend.t (8 lines)

Diff 19462

mercurial/verify.py

level = VERIFY_DEFAULT level = VERIFY_DEFAULT
self._level = level self._level = level
self.badrevs = set() self.badrevs = set()
self.errors = 0 self.errors = 0
self.warnings = 0 self.warnings = 0
self.havecl = len(repo.changelog) > 0 self.havecl = len(repo.changelog) > 0
self.havemf = len(repo.manifestlog.getstorage(b'')) > 0 self.havemf = len(repo.manifestlog.getstorage(b'')) > 0
self.revlogv1 = repo.changelog.version != revlog.REVLOGV0 self.revlogv1 = repo.changelog.version != revlog.REVLOGV0
self.lrugetctx = util.lrucachefunc(repo.__getitem__) self.lrugetctx = util.lrucachefunc(repo.unfiltered().__getitem__)
self.refersmf = False self.refersmf = False
self.fncachewarned = False self.fncachewarned = False
# developer config: verify.skipflags # developer config: verify.skipflags
self.skipflags = repo.ui.configint(b'verify', b'skipflags') self.skipflags = repo.ui.configint(b'verify', b'skipflags')
self.warnorphanstorefiles = True self.warnorphanstorefiles = True
def _warn(self, msg): def _warn(self, msg):
"""record a "warning" level issue""" """record a "warning" level issue"""

tests/test-unamend.t

rename to foo rename to foo
diff --git a/b b/foobar diff --git a/b b/foobar
rename from b rename from b
rename to foobar rename to foobar
$ hg mv c wat $ hg mv c wat
$ hg unamend $ hg unamend
$ hg verify -v
repository uses revlog format 1
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
checked 28 changesets with 16 changes to 11 files
Retained copies in new prdecessor commit Retained copies in new prdecessor commit
$ hg exp --git $ hg exp --git
# HG changeset patch # HG changeset patch
# User test # User test
# Date 0 0 # Date 0 0
# Thu Jan 01 00:00:00 1970 +0000 # Thu Jan 01 00:00:00 1970 +0000
# Node ID 552e3af4f01f620f88ca27be1f898316235b736a # Node ID 552e3af4f01f620f88ca27be1f898316235b736a