comparison mercurial/match.py @ 32500:369c2d5eeea3

match: remove support for exact matching from main matcher class

Exact matching is now handled by the exactmatcher class.

We can safely remove _files from the __repr__() implementation,
because even though the field is set, the patternspat field is enough
for the representation to be unambiguous (which was not the case when
the matcher could handle exact matches).

32499:a3583852861a

    if exact:
        m = exactmatcher(root, cwd, patterns, badfn)
    else:
        m = matcher(root, cwd, normalize, patterns, include=None,
                    default=default, exact=exact, auditor=auditor, ctx=ctx,
                    listsubrepos=listsubrepos, warn=warn, badfn=badfn)
    if include:
        im = matcher(root, cwd, normalize, [], include=include, default=default,
                     exact=False, auditor=auditor, ctx=ctx,
                     listsubrepos=listsubrepos, warn=warn, badfn=None)
        m = intersectmatchers(m, im)
    if exclude:
        em = matcher(root, cwd, normalize, [], include=exclude, default=default,
                     exact=False, auditor=auditor, ctx=ctx,
                     listsubrepos=listsubrepos, warn=warn, badfn=None)
        m = differencematcher(m, em)
    return m

def exact(root, cwd, files, badfn=None):
    return exactmatcher(root, cwd, files, badfn=badfn)

        return not self.always() and not self.isexact() and not self.anypats()

class matcher(basematcher):

    def __init__(self, root, cwd, normalize, patterns, include=None,
                 default='glob', exact=False, auditor=None, ctx=None,
                 listsubrepos=False, warn=None, badfn=None):
        super(matcher, self).__init__(root, cwd, badfn,
                                      relativeuipath=bool(include or patterns))
        if include is None:
            include = []

            self._anyincludepats = _anypats(kindpats)
            roots, dirs = _rootsanddirs(kindpats)
            self._includeroots.update(roots)
            self._includedirs.update(dirs)
            matchfns.append(im)
        if exact:
            if isinstance(patterns, list):
                self._files = patterns
            else:
                self._files = list(patterns)
            matchfns.append(self.exact)
        elif patterns:
            kindpats = normalize(patterns, default, root, cwd, auditor, warn)
            if not _kindpatsalwaysmatch(kindpats):
                self._files = _explicitfiles(kindpats)
                self._anypats = self._anypats or _anypats(kindpats)
                self.patternspat, pm = _buildmatch(ctx, kindpats, '$',

        return self._anypats

    def always(self):
        return self._always

    def isexact(self):
        return self.matchfn == self.exact

    def __repr__(self):
        return ('<matcher files=%r, patterns=%r, includes=%r>' %
                (self._files, self.patternspat, self.includepat))

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

32500:369c2d5eeea3

    if exact:
        m = exactmatcher(root, cwd, patterns, badfn)
    else:
        m = matcher(root, cwd, normalize, patterns, include=None,
                    default=default, auditor=auditor, ctx=ctx,
                    listsubrepos=listsubrepos, warn=warn, badfn=badfn)
    if include:
        im = matcher(root, cwd, normalize, [], include=include, default=default,
                     auditor=auditor, ctx=ctx, listsubrepos=listsubrepos,
                     warn=warn, badfn=None)
        m = intersectmatchers(m, im)
    if exclude:
        em = matcher(root, cwd, normalize, [], include=exclude, default=default,
                     auditor=auditor, ctx=ctx, listsubrepos=listsubrepos,
                     warn=warn, badfn=None)
        m = differencematcher(m, em)
    return m

def exact(root, cwd, files, badfn=None):
    return exactmatcher(root, cwd, files, badfn=badfn)

        return not self.always() and not self.isexact() and not self.anypats()

class matcher(basematcher):

    def __init__(self, root, cwd, normalize, patterns, include=None,
                 default='glob', auditor=None, ctx=None,
                 listsubrepos=False, warn=None, badfn=None):
        super(matcher, self).__init__(root, cwd, badfn,
                                      relativeuipath=bool(include or patterns))
        if include is None:
            include = []

            self._anyincludepats = _anypats(kindpats)
            roots, dirs = _rootsanddirs(kindpats)
            self._includeroots.update(roots)
            self._includedirs.update(dirs)
            matchfns.append(im)
        if patterns:
            kindpats = normalize(patterns, default, root, cwd, auditor, warn)
            if not _kindpatsalwaysmatch(kindpats):
                self._files = _explicitfiles(kindpats)
                self._anypats = self._anypats or _anypats(kindpats)
                self.patternspat, pm = _buildmatch(ctx, kindpats, '$',

        return self._anypats

    def always(self):
        return self._always

    def __repr__(self):
        return ('<matcher patterns=%r, includes=%r>' %
                (self.patternspat, self.includepat))

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