Patchwork D1975: narrow: remove support for old match modules

login
register
mail settings
Submitter phabricator
Date Feb. 1, 2018, 11 p.m.
Message ID <differential-rev-PHID-DREV-4pzbkdslw5cvvfcxnfgz-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/27164/
State Superseded
Headers show

Comments

phabricator - Feb. 1, 2018, 11 p.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1975

AFFECTED FILES
  hgext/narrow/__init__.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/narrow/__init__.py b/hgext/narrow/__init__.py
--- a/hgext/narrow/__init__.py
+++ b/hgext/narrow/__init__.py
@@ -24,7 +24,6 @@ 
     hg,
     localrepo,
     registrar,
-    util,
     verify as verifymod,
 )
 
@@ -85,15 +84,6 @@ 
         narrowpatch.setup(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):
     # The verifier's matcher argument was desgined for narrowhg, so it should
     # be None from core. If another extension passes a matcher (unlikely),
@@ -103,9 +93,6 @@ 
     orig(self, repo, matcher)
 
 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, 'copystore', narrowrepo.unsharenarrowspec)