This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3097

verify: allow suppressing warnings about extra files
ClosedPublic

Authored by indygreg on Apr 4 2018, 9:24 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG76d2115cb817: verify: allow suppressing warnings about extra files
Summary

The verifier issues warnings when the set of files in .hg/store
doesn't align with the set of files that are advertised via
repo.file(f).files() for all files seen in ctx.files() changelog
traversal.

This logic is reasonable for a default implementation. But some
stores may have extra files whose presence is harmless. Or those
stores may not have the same transaction rollback semantics that
unlink files as other stores.

This commit adds support for disabling the warning for orphaned
files.

The simple store extension has been taught to set this flag.

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.Apr 4 2018, 9:24 PM
durin42 accepted this revision.Apr 6 2018, 8:29 PM
This revision is now accepted and ready to land.Apr 6 2018, 8:29 PM
Closed by commit rHG76d2115cb817: verify: allow suppressing warnings about extra files (authored by indygreg). · Explain WhyApr 6 2018, 9:20 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/verify.py (17 lines)
Mtests/simplestorerepo.py (9 lines)

Diff 7823

mercurial/verify.py

self.havecl = len(repo.changelog) > 0 self.havecl = len(repo.changelog) > 0
self.havemf = len(repo.manifestlog._revlog) > 0 self.havemf = len(repo.manifestlog._revlog) > 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.__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('verify', 'skipflags') self.skipflags = repo.ui.configint('verify', 'skipflags')
self.warnorphanstorefiles = True
def warn(self, msg): def warn(self, msg):
self.ui.warn(msg + "\n") self.ui.warn(msg + "\n")
self.warnings += 1 self.warnings += 1
def err(self, linkrev, msg, filename=None): def err(self, linkrev, msg, filename=None):
if linkrev is not None: if linkrev is not None:
self.badrevs.add(linkrev) self.badrevs.add(linkrev)
for subdir, linkrevs in subdirnodes.iteritems(): for subdir, linkrevs in subdirnodes.iteritems():
subdirfilenodes = self._verifymanifest(linkrevs, subdir, storefiles, subdirfilenodes = self._verifymanifest(linkrevs, subdir, storefiles,
progress) progress)
for f, onefilenodes in subdirfilenodes.iteritems(): for f, onefilenodes in subdirfilenodes.iteritems():
filenodes.setdefault(f, {}).update(onefilenodes) filenodes.setdefault(f, {}).update(onefilenodes)
if not dir and subdirnodes: if not dir and subdirnodes:
ui.progress(_('checking'), None) ui.progress(_('checking'), None)
if self.warnorphanstorefiles:
for f in sorted(storefiles): for f in sorted(storefiles):
self.warn(_("warning: orphan data file '%s'") % f) self.warn(_("warning: orphan data file '%s'") % f)
return filenodes return filenodes
def _crosscheckfiles(self, filelinkrevs, filenodes): def _crosscheckfiles(self, filelinkrevs, filenodes):
repo = self.repo repo = self.repo
ui = self.ui ui = self.ui
ui.status(_("crosschecking files in changesets and manifests\n")) ui.status(_("crosschecking files in changesets and manifests\n"))
except error.RevlogError as e: except error.RevlogError as e:
self.err(lr, _("broken revlog! (%s)") % e, f) self.err(lr, _("broken revlog! (%s)") % e, f)
continue continue
for ff in fl.files(): for ff in fl.files():
try: try:
storefiles.remove(ff) storefiles.remove(ff)
except KeyError: except KeyError:
self.warn(_(" warning: revlog '%s' not in fncache!") % ff) if self.warnorphanstorefiles:
self.warn(_(" warning: revlog '%s' not in fncache!") %
ff)
self.fncachewarned = True self.fncachewarned = True
self.checklog(fl, f, lr) self.checklog(fl, f, lr)
seen = {} seen = {}
rp = None rp = None
for i in fl: for i in fl:
revisions += 1 revisions += 1
n = fl.node(i) n = fl.node(i)
lr = self.checkentry(fl, i, n, seen, linkrevs, f) lr = self.checkentry(fl, i, n, seen, linkrevs, f)
# cross-check # cross-check
if f in filenodes: if f in filenodes:
fns = [(v, k) for k, v in filenodes[f].iteritems()] fns = [(v, k) for k, v in filenodes[f].iteritems()]
for lr, node in sorted(fns): for lr, node in sorted(fns):
self.err(lr, _("manifest refers to unknown revision %s") % self.err(lr, _("manifest refers to unknown revision %s") %
short(node), f) short(node), f)
ui.progress(_('checking'), None) ui.progress(_('checking'), None)
if self.warnorphanstorefiles:
for f in sorted(storefiles): for f in sorted(storefiles):
self.warn(_("warning: orphan data file '%s'") % f) self.warn(_("warning: orphan data file '%s'") % f)
return len(files), revisions return len(files), revisions

tests/simplestorerepo.py

error, error,
extensions, extensions,
filelog, filelog,
localrepo, localrepo,
mdiff, mdiff,
pycompat, pycompat,
revlog, revlog,
store, store,
verify,
) )
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or # be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified. # leave the attribute unspecified.
testedwith = 'ships-with-hg-core' testedwith = 'ships-with-hg-core'
return requirements return requirements
def makestore(orig, requirements, path, vfstype): def makestore(orig, requirements, path, vfstype):
if REQUIREMENT not in requirements: if REQUIREMENT not in requirements:
return orig(requirements, path, vfstype) return orig(requirements, path, vfstype)
return simplestore(path, vfstype) return simplestore(path, vfstype)
def verifierinit(orig, self, *args, **kwargs):
orig(self, *args, **kwargs)
# We don't care that files in the store don't align with what is
# advertised. So suppress these warnings.
self.warnorphanstorefiles = False
def extsetup(ui): def extsetup(ui):
localrepo.featuresetupfuncs.add(featuresetup) localrepo.featuresetupfuncs.add(featuresetup)
extensions.wrapfunction(localrepo, 'newreporequirements', extensions.wrapfunction(localrepo, 'newreporequirements',
newreporequirements) newreporequirements)
extensions.wrapfunction(store, 'store', makestore) extensions.wrapfunction(store, 'store', makestore)
extensions.wrapfunction(verify.verifier, '__init__', verifierinit)