match: minor cleanups to patternmatcher and includematcher
The "patterns"/"include" in "patternspat"/"includepat" is redundant,
so drop it. Also a "_" prefix since it's "private".
Inline the "pm"/"im" variables.
--- a/mercurial/match.py Thu Jul 06 17:18:50 2017 +0200
+++ b/mercurial/match.py Thu Jun 08 22:49:21 2017 -0700
@@ -358,9 +358,8 @@
self._files = _explicitfiles(kindpats)
self._anypats = _anypats(kindpats)
- self.patternspat, pm = _buildmatch(ctx, kindpats, '$', listsubrepos,
- root)
- self.matchfn = pm
+ self._pats, self.matchfn = _buildmatch(ctx, kindpats, '$', listsubrepos,
+ root)
@propertycache
def _dirs(self):
@@ -379,7 +378,7 @@
return self._anypats
def __repr__(self):
- return ('<patternmatcher patterns=%r>' % self.patternspat)
+ return ('<patternmatcher patterns=%r>' % self._pats)
class includematcher(basematcher):
@@ -387,15 +386,14 @@
badfn=None):
super(includematcher, self).__init__(root, cwd, badfn)
- self.includepat, im = _buildmatch(ctx, kindpats, '(?:/|$)',
- listsubrepos, root)
+ self._pats, self.matchfn = _buildmatch(ctx, kindpats, '(?:/|$)',
+ listsubrepos, root)
self._anypats = _anypats(kindpats)
roots, dirs = _rootsanddirs(kindpats)
# roots are directories which are recursively included.
self._roots = set(roots)
# dirs are directories which are non-recursively included.
self._dirs = set(dirs)
- self.matchfn = im
def visitdir(self, dir):
if not self._anypats and dir in self._roots:
@@ -411,7 +409,7 @@
return True
def __repr__(self):
- return ('<includematcher includes=%r>' % self.includepat)
+ return ('<includematcher includes=%r>' % self._pats)
class exactmatcher(basematcher):
'''Matches the input files exactly. They are interpreted as paths, not