Patchwork D3076: rebase: use single transaction when running in memory

login
register
mail settings
Submitter phabricator
Date April 4, 2018, 6:25 p.m.
Message ID <a4177a439af667be38ebbf261a3dfea2@localhost.localdomain>
Download mbox | patch
Permalink /patch/30270/
State Not Applicable
Headers show

Comments

phabricator - April 4, 2018, 6:25 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb48b7b130d08: rebase: use single transaction when running in memory (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3076?vs=7625&id=7628

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

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, durin42
Cc: durin42, mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -788,7 +788,9 @@ 
         try:
             # in-memory merge doesn't support conflicts, so if we hit any, abort
             # and re-run as an on-disk merge.
-            return _origrebase(ui, repo, inmemory=inmemory, **opts)
+            overrides = {('rebase', 'singletransaction'): True}
+            with ui.configoverride(overrides, 'rebase'):
+                return _origrebase(ui, repo, inmemory=inmemory, **opts)
         except error.InMemoryMergeConflictsError:
             ui.warn(_('hit merge conflicts; re-running rebase without in-memory'
                       ' merge\n'))