| indygreg |
| hg-reviewers |
Good number of places in code, we iterate over the actions dict which has
filename as keys and filter based on the action.
This patch introduced another mapping which has action as key. This will help in
refactoring the code much more in upcoming patch.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
I don't like having to store some metadata redundantly in 2 dicts. I'm approving this for now under the assumption that future commits will refactor this, as the commit message and an inline comment implies.
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/merge.py (40 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit |
| # merge.py - directory-level update/merge handling for Mercurial | # merge.py - directory-level update/merge handling for Mercurial | ||||
| # | # | ||||
| # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com> | # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com> | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| import collections | |||||
| import errno | import errno | ||||
| import stat | import stat | ||||
| import struct | import struct | ||||
| from .i18n import _ | from .i18n import _ | ||||
| from .node import ( | from .node import ( | ||||
| addednodeid, | addednodeid, | ||||
| modifiednodeid, | modifiednodeid, | ||||
| """ | """ | ||||
| filemapping: dict of filename as keys and action related info as values | filemapping: dict of filename as keys and action related info as values | ||||
| diverge: mapping of source name -> list of dest name for | diverge: mapping of source name -> list of dest name for | ||||
| divergent renames | divergent renames | ||||
| renamedelete: mapping of source name -> list of destinations for files | renamedelete: mapping of source name -> list of destinations for files | ||||
| deleted on one side and renamed on other. | deleted on one side and renamed on other. | ||||
| commitinfo: dict containing data which should be used on commit | commitinfo: dict containing data which should be used on commit | ||||
| contains a filename -> info mapping | contains a filename -> info mapping | ||||
| actionmapping: dict of action names as keys and list of files and | |||||
| related data as values | |||||
| """ | """ | ||||
| self._filemapping = {} | self._filemapping = {} | ||||
| self._diverge = {} | self._diverge = {} | ||||
| self._renamedelete = {} | self._renamedelete = {} | ||||
| self._commitinfo = {} | self._commitinfo = {} | ||||
| self._actionmapping = collections.defaultdict(list) | |||||
| def updatevalues(self, diverge, renamedelete, commitinfo): | def updatevalues(self, diverge, renamedelete, commitinfo): | ||||
| self._diverge = diverge | self._diverge = diverge | ||||
| self._renamedelete = renamedelete | self._renamedelete = renamedelete | ||||
| self._commitinfo = commitinfo | self._commitinfo = commitinfo | ||||
| def addfile(self, filename, action, data, message): | def addfile(self, filename, action, data, message): | ||||
| """ adds a new file to the mergeresult object | """ adds a new file to the mergeresult object | ||||
| filename: file which we are adding | filename: file which we are adding | ||||
| action: one of mergestatemod.ACTION_* | action: one of mergestatemod.ACTION_* | ||||
| data: a tuple of information like fctx and ctx related to this merge | data: a tuple of information like fctx and ctx related to this merge | ||||
| message: a message about the merge | 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._filemapping[filename] = (action, data, message) | ||||
| self._actionmapping[action].append((filename, data, message)) | |||||
| def removefile(self, filename): | def removefile(self, filename): | ||||
| """ removes a file from the mergeresult object as the file might | """ removes a file from the mergeresult object as the file might | ||||
| not merging anymore """ | not merging anymore """ | ||||
| action, data, message = self._filemapping[filename] | |||||
| del 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 | @property | ||||
| def actions(self): | def actions(self): | ||||
| return self._filemapping | return self._filemapping | ||||
| @property | @property | ||||
| def diverge(self): | def diverge(self): | ||||
| return self._diverge | return self._diverge | ||||
| @property | @property | ||||
| def renamedelete(self): | def renamedelete(self): | ||||
| return self._renamedelete | return self._renamedelete | ||||
| @property | @property | ||||
| def commitinfo(self): | def commitinfo(self): | ||||
| return self._commitinfo | return self._commitinfo | ||||
| @property | @property | ||||
| def actionsdict(self): | def actionsdict(self): | ||||
| """ returns a dictionary of actions to be perfomed with action as key | """ returns a dictionary of actions to be perfomed with action as key | ||||
| and a list of files and related arguments as values """ | and a list of files and related arguments as values """ | ||||
| # Convert to dictionary-of-lists format | return self._actionmapping | ||||
| 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): | def setactions(self, actions): | ||||
| self._filemapping = 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): | def updateactions(self, updates): | ||||
| self._filemapping.update(updates) | for f, (a, data, msg) in pycompat.iteritems(updates): | ||||
| self.addfile(f, a, data, msg) | |||||
| def hasconflicts(self): | def hasconflicts(self): | ||||
| """ tells whether this merge resulted in some actions which can | """ tells whether this merge resulted in some actions which can | ||||
| result in conflicts or not """ | result in conflicts or not """ | ||||
| for _f, (m, _unused, _unused) in pycompat.iteritems(self._filemapping): | for _f, (m, _unused, _unused) in pycompat.iteritems(self._filemapping): | ||||
| if m not in ( | if m not in ( | ||||
| mergestatemod.ACTION_GET, | mergestatemod.ACTION_GET, | ||||
| mergestatemod.ACTION_KEEP, | mergestatemod.ACTION_KEEP, | ||||