From patchwork Thu Jul 19 12:19:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D3963: merge: mark file gets as not thread safe From: phabricator X-Patchwork-Id: 32913 Message-Id: <8e4e6635e7df1379a6fd5ed1e87db59f@localhost.localdomain> To: mercurial-devel@mercurial-scm.org Date: Thu, 19 Jul 2018 12:19:00 +0000 This revision was automatically updated to reflect the committed changes. Closed by commit rHGbe4984261611: merge: mark file gets as not thread safe (issue5933) (authored by indygreg, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3963?vs=9624&id=9631#toc REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3963?vs=9624&id=9631 REVISION DETAIL https://phab.mercurial-scm.org/D3963 AFFECTED FILES mercurial/configitems.py mercurial/merge.py CHANGE DETAILS To: indygreg, #hg-reviewers, lothiraldan Cc: lothiraldan, yuja, wlis, mercurial-devel diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -1637,9 +1637,12 @@ wctx[f0].remove() progress.increment(item=f) - # get in parallel + # get in parallel. + threadsafe = repo.ui.configbool('experimental', + 'worker.wdir-get-thread-safe') prog = worker.worker(repo.ui, cost, batchget, (repo, mctx, wctx), - actions[ACTION_GET]) + actions[ACTION_GET], + threadsafe=threadsafe) for i, item in prog: progress.increment(step=i, item=item) updated = len(actions[ACTION_GET]) diff --git a/mercurial/configitems.py b/mercurial/configitems.py --- a/mercurial/configitems.py +++ b/mercurial/configitems.py @@ -623,6 +623,9 @@ coreconfigitem('experimental', 'web.api.debugreflect', default=False, ) +coreconfigitem('experimental', 'worker.wdir-get-thread-safe', + default=False, +) coreconfigitem('experimental', 'xdiff', default=False, )