mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
Merge with crew-stable
This commit is contained in:
commit
969ff27288
@ -93,6 +93,7 @@ class config(object):
|
|||||||
self.set(section, item, v, "%s:%d" % (src, line))
|
self.set(section, item, v, "%s:%d" % (src, line))
|
||||||
continue
|
continue
|
||||||
item = None
|
item = None
|
||||||
|
cont = False
|
||||||
m = includere.match(l)
|
m = includere.match(l)
|
||||||
if m:
|
if m:
|
||||||
inc = m.group(1)
|
inc = m.group(1)
|
||||||
|
@ -24,6 +24,9 @@ def dispatch(args):
|
|||||||
except util.Abort, inst:
|
except util.Abort, inst:
|
||||||
sys.stderr.write(_("abort: %s\n") % inst)
|
sys.stderr.write(_("abort: %s\n") % inst)
|
||||||
return -1
|
return -1
|
||||||
|
except error.ConfigError, inst:
|
||||||
|
sys.stderr.write(_("hg: %s\n") % inst)
|
||||||
|
return -1
|
||||||
return _runcatch(u, args)
|
return _runcatch(u, args)
|
||||||
|
|
||||||
def _runcatch(ui, args):
|
def _runcatch(ui, args):
|
||||||
|
@ -16,3 +16,9 @@ cd foobar
|
|||||||
cat .hg/hgrc |sed -e "s:$p:...:"
|
cat .hg/hgrc |sed -e "s:$p:...:"
|
||||||
hg paths |sed -e "s:$p:...:"
|
hg paths |sed -e "s:$p:...:"
|
||||||
hg showconfig |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|"
|
||||||
|
@ -10,3 +10,4 @@ defaults.commit=-d "0 0"
|
|||||||
defaults.tag=-d "0 0"
|
defaults.tag=-d "0 0"
|
||||||
paths.default=.../foo%bar
|
paths.default=.../foo%bar
|
||||||
ui.slash=True
|
ui.slash=True
|
||||||
|
hg: config error at $HGRCPATH:8: ' x = y'
|
||||||
|
Loading…
Reference in New Issue
Block a user