##// END OF EJS Templates
merge: don't use workers in in-memory mode...
Phil Cohen -
r34787:9c899660 default
parent child Browse files
Show More
@@ -1427,8 +1427,12 b' def applyupdates(repo, actions, wctx, mc'
1427 1427 z += 1
1428 1428 progress(_updating, z, item=f, total=numupdates, unit=_files)
1429 1429
1430 # When merging in-memory, we can't support worker processes, so set the
1431 # per-item cost at 0 in that case.
1432 cost = 0 if wctx.isinmemory() else 0.001
1433
1430 1434 # remove in parallel (must come before resolving path conflicts and getting)
1431 prog = worker.worker(repo.ui, 0.001, batchremove, (repo, wctx),
1435 prog = worker.worker(repo.ui, cost, batchremove, (repo, wctx),
1432 1436 actions['r'])
1433 1437 for i, item in prog:
1434 1438 z += i
@@ -1452,7 +1456,7 b' def applyupdates(repo, actions, wctx, mc'
1452 1456 wctx.flushall()
1453 1457
1454 1458 # get in parallel
1455 prog = worker.worker(repo.ui, 0.001, batchget, (repo, mctx, wctx),
1459 prog = worker.worker(repo.ui, cost, batchget, (repo, mctx, wctx),
1456 1460 actions['g'])
1457 1461 for i, item in prog:
1458 1462 z += i
General Comments 0
You need to be logged in to leave comments. Login now