diff mercurial/localrepo.py @ 38239:ead71b15efd5

merge with stable

--- a/mercurial/localrepo.py	Sat May 26 03:01:14 2018 +0530
+++ b/mercurial/localrepo.py	Wed Jun 06 13:31:24 2018 -0400
@@ -1693,12 +1693,15 @@
         if wait:
             timeout = self.ui.configint("ui", "timeout")
             warntimeout = self.ui.configint("ui", "timeout.warn")
+        # internal config: ui.signal-safe-lock
+        signalsafe = self.ui.configbool('ui', 'signal-safe-lock')
 
         l = lockmod.trylock(self.ui, vfs, lockname, timeout, warntimeout,
                             releasefn=releasefn,
                             acquirefn=acquirefn, desc=desc,
                             inheritchecker=inheritchecker,
-                            parentlock=parentlock)
+                            parentlock=parentlock,
+                            signalsafe=signalsafe)
         return l
 
     def _afterlock(self, callback):