Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 35217:d210723b73e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lock: use configint for 'ui.timeout' config The ui object can do the conversion itself.
author Boris Feld <boris.feld@octobus.net>
date Wed, 29 Nov 2017 21:00:02 -0500
parents 66ecde8a704d
children 1b758105b5c7
line wrap: on
line diff
--- a/mercurial/localrepo.py	Mon Dec 04 09:39:37 2017 +0100
+++ b/mercurial/localrepo.py	Wed Nov 29 21:00:02 2017 -0500
@@ -1611,7 +1611,7 @@
                              (desc, inst.locker))
             # default to 600 seconds timeout
             l = lockmod.lock(vfs, lockname,
-                             int(self.ui.config("ui", "timeout")),
+                             self.ui.configint("ui", "timeout"),
                              releasefn=releasefn, acquirefn=acquirefn,
                              desc=desc)
             self.ui.warn(_("got lock after %s seconds\n") % l.delay)