changeset 35217 | d210723b73e5 |
parent 35196 | 66ecde8a704d |
child 35218 | 1b758105b5c7 |
--- 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)