This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5924

match: delete unused argument "listsubrepos" from _buildmatch()
ClosedPublic

Authored by martinvonz on Feb 10 2019, 2:59 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa13268524c25: match: delete unused argument "listsubrepos" from _buildmatch()
Summary

Seems to have been unused since 9f9ffe5f687c (match: compose 'set:'
pattern as matcher, 2018-06-10).

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

martinvonz created this revision.Feb 10 2019, 2:59 AM
Closed by commit rHGa13268524c25: match: delete unused argument "listsubrepos" from _buildmatch() (authored by martinvonz). · Explain WhyFeb 10 2019, 8:59 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/match.py (15 lines)

Diff 14010

mercurial/match.py

return True return True
def _buildkindpatsmatcher(matchercls, root, cwd, kindpats, ctx=None, def _buildkindpatsmatcher(matchercls, root, cwd, kindpats, ctx=None,
listsubrepos=False, badfn=None): listsubrepos=False, badfn=None):
matchers = [] matchers = []
fms, kindpats = _expandsets(root, cwd, kindpats, ctx=ctx, fms, kindpats = _expandsets(root, cwd, kindpats, ctx=ctx,
listsubrepos=listsubrepos, badfn=badfn) listsubrepos=listsubrepos, badfn=badfn)
if kindpats: if kindpats:
m = matchercls(root, cwd, kindpats, listsubrepos=listsubrepos, m = matchercls(root, cwd, kindpats, badfn=badfn)
badfn=badfn)
matchers.append(m) matchers.append(m)
if fms: if fms:
matchers.extend(fms) matchers.extend(fms)
if not matchers: if not matchers:
return nevermatcher(root, cwd, badfn=badfn) return nevermatcher(root, cwd, badfn=badfn)
if len(matchers) == 1: if len(matchers) == 1:
return matchers[0] return matchers[0]
return unionmatcher(matchers) return unionmatcher(matchers)
@encoding.strmethod @encoding.strmethod
def __repr__(self): def __repr__(self):
s = (stringutil.buildrepr(self._predrepr) s = (stringutil.buildrepr(self._predrepr)
or pycompat.byterepr(self.matchfn)) or pycompat.byterepr(self.matchfn))
return '<predicatenmatcher pred=%s>' % s return '<predicatenmatcher pred=%s>' % s
class patternmatcher(basematcher): class patternmatcher(basematcher):
def __init__(self, root, cwd, kindpats, listsubrepos=False, badfn=None): def __init__(self, root, cwd, kindpats, badfn=None):
super(patternmatcher, self).__init__(root, cwd, badfn) super(patternmatcher, self).__init__(root, cwd, badfn)
self._files = _explicitfiles(kindpats) self._files = _explicitfiles(kindpats)
self._prefix = _prefix(kindpats) self._prefix = _prefix(kindpats)
self._pats, self.matchfn = _buildmatch(kindpats, '$', listsubrepos, self._pats, self.matchfn = _buildmatch(kindpats, '$', root)
root)
@propertycache @propertycache
def _dirs(self): def _dirs(self):
return set(util.dirs(self._fileset)) | {'.'} return set(util.dirs(self._fileset)) | {'.'}
def visitdir(self, dir): def visitdir(self, dir):
if self._prefix and dir in self._fileset: if self._prefix and dir in self._fileset:
return 'all' return 'all'
pos = path.rfind('/', 0, pos) pos = path.rfind('/', 0, pos)
yield '.', path[:oldpos] yield '.', path[:oldpos]
def get(self, path): def get(self, path):
return self._dirs.get(path, set()) return self._dirs.get(path, set())
class includematcher(basematcher): class includematcher(basematcher):
def __init__(self, root, cwd, kindpats, listsubrepos=False, badfn=None): def __init__(self, root, cwd, kindpats, badfn=None):
super(includematcher, self).__init__(root, cwd, badfn) super(includematcher, self).__init__(root, cwd, badfn)
self._pats, self.matchfn = _buildmatch(kindpats, '(?:/|$)', self._pats, self.matchfn = _buildmatch(kindpats, '(?:/|$)', root)
listsubrepos, root)
self._prefix = _prefix(kindpats) self._prefix = _prefix(kindpats)
roots, dirs, parents = _rootsdirsandparents(kindpats) roots, dirs, parents = _rootsdirsandparents(kindpats)
# roots are directories which are recursively included. # roots are directories which are recursively included.
self._roots = set(roots) self._roots = set(roots)
# dirs are directories which are non-recursively included. # dirs are directories which are non-recursively included.
self._dirs = set(dirs) self._dirs = set(dirs)
# parents are directories which are non-recursively included because # parents are directories which are non-recursively included because
# they are needed to get to items in _dirs or _roots. # they are needed to get to items in _dirs or _roots.
if kind == 'relre': if kind == 'relre':
if pat.startswith('^'): if pat.startswith('^'):
return pat return pat
return '.*' + pat return '.*' + pat
if kind in ('glob', 'rootglob'): if kind in ('glob', 'rootglob'):
return _globre(pat) + globsuffix return _globre(pat) + globsuffix
raise error.ProgrammingError('not a regex pattern: %s:%s' % (kind, pat)) raise error.ProgrammingError('not a regex pattern: %s:%s' % (kind, pat))
def _buildmatch(kindpats, globsuffix, listsubrepos, root): def _buildmatch(kindpats, globsuffix, root):
'''Return regexp string and a matcher function for kindpats. '''Return regexp string and a matcher function for kindpats.
globsuffix is appended to the regexp of globs.''' globsuffix is appended to the regexp of globs.'''
matchfuncs = [] matchfuncs = []
subincludes, kindpats = _expandsubinclude(kindpats, root) subincludes, kindpats = _expandsubinclude(kindpats, root)
if subincludes: if subincludes:
submatchers = {} submatchers = {}
def matchsubinclude(f): def matchsubinclude(f):