comparison mercurial/merge.py @ 45291:26fa2eebc291

mergeresult: rename _actions to _filemapping

This is done because we will be introducing another dict which introduces the
same information but with action name as key.

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

45290:d70c972cec74

    It has information about what actions need to be performed on dirstate
    mapping of divergent renames and other such cases. '''

    def __init__(self):
        """
        actions: dict of filename as keys and action related info as values
        diverge: mapping of source name -> list of dest name for
                 divergent renames
        renamedelete: mapping of source name -> list of destinations for files
                      deleted on one side and renamed on other.
        commitinfo: dict containing data which should be used on commit
                    contains a filename -> info mapping
        """
        self._actions = {}
        self._diverge = {}
        self._renamedelete = {}
        self._commitinfo = {}

    def updatevalues(self, diverge, renamedelete, commitinfo):

        filename: file which we are adding
        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

    @property
    def diverge(self):
        return self._diverge

    def actionsdict(self):
        """ returns a dictionary of actions to be perfomed with action as key
        and a list of files and related arguments as values """
        # Convert to dictionary-of-lists format
        actions = emptyactions()
        for f, (m, args, msg) in pycompat.iteritems(self._actions):
            if m not in actions:
                actions[m] = []
            actions[m].append((f, args, msg))

        return actions

    def setactions(self, actions):
        self._actions = actions

    def updateactions(self, updates):
        self._actions.update(updates)

    def hasconflicts(self):
        """ tells whether this merge resulted in some actions which can
        result in conflicts or not """
        for _f, (m, _unused, _unused) in pycompat.iteritems(self._actions):
            if m not in (
                mergestatemod.ACTION_GET,
                mergestatemod.ACTION_KEEP,
                mergestatemod.ACTION_EXEC,
                mergestatemod.ACTION_REMOVE,

45291:26fa2eebc291

    It has information about what actions need to be performed on dirstate
    mapping of divergent renames and other such cases. '''

    def __init__(self):
        """
        filemapping: dict of filename as keys and action related info as values
        diverge: mapping of source name -> list of dest name for
                 divergent renames
        renamedelete: mapping of source name -> list of destinations for files
                      deleted on one side and renamed on other.
        commitinfo: dict containing data which should be used on commit
                    contains a filename -> info mapping
        """
        self._filemapping = {}
        self._diverge = {}
        self._renamedelete = {}
        self._commitinfo = {}

    def updatevalues(self, diverge, renamedelete, commitinfo):

        filename: file which we are adding
        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._filemapping[filename] = (action, data, message)

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

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

    @property
    def diverge(self):
        return self._diverge

    def actionsdict(self):
        """ returns a dictionary of actions to be perfomed with action as key
        and a list of files and related arguments as values """
        # Convert to dictionary-of-lists format
        actions = emptyactions()
        for f, (m, args, msg) in pycompat.iteritems(self._filemapping):
            if m not in actions:
                actions[m] = []
            actions[m].append((f, args, msg))

        return actions

    def setactions(self, actions):
        self._filemapping = actions

    def updateactions(self, updates):
        self._filemapping.update(updates)

    def hasconflicts(self):
        """ tells whether this merge resulted in some actions which can
        result in conflicts or not """
        for _f, (m, _unused, _unused) in pycompat.iteritems(self._filemapping):
            if m not in (
                mergestatemod.ACTION_GET,
                mergestatemod.ACTION_KEEP,
                mergestatemod.ACTION_EXEC,
                mergestatemod.ACTION_REMOVE,