comparison mercurial/match.py @ 32176:cf042543afa2

match: optimize visitdir() for patterns matching only root directory

Because _rootsanddirs() returns a list of directories to visit
recursively and a list of directories to visit non-recursively. For
patterns such as 'rootfilesin:foo/bar', we clearly need to visit the
directory foo/bar, but we also need to visit its parents. The method
therefore uses util.dirs() to find the parent directories of
'foo/bar'. That method does not include the root directory, but since
we obviously need to visit the root directory, we always added '.' to
the set of directories to visit non-recursively.

The visitdir() method had special handling to consider set(['.']) to
mean that no includes had been specified and would thus visit all
directories. However, when the pattern is 'rootfilesin:.', set(['.'])
is actually the real set of directories to visit and the special
handling of that set meant that all directories got visited instead of
just the root directory.

The fix is simple: add '.' to the set of parent directories in
_rootsanddirs() and stop treating set(['.']) specially. This makes

  hg files -r .  -I rootfilesin:.

in a treemanifest version of the Firefox repo go from 1.5s to 0.26s on
warm disk (and a *much* bigger improvement on cold disk).

Note that the -I is necessary for no good reason. We just haven't
optimized visitdir() for regular (non-include, non-exclude) patterns
yet.

32175:456b4a32d75f

        # roots are directories which are recursively included/excluded.
        self._includeroots = set()
        self._excluderoots = set()
        # dirs are directories which are non-recursively included.
        self._includedirs = set(['.'])

        if badfn is not None:
            self.bad = badfn

        matchfns = []

        '''
        if self.prefix() and dir in self._fileroots:
            return 'all'
        if dir in self._excluderoots:
            return False
        if ((self._includeroots or self._includedirs != set(['.'])) and
            '.' 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))):

    include directories that need to be implicitly considered as either, such as
    parent directories.

    >>> _rootsanddirs(\
        [('glob', 'g/h/*', ''), ('glob', 'g/h', ''), ('glob', 'g*', '')])
    (['g/h', 'g/h', '.'], ['g'])
    >>> _rootsanddirs(\
        [('rootfilesin', 'g/h', ''), ('rootfilesin', '', '')])
    ([], ['g/h', '.', 'g'])
    >>> _rootsanddirs(\
        [('relpath', 'r', ''), ('path', 'p/p', ''), ('path', '', '')])
    (['r', 'p/p', '.'], ['p'])
    >>> _rootsanddirs(\
        [('relglob', 'rg*', ''), ('re', 're/', ''), ('relre', 'rr', '')])
    (['.', '.', '.'], [])
    '''
    r, d = _patternrootsanddirs(kindpats)

    # Append the parents as non-recursive/exact directories, since they must be
    # scanned to get to either the roots or the other exact directories.
    d.extend(util.dirs(d))
    d.extend(util.dirs(r))

    return r, d

def _explicitfiles(kindpats):
    '''Returns the potential explicit filenames from the patterns.

32176:cf042543afa2

        # roots are directories which are recursively included/excluded.
        self._includeroots = set()
        self._excluderoots = set()
        # dirs are directories which are non-recursively included.
        self._includedirs = set()

        if badfn is not None:
            self.bad = badfn

        matchfns = []

        '''
        if self.prefix() and dir in self._fileroots:
            return 'all'
        if dir in self._excluderoots:
            return False
        if ((self._includeroots or self._includedirs) and
            '.' 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))):

    include directories that need to be implicitly considered as either, such as
    parent directories.

    >>> _rootsanddirs(\
        [('glob', 'g/h/*', ''), ('glob', 'g/h', ''), ('glob', 'g*', '')])
    (['g/h', 'g/h', '.'], ['g', '.'])
    >>> _rootsanddirs(\
        [('rootfilesin', 'g/h', ''), ('rootfilesin', '', '')])
    ([], ['g/h', '.', 'g', '.'])
    >>> _rootsanddirs(\
        [('relpath', 'r', ''), ('path', 'p/p', ''), ('path', '', '')])
    (['r', 'p/p', '.'], ['p', '.'])
    >>> _rootsanddirs(\
        [('relglob', 'rg*', ''), ('re', 're/', ''), ('relre', 'rr', '')])
    (['.', '.', '.'], ['.'])
    '''
    r, d = _patternrootsanddirs(kindpats)

    # Append the parents as non-recursive/exact directories, since they must be
    # scanned to get to either the roots or the other exact directories.
    d.extend(util.dirs(d))
    d.extend(util.dirs(r))
    # util.dirs() does not include the root directory, so add it manually
    d.append('.')

    return r, d

def _explicitfiles(kindpats):
    '''Returns the potential explicit filenames from the patterns.