# HG changeset patch # User Matt Mackall # Date 1120810487 28800 # Node ID a54a1c101a9a8670f0d0c12e2c3464cc038deac8 # Parent 08b65d66f3e77669a6619a7e66a66729fb4d9c9c Non-grouping regex for ignore -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Non-grouping regex for ignore Suggested by Mark Williamson manifest hash: dfd4686e7ac9f96e79da600edf299ed64213e05d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzjX3ywK+sNU5EO8RAnc1AJ4/sKzyZJiRs6UzE3uksE2U9rOkVQCeJsZf PhHsNtEt/WyL+v44mBfk8Mk= =e+Qy -----END PGP SIGNATURE----- diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -507,7 +507,7 @@ class localrepository: bigpat.append(util.pconvert(pat[:-1])) except IOError: pass if bigpat: - s = "(%s)" % (")|(".join(bigpat)) + s = "(?:%s)" % (")|(?:".join(bigpat)) r = re.compile(s) self.ignorefunc = r.search else: