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

phillco (Phil Cohen) phabricator at mercurial-scm.org
Wed Dec 27 18:36:50 EST 2017


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

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:



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


More information about the Mercurial-devel mailing list