comparison mercurial/match.py @ 43595:ecd11c4d3834

match: drop support for passing '.' for root dir to visit*() methods

We said we'd drop support for it after 5.1, so it's time to clean it
up now.

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

43594:ac140b85aae9

            self.matchfn
        )
        return b'<predicatenmatcher pred=%s>' % s


def normalizerootdir(dir, funcname):
    if dir == b'.':
        util.nouideprecwarn(
            b"match.%s() no longer accepts '.', use '' instead." % funcname,
            b'5.1',
        )
        return b''
    return dir


class patternmatcher(basematcher):
    """Matches a set of (kind, pat, source) against a 'root' directory.

    >>> kindpats = [
    ...     (b're', br'.*\.c$', b''),

    @propertycache
    def _dirs(self):
        return set(pathutil.dirs(self._fileset))

    def visitdir(self, dir):
        dir = normalizerootdir(dir, b'visitdir')
        if self._prefix and dir in self._fileset:
            return b'all'
        return (
            dir in self._fileset
            or dir in self._dirs

        # parents are directories which are non-recursively included because
        # they are needed to get to items in _dirs or _roots.
        self._parents = parents

    def visitdir(self, dir):
        dir = normalizerootdir(dir, b'visitdir')
        if self._prefix and dir in self._roots:
            return b'all'
        return (
            dir in self._roots
            or dir in self._dirs

    @propertycache
    def _dirs(self):
        return set(pathutil.dirs(self._fileset))

    def visitdir(self, dir):
        dir = normalizerootdir(dir, b'visitdir')
        return dir in self._dirs

    def visitchildrenset(self, dir):
        dir = normalizerootdir(dir, b'visitchildrenset')

        if not self._fileset or dir not in self._dirs:
            return set()

        candidates = self._fileset | self._dirs - {b''}
        if dir != b'':

        # from the inputs. Instead, we override matchfn() and visitdir() to
        # call the original matcher with the subdirectory path prepended.
        return self._matcher.matchfn(self._path + b"/" + f)

    def visitdir(self, dir):
        dir = normalizerootdir(dir, b'visitdir')
        if dir == b'':
            dir = self._path
        else:
            dir = self._path + b"/" + dir
        return self._matcher.visitdir(dir)

    def visitchildrenset(self, dir):
        dir = normalizerootdir(dir, b'visitchildrenset')
        if dir == b'':
            dir = self._path
        else:
            dir = self._path + b"/" + dir
        return self._matcher.visitchildrenset(dir)

43595:ecd11c4d3834

            self.matchfn
        )
        return b'<predicatenmatcher pred=%s>' % s


class patternmatcher(basematcher):
    """Matches a set of (kind, pat, source) against a 'root' directory.

    >>> kindpats = [
    ...     (b're', br'.*\.c$', b''),

    @propertycache
    def _dirs(self):
        return set(pathutil.dirs(self._fileset))

    def visitdir(self, dir):
        if self._prefix and dir in self._fileset:
            return b'all'
        return (
            dir in self._fileset
            or dir in self._dirs

        # parents are directories which are non-recursively included because
        # they are needed to get to items in _dirs or _roots.
        self._parents = parents

    def visitdir(self, dir):
        if self._prefix and dir in self._roots:
            return b'all'
        return (
            dir in self._roots
            or dir in self._dirs

    @propertycache
    def _dirs(self):
        return set(pathutil.dirs(self._fileset))

    def visitdir(self, dir):
        return dir in self._dirs

    def visitchildrenset(self, dir):
        if not self._fileset or dir not in self._dirs:
            return set()

        candidates = self._fileset | self._dirs - {b''}
        if dir != b'':

        # from the inputs. Instead, we override matchfn() and visitdir() to
        # call the original matcher with the subdirectory path prepended.
        return self._matcher.matchfn(self._path + b"/" + f)

    def visitdir(self, dir):
        if dir == b'':
            dir = self._path
        else:
            dir = self._path + b"/" + dir
        return self._matcher.visitdir(dir)

    def visitchildrenset(self, dir):
        if dir == b'':
            dir = self._path
        else:
            dir = self._path + b"/" + dir
        return self._matcher.visitchildrenset(dir)