# HG changeset patch # User Matt Mackall # Date 2009-07-14 17:18:22 # Node ID 294c5e460b369a383fb85b4985b60b5d06b33853 # Parent a87bc6e2a907e64db01beeea3f63a9984f7b92ee # Parent 78e54b9f3a629ba3f5200f8e0bcd165b5398b094 Merge with stable diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -242,7 +242,10 @@ def expandpats(pats): 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