comparison mercurial/commands.py @ 44687:1b8fd4af3318

mergestate: store about files resolved in favour of other

Committing a merge sometimes wrongly creates a new filenode where it can re-use
an existing one. This happens because the commit code does it's own calculation
and does not know what happened on merge.

This starts storing information in mergestate about files which were
automatically merged and the other/remote version of file was used.
We need this information at commit to pick the filenode parent for the new
commit.

This issue was found by Pierre-Yves David and idea to store the relevant parts
in mergestate is also suggested by him.

Somethings which can be further investigated are:

1) refactoring of commit logic more to depend on this information
2) maybe a more generic solution?

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

44686:bca57ad9e630

        for f in ms:
            if not m(f):
                continue

            label, key = mergestateinfo[ms[f]]
            fm.startitem()
            fm.context(ctx=wctx)
            fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
            fm.data(path=f)

        for f in ms:
            if not m(f):
                continue

            didwork = True

            # don't let driver-resolved files be marked, and run the conclude
            # step if asked to resolve
            if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
                exact = m.exact(f)

44687:1b8fd4af3318

        for f in ms:
            if not m(f):
                continue

            if ms[f] == mergemod.MERGE_RECORD_MERGED_OTHER:
                continue
            label, key = mergestateinfo[ms[f]]
            fm.startitem()
            fm.context(ctx=wctx)
            fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
            fm.data(path=f)

        for f in ms:
            if not m(f):
                continue

            didwork = True

            if ms[f] == mergemod.MERGE_RECORD_MERGED_OTHER:
                continue

            # don't let driver-resolved files be marked, and run the conclude
            # step if asked to resolve
            if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
                exact = m.exact(f)