comparison mercurial/match.py @ 38581:6467286b829c

match: remove ctx argument from code path down to _buildmatch()

'ctx' was there only for filesets.

38580:9f9ffe5f687c

def _buildkindpatsmatcher(matchercls, root, cwd, kindpats, ctx=None,
                          listsubrepos=False, badfn=None):
    fset, kindpats = _expandsets(kindpats, ctx, listsubrepos)
    matchers = []
    if kindpats:
        m = matchercls(root, cwd, kindpats, ctx=ctx, listsubrepos=listsubrepos,
                       badfn=badfn)
        matchers.append(m)
    if fset:
        m = predicatematcher(root, cwd, fset.__contains__,
                             predrepr='fileset', badfn=badfn)

             or pycompat.byterepr(self.matchfn))
        return '<predicatenmatcher pred=%s>' % s

class patternmatcher(basematcher):

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

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

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

    def __repr__(self):
        return ('<patternmatcher patterns=%r>' % pycompat.bytestr(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._prefix = _prefix(kindpats)
        roots, dirs = _rootsanddirs(kindpats)
        # roots are directories which are recursively included.
        self._roots = set(roots)

        return '.*' + pat
    if kind == 'glob':
        return _globre(pat) + globsuffix
    raise error.ProgrammingError('not a regex pattern: %s:%s' % (kind, pat))

def _buildmatch(ctx, kindpats, globsuffix, listsubrepos, root):
    '''Return regexp string and a matcher function for kindpats.
    globsuffix is appended to the regexp of globs.'''
    matchfuncs = []

    subincludes, kindpats = _expandsubinclude(kindpats, root)

38581:6467286b829c

def _buildkindpatsmatcher(matchercls, root, cwd, kindpats, ctx=None,
                          listsubrepos=False, badfn=None):
    fset, kindpats = _expandsets(kindpats, ctx, listsubrepos)
    matchers = []
    if kindpats:
        m = matchercls(root, cwd, kindpats, listsubrepos=listsubrepos,
                       badfn=badfn)
        matchers.append(m)
    if fset:
        m = predicatematcher(root, cwd, fset.__contains__,
                             predrepr='fileset', badfn=badfn)

             or pycompat.byterepr(self.matchfn))
        return '<predicatenmatcher pred=%s>' % s

class patternmatcher(basematcher):

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

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

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

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

class includematcher(basematcher):

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

        self._pats, self.matchfn = _buildmatch(kindpats, '(?:/|$)',
                                               listsubrepos, root)
        self._prefix = _prefix(kindpats)
        roots, dirs = _rootsanddirs(kindpats)
        # roots are directories which are recursively included.
        self._roots = set(roots)

        return '.*' + pat
    if kind == 'glob':
        return _globre(pat) + globsuffix
    raise error.ProgrammingError('not a regex pattern: %s:%s' % (kind, pat))

def _buildmatch(kindpats, globsuffix, listsubrepos, root):
    '''Return regexp string and a matcher function for kindpats.
    globsuffix is appended to the regexp of globs.'''
    matchfuncs = []

    subincludes, kindpats = _expandsubinclude(kindpats, root)