comparison mercurial/match.py @ 32496:ca77a243ffa7

match: move entire uipath() implementation to basematcher

Even though most matchers will always want to use the relative path in
uipath(), when we add support for intersecting matcher, we will want
to control which form to use for any kind of matcher without knowing
the type (see next patch), so we need the implementation on the base
class.

Also rename the attribute from "pathrestricted" to "relativeuipath"
since there actually are cases where we match everything but still use
relative paths (like when the user runs "hg files .." from inside
mercurial/).

32495:a25cc3ca874f

        kindpats.append((kind, pat, ''))
    return kindpats

class basematcher(object):

    def __init__(self, root, cwd, badfn=None):
        self._root = root
        self._cwd = cwd
        if badfn is not None:
            self.bad = badfn

    def __call__(self, fn):
        return self.matchfn(fn)
    def __iter__(self):
        for f in self._files:

    def uipath(self, f):
        '''Convert repo path to a display path.  If patterns or -I/-X were used
        to create this matcher, the display path will be relative to cwd.
        Otherwise it is relative to the root of the repo.'''
        return self.rel(f)

    @propertycache
    def _files(self):
        return []

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)
        if include is None:
            include = []

        self._anypats = bool(include)
        self._anyincludepats = False
        self._always = False
        self._pathrestricted = bool(include or patterns)
        self.patternspat = None
        self.includepat = None

        # roots are directories which are recursively included.
        self._includeroots = set()

                    if not matchfn(f):
                        return False
                return True

        self.matchfn = m

    def uipath(self, f):
        return (self._pathrestricted and self.rel(f)) or self.abs(f)

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

32496:ca77a243ffa7

        kindpats.append((kind, pat, ''))
    return kindpats

class basematcher(object):

    def __init__(self, root, cwd, badfn=None, relativeuipath=True):
        self._root = root
        self._cwd = cwd
        if badfn is not None:
            self.bad = badfn
        self._relativeuipath = relativeuipath

    def __call__(self, fn):
        return self.matchfn(fn)
    def __iter__(self):
        for f in self._files:

    def uipath(self, f):
        '''Convert repo path to a display path.  If patterns or -I/-X were used
        to create this matcher, the display path will be relative to cwd.
        Otherwise it is relative to the root of the repo.'''
        return (self._relativeuipath and self.rel(f)) or self.abs(f)

    @propertycache
    def _files(self):
        return []

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._anypats = bool(include)
        self._anyincludepats = False
        self._always = False
        self.patternspat = None
        self.includepat = None

        # roots are directories which are recursively included.
        self._includeroots = set()

                    if not matchfn(f):
                        return False
                return True

        self.matchfn = m

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