comparison mercurial/merge.py @ 43796:ebfd349eac46

graft: rename `pctx` argument to `base` since that's what it is

The new name better matches the docstring. It also frees up `pctx` to
be used for something else (next patch).

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

43795:0f6782df1100

        )
    return stats


def graft(
    repo, ctx, pctx, labels=None, keepparent=False, keepconflictparent=False
):
    """Do a graft-like merge.

    This is a merge where the merge ancestor is chosen such that one
    or more changesets are grafted onto the current changeset. In
    addition to the merge, this fixes up the dirstate to include only
    a single parent (if keepparent is False) and tries to duplicate any
    renames/copies appropriately.

    ctx - changeset to rebase
    pctx - merge base, usually ctx.p1()
    labels - merge labels eg ['local', 'graft']
    keepparent - keep second parent if any
    keepconflictparent - if unresolved, keep parent used for the merge

    """

    stats = update(
        repo,
        ctx.node(),
        True,
        True,
        pctx.node(),
        mergeancestor=mergeancestor,
        labels=labels,
    )

    if keepconflictparent and stats.unresolvedcount:
        pother = ctx.node()
    else:
        pother = nullid
        parents = ctx.parents()
        if keepparent and len(parents) == 2 and pctx in parents:
            parents.remove(pctx)
            pother = parents[0].node()

    with repo.dirstate.parentchange():
        repo.setparents(repo[b'.'].node(), pother)
        repo.dirstate.write(repo.currenttransaction())
        # fix up dirstate for copies and renames
        copies.duplicatecopies(repo, repo[None], ctx.rev(), pctx.rev())
    return stats


def purge(
    repo,

43796:ebfd349eac46

        )
    return stats


def graft(
    repo, ctx, base, labels=None, keepparent=False, keepconflictparent=False
):
    """Do a graft-like merge.

    This is a merge where the merge ancestor is chosen such that one
    or more changesets are grafted onto the current changeset. In
    addition to the merge, this fixes up the dirstate to include only
    a single parent (if keepparent is False) and tries to duplicate any
    renames/copies appropriately.

    ctx - changeset to rebase
    base - merge base, usually ctx.p1()
    labels - merge labels eg ['local', 'graft']
    keepparent - keep second parent if any
    keepconflictparent - if unresolved, keep parent used for the merge

    """

    stats = update(
        repo,
        ctx.node(),
        True,
        True,
        base.node(),
        mergeancestor=mergeancestor,
        labels=labels,
    )

    if keepconflictparent and stats.unresolvedcount:
        pother = ctx.node()
    else:
        pother = nullid
        parents = ctx.parents()
        if keepparent and len(parents) == 2 and base in parents:
            parents.remove(base)
            pother = parents[0].node()

    with repo.dirstate.parentchange():
        repo.setparents(repo[b'.'].node(), pother)
        repo.dirstate.write(repo.currenttransaction())
        # fix up dirstate for copies and renames
        copies.duplicatecopies(repo, repo[None], ctx.rev(), base.rev())
    return stats


def purge(
    repo,