comparison mercurial/merge.py @ 45299:e98f7c5babd7

mergeresult: make actionmapping a dict of dict instead of dict of lists

This makes deleting a specific filename entry faster and easier.

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

45298:a3cd63d6005b

                 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
        actionmapping: dict of action names as keys and list of files and
                       related data as values
        """
        self._filemapping = {}
        self._diverge = {}
        self._renamedelete = {}
        self._commitinfo = {}
        self._actionmapping = collections.defaultdict(list)

    def updatevalues(self, diverge, renamedelete, commitinfo):
        self._diverge = diverge
        self._renamedelete = renamedelete
        self._commitinfo = commitinfo

        message: a message about the merge
        """
        # if the file already existed, we need to delete it's old
        # entry form _actionmapping too
        if filename in self._filemapping:
            # TODO: this is inefficient
            a, d, m = self._filemapping[filename]
            self._actionmapping[a].remove((filename, d, m))

        self._filemapping[filename] = (action, data, message)
        self._actionmapping[action].append((filename, data, message))

    def removefile(self, filename):
        """ removes a file from the mergeresult object as the file might
        not merging anymore """
        action, data, message = self._filemapping[filename]
        del self._filemapping[filename]
        # TODO: this is inefficient
        self._actionmapping[action].remove((filename, data, message))

    def getactions(self, actions):
        """ get list of files which are marked with these actions

        Returns a list of tuple of form (filename, data, message)
        """
        res = []
        for a in actions:
            res.extend(self._actionmapping[a])
        return res

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

    @property
    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 """
        return self._actionmapping

    def setactions(self, actions):
        self._filemapping = actions
        self._actionmapping = collections.defaultdict(list)
        for f, (act, data, msg) in pycompat.iteritems(self._filemapping):
            self._actionmapping[act].append((f, data, msg))

    def updateactions(self, updates):
        for f, (a, data, msg) in pycompat.iteritems(updates):
            self.addfile(f, a, data, msg)

45299:e98f7c5babd7

                 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
        actionmapping: dict of action names as keys and values are dict of
                       filename as key and related data as values
        """
        self._filemapping = {}
        self._diverge = {}
        self._renamedelete = {}
        self._commitinfo = {}
        self._actionmapping = collections.defaultdict(dict)

    def updatevalues(self, diverge, renamedelete, commitinfo):
        self._diverge = diverge
        self._renamedelete = renamedelete
        self._commitinfo = commitinfo

        message: a message about the merge
        """
        # if the file already existed, we need to delete it's old
        # entry form _actionmapping too
        if filename in self._filemapping:
            a, d, m = self._filemapping[filename]
            del self._actionmapping[a][filename]

        self._filemapping[filename] = (action, data, message)
        self._actionmapping[action][filename] = (data, message)

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

    def getactions(self, actions):
        """ get list of files which are marked with these actions

        Returns a list of tuple of form (filename, data, message)
        """
        res = []
        for a in actions:
            for f, (args, msg) in pycompat.iteritems(self._actionmapping[a]):
                res.append((f, args, msg))
        return res

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

    @property
    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 """
        res = emptyactions()
        for a, d in pycompat.iteritems(self._actionmapping):
            for f, (args, msg) in pycompat.iteritems(d):
                res[a].append((f, args, msg))
        return res

    def setactions(self, actions):
        self._filemapping = actions
        self._actionmapping = collections.defaultdict(dict)
        for f, (act, data, msg) in pycompat.iteritems(self._filemapping):
            self._actionmapping[act][f] = data, msg

    def updateactions(self, updates):
        for f, (a, data, msg) in pycompat.iteritems(updates):
            self.addfile(f, a, data, msg)