diff -r 1b758105b5c7 -r 9153871d50e0 mercurial/localrepo.py --- a/mercurial/localrepo.py Wed Nov 29 20:36:29 2017 -0500 +++ b/mercurial/localrepo.py Wed Nov 29 20:39:59 2017 -0500 @@ -1594,10 +1594,12 @@ parentlock = encoding.environ.get(parentenvvar) timeout = 0 + warntimeout = 0 if wait: timeout = self.ui.configint("ui", "timeout") + warntimeout = self.ui.configint("ui", "timeout.warn") - l = lockmod.trylock(self.ui, vfs, lockname, timeout, + l = lockmod.trylock(self.ui, vfs, lockname, timeout, warntimeout, releasefn=releasefn, acquirefn=acquirefn, desc=desc, inheritchecker=inheritchecker,