Patchwork [5,of,5] rebase: turn off inmemory flag on --stop

login
register
mail settings
Submitter Yuya Nishihara
Date Aug. 15, 2018, 2:06 a.m.
Message ID <b257de027bd2aa380dd3.1534298792@mimosa>
Download mbox | patch
Permalink /patch/33740/
State Accepted
Headers show

Comments

Yuya Nishihara - Aug. 15, 2018, 2:06 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1534298267 -32400
#      Wed Aug 15 10:57:47 2018 +0900
# Node ID b257de027bd2aa380dd39468815a3ae2d1869a7f
# Parent  ef2c3c145968fcc9a6feb6edf626f9389f2d2a33
rebase: turn off inmemory flag on --stop

Guessing from the inline comment, "in-memory rebase is not compatible with
resuming rebases", in-memory rebasing should be disabled.

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -818,7 +818,7 @@  def rebase(ui, repo, **opts):
     if dryrun and confirm:
         raise error.Abort(_('cannot specify both --confirm and --dry-run'))
 
-    if action in {'abort', 'continue'} or repo.currenttransaction() is not None:
+    if action 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.)