# HG changeset patch
# User Patrick Mezard <patrick@mezard.eu>
# Date 1345051545 -7200
# Node ID 01cc267fc105b150339df7878cd275889ba1ecae
# Parent  ce625185cfd951cf55ae3daa32c8fd40a484e01e
fileset: do not traceback on invalid grep pattern

diff -r ce625185cfd9 -r 01cc267fc105 mercurial/fileset.py
--- a/mercurial/fileset.py	Wed Aug 15 22:29:32 2012 +0200
+++ b/mercurial/fileset.py	Wed Aug 15 19:25:45 2012 +0200
@@ -256,8 +256,11 @@
     """``grep(regex)``
     File contains the given regular expression.
     """
-    pat = getstring(x, _("grep requires a pattern"))
-    r = re.compile(pat)
+    try:
+        # i18n: "grep" is a keyword
+        r = re.compile(getstring(x, _("grep requires a pattern")))
+    except re.error, e:
+        raise error.ParseError(_('invalid match pattern: %s') % e)
     return [f for f in mctx.existing() if r.search(mctx.ctx[f].data())]
 
 _units = dict(k=2**10, K=2**10, kB=2**10, KB=2**10,
diff -r ce625185cfd9 -r 01cc267fc105 tests/test-fileset.t
--- a/tests/test-fileset.t	Wed Aug 15 22:29:32 2012 +0200
+++ b/tests/test-fileset.t	Wed Aug 15 19:25:45 2012 +0200
@@ -89,3 +89,11 @@
   $ fileset 'binary()'
   bin
 
+  $ fileset 'grep("b{1}")'
+  b2
+  c1
+  b1
+  $ fileset 'grep("missingparens(")'
+  hg: parse error: invalid match pattern: unbalanced parenthesis
+  [255]
+