comparison mercurial/match.py @ 49605:b3480822a251 stable

matcher: do not prepend '.*' to pattern using ^ after flags

Since the previous commit (fixing wider issue), the code generated strange
regex. This is now fixed and tested.

49604:086b0c4f8663

        else:
            res += escape(c, c)
    return res


FLAG_RE = util.re.compile(b'^\(\?([aiLmsux]+)\)')


def _regex(kind, pat, globsuffix):
    """Convert a (normalized) pattern of any kind into a
    regular expression.

            # When pat has the form *XYZ (common), make the returned regex more
            # legible by returning the regex for **XYZ instead of **/*XYZ.
            return b'.*' + globre[len(b'[^/]*') :] + globsuffix
        return b'(?:|.*/)' + globre + globsuffix
    if kind == b'relre':
        if pat.startswith(b'^'):
            return pat
        if FLAG_RE.match(pat):
            return FLAG_RE.sub(br'(?\1:.*', pat) + b')'
        return b'.*' + pat
    if kind in (b'glob', b'rootglob'):
        return _globre(pat) + globsuffix
    raise error.ProgrammingError(b'not a regex pattern: %s:%s' % (kind, pat))

49605:b3480822a251

        else:
            res += escape(c, c)
    return res


FLAG_RE = util.re.compile(b'^\(\?([aiLmsux]+)\)(.*)')


def _regex(kind, pat, globsuffix):
    """Convert a (normalized) pattern of any kind into a
    regular expression.

            # When pat has the form *XYZ (common), make the returned regex more
            # legible by returning the regex for **XYZ instead of **/*XYZ.
            return b'.*' + globre[len(b'[^/]*') :] + globsuffix
        return b'(?:|.*/)' + globre + globsuffix
    if kind == b'relre':
        flag = None
        m = FLAG_RE.match(pat)
        if m:
            flag, pat = m.groups()
        if not pat.startswith(b'^'):
            pat = b'.*' + pat
        if flag is not None:
            pat = br'(?%s:%s)' % (flag, pat)
        return pat
    if kind in (b'glob', b'rootglob'):
        return _globre(pat) + globsuffix
    raise error.ProgrammingError(b'not a regex pattern: %s:%s' % (kind, pat))