Merge with stable
authorMatt Mackall <mpm@selenic.com>
Tue, 14 Jul 2009 12:18:22 -0500
changeset 9119 294c5e460b36
parent 9117 a87bc6e2a907 (current diff)
parent 9118 78e54b9f3a62 (diff)
child 9138 5e5a91e39642
Merge with stable
--- a/mercurial/cmdutil.py	Mon Jul 13 21:55:17 2009 +0900
+++ b/mercurial/cmdutil.py	Tue Jul 14 12:18:22 2009 -0500
@@ -242,7 +242,10 @@
     for p in pats:
         kind, name = _match._patsplit(p, None)
         if kind is None:
-            globbed = glob.glob(name)
+            try:
+                globbed = glob.glob(name)
+            except re.error:
+                globbed = [name]
             if globbed:
                 ret.extend(globbed)
                 continue