( )⚙ D9070 rebase: remove redundant isinmemory argument from _origrebase()

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9070

rebase: remove redundant isinmemory argument from _origrebase()
ClosedPublic

Authored by martinvonz on Sep 23 2020, 3:12 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3d47b5c7fe8d: rebase: remove redundant isinmemory argument from _origrebase()
Summary

The argument is redundant with rbst.inmemory, which makes it unclear
what to do if they were somehow different.

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 (18 lines)

Diff 22820

hgext/rebase.py

_(b'starting dry-run rebase; repository will not be changed\n') _(b'starting dry-run rebase; repository will not be changed\n')
) )
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
needsabort = True needsabort = True
try: try:
overrides = {(b'rebase', b'singletransaction'): True} overrides = {(b'rebase', b'singletransaction'): True}
with ui.configoverride(overrides, b'rebase'): with ui.configoverride(overrides, b'rebase'):
_origrebase( _origrebase(
ui, ui, repo, action, opts, rbsrt, leaveunfinished=True,
repo,
action,
opts,
rbsrt,
inmemory=True,
leaveunfinished=True,
) )
except error.InMemoryMergeConflictsError: except error.InMemoryMergeConflictsError:
ui.status(_(b'hit a merge conflict\n')) ui.status(_(b'hit a merge conflict\n'))
return 1 return 1
except error.Abort: except error.Abort:
needsabort = False needsabort = False
raise raise
else: else:
backup=False, backup=False,
suppwarns=True, suppwarns=True,
dryrun=opts.get(b'dry_run'), dryrun=opts.get(b'dry_run'),
) )
def _dorebase(ui, repo, action, opts, inmemory=False): def _dorebase(ui, repo, action, opts, inmemory=False):
rbsrt = rebaseruntime(repo, ui, inmemory, opts) rbsrt = rebaseruntime(repo, ui, inmemory, opts)
return _origrebase(ui, repo, action, opts, rbsrt, inmemory=inmemory) return _origrebase(ui, repo, action, opts, rbsrt)
def _origrebase( def _origrebase(ui, repo, action, opts, rbsrt, 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():
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="
return retcode return retcode
else: else:
# search default destination in this space # search default destination in this space
# used in the 'hg pull --rebase' case, see issue 5214. # used in the 'hg pull --rebase' case, see issue 5214.
destspace = opts.get(b'_destspace') destspace = opts.get(b'_destspace')
destmap = _definedestmap( destmap = _definedestmap(
ui, ui,
repo, repo,
inmemory, rbsrt.inmemory,
opts.get(b'dest', None), opts.get(b'dest', None),
opts.get(b'source', []), opts.get(b'source', []),
opts.get(b'base', []), opts.get(b'base', []),
opts.get(b'rev', []), 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
singletr = ui.configbool(b'rebase', b'singletransaction') singletr = ui.configbool(b'rebase', b'singletransaction')
if singletr: if singletr:
tr = repo.transaction(b'rebase') tr = repo.transaction(b'rebase')
# If `rebase.singletransaction` is enabled, wrap the entire operation in # If `rebase.singletransaction` is enabled, wrap the entire operation in
# one transaction here. Otherwise, transactions are obtained when # one transaction here. Otherwise, transactions are obtained when
# committing each node, which is slower but allows partial success. # committing each node, which is slower but allows partial success.
with util.acceptintervention(tr): with util.acceptintervention(tr):
# Same logic for the dirstate guard, except we don't create one when # Same logic for the dirstate guard, except we don't create one when
# rebasing in-memory (it's not needed). # rebasing in-memory (it's not needed).
dsguard = None dsguard = None
if singletr and not inmemory: if singletr and not rbsrt.inmemory:
dsguard = dirstateguard.dirstateguard(repo, b'rebase') dsguard = dirstateguard.dirstateguard(repo, b'rebase')
with util.acceptintervention(dsguard): with util.acceptintervention(dsguard):
rbsrt._performrebase(tr) rbsrt._performrebase(tr)
if not leaveunfinished: if not leaveunfinished:
rbsrt._finishrebase() rbsrt._finishrebase()
def _definedestmap(ui, repo, inmemory, destf, srcf, basef, revf, destspace): def _definedestmap(ui, repo, inmemory, destf, srcf, basef, revf, destspace):