D7646: rebase: inline single-use variables passed to _definedestmap()
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Dec 18 01:48:08 EST 2019
Closed by commit rHG9fb9f3a5cad7: rebase: inline single-use variables passed to _definedestmap() (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D7646?vs=18825&id=18858
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7646/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7646
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
@@ -1163,14 +1163,6 @@
):
assert action != b'stop'
with repo.wlock(), repo.lock():
- # Validate input and define rebasing points
- destf = opts.get(b'dest', None)
- srcf = opts.get(b'source', None)
- basef = opts.get(b'base', None)
- revf = opts.get(b'rev', [])
- # search default destination in this space
- # used in the 'hg pull --rebase' case, see issue 5214.
- destspace = opts.get(b'_destspace')
if opts.get(b'interactive'):
try:
if extensions.find(b'histedit'):
@@ -1207,14 +1199,17 @@
if retcode is not None:
return retcode
else:
+ # search default destination in this space
+ # used in the 'hg pull --rebase' case, see issue 5214.
+ destspace = opts.get(b'_destspace')
destmap = _definedestmap(
ui,
repo,
inmemory,
- destf,
- srcf,
- basef,
- revf,
+ opts.get(b'dest', None),
+ opts.get(b'source', None),
+ opts.get(b'base', None),
+ opts.get(b'rev', []),
destspace=destspace,
)
retcode = rbsrt._preparenewrebase(destmap)
To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list