# HG changeset patch # User Martin von Zweigbergk # Date 2019-10-30 06:33:34 # Node ID ecd11c4d3834b7602d9bdc6f27ba1f4fc07911a1 # Parent ac140b85aae9afa3aaac708e937875bcef0d2d94 match: drop support for passing '.' for root dir to visit*() methods We said we'd drop support for it after 5.1, so it's time to clean it up now. Differential Revision: https://phab.mercurial-scm.org/D7249 diff --git a/mercurial/match.py b/mercurial/match.py --- a/mercurial/match.py +++ b/mercurial/match.py @@ -547,16 +547,6 @@ class predicatematcher(basematcher): return b'' % 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. @@ -602,7 +592,6 @@ class patternmatcher(basematcher): return set(pathutil.dirs(self._fileset)) def visitdir(self, dir): - dir = normalizerootdir(dir, b'visitdir') if self._prefix and dir in self._fileset: return b'all' return ( @@ -686,7 +675,6 @@ class includematcher(basematcher): self._parents = parents def visitdir(self, dir): - dir = normalizerootdir(dir, b'visitdir') if self._prefix and dir in self._roots: return b'all' return ( @@ -767,12 +755,9 @@ class exactmatcher(basematcher): return set(pathutil.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() @@ -1009,7 +994,6 @@ class subdirmatcher(basematcher): return self._matcher.matchfn(self._path + b"/" + f) def visitdir(self, dir): - dir = normalizerootdir(dir, b'visitdir') if dir == b'': dir = self._path else: @@ -1017,7 +1001,6 @@ class subdirmatcher(basematcher): return self._matcher.visitdir(dir) def visitchildrenset(self, dir): - dir = normalizerootdir(dir, b'visitchildrenset') if dir == b'': dir = self._path else: