hgext/rebase.py

43925:7929bb58146f

    action = cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
    if dryrun and action:
        raise error.Abort(_(b'cannot specify both --dry-run and --%s') % action)
    if confirm and action:
        raise error.Abort(_(b'cannot specify both --confirm and --%s') % action)
    if dryrun and confirm:
        raise error.Abort(_(b'cannot specify both --confirm and --dry-run'))

    if action or repo.currenttransaction() is not None:
        # in-memory rebase is not compatible with resuming rebases.
        # (Or if it is run within a transaction, since the restart logic can
        # fail the entire transaction.)

43926:daed70e95d60

    action = cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
    if dryrun and action:
        raise error.Abort(_(b'cannot specify both --dry-run and --%s') % action)
    if confirm and action:
        raise error.Abort(_(b'cannot specify both --confirm and --%s') % action)
    cmdutil.check_at_most_one_arg(opts, b'confirm', b'dry_run')

    if action or repo.currenttransaction() is not None:
        # in-memory rebase is not compatible with resuming rebases.
        # (Or if it is run within a transaction, since the restart logic can
        # fail the entire transaction.)