diff mercurial/dispatch.py @ 9471:bccf780f78ed

Merge with crew-stable
author Martin Geisler <mg@lazybytes.net>
date Sat, 19 Sep 2009 13:55:18 +0200
parents 4c041f1ee1b4 ba75830d17a9
children ceb0f59e1327
line wrap: on
line diff
--- a/mercurial/dispatch.py	Thu Sep 17 22:39:38 2009 -0700
+++ b/mercurial/dispatch.py	Sat Sep 19 13:55:18 2009 +0200
@@ -24,6 +24,9 @@
     except util.Abort, inst:
         sys.stderr.write(_("abort: %s\n") % inst)
         return -1
+    except error.ConfigError, inst:
+        sys.stderr.write(_("hg: %s\n") % inst)
+        return -1
     return _runcatch(u, args)
 
 def _runcatch(ui, args):