equal
deleted
inserted
replaced
1327 if opts.get('subrepos'): |
1327 if opts.get('subrepos'): |
1328 if opts.get('amend'): |
1328 if opts.get('amend'): |
1329 raise util.Abort(_('cannot amend with --subrepos')) |
1329 raise util.Abort(_('cannot amend with --subrepos')) |
1330 # Let --subrepos on the command line override config setting. |
1330 # Let --subrepos on the command line override config setting. |
1331 ui.setconfig('ui', 'commitsubrepos', True) |
1331 ui.setconfig('ui', 'commitsubrepos', True) |
|
1332 |
|
1333 if repo.vfs.exists('graftstate'): |
|
1334 raise util.Abort(_('cannot commit an interrupted graft operation'), |
|
1335 hint=_('use "hg graft -c" to continue graft')) |
1332 |
1336 |
1333 extra = {} |
1337 extra = {} |
1334 if opts.get('close_branch'): |
1338 if opts.get('close_branch'): |
1335 extra['close'] = 1 |
1339 extra['close'] = 1 |
1336 |
1340 |