merge: store commitinfo if these is a dc or cd conflict delete-changed or changed-delete conflicts can either be resolved by mergetool, if some tool is passed and using or by user choose something on prompt or user doing some `hg revert` after choosing the file to remain conflicted. If the user decides to keep the changed side, on commit we just reuse the parent filenode. This is mostly fine unless we are in a distributed environment and people are doing criss-cross merges. Since, we don't have recursive merges or any other way of describing the end result of the merge was an explicit choice and it should be differentiated from it's ancestors, merge algo during criss-cross merges fails to take in account the explicit choice made by user and end up with a what-can-be-said-wrong-merge. The solution which we are trying to fix this is by creating a filenode on commit instead of reusing the parent filenode. This helps differentiate between pre-merged filenode and post-merge filenode and kind of tells about the choice user made. To implement creating new filenode functionality, we store info about these files in mergestate so that we can read them on commit and force create a new filenode. Differential Revision: https://phab.mercurial-scm.org/D8988

     1

from __future__ import absolute_import

     2

import os

     3

from mercurial import (

     4

    dispatch,

     5

    extensions,

     6

    ui as uimod,

     7

)

     8

     9

    10

def testdispatch(cmd):

    11

    """Simple wrapper around dispatch.dispatch()

    12

    13

    Prints command and result value, but does not handle quoting.

    14

    """

    15

    ui = uimod.ui.load()

    16

    extensions.populateui(ui)

    17

    ui.statusnoi18n(b"running: %s\n" % cmd)

    18

    req = dispatch.request(cmd.split(), ui)

    19

    result = dispatch.dispatch(req)

    20

    ui.statusnoi18n(b"result: %r\n" % result)

    21

    22

    23

# create file 'foo', add and commit

    24

f = open(b'foo', 'wb')

    25

f.write(b'foo\n')

    26

f.close()

    27

testdispatch(b"--debug add foo")

    28

testdispatch(b"--debug commit -m commit1 -d 2000-01-01 foo")

    29

    30

# append to file 'foo' and commit

    31

f = open(b'foo', 'ab')

    32

f.write(b'bar\n')

    33

f.close()

    34

# remove blackbox.log directory (proxy for readonly log file)

    35

os.rmdir(b".hg/blackbox.log")

    36

# replace it with the real blackbox.log file

    37

os.rename(b".hg/blackbox.log-", b".hg/blackbox.log")

    38

testdispatch(b"--debug commit -m commit2 -d 2000-01-02 foo")

    39

    40

# check 88803a69b24 (fancyopts modified command table)

    41

testdispatch(b"--debug log -r 0")

    42

testdispatch(b"--debug log -r tip")