commit: use ui.configbool when checking 'commitsubrepos' setting on --amend stable
authorAdrian Buehlmann <adrian@cadifra.com>
Sat, 21 Apr 2012 10:23:47 +0200
branchstable
changeset 16505 db85c24dcdea
parent 16504 e3c7ca15cde2
child 16506 fc4e0fecf403
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
mercurial/commands.py
--- a/mercurial/commands.py	Mon Apr 23 00:38:22 2012 +0900
+++ b/mercurial/commands.py	Sat Apr 21 10:23:47 2012 +0200
@@ -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['.']