comparison hgext/fix.py @ 44090:2f0a44c69e07

copies: replace duplicatecopies() by function that takes contexts

The callers mostly have context objects, so let's avoid looking up the
same context objects inside `duplicatecopies()`.

I also renamed the function to `graftcopies()` since I think that
better matches its purpose. I did it in the same commit so it's easier
for extensions to switch between the functions.

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

44089:bd22e90c54b3

    extra = ctx.extra().copy()
    extra[b'fix_source'] = ctx.hex()

    wctx = context.overlayworkingctx(repo)
    wctx.setbase(repo[newp1node])
    merge.update(
        repo,
        ctx.rev(),
        branchmerge=False,
        force=True,
        ancestor=p1rev,
        mergeancestor=False,
        wc=wctx,
    )
    copies.duplicatecopies(
        repo, wctx, ctx.rev(), ctx.p1().rev(), skiprev=newp1node
    )

    for path in filedata.keys():
        fctx = ctx[path]
        copysource = fctx.copysource()
        wctx.write(path, filedata[path], flags=fctx.flags())

44090:2f0a44c69e07

    extra = ctx.extra().copy()
    extra[b'fix_source'] = ctx.hex()

    wctx = context.overlayworkingctx(repo)
    newp1ctx = repo[newp1node]
    wctx.setbase(newp1ctx)
    merge.update(
        repo,
        ctx.rev(),
        branchmerge=False,
        force=True,
        ancestor=p1rev,
        mergeancestor=False,
        wc=wctx,
    )
    copies.graftcopies(repo, wctx, ctx, ctx.p1(), skip=newp1ctx)

    for path in filedata.keys():
        fctx = ctx[path]
        copysource = fctx.copysource()
        wctx.write(path, filedata[path], flags=fctx.flags())