| indygreg |
| hg-reviewers |
This is done because we will be introducing another dict which introduces the
same information but with action name as key.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/merge.py (18 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 |
| class mergeresult(object): | class mergeresult(object): | ||||
| ''''An object representing result of merging manifests. | ''''An object representing result of merging manifests. | ||||
| It has information about what actions need to be performed on dirstate | It has information about what actions need to be performed on dirstate | ||||
| mapping of divergent renames and other such cases. ''' | mapping of divergent renames and other such cases. ''' | ||||
| def __init__(self): | def __init__(self): | ||||
| """ | """ | ||||
| actions: 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 | ||||
| """ | """ | ||||
| self._actions = {} | self._filemapping = {} | ||||
| self._diverge = {} | self._diverge = {} | ||||
| self._renamedelete = {} | self._renamedelete = {} | ||||
| self._commitinfo = {} | self._commitinfo = {} | ||||
| 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 | ||||
| """ | """ | ||||
| self._actions[filename] = (action, data, message) | self._filemapping[filename] = (action, 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 """ | ||||
| del self._actions[filename] | del self._filemapping[filename] | ||||
| @property | @property | ||||
| def actions(self): | def actions(self): | ||||
| return self._actions | 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 | # Convert to dictionary-of-lists format | ||||
| actions = emptyactions() | actions = emptyactions() | ||||
| for f, (m, args, msg) in pycompat.iteritems(self._actions): | for f, (m, args, msg) in pycompat.iteritems(self._filemapping): | ||||
| if m not in actions: | if m not in actions: | ||||
| actions[m] = [] | actions[m] = [] | ||||
| actions[m].append((f, args, msg)) | actions[m].append((f, args, msg)) | ||||
| return actions | return actions | ||||
| def setactions(self, actions): | def setactions(self, actions): | ||||
| self._actions = actions | self._filemapping = actions | ||||
| def updateactions(self, updates): | def updateactions(self, updates): | ||||
| self._actions.update(updates) | self._filemapping.update(updates) | ||||
| 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._actions): | 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, | ||||
| mergestatemod.ACTION_EXEC, | mergestatemod.ACTION_EXEC, | ||||
| mergestatemod.ACTION_REMOVE, | mergestatemod.ACTION_REMOVE, | ||||
| mergestatemod.ACTION_PATH_CONFLICT_RESOLVE, | mergestatemod.ACTION_PATH_CONFLICT_RESOLVE, | ||||
| ): | ): | ||||
| return True | return True | ||||