comparison mercurial/commit.py @ 45706:b92887ce8db4

commit: move salvaged calculation a bit earlier in the function

This helps us initialize mergestate before and now we can pass it into
`_process_files()` instead of re-reading it there.

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

45705:61454026fa04

def _prepare_files(tr, ctx, error=False, origctx=None):
    repo = ctx.repo()
    p1 = ctx.p1()

    writechangesetcopy, writefilecopymeta = _write_copy_meta(repo)

    if ctx.manifestnode():
        # reuse an existing manifest revision
        repo.ui.debug(b'reusing known manifest\n')
        mn = ctx.manifestnode()

    if writechangesetcopy:
        files.update_copies_from_p1(ctx.p1copies())
        files.update_copies_from_p2(ctx.p2copies())

    ms = mergestate.mergestate.read(repo)
    salvaged = _get_salvaged(ctx.repo(), ms, ctx)
    for s in salvaged:
        files.mark_salvaged(s)

    return mn, files

45706:b92887ce8db4

def _prepare_files(tr, ctx, error=False, origctx=None):
    repo = ctx.repo()
    p1 = ctx.p1()

    writechangesetcopy, writefilecopymeta = _write_copy_meta(repo)
    ms = mergestate.mergestate.read(repo)
    salvaged = _get_salvaged(repo, ms, ctx)

    if ctx.manifestnode():
        # reuse an existing manifest revision
        repo.ui.debug(b'reusing known manifest\n')
        mn = ctx.manifestnode()

    if writechangesetcopy:
        files.update_copies_from_p1(ctx.p1copies())
        files.update_copies_from_p2(ctx.p2copies())

    for s in salvaged:
        files.mark_salvaged(s)

    return mn, files