# HG changeset patch # User Martin Geisler # Date 1253361174 -7200 # Node ID ba75830d17a9e685251563dff123b350413d6347 # Parent 7f0f882af23d289fcca14be2be207773f2f23d50 dispatch: catch ConfigError while constructing ui diff -r 7f0f882af23d -r ba75830d17a9 mercurial/dispatch.py --- a/mercurial/dispatch.py Sat Sep 12 11:17:07 2009 +0200 +++ b/mercurial/dispatch.py Sat Sep 19 13:52:54 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): diff -r 7f0f882af23d -r ba75830d17a9 tests/test-hgrc --- a/tests/test-hgrc Sat Sep 12 11:17:07 2009 +0200 +++ b/tests/test-hgrc Sat Sep 19 13:52:54 2009 +0200 @@ -16,3 +16,9 @@ cat .hg/hgrc |sed -e "s:$p:...:" hg paths |sed -e "s:$p:...:" hg showconfig |sed -e "s:$p:...:" + +# issue1829: wrong indentation +cd .. +echo '[foo]' >> $HGRCPATH +echo ' x = y' >> $HGRCPATH +hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|" diff -r 7f0f882af23d -r ba75830d17a9 tests/test-hgrc.out --- a/tests/test-hgrc.out Sat Sep 12 11:17:07 2009 +0200 +++ b/tests/test-hgrc.out Sat Sep 19 13:52:54 2009 +0200 @@ -10,3 +10,4 @@ defaults.tag=-d "0 0" paths.default=.../foo%bar ui.slash=True +hg: config error at $HGRCPATH:8: ' x = y'