# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2018-12-02 21:44:49
# Node ID 1e019f45fa88b142f47b3caa2ef5fc789a21d458
# Parent  e8c992d564656781426064dc109cc18219f247c6

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

diff --git a/mercurial/match.py b/mercurial/match.py
--- a/mercurial/match.py
+++ b/mercurial/match.py
@@ -1185,7 +1185,7 @@ def _buildmatch(kindpats, globsuffix, li
         return regex, lambda f: any(mf(f) for mf in matchfuncs)
 
 MAX_RE_SIZE = 20000
-_BASE_SIZE = len('(?:)') - 1
+_BASE_SIZE = len('(?:)')
 
 def _joinregexes(regexps):
     """gather multiple regular expressions into a single one"""
@@ -1215,7 +1215,7 @@ def _buildregexmatch(kindpats, globsuffi
             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:
+            elif (groupsize + piecesize) > MAX_RE_SIZE:
                 group = regexps[startidx:idx]
                 allgroups.append(_joinregexes(group))
                 startidx = idx