comparison mercurial/commands.py @ 50825:973fbb27ab45

backout: migrate `opts` to native kwargs

It will take a bit to unwind `cmdutil.commit`, so there's a conversion to
byteskwargs there, without changing the type of `opts` in this function.  That's
also useful to flag it as needing to be changed.

50824:489268c8ee7e

        return _dobackout(ui, repo, node, rev, **opts)


def _dobackout(ui, repo, node=None, rev=None, **opts):
    cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
    opts = pycompat.byteskwargs(opts)

    if rev and node:
        raise error.InputError(_(b"please specify just one revision"))

    if not rev:
        rev = node

    if not rev:
        raise error.InputError(_(b"please specify a revision to backout"))

    date = opts.get(b'date')
    if date:
        opts[b'date'] = dateutil.parsedate(date)

    cmdutil.checkunfinished(repo)
    cmdutil.bailifchanged(repo)
    ctx = logcmdutil.revsingle(repo, rev)
    node = ctx.node()

    p1, p2 = repo.changelog.parents(node)
    if p1 == repo.nullid:
        raise error.InputError(_(b'cannot backout a change with no parents'))
    if p2 != repo.nullid:
        if not opts.get(b'parent'):
            raise error.InputError(_(b'cannot backout a merge changeset'))
        p = repo.lookup(opts[b'parent'])
        if p not in (p1, p2):
            raise error.InputError(
                _(b'%s is not a parent of %s') % (short(p), short(node))
            )
        parent = p
    else:
        if opts.get(b'parent'):
            raise error.InputError(
                _(b'cannot use --parent on non-merge changeset')
            )
        parent = p1

    # the backout should appear on the same branch
    branch = repo.dirstate.branch()
    bheads = repo.branchheads(branch)
    rctx = scmutil.revsingle(repo, hex(parent))
    if not opts.get(b'merge') and op1 != node:
        with repo.transaction(b"backout"):
            overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
            with ui.configoverride(overrides, b'backout'):
                stats = mergemod.back_out(ctx, parent=repo[parent])
            repo.setparents(op1, op2)
        hg._showstats(repo, stats)
        if stats.unresolvedcount:

    else:
        hg.clean(repo, node, show_stats=False)
        repo.dirstate.setbranch(branch, repo.currenttransaction())
        cmdutil.revert(ui, repo, rctx)

    if opts.get(b'no_commit'):
        msg = _(b"changeset %s backed out, don't forget to commit.\n")
        ui.status(msg % short(node))
        return 0

    def commitfunc(ui, repo, message, match, opts):

        )

    # save to detect changes
    tip = repo.changelog.tip()

    newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
    if not newnode:
        ui.status(_(b"nothing changed\n"))
        return 1
    cmdutil.commitstatus(repo, newnode, branch, bheads, tip)

    ui.status(
        _(b'changeset %s backs out changeset %s\n')
        % (nice(newnode), nice(node))
    )
    if opts.get(b'merge') and op1 != node:
        hg.clean(repo, op1, show_stats=False)
        ui.status(_(b'merging with changeset %s\n') % nice(newnode))
        overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
        with ui.configoverride(overrides, b'backout'):
            return hg.merge(repo[b'tip'])
    return 0

50825:973fbb27ab45

        return _dobackout(ui, repo, node, rev, **opts)


def _dobackout(ui, repo, node=None, rev=None, **opts):
    cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])

    if rev and node:
        raise error.InputError(_(b"please specify just one revision"))

    if not rev:
        rev = node

    if not rev:
        raise error.InputError(_(b"please specify a revision to backout"))

    date = opts.get('date')
    if date:
        opts['date'] = dateutil.parsedate(date)

    cmdutil.checkunfinished(repo)
    cmdutil.bailifchanged(repo)
    ctx = logcmdutil.revsingle(repo, rev)
    node = ctx.node()

    p1, p2 = repo.changelog.parents(node)
    if p1 == repo.nullid:
        raise error.InputError(_(b'cannot backout a change with no parents'))
    if p2 != repo.nullid:
        if not opts.get('parent'):
            raise error.InputError(_(b'cannot backout a merge changeset'))
        p = repo.lookup(opts['parent'])
        if p not in (p1, p2):
            raise error.InputError(
                _(b'%s is not a parent of %s') % (short(p), short(node))
            )
        parent = p
    else:
        if opts.get('parent'):
            raise error.InputError(
                _(b'cannot use --parent on non-merge changeset')
            )
        parent = p1

    # the backout should appear on the same branch
    branch = repo.dirstate.branch()
    bheads = repo.branchheads(branch)
    rctx = scmutil.revsingle(repo, hex(parent))
    if not opts.get('merge') and op1 != node:
        with repo.transaction(b"backout"):
            overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
            with ui.configoverride(overrides, b'backout'):
                stats = mergemod.back_out(ctx, parent=repo[parent])
            repo.setparents(op1, op2)
        hg._showstats(repo, stats)
        if stats.unresolvedcount:

    else:
        hg.clean(repo, node, show_stats=False)
        repo.dirstate.setbranch(branch, repo.currenttransaction())
        cmdutil.revert(ui, repo, rctx)

    if opts.get('no_commit'):
        msg = _(b"changeset %s backed out, don't forget to commit.\n")
        ui.status(msg % short(node))
        return 0

    def commitfunc(ui, repo, message, match, opts):

        )

    # save to detect changes
    tip = repo.changelog.tip()

    newnode = cmdutil.commit(
        ui, repo, commitfunc, [], pycompat.byteskwargs(opts)
    )
    if not newnode:
        ui.status(_(b"nothing changed\n"))
        return 1
    cmdutil.commitstatus(repo, newnode, branch, bheads, tip)

    ui.status(
        _(b'changeset %s backs out changeset %s\n')
        % (nice(newnode), nice(node))
    )
    if opts.get('merge') and op1 != node:
        hg.clean(repo, op1, show_stats=False)
        ui.status(_(b'merging with changeset %s\n') % nice(newnode))
        overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
        with ui.configoverride(overrides, b'backout'):
            return hg.merge(repo[b'tip'])
    return 0