comparison mercurial/merge.py @ 45283:f1fb9a079131

merge: add removefile() to mergeresult object

There are cases where some further calculation makes the file not needing to be
merged anymore and hence needs to be dropped in mergeresult object. This adds a
function for that.

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

45282:b442920ab1de

        action: one of mergestatemod.ACTION_*
        data: a tuple of information like fctx and ctx related to this merge
        message: a message about the merge
        """
        self._actions[filename] = (action, data, message)

    @property
    def actions(self):
        return self._actions

                        mergestatemod.ACTION_GET,
                        (flags, False),
                        b'prompt recreating',
                    )
                else:
                    del mresult.actions[f]

        # Convert to dictionary-of-lists format
        actions = mresult.actionsdict

        if not util.fscasesensitive(repo.path):

45283:f1fb9a079131

        action: one of mergestatemod.ACTION_*
        data: a tuple of information like fctx and ctx related to this merge
        message: a message about the merge
        """
        self._actions[filename] = (action, data, message)

    def removefile(self, filename):
        """ removes a file from the mergeresult object as the file might
        not merging anymore """
        del self._actions[filename]

    @property
    def actions(self):
        return self._actions

                        mergestatemod.ACTION_GET,
                        (flags, False),
                        b'prompt recreating',
                    )
                else:
                    mresult.removefile(f)

        # Convert to dictionary-of-lists format
        actions = mresult.actionsdict

        if not util.fscasesensitive(repo.path):