| hg-reviewers |
Make sure --stop feature raise error for conflicting options
--continue, --abort, --confirm, --dry-run. Tests are added to
reflect the same.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/rebase.py (7 lines) | |||
| M | tests/test-rebase-obsolete.t (19 lines) |
| 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('rebase', 'experimental.inmemory') | inmemory = ui.configbool('rebase', 'experimental.inmemory') | ||||
| dryrun = opts.get('dry_run') | dryrun = opts.get('dry_run') | ||||
| stop = opts.get('stop') | stop = opts.get('stop') | ||||
| if stop: | |||||
| if opts.get('dry_run') or opts.get('confirm'): | |||||
| raise error.Abort(_('cannot use --stop with --dry-run ' | |||||
| 'or --confirm')) | |||||
| if opts.get('abort') or opts.get('continue'): | |||||
| raise error.Abort(_('cannot use --stop with --abort or --continue')) | |||||
| if dryrun: | if dryrun: | ||||
| if opts.get('abort'): | if opts.get('abort'): | ||||
| raise error.Abort(_('cannot specify both --dry-run and --abort')) | raise error.Abort(_('cannot specify both --dry-run and --abort')) | ||||
| if opts.get('continue'): | if opts.get('continue'): | ||||
| raise error.Abort(_('cannot specify both --dry-run and --continue')) | raise error.Abort(_('cannot specify both --dry-run and --continue')) | ||||
| if opts.get('confirm'): | if opts.get('confirm'): | ||||
| dryrun = True | dryrun = True | ||||
| if opts.get('dry_run'): | if opts.get('dry_run'): | ||||
| opts['dest'] = '_destautoorphanrebase(SRC)' | opts['dest'] = '_destautoorphanrebase(SRC)' | ||||
| if dryrun: | if dryrun: | ||||
| return _dryrunrebase(ui, repo, opts) | return _dryrunrebase(ui, repo, opts) | ||||
| elif stop: | elif stop: | ||||
| rbsrt = rebaseruntime(repo, ui) | rbsrt = rebaseruntime(repo, ui) | ||||
| rbsrt.restorestatus() | rbsrt.restorestatus() | ||||
| #todo: raise error for conflicting options | |||||
| if rbsrt.collapsef: | if rbsrt.collapsef: | ||||
| raise error.Abort(_("cannot stop in --collapse session")) | raise error.Abort(_("cannot stop in --collapse session")) | ||||
| allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) | allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) | ||||
| if not (rbsrt.keepf or allowunstable): | if not (rbsrt.keepf or allowunstable): | ||||
| raise error.Abort(_("cannot remove original changesets with" | raise error.Abort(_("cannot remove original changesets with" | ||||
| " unrebased descendants"), | " unrebased descendants"), | ||||
| hint=_('either enable obsmarkers to allow unstable ' | hint=_('either enable obsmarkers to allow unstable ' | ||||
| 'revisions or use --keep to keep original ' | 'revisions or use --keep to keep original ' | ||||
| | | c | | | c | ||||
| | | | | | | ||||
| | o 1:d2ae7f538514 test | | o 1:d2ae7f538514 test | ||||
| |/ b | |/ b | ||||
| | | | | ||||
| o 0:cb9a9f314b8b test | o 0:cb9a9f314b8b test | ||||
| a | a | ||||
| Test --stop raise errors with conflicting options: | |||||
| ================================================= | |||||
| $ hg rebase -s 3 -d 5 | |||||
| rebasing 3:055a42cdd887 "d" | |||||
| merging d | |||||
| warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | |||||
| unresolved conflicts (see hg resolve, then hg rebase --continue) | |||||
| [1] | |||||
| $ hg rebase --stop --dry-run | |||||
| abort: cannot use --stop with --dry-run or --confirm | |||||
| [255] | |||||
| $ hg rebase -s 3 -d 5 | |||||
| abort: rebase in progress | |||||
| (use 'hg rebase --continue' or 'hg rebase --abort') | |||||
| [255] | |||||
| $ hg rebase --stop --continue | |||||
| abort: cannot use --stop with --abort or --continue | |||||
| [255] | |||||