comparison mercurial/match.py @ 40780:1e019f45fa88

match: make "groupsize" include the trailing "|"

I think this is a little easier to follow and it will simplify later
patches too.

Differential Revision: https://phab.mercurial-scm.org/D5350

40779:e8c992d56465

        return regex, matchfuncs[0]
    else:
        return regex, lambda f: any(mf(f) for mf in matchfuncs)

MAX_RE_SIZE = 20000
_BASE_SIZE = len('(?:)') - 1

def _joinregexes(regexps):
    """gather multiple regular expressions into a single one"""
    return '(?:%s)' % '|'.join(regexps)

        for idx, r in enumerate(regexps):
            piecesize = len(r)
            if (piecesize + 4) > MAX_RE_SIZE:
                msg = _("matcher pattern is too long (%d bytes)") % piecesize
                raise error.Abort(msg)
            elif (groupsize + 1 + piecesize) > MAX_RE_SIZE:
                group = regexps[startidx:idx]
                allgroups.append(_joinregexes(group))
                startidx = idx
                groupsize = _BASE_SIZE
            groupsize += piecesize + 1

40780:1e019f45fa88

        return regex, matchfuncs[0]
    else:
        return regex, lambda f: any(mf(f) for mf in matchfuncs)

MAX_RE_SIZE = 20000
_BASE_SIZE = len('(?:)')

def _joinregexes(regexps):
    """gather multiple regular expressions into a single one"""
    return '(?:%s)' % '|'.join(regexps)

        for idx, r in enumerate(regexps):
            piecesize = len(r)
            if (piecesize + 4) > MAX_RE_SIZE:
                msg = _("matcher pattern is too long (%d bytes)") % piecesize
                raise error.Abort(msg)
            elif (groupsize + piecesize) > MAX_RE_SIZE:
                group = regexps[startidx:idx]
                allgroups.append(_joinregexes(group))
                startidx = idx
                groupsize = _BASE_SIZE
            groupsize += piecesize + 1