This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7646

rebase: inline single-use variables passed to _definedestmap()
ClosedPublic

Authored by martinvonz on Dec 13 2019, 2:54 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG9fb9f3a5cad7: rebase: inline single-use variables passed to _definedestmap()

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (19 lines)

Diff 18858

hgext/rebase.py

return _origrebase(ui, repo, action, opts, rbsrt, inmemory=inmemory) return _origrebase(ui, repo, action, opts, rbsrt, inmemory=inmemory)
def _origrebase( def _origrebase(
ui, repo, action, opts, rbsrt, inmemory=False, leaveunfinished=False ui, repo, action, opts, rbsrt, inmemory=False, leaveunfinished=False
): ):
assert action != b'stop' assert action != b'stop'
with repo.wlock(), repo.lock(): 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'): if opts.get(b'interactive'):
try: try:
if extensions.find(b'histedit'): if extensions.find(b'histedit'):
enablehistedit = b'' enablehistedit = b''
except KeyError: except KeyError:
enablehistedit = b" --config extensions.histedit=" enablehistedit = b" --config extensions.histedit="
help = b"hg%s help -e histedit" % enablehistedit help = b"hg%s help -e histedit" % enablehistedit
msg = ( msg = (
mergeutil.checkunresolved(ms) mergeutil.checkunresolved(ms)
retcode = rbsrt._prepareabortorcontinue( retcode = rbsrt._prepareabortorcontinue(
isabort=(action == b'abort') isabort=(action == b'abort')
) )
if retcode is not None: if retcode is not None:
return retcode return retcode
else: else:
# search default destination in this space
# used in the 'hg pull --rebase' case, see issue 5214.
destspace = opts.get(b'_destspace')
destmap = _definedestmap( destmap = _definedestmap(
ui, ui,
repo, repo,
inmemory, inmemory,
destf, opts.get(b'dest', None),
srcf, opts.get(b'source', None),
basef, opts.get(b'base', None),
revf, opts.get(b'rev', []),
destspace=destspace, destspace=destspace,
) )
retcode = rbsrt._preparenewrebase(destmap) retcode = rbsrt._preparenewrebase(destmap)
if retcode is not None: if retcode is not None:
return retcode return retcode
storecollapsemsg(repo, rbsrt.collapsemsg) storecollapsemsg(repo, rbsrt.collapsemsg)
tr = None tr = None