| indygreg |
| hg-reviewers |
Instead of returning a dict of actions and then updating it, let's pass the
object directly and update it there.
This makes updateactions() on mergeresult unused and this patch removes that.
After this patch, we have couple of methods left on mergeresult class which
still exposes the internal dict based action storage.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| f in fileconflicts | f in fileconflicts | ||||
| or f in pathconflicts | or f in pathconflicts | ||||
| or any(p in pathconflicts for p in pathutil.finddirs(f)) | or any(p in pathconflicts for p in pathutil.finddirs(f)) | ||||
| ) | ) | ||||
| (flags,) = args | (flags,) = args | ||||
| mresult.addfile(f, mergestatemod.ACTION_GET, (flags, backup), msg) | mresult.addfile(f, mergestatemod.ACTION_GET, (flags, backup), msg) | ||||
| def _forgetremoved(wctx, mctx, branchmerge): | def _forgetremoved(wctx, mctx, branchmerge, mresult): | ||||
| """ | """ | ||||
| Forget removed files | Forget removed files | ||||
| If we're jumping between revisions (as opposed to merging), and if | If we're jumping between revisions (as opposed to merging), and if | ||||
| neither the working directory nor the target rev has the file, | neither the working directory nor the target rev has the file, | ||||
| then we need to remove it from the dirstate, to prevent the | then we need to remove it from the dirstate, to prevent the | ||||
| dirstate from listing the file when it is no longer in the | dirstate from listing the file when it is no longer in the | ||||
| manifest. | manifest. | ||||
| If we're merging, and the other revision has removed a file | If we're merging, and the other revision has removed a file | ||||
| that is not present in the working directory, we need to mark it | that is not present in the working directory, we need to mark it | ||||
| as removed. | as removed. | ||||
| """ | """ | ||||
| actions = {} | |||||
| m = mergestatemod.ACTION_FORGET | m = mergestatemod.ACTION_FORGET | ||||
| if branchmerge: | if branchmerge: | ||||
| m = mergestatemod.ACTION_REMOVE | m = mergestatemod.ACTION_REMOVE | ||||
| for f in wctx.deleted(): | for f in wctx.deleted(): | ||||
| if f not in mctx: | if f not in mctx: | ||||
| actions[f] = m, None, b"forget deleted" | mresult.addfile(f, m, None, b"forget deleted") | ||||
| if not branchmerge: | if not branchmerge: | ||||
| for f in wctx.removed(): | for f in wctx.removed(): | ||||
| if f not in mctx: | if f not in mctx: | ||||
| actions[f] = ( | mresult.addfile( | ||||
| mergestatemod.ACTION_FORGET, | f, mergestatemod.ACTION_FORGET, None, b"forget removed", | ||||
| None, | |||||
| b"forget removed", | |||||
| ) | ) | ||||
| return actions | |||||
| def _checkcollision(repo, wmf, mresult): | def _checkcollision(repo, wmf, mresult): | ||||
| """ | """ | ||||
| Check for case-folding collisions. | Check for case-folding collisions. | ||||
| """ | """ | ||||
| # If the repo is narrowed, filter out files outside the narrowspec. | # If the repo is narrowed, filter out files outside the narrowspec. | ||||
| narrowmatch = repo.narrowmatch() | narrowmatch = repo.narrowmatch() | ||||
| if not narrowmatch.always(): | if not narrowmatch.always(): | ||||
| return res | return res | ||||
| def setactions(self, actions): | def setactions(self, actions): | ||||
| self._filemapping = actions | self._filemapping = actions | ||||
| self._actionmapping = collections.defaultdict(dict) | self._actionmapping = collections.defaultdict(dict) | ||||
| for f, (act, data, msg) in pycompat.iteritems(self._filemapping): | for f, (act, data, msg) in pycompat.iteritems(self._filemapping): | ||||
| self._actionmapping[act][f] = data, msg | 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) | |||||
| 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 a in self._actionmapping.keys(): | for a in self._actionmapping.keys(): | ||||
| if ( | if ( | ||||
| a | a | ||||
| not in ( | not in ( | ||||
| mergestatemod.ACTION_GET, | mergestatemod.ACTION_GET, | ||||
| ) | ) | ||||
| mresult.addfile(f, *l[0]) | mresult.addfile(f, *l[0]) | ||||
| continue | continue | ||||
| repo.ui.note(_(b'end of auction\n\n')) | repo.ui.note(_(b'end of auction\n\n')) | ||||
| # TODO: think about commitinfo when bid merge is used | # TODO: think about commitinfo when bid merge is used | ||||
| mresult.updatevalues(diverge, renamedelete, {}) | mresult.updatevalues(diverge, renamedelete, {}) | ||||
| if wctx.rev() is None: | if wctx.rev() is None: | ||||
| fractions = _forgetremoved(wctx, mctx, branchmerge) | _forgetremoved(wctx, mctx, branchmerge, mresult) | ||||
| mresult.updateactions(fractions) | |||||
| sparse.filterupdatesactions(repo, wctx, mctx, branchmerge, mresult) | sparse.filterupdatesactions(repo, wctx, mctx, branchmerge, mresult) | ||||
| _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult) | _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult) | ||||
| return mresult | return mresult | ||||
| def _getcwd(): | def _getcwd(): | ||||