# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1253361318 -7200
# Node ID bccf780f78ed7cab3fac47bfac68fdd56a059ba7
# Parent  b2310903c4627ba8a6045b49f32717a0cdc8ef05# Parent  ba75830d17a9e685251563dff123b350413d6347
Merge with crew-stable

diff -r b2310903c462 -r bccf780f78ed mercurial/config.py
--- a/mercurial/config.py	Thu Sep 17 22:39:38 2009 -0700
+++ b/mercurial/config.py	Sat Sep 19 13:55:18 2009 +0200
@@ -93,6 +93,7 @@
                     self.set(section, item, v, "%s:%d" % (src, line))
                     continue
                 item = None
+                cont = False
             m = includere.match(l)
             if m:
                 inc = m.group(1)
diff -r b2310903c462 -r bccf780f78ed mercurial/dispatch.py
--- 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):
diff -r b2310903c462 -r bccf780f78ed tests/test-hgrc
--- a/tests/test-hgrc	Thu Sep 17 22:39:38 2009 -0700
+++ b/tests/test-hgrc	Sat Sep 19 13:55:18 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 b2310903c462 -r bccf780f78ed tests/test-hgrc.out
--- a/tests/test-hgrc.out	Thu Sep 17 22:39:38 2009 -0700
+++ b/tests/test-hgrc.out	Sat Sep 19 13:55:18 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'