comparison hgext/rebase.py @ 39094:2cf0b8b830ba

rebase: raise error for options conflicting with --stop

Make sure --stop feature raise error for conflicting options
--continue, --abort, --confirm, --dry-run. Tests are added to
reflect the same.

Differential Revision: https://phab.mercurial-scm.org/D3969

39093:cc37009e95ca

    """
    opts = pycompat.byteskwargs(opts)
    inmemory = ui.configbool('rebase', 'experimental.inmemory')
    dryrun = opts.get('dry_run')
    stop = opts.get('stop')
    if dryrun:
        if opts.get('abort'):
            raise error.Abort(_('cannot specify both --dry-run and --abort'))
        if opts.get('continue'):
            raise error.Abort(_('cannot specify both --dry-run and --continue'))

        return _dryrunrebase(ui, repo, opts)
    elif stop:
        rbsrt = rebaseruntime(repo, ui)
        rbsrt.restorestatus()

        #todo: raise error for conflicting options
        if rbsrt.collapsef:
            raise error.Abort(_("cannot stop in --collapse session"))
        allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
        if not (rbsrt.keepf or allowunstable):
            raise error.Abort(_("cannot remove original changesets with"

39094:2cf0b8b830ba

    """
    opts = pycompat.byteskwargs(opts)
    inmemory = ui.configbool('rebase', 'experimental.inmemory')
    dryrun = opts.get('dry_run')
    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 opts.get('abort'):
            raise error.Abort(_('cannot specify both --dry-run and --abort'))
        if opts.get('continue'):
            raise error.Abort(_('cannot specify both --dry-run and --continue'))

        return _dryrunrebase(ui, repo, opts)
    elif stop:
        rbsrt = rebaseruntime(repo, ui)
        rbsrt.restorestatus()

        if rbsrt.collapsef:
            raise error.Abort(_("cannot stop in --collapse session"))
        allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
        if not (rbsrt.keepf or allowunstable):
            raise error.Abort(_("cannot remove original changesets with"