comparison mercurial/commit.py @ 45443:037e88d453fa

commit: pass mergestate into _filecommit() instead of re-reading it

mergestate reading although cheap is not free. Let's read mergestate once on top
and pass it into `_filecommit()`.

In upcoming patches, we will be reading mergestate more in `_filecommit()`.

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

45442:c6e332a451d0

    mctx = m1ctx.copy()

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

    files = metadata.ChangingFiles()

    # check in files
    added = []

            if fctx is None:
                removed.append(f)
            else:
                added.append(f)
                m[f], is_touched = _filecommit(
                    repo, fctx, m1, m2, linkrev, tr, writefilecopymeta,
                )
                if is_touched:
                    if is_touched == 'added':
                        files.mark_added(f)
                    else:

    return mn, files


def _filecommit(
    repo, fctx, manifest1, manifest2, linkrev, tr, includecopymeta,
):
    """
    commit an individual file as part of a larger transaction

    input:

        linkrev:    revision number of the changeset being created
        tr:         current transation
        includecopymeta: boolean, set to False to skip storing the copy data
                    (only used by the Google specific feature of using
                    changeset extra as copy source of truth).

    output: (filenode, touched)

        filenode: the filenode that should be used by this changeset
        touched:  one of: None (mean untouched), 'added' or 'modified'

            fparent1, fparent2 = fparent2, nullid
        elif fparent2 in fparentancestors:
            fparent2 = nullid
        elif not fparentancestors:
            # TODO: this whole if-else might be simplified much more
            ms = mergestate.mergestate.read(repo)
            if ms.extras(fname).get(b'filenode-source') == b'other':
                fparent1, fparent2 = fparent2, nullid

    # is the file changed?
    text = fctx.data()
    if fparent2 != nullid or meta or flog.cmp(fparent1, text):

45443:037e88d453fa

    mctx = m1ctx.copy()

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

    files = metadata.ChangingFiles()

    # check in files
    added = []

            if fctx is None:
                removed.append(f)
            else:
                added.append(f)
                m[f], is_touched = _filecommit(
                    repo, fctx, m1, m2, linkrev, tr, writefilecopymeta, ms
                )
                if is_touched:
                    if is_touched == 'added':
                        files.mark_added(f)
                    else:

    return mn, files


def _filecommit(
    repo, fctx, manifest1, manifest2, linkrev, tr, includecopymeta, ms,
):
    """
    commit an individual file as part of a larger transaction

    input:

        linkrev:    revision number of the changeset being created
        tr:         current transation
        includecopymeta: boolean, set to False to skip storing the copy data
                    (only used by the Google specific feature of using
                    changeset extra as copy source of truth).
        ms:         mergestate object

    output: (filenode, touched)

        filenode: the filenode that should be used by this changeset
        touched:  one of: None (mean untouched), 'added' or 'modified'

            fparent1, fparent2 = fparent2, nullid
        elif fparent2 in fparentancestors:
            fparent2 = nullid
        elif not fparentancestors:
            # TODO: this whole if-else might be simplified much more
            if (
                ms.active()
                and ms.extras(fname).get(b'filenode-source') == b'other'
            ):
                fparent1, fparent2 = fparent2, nullid

    # is the file changed?
    text = fctx.data()
    if fparent2 != nullid or meta or flog.cmp(fparent1, text):