changeset 5202:1108c952cca1

Merge with -stable

--- a/mercurial/util.py	Sat Aug 18 21:36:10 2007 -0300
+++ b/mercurial/util.py	Sun Aug 19 14:04:26 2007 -0500
@@ -477,6 +477,15 @@
         try:
             pat = '(?:%s)' % '|'.join([regex(k, p, tail) for (k, p) in pats])
             return re.compile(pat).match
+        except OverflowError:
+            # We're using a Python with a tiny regex engine and we
+            # made it explode, so we'll divide the pattern list in two
+            # until it works
+            l = len(pats)
+            if l < 2:
+                raise
+            a, b = matchfn(pats[:l/2], tail), matchfn(pats[l/2:], tail)
+            return lambda s: a(s) or b(s)
         except re.error:
             for k, p in pats:
                 try: