comparison mercurial/merge.py @ 44212:cb8b67016110

graft: default `base` argument to common case of `ctx.p1()`

I also updated the callers that wanted that, partly to simplify and
partly to show that it works.

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

44211:fc7175df6359

def graft(
    repo,
    ctx,
    base,
    labels=None,
    keepparent=False,
    keepconflictparent=False,
    wctx=None,
):

    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

    """

    # to copy commits), and 2) informs update that the incoming changes are
    # newer than the destination so it doesn't prompt about "remote changed foo
    # which local deleted".
    wctx = wctx or repo[None]
    pctx = wctx.p1()
    mergeancestor = repo.changelog.isancestor(pctx.node(), ctx.node())

    stats = update(
        repo,
        ctx.node(),

44212:cb8b67016110

def graft(
    repo,
    ctx,
    base=None,
    labels=None,
    keepparent=False,
    keepconflictparent=False,
    wctx=None,
):

    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, or ctx.p1() if not specified
    labels - merge labels eg ['local', 'graft']
    keepparent - keep second parent if any
    keepconflictparent - if unresolved, keep parent used for the merge

    """

    # to copy commits), and 2) informs update that the incoming changes are
    # newer than the destination so it doesn't prompt about "remote changed foo
    # which local deleted".
    wctx = wctx or repo[None]
    pctx = wctx.p1()
    base = base or ctx.p1()
    mergeancestor = repo.changelog.isancestor(pctx.node(), ctx.node())

    stats = update(
        repo,
        ctx.node(),