comparison mercurial/match.py @ 32503:361808a2b0b8

match: simplify includematcher a bit

The "include" we have in symbols is redundant and the double negative
in visitdir() can be removed.

32502:3026f19b4b01

        super(includematcher, self).__init__(root, cwd, badfn)

        kindpats = normalize(include, 'glob', root, cwd, auditor, warn)
        self.includepat, im = _buildmatch(ctx, kindpats, '(?:/|$)',
                                          listsubrepos, root)
        self._anyincludepats = _anypats(kindpats)
        roots, dirs = _rootsanddirs(kindpats)
        # roots are directories which are recursively included.
        self._includeroots = set(roots)
        # dirs are directories which are non-recursively included.
        self._includedirs = set(dirs)
        self.matchfn = im

    def visitdir(self, dir):
        if not self._anyincludepats and dir in self._includeroots:
            # The condition above is essentially self.prefix() for includes
            return 'all'
        if ('.' not in self._includeroots and
            dir not in self._includeroots and
            dir not in self._includedirs and
            not any(parent in self._includeroots
                    for parent in util.finddirs(dir))):
            return False
        return True

    def anypats(self):
        return True

    def __repr__(self):

32503:361808a2b0b8

        super(includematcher, self).__init__(root, cwd, badfn)

        kindpats = normalize(include, 'glob', root, cwd, auditor, warn)
        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'
        return ('.' in self._roots or
                dir in self._roots or
                dir in self._dirs or
                any(parentdir in self._roots
                    for parentdir in util.finddirs(dir)))

    def anypats(self):
        return True

    def __repr__(self):