mercurial/fileset.py
branchstable
changeset 17368 01cc267fc105
parent 17367 ce625185cfd9
child 17371 1310489eb5d6
--- 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,