Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 16505:db85c24dcdea stable
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
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Sat, 21 Apr 2012 10:23:47 +0200 |
| parents | bfe89d65d651 |
| children | ebf6d38c9063 |
line wrap: on
line diff
--- 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['.']