Patchwork D1782: rebase: don't run IMM if running rebase in a transaction

login
register
mail settings
Submitter phabricator
Date Dec. 27, 2017, 11:36 p.m.
Message ID <641c76693f72c2060b2a9bb7f95b4f23@localhost.localdomain>
Download mbox | patch
Permalink /patch/26476/
State Not Applicable
Headers show

Comments

phabricator - Dec. 27, 2017, 11:36 p.m.
phillco updated this revision to Diff 4645.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1782?vs=4644&id=4645

REVISION DETAIL
  https://phab.mercurial-scm.org/D1782

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: phillco, #hg-reviewers, quark
Cc: quark, mercurial-devel, sid0

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -779,8 +779,11 @@ 
 
     """
     inmemory = ui.configbool('rebase', 'experimental.inmemory')
-    if opts.get('continue') or opts.get('abort'):
+    if (opts.get('continue') or opts.get('abort') or
+            repo.currenttransaction() is not None):
         # in-memory rebase is not compatible with resuming rebases.
+        # (Or if it is run within a transaction, since the restart logic can
+        # fail the entire transaction.)
         inmemory = False
 
     if inmemory: