| indygreg |
| hg-reviewers |
Before this patch, we have good number of instances of following types:
for f, (m, args, msg) in mresult.actions:
if m == ACTION_X:
do_somethingWe iterate over the whole list and then filter for a certain action. Previous
patch introduced a action based mapping in mergeresult object. The above code
now looks like:
for f, args, msg in mresult.getactions([ACTION_X, ...]):
do_something| 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 (170 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 |
| def collectconflicts(conflicts, config): | def collectconflicts(conflicts, config): | ||||
| if config == b'abort': | if config == b'abort': | ||||
| abortconflicts.update(conflicts) | abortconflicts.update(conflicts) | ||||
| elif config == b'warn': | elif config == b'warn': | ||||
| warnconflicts.update(conflicts) | warnconflicts.update(conflicts) | ||||
| checkunknowndirs = _unknowndirschecker() | checkunknowndirs = _unknowndirschecker() | ||||
| for f, (m, args, msg) in pycompat.iteritems(mresult.actions): | for f, args, msg in mresult.getactions( | ||||
| if m in ( | [ | ||||
| mergestatemod.ACTION_CREATED, | mergestatemod.ACTION_CREATED, | ||||
| mergestatemod.ACTION_DELETED_CHANGED, | mergestatemod.ACTION_DELETED_CHANGED, | ||||
| ] | |||||
| ): | ): | ||||
| if _checkunknownfile(repo, wctx, mctx, f): | if _checkunknownfile(repo, wctx, mctx, f): | ||||
| fileconflicts.add(f) | fileconflicts.add(f) | ||||
| elif pathconfig and f not in wctx: | elif pathconfig and f not in wctx: | ||||
| path = checkunknowndirs(repo, wctx, f) | path = checkunknowndirs(repo, wctx, f) | ||||
| if path is not None: | if path is not None: | ||||
| pathconflicts.add(path) | pathconflicts.add(path) | ||||
| elif m == mergestatemod.ACTION_LOCAL_DIR_RENAME_GET: | for f, args, msg in mresult.getactions( | ||||
| [mergestatemod.ACTION_LOCAL_DIR_RENAME_GET] | |||||
| ): | |||||
| if _checkunknownfile(repo, wctx, mctx, f, args[0]): | if _checkunknownfile(repo, wctx, mctx, f, args[0]): | ||||
| fileconflicts.add(f) | fileconflicts.add(f) | ||||
| allconflicts = fileconflicts | pathconflicts | allconflicts = fileconflicts | pathconflicts | ||||
| ignoredconflicts = {c for c in allconflicts if repo.dirstate._ignore(c)} | ignoredconflicts = {c for c in allconflicts if repo.dirstate._ignore(c)} | ||||
| unknownconflicts = allconflicts - ignoredconflicts | unknownconflicts = allconflicts - ignoredconflicts | ||||
| collectconflicts(ignoredconflicts, ignoredconfig) | collectconflicts(ignoredconflicts, ignoredconfig) | ||||
| collectconflicts(unknownconflicts, unknownconfig) | collectconflicts(unknownconflicts, unknownconfig) | ||||
| else: | else: | ||||
| for f, (m, args, msg) in pycompat.iteritems(mresult.actions): | for f, args, msg in mresult.getactions( | ||||
| if m == mergestatemod.ACTION_CREATED_MERGE: | [mergestatemod.ACTION_CREATED_MERGE] | ||||
| ): | |||||
| fl2, anc = args | fl2, anc = args | ||||
| different = _checkunknownfile(repo, wctx, mctx, f) | different = _checkunknownfile(repo, wctx, mctx, f) | ||||
| if repo.dirstate._ignore(f): | if repo.dirstate._ignore(f): | ||||
| config = ignoredconfig | config = ignoredconfig | ||||
| else: | else: | ||||
| config = unknownconfig | config = unknownconfig | ||||
| # The behavior when force is True is described by this table: | # The behavior when force is True is described by this table: | ||||
| # config different mergeforce | action backup | # config different mergeforce | action backup | ||||
| # * n * | get n | # * n * | get n | ||||
| # * y y | merge - | # * y y | merge - | ||||
| # abort y n | merge - (1) | # abort y n | merge - (1) | ||||
| # warn y n | warn + get y | # warn y n | warn + get y | ||||
| # ignore y n | get y | # ignore y n | get y | ||||
| # | # | ||||
| # (1) this is probably the wrong behavior here -- we should | # (1) this is probably the wrong behavior here -- we should | ||||
| # probably abort, but some actions like rebases currently | # probably abort, but some actions like rebases currently | ||||
| # don't like an abort happening in the middle of | # don't like an abort happening in the middle of | ||||
| # merge.update. | # merge.update. | ||||
| if not different: | if not different: | ||||
| mresult.addfile( | mresult.addfile( | ||||
| f, | f, | ||||
| mergestatemod.ACTION_GET, | mergestatemod.ACTION_GET, | ||||
| (fl2, False), | (fl2, False), | ||||
| b'remote created', | b'remote created', | ||||
| ) | ) | ||||
| elif mergeforce or config == b'abort': | elif mergeforce or config == b'abort': | ||||
| mresult.addfile( | mresult.addfile( | ||||
| f, | f, | ||||
| mergestatemod.ACTION_MERGE, | mergestatemod.ACTION_MERGE, | ||||
| (f, f, None, False, anc), | (f, f, None, False, anc), | ||||
| b'remote differs from untracked local', | b'remote differs from untracked local', | ||||
| ) | ) | ||||
| elif config == b'abort': | elif config == b'abort': | ||||
| abortconflicts.add(f) | abortconflicts.add(f) | ||||
| else: | else: | ||||
| if config == b'warn': | if config == b'warn': | ||||
| warnconflicts.add(f) | warnconflicts.add(f) | ||||
| mresult.addfile( | mresult.addfile( | ||||
| f, | f, mergestatemod.ACTION_GET, (fl2, True), b'remote created', | ||||
| mergestatemod.ACTION_GET, | |||||
| (fl2, True), | |||||
| b'remote created', | |||||
| ) | ) | ||||
| for f in sorted(abortconflicts): | for f in sorted(abortconflicts): | ||||
| warn = repo.ui.warn | warn = repo.ui.warn | ||||
| if f in pathconflicts: | if f in pathconflicts: | ||||
| if repo.wvfs.isfileorlink(f): | if repo.wvfs.isfileorlink(f): | ||||
| warn(_(b"%s: untracked file conflicts with directory\n") % f) | warn(_(b"%s: untracked file conflicts with directory\n") % f) | ||||
| else: | else: | ||||
| warn(_(b"%s: untracked directory conflicts with file\n") % f) | warn(_(b"%s: untracked directory conflicts with file\n") % f) | ||||
| else: | else: | ||||
| warn(_(b"%s: untracked file differs\n") % f) | warn(_(b"%s: untracked file differs\n") % f) | ||||
| if abortconflicts: | if abortconflicts: | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _( | _( | ||||
| b"untracked files in working directory " | b"untracked files in working directory " | ||||
| b"differ from files in requested revision" | b"differ from files in requested revision" | ||||
| ) | ) | ||||
| ) | ) | ||||
| for f in sorted(warnconflicts): | for f in sorted(warnconflicts): | ||||
| if repo.wvfs.isfileorlink(f): | if repo.wvfs.isfileorlink(f): | ||||
| repo.ui.warn(_(b"%s: replacing untracked file\n") % f) | repo.ui.warn(_(b"%s: replacing untracked file\n") % f) | ||||
| else: | else: | ||||
| repo.ui.warn(_(b"%s: replacing untracked files in directory\n") % f) | repo.ui.warn(_(b"%s: replacing untracked files in directory\n") % f) | ||||
| for f, (m, args, msg) in pycompat.iteritems(mresult.actions): | for f, args, msg in mresult.getactions([mergestatemod.ACTION_CREATED]): | ||||
| if m == mergestatemod.ACTION_CREATED: | |||||
| backup = ( | backup = ( | ||||
| 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): | ||||
| """ | """ | ||||
| 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, | ||||
| def updateactions(self, updates): | def updateactions(self, updates): | ||||
| for f, (a, data, msg) in pycompat.iteritems(updates): | for f, (a, data, msg) in pycompat.iteritems(updates): | ||||
| self.addfile(f, a, data, msg) | 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 a in self._actionmapping.keys(): | ||||
| if m not in ( | if ( | ||||
| a | |||||
| 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, | ||||
| ) | |||||
| and self._actionmapping[a] | |||||
| ): | ): | ||||
| return True | return True | ||||
| return False | return False | ||||
| def manifestmerge( | def manifestmerge( | ||||
| repo, | repo, | ||||
| return mresult | return mresult | ||||
| def _resolvetrivial(repo, wctx, mctx, ancestor, mresult): | def _resolvetrivial(repo, wctx, mctx, ancestor, mresult): | ||||
| """Resolves false conflicts where the nodeid changed but the content | """Resolves false conflicts where the nodeid changed but the content | ||||
| remained the same.""" | remained the same.""" | ||||
| # We force a copy of actions.items() because we're going to mutate | # We force a copy of actions.items() because we're going to mutate | ||||
| # actions as we resolve trivial conflicts. | # actions as we resolve trivial conflicts. | ||||
| for f, (m, args, msg) in list(mresult.actions.items()): | for f, args, msg in mresult.getactions( | ||||
| if ( | [mergestatemod.ACTION_CHANGED_DELETED] | ||||
| m == mergestatemod.ACTION_CHANGED_DELETED | |||||
| and f in ancestor | |||||
| and not wctx[f].cmp(ancestor[f]) | |||||
| ): | ): | ||||
| if f in ancestor and not wctx[f].cmp(ancestor[f]): | |||||
| # local did change but ended up with same content | # local did change but ended up with same content | ||||
| mresult.addfile( | mresult.addfile( | ||||
| f, mergestatemod.ACTION_REMOVE, None, b'prompt same' | f, mergestatemod.ACTION_REMOVE, None, b'prompt same' | ||||
| ) | ) | ||||
| elif ( | |||||
| m == mergestatemod.ACTION_DELETED_CHANGED | for f, args, msg in list( | ||||
| and f in ancestor | mresult.getactions([mergestatemod.ACTION_DELETED_CHANGED]) | ||||
| and not mctx[f].cmp(ancestor[f]) | |||||
| ): | ): | ||||
| if f in ancestor and not mctx[f].cmp(ancestor[f]): | |||||
| # remote did change but ended up with same content | # remote did change but ended up with same content | ||||
| mresult.removefile(f) # don't get = keep local deleted | mresult.removefile(f) # don't get = keep local deleted | ||||
| def calculateupdates( | def calculateupdates( | ||||
| repo, | repo, | ||||
| wctx, | wctx, | ||||
| mctx, | mctx, | ||||