| indygreg |
| hg-reviewers |
We now pass the mergeresult object and hence there is no need to have a separate
commitinfo argument as the required info is present in mergeresult object.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| self.updatedcount | self.updatedcount | ||||
| or self.mergedcount | or self.mergedcount | ||||
| or self.removedcount | or self.removedcount | ||||
| or self.unresolvedcount | or self.unresolvedcount | ||||
| ) | ) | ||||
| def applyupdates( | def applyupdates( | ||||
| repo, | repo, mresult, wctx, mctx, overwrite, wantfiledata, labels=None, | ||||
| mresult, | |||||
| wctx, | |||||
| mctx, | |||||
| overwrite, | |||||
| wantfiledata, | |||||
| labels=None, | |||||
| commitinfo=None, | |||||
| ): | ): | ||||
| """apply the merge action list to the working directory | """apply the merge action list to the working directory | ||||
| mresult is a mergeresult object representing result of the merge | mresult is a mergeresult object representing result of the merge | ||||
| wctx is the working copy context | wctx is the working copy context | ||||
| mctx is the context to be merged into the working copy | mctx is the context to be merged into the working copy | ||||
| commitinfo is a mapping of information which needs to be stored somewhere | |||||
| (probably mergestate) so that it can be used at commit time. | |||||
| Return a tuple of (counts, filedata), where counts is a tuple | Return a tuple of (counts, filedata), where counts is a tuple | ||||
| (updated, merged, removed, unresolved) that describes how many | (updated, merged, removed, unresolved) that describes how many | ||||
| files were affected by the update, and filedata is as described in | files were affected by the update, and filedata is as described in | ||||
| batchget. | batchget. | ||||
| """ | """ | ||||
| _prefetchfiles(repo, mctx, mresult) | _prefetchfiles(repo, mctx, mresult) | ||||
| updated, merged, removed = 0, 0, 0 | updated, merged, removed = 0, 0, 0 | ||||
| ms = mergestatemod.mergestate.clean( | ms = mergestatemod.mergestate.clean( | ||||
| repo, wctx.p1().node(), mctx.node(), labels | repo, wctx.p1().node(), mctx.node(), labels | ||||
| ) | ) | ||||
| if commitinfo is None: | for f, op in pycompat.iteritems(mresult.commitinfo): | ||||
| commitinfo = {} | |||||
| for f, op in pycompat.iteritems(commitinfo): | |||||
| # the other side of filenode was choosen while merging, store this in | # the other side of filenode was choosen while merging, store this in | ||||
| # mergestate so that it can be reused on commit | # mergestate so that it can be reused on commit | ||||
| if op == b'other': | if op == b'other': | ||||
| ms.addmergedother(f) | ms.addmergedother(f) | ||||
| moves = [] | moves = [] | ||||
| # 'cd' and 'dc' actions are treated like other merge conflicts | # 'cd' and 'dc' actions are treated like other merge conflicts | ||||
| repo.vfs.write(b'updatestate', p2.hex()) | repo.vfs.write(b'updatestate', p2.hex()) | ||||
| _advertisefsmonitor( | _advertisefsmonitor( | ||||
| repo, mresult.len((mergestatemod.ACTION_GET,)), p1.node() | repo, mresult.len((mergestatemod.ACTION_GET,)), p1.node() | ||||
| ) | ) | ||||
| wantfiledata = updatedirstate and not branchmerge | wantfiledata = updatedirstate and not branchmerge | ||||
| stats, getfiledata = applyupdates( | stats, getfiledata = applyupdates( | ||||
| repo, | repo, mresult, wc, p2, overwrite, wantfiledata, labels=labels, | ||||
| mresult, | |||||
| wc, | |||||
| p2, | |||||
| overwrite, | |||||
| wantfiledata, | |||||
| labels=labels, | |||||
| commitinfo=mresult.commitinfo, | |||||
| ) | ) | ||||
| if updatedirstate: | if updatedirstate: | ||||
| with repo.dirstate.parentchange(): | with repo.dirstate.parentchange(): | ||||
| repo.setparents(fp1, fp2) | repo.setparents(fp1, fp2) | ||||
| mergestatemod.recordupdates( | mergestatemod.recordupdates( | ||||
| repo, mresult.actionsdict, branchmerge, getfiledata | repo, mresult.actionsdict, branchmerge, getfiledata | ||||
| ) | ) | ||||