D3076: rebase: use single transaction when running in memory
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Apr 4 14:25:54 EDT 2018
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
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'))
To: martinvonz, #hg-reviewers, durin42
Cc: durin42, mercurial-devel
More information about the Mercurial-devel
mailing list