Patchwork D7642: rebase: inline single-use `dryrun` and `confirm` variables

login
register
mail settings
Submitter phabricator
Date Dec. 17, 2019, 6:10 p.m.
Message ID <9d3de47c66169c6e0636bd2dc2e4f362@localhost.localdomain>
Download mbox | patch
Permalink /patch/43930/
State Not Applicable
Headers show

Comments

phabricator - Dec. 17, 2019, 6:10 p.m.
martinvonz updated this revision to Diff 18821.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7642?vs=18769&id=18821

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7642/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7642

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -1019,8 +1019,6 @@ 
     """
     opts = pycompat.byteskwargs(opts)
     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')
     if action:
         cmdutil.check_incompatible_arguments(
@@ -1044,7 +1042,7 @@ 
         opts[b'rev'] = [revsetlang.formatspec(b'%ld and orphan()', userrevs)]
         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)
     elif action == b'stop':
         rbsrt = rebaseruntime(repo, ui)