comparison hgext/rebase.py @ 43591:b56c6647f65e

rebase: check for unfinished ops even when inmemory (issue6214) When using rebase.experimental.inmemory, we should be able to work well with a dirty working directory, but we can not reliably work if we're in the middle of another operation (such as another rebase), as we'll potentially stomp on some state that the other operation needs. Differential Revision: https://phab.mercurial-scm.org/D7298
author Kyle Lippincott <spectral@google.com>
date Wed, 06 Nov 2019 18:28:11 -0800
parents 0fea03924990
children be8552f25cab
comparison
equal deleted inserted replaced
43590:95d0532ad171 43591:b56c6647f65e
1272 if revf and basef: 1272 if revf and basef:
1273 raise error.Abort(_(b'cannot specify both a revision and a base')) 1273 raise error.Abort(_(b'cannot specify both a revision and a base'))
1274 if revf and srcf: 1274 if revf and srcf:
1275 raise error.Abort(_(b'cannot specify both a revision and a source')) 1275 raise error.Abort(_(b'cannot specify both a revision and a source'))
1276 1276
1277 cmdutil.checkunfinished(repo)
1277 if not inmemory: 1278 if not inmemory:
1278 cmdutil.checkunfinished(repo)
1279 cmdutil.bailifchanged(repo) 1279 cmdutil.bailifchanged(repo)
1280 1280
1281 if ui.configbool(b'commands', b'rebase.requiredest') and not destf: 1281 if ui.configbool(b'commands', b'rebase.requiredest') and not destf:
1282 raise error.Abort( 1282 raise error.Abort(
1283 _(b'you must specify a destination'), 1283 _(b'you must specify a destination'),