##// END OF EJS Templates
rebase: inline single-use `dryrun` and `confirm` variables...
Martin von Zweigbergk -
r44380:0b769e1c default
parent child Browse files
Show More
@@ -1019,8 +1019,6 b' def rebase(ui, repo, **opts):'
1019 """
1019 """
1020 opts = pycompat.byteskwargs(opts)
1020 opts = pycompat.byteskwargs(opts)
1021 inmemory = ui.configbool(b'rebase', b'experimental.inmemory')
1021 inmemory = ui.configbool(b'rebase', b'experimental.inmemory')
1022 dryrun = opts.get(b'dry_run')
1023 confirm = opts.get(b'confirm')
1024 action = cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
1022 action = cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
1025 if action:
1023 if action:
1026 cmdutil.check_incompatible_arguments(
1024 cmdutil.check_incompatible_arguments(
@@ -1044,7 +1042,7 b' def rebase(ui, repo, **opts):'
1044 opts[b'rev'] = [revsetlang.formatspec(b'%ld and orphan()', userrevs)]
1042 opts[b'rev'] = [revsetlang.formatspec(b'%ld and orphan()', userrevs)]
1045 opts[b'dest'] = b'_destautoorphanrebase(SRC)'
1043 opts[b'dest'] = b'_destautoorphanrebase(SRC)'
1046
1044
1047 if dryrun or confirm:
1045 if opts.get(b'dry_run') or opts.get(b'confirm'):
1048 return _dryrunrebase(ui, repo, action, opts)
1046 return _dryrunrebase(ui, repo, action, opts)
1049 elif action == b'stop':
1047 elif action == b'stop':
1050 rbsrt = rebaseruntime(repo, ui)
1048 rbsrt = rebaseruntime(repo, ui)
General Comments 0
You need to be logged in to leave comments. Login now