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

login
register
mail settings
Submitter phabricator
Date Jan. 18, 2018, 1:01 p.m.
Message ID <73cf9ad450ece01df8ac3789c87550b3@localhost.localdomain>
Download mbox | patch
Permalink /patch/26869/
State Not Applicable
Headers show

Comments

phabricator - Jan. 18, 2018, 1:01 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc5d220a621e7: rebase: don&#039;t run IMM if running rebase in a transaction (authored by phillco, committed by ).

REPOSITORY
  rHG Mercurial

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

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
@@ -771,8 +771,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: