Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 19253:e078ea9b4ce4 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: refuse to commit an interrupted graft (issue3667)
author Simon King <simon@simonking.org.uk>
date Thu, 30 May 2013 22:32:10 +0100
parents b592fd33233a
children 043abd6a91d1 b500a663a2c7
comparison
equal deleted inserted replaced
19236:39ea540dc154 19253:e078ea9b4ce4
1312 if opts.get('subrepos'): 1312 if opts.get('subrepos'):
1313 if opts.get('amend'): 1313 if opts.get('amend'):
1314 raise util.Abort(_('cannot amend with --subrepos')) 1314 raise util.Abort(_('cannot amend with --subrepos'))
1315 # Let --subrepos on the command line override config setting. 1315 # Let --subrepos on the command line override config setting.
1316 ui.setconfig('ui', 'commitsubrepos', True) 1316 ui.setconfig('ui', 'commitsubrepos', True)
1317
1318 if repo.vfs.exists('graftstate'):
1319 raise util.Abort(_('cannot commit an interrupted graft operation'),
1320 hint=_('use "hg graft -c" to continue graft'))
1317 1321
1318 extra = {} 1322 extra = {}
1319 if opts.get('close_branch'): 1323 if opts.get('close_branch'):
1320 extra['close'] = 1 1324 extra['close'] = 1
1321 1325