[Updated] D8665: merge: don't grab wlock when merging in memory

[martinvonz (Martin von Zweigbergk)]

Closed by commit rHGd1471dbbdd63: merge: don't grab wlock when merging in memory (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8665?vs=21712&id=21715

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8665/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8665

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1572,7 +1572,11 @@
                     ),
                 )
             )
-    with repo.wlock():
+    if wc is not None and wc.isinmemory():
+        maybe_wlock = util.nullcontextmanager()
+    else:
+        maybe_wlock = repo.wlock()
+    with maybe_wlock:
         if wc is None:
             wc = repo[None]
         pl = wc.parents()



To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200625/42a98e34/attachment-0002.html>