comparison mercurial/merge.py @ 44089:bd22e90c54b3

graft: extract repo[None] to a variable

I plan to allow the caller pass in an overlayworkingctx, so this
prepares for that.

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

44088:b3ec1ea95ee6

    # mergeancestor=True to update. This does two things: 1) allows the merge if
    # the destination is the same as the parent of the ctx (so we can use graft
    # 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".
    pctx = repo[b'.']
    mergeancestor = repo.changelog.isancestor(pctx.node(), ctx.node())

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

    with repo.dirstate.parentchange():
        repo.setparents(pctx.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,

44089:bd22e90c54b3

    # mergeancestor=True to update. This does two things: 1) allows the merge if
    # the destination is the same as the parent of the ctx (so we can use graft
    # 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 = repo[None]
    pctx = wctx.p1()
    mergeancestor = repo.changelog.isancestor(pctx.node(), ctx.node())

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

    with repo.dirstate.parentchange():
        repo.setparents(pctx.node(), pother)
        repo.dirstate.write(repo.currenttransaction())
        # fix up dirstate for copies and renames
        copies.duplicatecopies(repo, wctx, ctx.rev(), base.rev())
    return stats


def purge(
    repo,