D7249: match: drop support for passing '.' for root dir to visit*() methods
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Nov 6 01:01:08 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
We said we'd drop support for it after 5.1, so it's time to clean it
up now.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D7249
AFFECTED FILES
mercurial/match.py
CHANGE DETAILS
diff --git a/mercurial/match.py b/mercurial/match.py
--- a/mercurial/match.py
+++ b/mercurial/match.py
@@ -543,16 +543,6 @@
return b'<predicatenmatcher pred=%s>' % s
-def normalizerootdir(dir, funcname):
- if dir == b'.':
- util.nouideprecwarn(
- b"match.%s() no longer accepts '.', use '' instead." % funcname,
- b'5.1',
- )
- return b''
- return dir
-
-
class patternmatcher(basematcher):
"""Matches a set of (kind, pat, source) against a 'root' directory.
@@ -598,7 +588,6 @@
return set(util.dirs(self._fileset))
def visitdir(self, dir):
- dir = normalizerootdir(dir, b'visitdir')
if self._prefix and dir in self._fileset:
return b'all'
return (
@@ -682,7 +671,6 @@
self._parents = parents
def visitdir(self, dir):
- dir = normalizerootdir(dir, b'visitdir')
if self._prefix and dir in self._roots:
return b'all'
return (
@@ -763,12 +751,9 @@
return set(util.dirs(self._fileset))
def visitdir(self, dir):
- dir = normalizerootdir(dir, b'visitdir')
return dir in self._dirs
def visitchildrenset(self, dir):
- dir = normalizerootdir(dir, b'visitchildrenset')
-
if not self._fileset or dir not in self._dirs:
return set()
@@ -1005,7 +990,6 @@
return self._matcher.matchfn(self._path + b"/" + f)
def visitdir(self, dir):
- dir = normalizerootdir(dir, b'visitdir')
if dir == b'':
dir = self._path
else:
@@ -1013,7 +997,6 @@
return self._matcher.visitdir(dir)
def visitchildrenset(self, dir):
- dir = normalizerootdir(dir, b'visitchildrenset')
if dir == b'':
dir = self._path
else:
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list