| durin42 |
| hg-reviewers |
The worker processes can't share memory, so workers should not be used.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| s(_("the local file has been renamed to %s\n") % f1) | s(_("the local file has been renamed to %s\n") % f1) | ||||
| else: | else: | ||||
| s(_("the remote file has been renamed to %s\n") % f1) | s(_("the remote file has been renamed to %s\n") % f1) | ||||
| s(_("resolve manually then use 'hg resolve --mark %s'\n") % f) | s(_("resolve manually then use 'hg resolve --mark %s'\n") % f) | ||||
| ms.addpath(f, f1, fo) | ms.addpath(f, f1, fo) | ||||
| z += 1 | z += 1 | ||||
| progress(_updating, z, item=f, total=numupdates, unit=_files) | progress(_updating, z, item=f, total=numupdates, unit=_files) | ||||
| # When merging in-memory, we can't support worker processes, so set the | |||||
| # per-item cost at 0 in that case. | |||||
| cost = 0 if wctx.isinmemory() else 0.001 | |||||
| # remove in parallel (must come before resolving path conflicts and getting) | # remove in parallel (must come before resolving path conflicts and getting) | ||||
| prog = worker.worker(repo.ui, 0.001, batchremove, (repo, wctx), | prog = worker.worker(repo.ui, cost, batchremove, (repo, wctx), | ||||
| actions['r']) | actions['r']) | ||||
| for i, item in prog: | for i, item in prog: | ||||
| z += i | z += i | ||||
| progress(_updating, z, item=item, total=numupdates, unit=_files) | progress(_updating, z, item=item, total=numupdates, unit=_files) | ||||
| removed = len(actions['r']) | removed = len(actions['r']) | ||||
| # resolve path conflicts (must come before getting) | # resolve path conflicts (must come before getting) | ||||
| for f, args, msg in actions['pr']: | for f, args, msg in actions['pr']: | ||||
| repo.ui.debug(" %s: %s -> pr\n" % (f, msg)) | repo.ui.debug(" %s: %s -> pr\n" % (f, msg)) | ||||
| f0, = args | f0, = args | ||||
| if wctx[f0].lexists(): | if wctx[f0].lexists(): | ||||
| repo.ui.note(_("moving %s to %s\n") % (f0, f)) | repo.ui.note(_("moving %s to %s\n") % (f0, f)) | ||||
| wctx[f].audit() | wctx[f].audit() | ||||
| wctx[f].write(wctx.filectx(f0).data(), wctx.filectx(f0).flags()) | wctx[f].write(wctx.filectx(f0).data(), wctx.filectx(f0).flags()) | ||||
| wctx[f0].remove() | wctx[f0].remove() | ||||
| z += 1 | z += 1 | ||||
| progress(_updating, z, item=f, total=numupdates, unit=_files) | progress(_updating, z, item=f, total=numupdates, unit=_files) | ||||
| # We should flush before forking into worker processes, since those workers | # We should flush before forking into worker processes, since those workers | ||||
| # flush when they complete, and we don't want to duplicate work. | # flush when they complete, and we don't want to duplicate work. | ||||
| wctx.flushall() | wctx.flushall() | ||||
| # get in parallel | # get in parallel | ||||
| prog = worker.worker(repo.ui, 0.001, batchget, (repo, mctx, wctx), | prog = worker.worker(repo.ui, cost, batchget, (repo, mctx, wctx), | ||||
| actions['g']) | actions['g']) | ||||
| for i, item in prog: | for i, item in prog: | ||||
| z += i | z += i | ||||
| progress(_updating, z, item=item, total=numupdates, unit=_files) | progress(_updating, z, item=item, total=numupdates, unit=_files) | ||||
| updated = len(actions['g']) | updated = len(actions['g']) | ||||
| if [a for a in actions['g'] if a[0] == '.hgsubstate']: | if [a for a in actions['g'] if a[0] == '.hgsubstate']: | ||||
| subrepo.submerge(repo, wctx, mctx, wctx, overwrite, labels) | subrepo.submerge(repo, wctx, mctx, wctx, overwrite, labels) | ||||