##// END OF EJS Templates
merge: mark file gets as not thread safe (issue5933)...
Gregory Szorc -
r38755:be498426 default
parent child Browse files
Show More
@@ -623,6 +623,9 b" coreconfigitem('experimental', 'web.api."
623 coreconfigitem('experimental', 'web.api.debugreflect',
623 coreconfigitem('experimental', 'web.api.debugreflect',
624 default=False,
624 default=False,
625 )
625 )
626 coreconfigitem('experimental', 'worker.wdir-get-thread-safe',
627 default=False,
628 )
626 coreconfigitem('experimental', 'xdiff',
629 coreconfigitem('experimental', 'xdiff',
627 default=False,
630 default=False,
628 )
631 )
@@ -1637,9 +1637,12 b' def applyupdates(repo, actions, wctx, mc'
1637 wctx[f0].remove()
1637 wctx[f0].remove()
1638 progress.increment(item=f)
1638 progress.increment(item=f)
1639
1639
1640 # get in parallel
1640 # get in parallel.
1641 threadsafe = repo.ui.configbool('experimental',
1642 'worker.wdir-get-thread-safe')
1641 prog = worker.worker(repo.ui, cost, batchget, (repo, mctx, wctx),
1643 prog = worker.worker(repo.ui, cost, batchget, (repo, mctx, wctx),
1642 actions[ACTION_GET])
1644 actions[ACTION_GET],
1645 threadsafe=threadsafe)
1643 for i, item in prog:
1646 for i, item in prog:
1644 progress.increment(step=i, item=item)
1647 progress.increment(step=i, item=item)
1645 updated = len(actions[ACTION_GET])
1648 updated = len(actions[ACTION_GET])
General Comments 0
You need to be logged in to leave comments. Login now