Mercurial > public > mercurial-scm > hg
diff mercurial/localrepo.py @ 38239:ead71b15efd5
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Wed, 06 Jun 2018 13:31:24 -0400 |
| parents | 2b8cb0ab231c 8c828beb7543 |
| children | aa21a9ad46ea |
line wrap: on
line diff
--- 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):