Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 16505:db85c24dcdea stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
16504:e3c7ca15cde2 16505:db85c24dcdea
1226 1226
1227 branch = repo[None].branch() 1227 branch = repo[None].branch()
1228 bheads = repo.branchheads(branch) 1228 bheads = repo.branchheads(branch)
1229 1229
1230 if opts.get('amend'): 1230 if opts.get('amend'):
1231 if ui.config('ui', 'commitsubrepos'): 1231 if ui.configbool('ui', 'commitsubrepos'):
1232 raise util.Abort(_('cannot amend recursively')) 1232 raise util.Abort(_('cannot amend recursively'))
1233 1233
1234 old = repo['.'] 1234 old = repo['.']
1235 if old.phase() == phases.public: 1235 if old.phase() == phases.public:
1236 raise util.Abort(_('cannot amend public changesets')) 1236 raise util.Abort(_('cannot amend public changesets'))