This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1975

narrow: remove support for old match modules
ClosedPublic

Authored by durin42 on Feb 1 2018, 6:00 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG9dc28d8ea61e: narrow: remove support for old match modules
Summary

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

durin42 created this revision.Feb 1 2018, 6:00 PM
indygreg accepted this revision.Feb 5 2018, 4:22 PM
This revision is now accepted and ready to land.Feb 5 2018, 4:22 PM
Closed by commit rHG9dc28d8ea61e: narrow: remove support for old match modules (authored by durin42). · Explain WhyFeb 12 2018, 6:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/__init__.py (15 lines)

Diff 5542

hgext/narrow/__init__.py

except ImportError: except ImportError:
pass pass
from mercurial import ( from mercurial import (
extensions, extensions,
hg, hg,
localrepo, localrepo,
registrar, registrar,
util,
verify as verifymod, verify as verifymod,
) )
from . import ( from . import (
narrowbundle2, narrowbundle2,
narrowchangegroup, narrowchangegroup,
narrowcommands, narrowcommands,
narrowcopies, narrowcopies,
if narrowrepo.requirement in repo.requirements: if narrowrepo.requirement in repo.requirements:
narrowrepo.wraprepo(repo, True) narrowrepo.wraprepo(repo, True)
narrowcopies.setup(repo) narrowcopies.setup(repo)
narrowdirstate.setup(repo) narrowdirstate.setup(repo)
narrowpatch.setup(repo) narrowpatch.setup(repo)
narrowwirepeer.reposetup(repo) narrowwirepeer.reposetup(repo)
def _narrowvalidpath(orig, repo, path):
matcher = getattr(repo, 'narrowmatch', None)
if matcher is None:
return orig(repo, path)
matcher = matcher()
if matcher.visitdir(path) or matcher(path):
return orig(repo, path)
return False
def _verifierinit(orig, self, repo, matcher=None): def _verifierinit(orig, self, repo, matcher=None):
# The verifier's matcher argument was desgined for narrowhg, so it should # The verifier's matcher argument was desgined for narrowhg, so it should
# be None from core. If another extension passes a matcher (unlikely), # be None from core. If another extension passes a matcher (unlikely),
# we'll have to fail until matchers can be composed more easily. # we'll have to fail until matchers can be composed more easily.
assert matcher is None assert matcher is None
matcher = getattr(repo, 'narrowmatch', lambda: None)() matcher = getattr(repo, 'narrowmatch', lambda: None)()
orig(self, repo, matcher) orig(self, repo, matcher)
def extsetup(ui): def extsetup(ui):
if util.safehasattr(verifymod, '_validpath'):
extensions.wrapfunction(verifymod, '_validpath', _narrowvalidpath)
else:
extensions.wrapfunction(verifymod.verifier, '__init__', _verifierinit) extensions.wrapfunction(verifymod.verifier, '__init__', _verifierinit)
extensions.wrapfunction(hg, 'postshare', narrowrepo.wrappostshare) extensions.wrapfunction(hg, 'postshare', narrowrepo.wrappostshare)
extensions.wrapfunction(hg, 'copystore', narrowrepo.unsharenarrowspec) extensions.wrapfunction(hg, 'copystore', narrowrepo.unsharenarrowspec)