mercurial/merge.py
changeset 38732 be4984261611
parent 38498 d4be8ea8f22d
child 38757 d49e490a9e85
equal deleted inserted replaced
38731:ef3838a47503 38732:be4984261611
  1635             wctx[f].audit()
  1635             wctx[f].audit()
  1636             wctx[f].write(wctx.filectx(f0).data(), wctx.filectx(f0).flags())
  1636             wctx[f].write(wctx.filectx(f0).data(), wctx.filectx(f0).flags())
  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])
  1646 
  1649 
  1647     if [a for a in actions[ACTION_GET] if a[0] == '.hgsubstate']:
  1650     if [a for a in actions[ACTION_GET] if a[0] == '.hgsubstate']: