# HG changeset patch # User Boris Feld # Date 1512007202 18000 # Node ID d210723b73e503f14d9c72b9310b95a7de5ed48f # Parent 278f1feee73a3190baba3f46770ca1c119e69167 lock: use configint for 'ui.timeout' config The ui object can do the conversion itself. diff -r 278f1feee73a -r d210723b73e5 hgext/journal.py --- a/hgext/journal.py Mon Dec 04 09:39:37 2017 +0100 +++ b/hgext/journal.py Wed Nov 29 21:00:02 2017 -0500 @@ -304,7 +304,7 @@ # default to 600 seconds timeout l = lock.lock( vfs, 'namejournal.lock', - int(self.ui.config("ui", "timeout")), desc=desc) + self.ui.configint("ui", "timeout"), desc=desc) self.ui.warn(_("got lock after %s seconds\n") % l.delay) self._lockref = weakref.ref(l) return l diff -r 278f1feee73a -r d210723b73e5 mercurial/localrepo.py --- 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)