Mercurial > hg
comparison hgext/journal.py @ 35207:d210723b73e5
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 | 135edf120d76 |
| children | 6f754b0fe54e |
comparison
equal
deleted
inserted
replaced
| 35206:278f1feee73a | 35207:d210723b73e5 |
|---|---|
| 302 self.ui.warn( | 302 self.ui.warn( |
| 303 _("waiting for lock on %s held by %r\n") % (desc, inst.locker)) | 303 _("waiting for lock on %s held by %r\n") % (desc, inst.locker)) |
| 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 |
| 311 | 311 |
| 312 def record(self, namespace, name, oldhashes, newhashes): | 312 def record(self, namespace, name, oldhashes, newhashes): |