Mercurial > hg
diff hgext/rebase.py @ 43932:9fb9f3a5cad7
rebase: inline single-use variables passed to _definedestmap()
Differential Revision: https://phab.mercurial-scm.org/D7646
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 12 Dec 2019 23:25:16 -0800 |
parents | 8c87cc169946 |
children | 71fee4564410 |
line wrap: on
line diff
--- a/hgext/rebase.py Thu Dec 12 23:20:48 2019 -0800 +++ b/hgext/rebase.py Thu Dec 12 23:25:16 2019 -0800 @@ -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)