diff 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
line wrap: on
line diff
--- a/hgext/rebase.py	Fri Oct 18 23:18:47 2019 -0700
+++ b/hgext/rebase.py	Wed Nov 06 18:28:11 2019 -0800
@@ -1274,8 +1274,8 @@
     if revf and srcf:
         raise error.Abort(_(b'cannot specify both a revision and a source'))
 
+    cmdutil.checkunfinished(repo)
     if not inmemory:
-        cmdutil.checkunfinished(repo)
         cmdutil.bailifchanged(repo)
 
     if ui.configbool(b'commands', b'rebase.requiredest') and not destf: