hgext/rebase.py

44089:bd22e90c54b3

            repo.ui.debug(b" already in destination\n")
        # This is, alas, necessary to invalidate workingctx's manifest cache,
        # as well as other data we litter on it in other places.
        wctx = repo[None]
        repo.dirstate.write(repo.currenttransaction())
    repo.ui.debug(b" merge against %d:%s\n" % (rev, repo[rev]))
    if base is not None:
        repo.ui.debug(b"   detach base %d:%s\n" % (base, repo[base]))
    # When collapsing in-place, the parent is the common ancestor, we
    # have to allow merging with it.
    stats = mergemod.update(

        ancestor=base,
        mergeancestor=collapse,
        labels=[b'dest', b'source'],
        wc=wctx,
    )
    if collapse:
        copies.duplicatecopies(repo, wctx, rev, dest)
    else:
        # If we're not using --collapse, we need to
        # duplicate copies between the revision we're
        # rebasing and its first parent, but *not*
        # duplicate any copies that have already been
        # performed in the destination.
        p1rev = repo[rev].p1().rev()
        copies.duplicatecopies(repo, wctx, rev, p1rev, skiprev=dest)
    return stats


def adjustdest(repo, rev, destmap, state, skipped):
    r"""adjust rebase destination given the current rebase state

44090:2f0a44c69e07

            repo.ui.debug(b" already in destination\n")
        # This is, alas, necessary to invalidate workingctx's manifest cache,
        # as well as other data we litter on it in other places.
        wctx = repo[None]
        repo.dirstate.write(repo.currenttransaction())
    ctx = repo[rev]
    repo.ui.debug(b" merge against %d:%s\n" % (rev, ctx))
    if base is not None:
        repo.ui.debug(b"   detach base %d:%s\n" % (base, repo[base]))
    # When collapsing in-place, the parent is the common ancestor, we
    # have to allow merging with it.
    stats = mergemod.update(

        ancestor=base,
        mergeancestor=collapse,
        labels=[b'dest', b'source'],
        wc=wctx,
    )
    destctx = repo[dest]
    if collapse:
        copies.graftcopies(repo, wctx, ctx, destctx)
    else:
        # If we're not using --collapse, we need to
        # duplicate copies between the revision we're
        # rebasing and its first parent, but *not*
        # duplicate any copies that have already been
        # performed in the destination.
        copies.graftcopies(repo, wctx, ctx, ctx.p1(), skip=destctx)
    return stats


def adjustdest(repo, rev, destmap, state, skipped):
    r"""adjust rebase destination given the current rebase state