[Updated] [+ ] D9070: rebase: remove redundant isinmemory argument from _origrebase()
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Sep 23 17:29:56 UTC 2020
martinvonz updated this revision to Diff 22809.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D9070?vs=22770&id=22809
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D9070/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D9070
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
@@ -1109,13 +1109,7 @@
overrides = {(b'rebase', b'singletransaction'): True}
with ui.configoverride(overrides, b'rebase'):
_origrebase(
- ui,
- repo,
- action,
- opts,
- rbsrt,
- inmemory=True,
- leaveunfinished=True,
+ ui, repo, action, opts, rbsrt, leaveunfinished=True,
)
except error.InMemoryMergeConflictsError:
ui.status(_(b'hit a merge conflict\n'))
@@ -1158,12 +1152,10 @@
def _dorebase(ui, repo, action, opts, inmemory=False):
rbsrt = rebaseruntime(repo, ui, inmemory, opts)
- return _origrebase(ui, repo, action, opts, rbsrt, inmemory=inmemory)
+ return _origrebase(ui, repo, action, opts, rbsrt)
-def _origrebase(
- ui, repo, action, opts, rbsrt, inmemory=False, leaveunfinished=False
-):
+def _origrebase(ui, repo, action, opts, rbsrt, leaveunfinished=False):
assert action != b'stop'
with repo.wlock(), repo.lock():
if opts.get(b'interactive'):
@@ -1208,7 +1200,7 @@
destmap = _definedestmap(
ui,
repo,
- inmemory,
+ rbsrt.inmemory,
opts.get(b'dest', None),
opts.get(b'source', []),
opts.get(b'base', []),
@@ -1233,7 +1225,7 @@
# Same logic for the dirstate guard, except we don't create one when
# rebasing in-memory (it's not needed).
dsguard = None
- if singletr and not inmemory:
+ if singletr and not rbsrt.inmemory:
dsguard = dirstateguard.dirstateguard(repo, b'rebase')
with util.acceptintervention(dsguard):
rbsrt._performrebase(tr)
To: martinvonz, #hg-reviewers
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200923/74b6473f/attachment-0002.html>
More information about the Mercurial-patches
mailing list