Show More
@@ -805,6 +805,7 b' def rebase(ui, repo, **opts):' | |||||
805 | opts = pycompat.byteskwargs(opts) |
|
805 | opts = pycompat.byteskwargs(opts) | |
806 | inmemory = ui.configbool('rebase', 'experimental.inmemory') |
|
806 | inmemory = ui.configbool('rebase', 'experimental.inmemory') | |
807 | dryrun = opts.get('dry_run') |
|
807 | dryrun = opts.get('dry_run') | |
|
808 | confirm = opts.get('confirm') | |||
808 | stop = opts.get('stop') |
|
809 | stop = opts.get('stop') | |
809 | if stop: |
|
810 | if stop: | |
810 | if opts.get('dry_run') or opts.get('confirm'): |
|
811 | if opts.get('dry_run') or opts.get('confirm'): | |
@@ -817,8 +818,7 b' def rebase(ui, repo, **opts):' | |||||
817 | raise error.Abort(_('cannot specify both --dry-run and --abort')) |
|
818 | raise error.Abort(_('cannot specify both --dry-run and --abort')) | |
818 | if opts.get('continue'): |
|
819 | if opts.get('continue'): | |
819 | raise error.Abort(_('cannot specify both --dry-run and --continue')) |
|
820 | raise error.Abort(_('cannot specify both --dry-run and --continue')) | |
820 |
if |
|
821 | if confirm: | |
821 | dryrun = True |
|
|||
822 | if opts.get('dry_run'): |
|
822 | if opts.get('dry_run'): | |
823 | raise error.Abort(_('cannot specify both --confirm and --dry-run')) |
|
823 | raise error.Abort(_('cannot specify both --confirm and --dry-run')) | |
824 | if opts.get('abort'): |
|
824 | if opts.get('abort'): | |
@@ -842,7 +842,7 b' def rebase(ui, repo, **opts):' | |||||
842 | opts['rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)] |
|
842 | opts['rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)] | |
843 | opts['dest'] = '_destautoorphanrebase(SRC)' |
|
843 | opts['dest'] = '_destautoorphanrebase(SRC)' | |
844 |
|
844 | |||
845 | if dryrun: |
|
845 | if dryrun or confirm: | |
846 | return _dryrunrebase(ui, repo, opts) |
|
846 | return _dryrunrebase(ui, repo, opts) | |
847 | elif stop: |
|
847 | elif stop: | |
848 | rbsrt = rebaseruntime(repo, ui) |
|
848 | rbsrt = rebaseruntime(repo, ui) |
General Comments 0
You need to be logged in to leave comments.
Login now