diff mercurial/commands.py @ 12386:8eedf53547b8

merge with stable
author Martin Geisler <mg@aragost.com>
date Thu, 23 Sep 2010 10:59:21 +0200
parents f1e8d6f6e682 9a93f4fb141b
children 4ac734b9b3fd
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Sep 23 01:59:02 2010 +0200
+++ b/mercurial/commands.py	Thu Sep 23 10:59:21 2010 +0200
@@ -1585,7 +1585,7 @@
         reflags |= re.I
     try:
         regexp = re.compile(pattern, reflags)
-    except Exception, inst:
+    except re.error, inst:
         ui.warn(_("grep: invalid match pattern: %s\n") % inst)
         return 1
     sep, eol = ':', '\n'