Mercurial > hg-stable
changeset 43934:0b769e1cbe89
rebase: inline single-use `dryrun` and `confirm` variables
Differential Revision: https://phab.mercurial-scm.org/D7642
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 12 Dec 2019 23:11:33 -0800 |
| parents | 905b21783968 |
| children | 08b8bf4a8516 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Fri Dec 13 14:50:42 2019 -0800 +++ b/hgext/rebase.py Thu Dec 12 23:11:33 2019 -0800 @@ -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)