comparison mercurial/commit.py @ 45707:035302e6bb38

commit: pass mergestate into `_process_files` instead of re-reading it

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

45706:b92887ce8db4

    elif not ctx.files():
        repo.ui.debug(b'reusing manifest from p1 (no file change)\n')
        mn = p1.manifestnode()
        files = metadata.ChangingFiles()
    else:
        mn, files = _process_files(tr, ctx, error=error)

    if origctx and origctx.manifestnode() == mn:
        origfiles = origctx.files()
        assert files.touched.issubset(origfiles)
        files.update_touched(origfiles)

                    if fname in ctx:
                        salvaged.append(fname)
    return salvaged


def _process_files(tr, ctx, error=False):
    repo = ctx.repo()
    p1 = ctx.p1()
    p2 = ctx.p2()

    writechangesetcopy, writefilecopymeta = _write_copy_meta(repo)

    mctx = m1ctx.copy()

    m = mctx.read()
    m1 = m1ctx.read()
    m2 = m2ctx.read()
    ms = mergestate.mergestate.read(repo)

    files = metadata.ChangingFiles()

    # check in files
    added = []

45707:035302e6bb38

    elif not ctx.files():
        repo.ui.debug(b'reusing manifest from p1 (no file change)\n')
        mn = p1.manifestnode()
        files = metadata.ChangingFiles()
    else:
        mn, files = _process_files(tr, ctx, ms, error=error)

    if origctx and origctx.manifestnode() == mn:
        origfiles = origctx.files()
        assert files.touched.issubset(origfiles)
        files.update_touched(origfiles)

                    if fname in ctx:
                        salvaged.append(fname)
    return salvaged


def _process_files(tr, ctx, ms, error=False):
    repo = ctx.repo()
    p1 = ctx.p1()
    p2 = ctx.p2()

    writechangesetcopy, writefilecopymeta = _write_copy_meta(repo)

    mctx = m1ctx.copy()

    m = mctx.read()
    m1 = m1ctx.read()
    m2 = m2ctx.read()

    files = metadata.ChangingFiles()

    # check in files
    added = []