This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7642

rebase: inline single-use `dryrun` and `confirm` variables
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0b769e1cbe89: rebase: inline single-use `dryrun` and `confirm` variables

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

Diff 18854

hgext/rebase.py

Return Values: Return Values:
Returns 0 on success, 1 if nothing to rebase or there are Returns 0 on success, 1 if nothing to rebase or there are
unresolved conflicts. unresolved conflicts.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
inmemory = ui.configbool(b'rebase', b'experimental.inmemory') inmemory = ui.configbool(b'rebase', b'experimental.inmemory')
dryrun = opts.get(b'dry_run')
confirm = opts.get(b'confirm')
action = cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue') action = cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
if action: if action:
cmdutil.check_incompatible_arguments( cmdutil.check_incompatible_arguments(
opts, action, b'confirm', b'dry_run' opts, action, b'confirm', b'dry_run'
) )
cmdutil.check_at_most_one_arg(opts, b'confirm', b'dry_run') cmdutil.check_at_most_one_arg(opts, b'confirm', b'dry_run')
if action or repo.currenttransaction() is not None: if action or repo.currenttransaction() is not None:
# in-memory rebase is not compatible with resuming rebases. # in-memory rebase is not compatible with resuming rebases.
# (Or if it is run within a transaction, since the restart logic can # (Or if it is run within a transaction, since the restart logic can
# fail the entire transaction.) # fail the entire transaction.)
inmemory = False inmemory = False
if opts.get(b'auto_orphans'): if opts.get(b'auto_orphans'):
for key in opts: for key in opts:
if key != b'auto_orphans' and opts.get(key): if key != b'auto_orphans' and opts.get(key):
raise error.Abort( raise error.Abort(
_(b'--auto-orphans is incompatible with %s') % (b'--' + key) _(b'--auto-orphans is incompatible with %s') % (b'--' + key)
) )
userrevs = list(repo.revs(opts.get(b'auto_orphans'))) userrevs = list(repo.revs(opts.get(b'auto_orphans')))
opts[b'rev'] = [revsetlang.formatspec(b'%ld and orphan()', userrevs)] opts[b'rev'] = [revsetlang.formatspec(b'%ld and orphan()', userrevs)]
opts[b'dest'] = b'_destautoorphanrebase(SRC)' opts[b'dest'] = b'_destautoorphanrebase(SRC)'
if dryrun or confirm: if opts.get(b'dry_run') or opts.get(b'confirm'):
return _dryrunrebase(ui, repo, action, opts) return _dryrunrebase(ui, repo, action, opts)
elif action == b'stop': elif action == b'stop':
rbsrt = rebaseruntime(repo, ui) rbsrt = rebaseruntime(repo, ui)
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
rbsrt.restorestatus() rbsrt.restorestatus()
if rbsrt.collapsef: if rbsrt.collapsef:
raise error.Abort(_(b"cannot stop in --collapse session")) raise error.Abort(_(b"cannot stop in --collapse session"))
allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)