comparison mercurial/match.py @ 33306:a9808bd1449e

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.

33305:aaa1f8f514cf

                 badfn=None):
        super(patternmatcher, self).__init__(root, cwd, badfn)

        self._files = _explicitfiles(kindpats)
        self._anypats = _anypats(kindpats)
        self.patternspat, pm = _buildmatch(ctx, kindpats, '$', listsubrepos,
                                           root)
        self.matchfn = pm

    @propertycache
    def _dirs(self):
        return set(util.dirs(self._fileset)) | {'.'}

    def anypats(self):
        return self._anypats

    def __repr__(self):
        return ('<patternmatcher patterns=%r>' % self.patternspat)

class includematcher(basematcher):

    def __init__(self, root, cwd, kindpats, ctx=None, listsubrepos=False,
                 badfn=None):
        super(includematcher, self).__init__(root, cwd, badfn)

        self.includepat, im = _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:
            # The condition above is essentially self.prefix() for includes
            return 'all'

    def anypats(self):
        return True

    def __repr__(self):
        return ('<includematcher includes=%r>' % self.includepat)

class exactmatcher(basematcher):
    '''Matches the input files exactly. They are interpreted as paths, not
    patterns (so no kind-prefixes).
    '''

33306:a9808bd1449e

                 badfn=None):
        super(patternmatcher, self).__init__(root, cwd, badfn)

        self._files = _explicitfiles(kindpats)
        self._anypats = _anypats(kindpats)
        self._pats, self.matchfn = _buildmatch(ctx, kindpats, '$', listsubrepos,
                                               root)

    @propertycache
    def _dirs(self):
        return set(util.dirs(self._fileset)) | {'.'}

    def anypats(self):
        return self._anypats

    def __repr__(self):
        return ('<patternmatcher patterns=%r>' % self._pats)

class includematcher(basematcher):

    def __init__(self, root, cwd, kindpats, ctx=None, listsubrepos=False,
                 badfn=None):
        super(includematcher, self).__init__(root, cwd, badfn)

        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)

    def visitdir(self, dir):
        if not self._anypats and dir in self._roots:
            # The condition above is essentially self.prefix() for includes
            return 'all'

    def anypats(self):
        return True

    def __repr__(self):
        return ('<includematcher includes=%r>' % self._pats)

class exactmatcher(basematcher):
    '''Matches the input files exactly. They are interpreted as paths, not
    patterns (so no kind-prefixes).
    '''