This is an archive of the discontinued Mercurial Phabricator instance.

Differential D58

match: make unionmatcher a proper matcher
ClosedPublic

Authored by martinvonz on Jul 11 2017, 8:01 PM.

Details

Reviewers
dsp
durin42
Group Reviewers
hg-reviewers
Commits
rHG04be8aec44a8: match: make unionmatcher a proper matcher
Summary

unionmatcher is currently used where only a limited subset of its
functions will be called. Specifically, visitdir() is never
called. The next patch will pass it to dirstate.walk() where it will
matter that visitdir() is correctly implemented, so let's fix
that. Also add the explicitdir etc that will also be assumed by
dirstate.walk() to exist on a matcher.

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.Jul 11 2017, 8:01 PM
dsp accepted this revision.Jul 13 2017, 2:06 PM
This revision is now accepted and ready to land.Jul 13 2017, 2:06 PM
martinvonz updated this revision to Diff 129.Jul 14 2017, 2:47 AM
This revision now requires review to proceed.Jul 14 2017, 2:47 AM
durin42 accepted this revision.Jul 14 2017, 12:25 PM
This revision is now accepted and ready to land.Jul 14 2017, 12:25 PM
Closed by commit rHG04be8aec44a8: match: make unionmatcher a proper matcher (authored by martinvonz). · Explain WhyJul 14 2017, 1:25 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/match.py (20 lines)

Diff 146

mercurial/match.py

def prefix(self): def prefix(self):
return self._matcher.prefix() and not self._always return self._matcher.prefix() and not self._always
def __repr__(self): def __repr__(self):
return ('<subdirmatcher path=%r, matcher=%r>' % return ('<subdirmatcher path=%r, matcher=%r>' %
(self._path, self._matcher)) (self._path, self._matcher))
class unionmatcher(basematcher): class unionmatcher(basematcher):
"""A matcher that is the union of several matchers.""" """A matcher that is the union of several matchers.
The non-matching-attributes (root, cwd, bad, explicitdir, traversedir) are
taken from the first matcher.
"""
def __init__(self, matchers): def __init__(self, matchers):
m1 = matchers[0]
super(unionmatcher, self).__init__(m1._root, m1._cwd)
self.explicitdir = m1.explicitdir
self.traversedir = m1.traversedir
self._matchers = matchers self._matchers = matchers
def matchfn(self, f): def matchfn(self, f):
for match in self._matchers: for match in self._matchers:
if match(f): if match(f):
return True return True
return False return False
def visitdir(self, dir):
r = False
for m in self._matchers:
v = m.visitdir(dir)
if v == 'all':
return v
r |= v
return r
def __repr__(self): def __repr__(self):
return ('<unionmatcher matchers=%r>' % self._matchers) return ('<unionmatcher matchers=%r>' % self._matchers)
class negatematcher(basematcher): class negatematcher(basematcher):
def __init__(self, matcher): def __init__(self, matcher):
self._matcher = matcher self._matcher = matcher
def matchfn(self, f): def matchfn(self, f):