| indygreg |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| yield False, (i, f) | yield False, (i, f) | ||||
| i = 0 | i = 0 | ||||
| i += 1 | i += 1 | ||||
| if i > 0: | if i > 0: | ||||
| yield False, (i, f) | yield False, (i, f) | ||||
| yield True, filedata | yield True, filedata | ||||
| def _prefetchfiles(repo, ctx, actions): | def _prefetchfiles(repo, ctx, mresult): | ||||
| """Invoke ``scmutil.prefetchfiles()`` for the files relevant to the dict | """Invoke ``scmutil.prefetchfiles()`` for the files relevant to the dict | ||||
| of merge actions. ``ctx`` is the context being merged in.""" | of merge actions. ``ctx`` is the context being merged in.""" | ||||
| # Skipping 'a', 'am', 'f', 'r', 'dm', 'e', 'k', 'p' and 'pr', because they | # Skipping 'a', 'am', 'f', 'r', 'dm', 'e', 'k', 'p' and 'pr', because they | ||||
| # don't touch the context to be merged in. 'cd' is skipped, because | # don't touch the context to be merged in. 'cd' is skipped, because | ||||
| # changed/deleted never resolves to something from the remote side. | # changed/deleted never resolves to something from the remote side. | ||||
| oplist = [ | files = [] | ||||
| actions[a] | for f, args, msg in mresult.getactions( | ||||
| for a in ( | [ | ||||
| mergestatemod.ACTION_GET, | mergestatemod.ACTION_GET, | ||||
| mergestatemod.ACTION_DELETED_CHANGED, | mergestatemod.ACTION_DELETED_CHANGED, | ||||
| mergestatemod.ACTION_LOCAL_DIR_RENAME_GET, | mergestatemod.ACTION_LOCAL_DIR_RENAME_GET, | ||||
| mergestatemod.ACTION_MERGE, | mergestatemod.ACTION_MERGE, | ||||
| ) | |||||
| ] | ] | ||||
| ): | |||||
| files.append(f) | |||||
| prefetch = scmutil.prefetchfiles | prefetch = scmutil.prefetchfiles | ||||
| matchfiles = scmutil.matchfiles | matchfiles = scmutil.matchfiles | ||||
| prefetch( | prefetch( | ||||
| repo, | repo, [(ctx.rev(), matchfiles(repo, files),)], | ||||
| [ | |||||
| ( | |||||
| ctx.rev(), | |||||
| matchfiles( | |||||
| repo, [f for sublist in oplist for f, args, msg in sublist] | |||||
| ), | |||||
| ) | |||||
| ], | |||||
| ) | ) | ||||
| @attr.s(frozen=True) | @attr.s(frozen=True) | ||||
| class updateresult(object): | class updateresult(object): | ||||
| updatedcount = attr.ib() | updatedcount = attr.ib() | ||||
| mergedcount = attr.ib() | mergedcount = attr.ib() | ||||
| removedcount = attr.ib() | removedcount = attr.ib() | ||||
| 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. | ||||
| """ | """ | ||||
| actions = mresult.actionsdict | actions = mresult.actionsdict | ||||
| _prefetchfiles(repo, mctx, actions) | _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: | if commitinfo is None: | ||||
| commitinfo = {} | commitinfo = {} | ||||