##// END OF EJS Templates
lock: use configint for 'ui.timeout' config...
Boris Feld -
r35208:d210723b default
parent child Browse files
Show More
@@ -304,7 +304,7 b' class journalstorage(object):'
304 # default to 600 seconds timeout
304 # default to 600 seconds timeout
305 l = lock.lock(
305 l = lock.lock(
306 vfs, 'namejournal.lock',
306 vfs, 'namejournal.lock',
307 int(self.ui.config("ui", "timeout")), desc=desc)
307 self.ui.configint("ui", "timeout"), desc=desc)
308 self.ui.warn(_("got lock after %s seconds\n") % l.delay)
308 self.ui.warn(_("got lock after %s seconds\n") % l.delay)
309 self._lockref = weakref.ref(l)
309 self._lockref = weakref.ref(l)
310 return l
310 return l
@@ -1611,7 +1611,7 b' class localrepository(object):'
1611 (desc, inst.locker))
1611 (desc, inst.locker))
1612 # default to 600 seconds timeout
1612 # default to 600 seconds timeout
1613 l = lockmod.lock(vfs, lockname,
1613 l = lockmod.lock(vfs, lockname,
1614 int(self.ui.config("ui", "timeout")),
1614 self.ui.configint("ui", "timeout"),
1615 releasefn=releasefn, acquirefn=acquirefn,
1615 releasefn=releasefn, acquirefn=acquirefn,
1616 desc=desc)
1616 desc=desc)
1617 self.ui.warn(_("got lock after %s seconds\n") % l.delay)
1617 self.ui.warn(_("got lock after %s seconds\n") % l.delay)
General Comments 0
You need to be logged in to leave comments. Login now