This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5927

cleanup: prefer matchmod.{always,never}() over accessing matchers directly
ClosedPublic

Authored by martinvonz on Feb 11 2019, 12:52 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1db5ae4b0dda: cleanup: prefer matchmod.{always,never}() over accessing matchers directly
Summary

We have these factory methods so we should use them.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (4 lines)
Mmercurial/fileset.py (3 lines)
Mmercurial/subrepo.py (2 lines)

Diff 14015

mercurial/changegroup.py

return min(versions) return min(versions)
def getbundler(version, repo, bundlecaps=None, oldmatcher=None, def getbundler(version, repo, bundlecaps=None, oldmatcher=None,
matcher=None, ellipses=False, shallow=False, matcher=None, ellipses=False, shallow=False,
ellipsisroots=None, fullnodes=None): ellipsisroots=None, fullnodes=None):
assert version in supportedoutgoingversions(repo) assert version in supportedoutgoingversions(repo)
if matcher is None: if matcher is None:
matcher = matchmod.alwaysmatcher(repo.root, '') matcher = matchmod.always(repo.root, '')
if oldmatcher is None: if oldmatcher is None:
oldmatcher = matchmod.nevermatcher(repo.root, '') oldmatcher = matchmod.never(repo.root, '')
if version == '01' and not matcher.always(): if version == '01' and not matcher.always():
raise error.ProgrammingError('version 01 changegroups do not support ' raise error.ProgrammingError('version 01 changegroups do not support '
'sparse file matchers') 'sparse file matchers')
if ellipses and version in (b'01', b'02'): if ellipses and version in (b'01', b'02'):
raise error.Abort( raise error.Abort(
_('ellipsis nodes require at least cg3 on client and server, ' _('ellipsis nodes require at least cg3 on client and server, '

mercurial/fileset.py

except error.LookupError: except error.LookupError:
return False return False
return predfn(fctx) return predfn(fctx)
return self.predicate(fctxpredfn, predrepr=predrepr, cache=cache) return self.predicate(fctxpredfn, predrepr=predrepr, cache=cache)
def never(self): def never(self):
"""Create a matcher to select nothing""" """Create a matcher to select nothing"""
repo = self.ctx.repo() repo = self.ctx.repo()
return matchmod.nevermatcher(repo.root, repo.getcwd(), return matchmod.never(repo.root, repo.getcwd(), badfn=self._badfn)
badfn=self._badfn)
def match(ctx, expr, badfn=None): def match(ctx, expr, badfn=None):
"""Create a matcher for a single fileset expression""" """Create a matcher for a single fileset expression"""
tree = filesetlang.parse(expr) tree = filesetlang.parse(expr)
tree = filesetlang.analyze(tree) tree = filesetlang.analyze(tree)
tree = filesetlang.optimize(tree) tree = filesetlang.optimize(tree)
mctx = matchctx(ctx.p1(), ctx, badfn=badfn) mctx = matchctx(ctx.p1(), ctx, badfn=badfn)
return getmatch(mctx, tree) return getmatch(mctx, tree)

mercurial/subrepo.py

raise NotImplementedError raise NotImplementedError
def fileflags(self, name): def fileflags(self, name):
"""return file flags""" """return file flags"""
return '' return ''
def matchfileset(self, expr, badfn=None): def matchfileset(self, expr, badfn=None):
"""Resolve the fileset expression for this repo""" """Resolve the fileset expression for this repo"""
return matchmod.nevermatcher(self.wvfs.base, '', badfn=badfn) return matchmod.never(self.wvfs.base, '', badfn=badfn)
def printfiles(self, ui, m, fm, fmt, subrepos): def printfiles(self, ui, m, fm, fmt, subrepos):
"""handle the files command for this subrepo""" """handle the files command for this subrepo"""
return 1 return 1
def archive(self, archiver, prefix, match=None, decode=True): def archive(self, archiver, prefix, match=None, decode=True):
if match is not None: if match is not None:
files = [f for f in self.files() if match(f)] files = [f for f in self.files() if match(f)]