This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5350

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

Authored by martinvonz on Dec 2 2018, 4:53 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1e019f45fa88: match: make "groupsize" include the trailing "|"
Summary

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

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Dec 2 2018, 4:53 PM
Closed by commit rHG1e019f45fa88: match: make "groupsize" include the trailing "|" (authored by martinvonz). · Explain WhyDec 3 2018, 5:55 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/match.py (4 lines)

Diff 12666

mercurial/match.py

matchfuncs.append(mf) matchfuncs.append(mf)
if len(matchfuncs) == 1: if len(matchfuncs) == 1:
return regex, matchfuncs[0] return regex, matchfuncs[0]
else: else:
return regex, lambda f: any(mf(f) for mf in matchfuncs) return regex, lambda f: any(mf(f) for mf in matchfuncs)
MAX_RE_SIZE = 20000 MAX_RE_SIZE = 20000
_BASE_SIZE = len('(?:)') - 1 _BASE_SIZE = len('(?:)')
def _joinregexes(regexps): def _joinregexes(regexps):
"""gather multiple regular expressions into a single one""" """gather multiple regular expressions into a single one"""
return '(?:%s)' % '|'.join(regexps) return '(?:%s)' % '|'.join(regexps)
def _buildregexmatch(kindpats, globsuffix): def _buildregexmatch(kindpats, globsuffix):
"""Build a match function from a list of kinds and kindpats, """Build a match function from a list of kinds and kindpats,
return regexp string and a matcher function. return regexp string and a matcher function.
startidx = 0 startidx = 0
groupsize = _BASE_SIZE groupsize = _BASE_SIZE
for idx, r in enumerate(regexps): for idx, r in enumerate(regexps):
piecesize = len(r) piecesize = len(r)
if (piecesize + 4) > MAX_RE_SIZE: if (piecesize + 4) > MAX_RE_SIZE:
msg = _("matcher pattern is too long (%d bytes)") % piecesize msg = _("matcher pattern is too long (%d bytes)") % piecesize
raise error.Abort(msg) raise error.Abort(msg)
elif (groupsize + 1 + piecesize) > MAX_RE_SIZE: elif (groupsize + piecesize) > MAX_RE_SIZE:
group = regexps[startidx:idx] group = regexps[startidx:idx]
allgroups.append(_joinregexes(group)) allgroups.append(_joinregexes(group))
startidx = idx startidx = idx
groupsize = _BASE_SIZE groupsize = _BASE_SIZE
groupsize += piecesize + 1 groupsize += piecesize + 1
if startidx == 0: if startidx == 0:
func = _rematcher(fullregexp) func = _rematcher(fullregexp)