This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4824

narrow: move support for `hg verify` into core
ClosedPublic

Authored by martinvonz on Oct 1 2018, 1:01 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGfec944719324: narrow: move support for `hg verify` into core
rHGa81cb91b15f0: narrow: move support for `hg verify` into core
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Oct 1 2018, 1:01 PM
indygreg added a subscriber: indygreg.Oct 1 2018, 1:13 PM
indygreg added inline comments.
mercurial/verify.py
37

match is unused after this change. Should we drop it?

martinvonz marked an inline comment as done.Oct 1 2018, 1:14 PM
Closed by commit rHGa81cb91b15f0: narrow: move support for `hg verify` into core (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.
martinvonz updated this revision to Diff 11535.Oct 1 2018, 1:15 PM
martinvonz added inline comments.Oct 1 2018, 1:15 PM
mercurial/verify.py
37

Done

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/__init__.py (12 lines)
Mmercurial/verify.py (7 lines)

Diff 11535

hgext/narrow/__init__.py

# 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'
from mercurial import ( from mercurial import (
extensions,
localrepo, localrepo,
registrar, registrar,
repository, repository,
verify as verifymod,
) )
from . import ( from . import (
narrowbundle2, narrowbundle2,
narrowcommands, narrowcommands,
narrowpatch, narrowpatch,
narrowrepo, narrowrepo,
narrowtemplates, narrowtemplates,
if not repo.local(): if not repo.local():
return return
if repository.NARROW_REQUIREMENT in repo.requirements: if repository.NARROW_REQUIREMENT in repo.requirements:
narrowrepo.wraprepo(repo) narrowrepo.wraprepo(repo)
narrowpatch.setup(repo) narrowpatch.setup(repo)
narrowwirepeer.reposetup(repo) narrowwirepeer.reposetup(repo)
def _verifierinit(orig, self, repo, matcher=None):
# The verifier's matcher argument was desgined for narrowhg, so it should
# be None from core. If another extension passes a matcher (unlikely),
# we'll have to fail until matchers can be composed more easily.
assert matcher is None
orig(self, repo, repo.narrowmatch())
def extsetup(ui):
extensions.wrapfunction(verifymod.verifier, '__init__', _verifierinit)
templatekeyword = narrowtemplates.templatekeyword templatekeyword = narrowtemplates.templatekeyword
revsetpredicate = narrowtemplates.revsetpredicate revsetpredicate = narrowtemplates.revsetpredicate

mercurial/verify.py

nullid, nullid,
short, short,
) )
from . import ( from . import (
error, error,
pycompat, pycompat,
revlog, revlog,
scmutil,
util, util,
) )
def verify(repo): def verify(repo):
with repo.lock(): with repo.lock():
return verifier(repo).verify() return verifier(repo).verify()
def _normpath(f): def _normpath(f):
# under hg < 2.4, convert didn't sanitize paths properly, so a # under hg < 2.4, convert didn't sanitize paths properly, so a
# converted repo may contain repeated slashes # converted repo may contain repeated slashes
while '//' in f: while '//' in f:
f = f.replace('//', '/') f = f.replace('//', '/')
return f return f
class verifier(object): class verifier(object):
# The match argument is always None in hg core, but e.g. the narrowhg def __init__(self, repo):
indygregUnsubmitted
Done

match is unused after this change. Should we drop it?

indygreg: `match` is unused after this change. Should we drop it?
martinvonzAuthorUnsubmitted
Not Done

Done

martinvonz: Done
# extension will pass in a matcher here.
def __init__(self, repo, match=None):
self.repo = repo.unfiltered() self.repo = repo.unfiltered()
self.ui = repo.ui self.ui = repo.ui
self.match = match or scmutil.matchall(repo) self.match = repo.narrowmatch()
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.__getitem__)
self.refersmf = False self.refersmf = False