Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 51558:0239ebdd0740

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge stable into default
author Rapha?l Gom?s <rgomes@octobus.net>
date Fri, 15 Mar 2024 10:52:51 +0100
parents 79a7616a82b8 9da3fcc5f70f
children 4a8bb136ee77
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sun Mar 10 03:29:12 2024 +0100
+++ b/mercurial/localrepo.py	Fri Mar 15 10:52:51 2024 +0100
@@ -3072,6 +3072,9 @@
             warntimeout = self.ui.configint(b"ui", b"timeout.warn")
         # internal config: ui.signal-safe-lock
         signalsafe = self.ui.configbool(b'ui', b'signal-safe-lock')
+        sync_file = self.ui.config(b'devel', b'lock-wait-sync-file')
+        if not sync_file:
+            sync_file = None
 
         l = lockmod.trylock(
             self.ui,
@@ -3083,6 +3086,7 @@
             acquirefn=acquirefn,
             desc=desc,
             signalsafe=signalsafe,
+            devel_wait_sync_file=sync_file,
         )
         return l