[PATCH STABLE] commit: use ui.configbool when checking 'commitsubrepos' setting on --amend
Adrian Buehlmann
adrian at cadifra.com
Sat Apr 21 04:15:30 CDT 2012
# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1334996627 -7200
# Branch stable
# Node ID d7d961adfa9f86d481d37179dcc3b58af775061f
# Parent cbf2ea2f5ca169d22e0729cb71a21b808574b90e
commit: use ui.configbool when checking 'commitsubrepos' setting on --amend
Before this fix, having
[ui]
commitsubrepos = False
in the config file lead to
$ hg ci --amend -mx
abort: cannot amend recursively
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1228,7 +1228,7 @@
bheads = repo.branchheads(branch)
if opts.get('amend'):
- if ui.config('ui', 'commitsubrepos'):
+ if ui.configbool('ui', 'commitsubrepos'):
raise util.Abort(_('cannot amend recursively'))
old = repo['.']
More information about the Mercurial-devel
mailing list