##// END OF EJS Templates
Merge with crew-stable
Martin Geisler -
r9471:bccf780f merge default
parent child Browse files
Show More
@@ -93,6 +93,7 b' class config(object):'
93 93 self.set(section, item, v, "%s:%d" % (src, line))
94 94 continue
95 95 item = None
96 cont = False
96 97 m = includere.match(l)
97 98 if m:
98 99 inc = m.group(1)
@@ -24,6 +24,9 b' def dispatch(args):'
24 24 except util.Abort, inst:
25 25 sys.stderr.write(_("abort: %s\n") % inst)
26 26 return -1
27 except error.ConfigError, inst:
28 sys.stderr.write(_("hg: %s\n") % inst)
29 return -1
27 30 return _runcatch(u, args)
28 31
29 32 def _runcatch(ui, args):
@@ -16,3 +16,9 b' cd foobar'
16 16 cat .hg/hgrc |sed -e "s:$p:...:"
17 17 hg paths |sed -e "s:$p:...:"
18 18 hg showconfig |sed -e "s:$p:...:"
19
20 # issue1829: wrong indentation
21 cd ..
22 echo '[foo]' >> $HGRCPATH
23 echo ' x = y' >> $HGRCPATH
24 hg version 2>&1 | sed -e "s|$HGRCPATH|\$HGRCPATH|"
@@ -10,3 +10,4 b' defaults.commit=-d "0 0"'
10 10 defaults.tag=-d "0 0"
11 11 paths.default=.../foo%bar
12 12 ui.slash=True
13 hg: config error at $HGRCPATH:8: ' x = y'
General Comments 0
You need to be logged in to leave comments. Login now