comparison mercurial/match.py @ 33447:6f4e5e5940a5

match: write forceincludematcher using unionmatcher

The forceincludematcher is simply a unionmatcher of a includematcher
(matching paths recursively) with the given matcher. Since the
forceincludematcher is only used by sparse, move it there.

I don't have a good sparse repo setup to test performance impact on.

Differential Revision: https://phab.mercurial-scm.org/D57

33446:fad6852cf879

        return self._matcher.prefix() and not self._always

    def __repr__(self):
        return ('<subdirmatcher path=%r, matcher=%r>' %
                (self._path, self._matcher))

class forceincludematcher(basematcher):
    """A matcher that returns true for any of the forced includes before testing
    against the actual matcher."""
    def __init__(self, matcher, includes):
        self._matcher = matcher
        self._includes = includes

    def matchfn(self, f):
        return f in self._includes or self._matcher(f)

    def __repr__(self):
        return ('<forceincludematcher matcher=%r, includes=%r>' %
                (self._matcher, sorted(self._includes)))

class unionmatcher(basematcher):
    """A matcher that is the union of several matchers."""
    def __init__(self, matchers):
        self._matchers = matchers

33447:6f4e5e5940a5

        return self._matcher.prefix() and not self._always

    def __repr__(self):
        return ('<subdirmatcher path=%r, matcher=%r>' %
                (self._path, self._matcher))

class unionmatcher(basematcher):
    """A matcher that is the union of several matchers."""
    def __init__(self, matchers):
        self._matchers = matchers