equal
deleted
inserted
replaced
301 self.ui.warn( |
301 self.ui.warn( |
302 _("waiting for lock on %s held by %r\n") % (desc, inst.locker)) |
302 _("waiting for lock on %s held by %r\n") % (desc, inst.locker)) |
303 # default to 600 seconds timeout |
303 # default to 600 seconds timeout |
304 l = lock.lock( |
304 l = lock.lock( |
305 vfs, 'namejournal.lock', |
305 vfs, 'namejournal.lock', |
306 int(self.ui.config("ui", "timeout", "600")), desc=desc) |
306 int(self.ui.config("ui", "timeout")), desc=desc) |
307 self.ui.warn(_("got lock after %s seconds\n") % l.delay) |
307 self.ui.warn(_("got lock after %s seconds\n") % l.delay) |
308 self._lockref = weakref.ref(l) |
308 self._lockref = weakref.ref(l) |
309 return l |
309 return l |
310 |
310 |
311 def record(self, namespace, name, oldhashes, newhashes): |
311 def record(self, namespace, name, oldhashes, newhashes): |