equal
deleted
inserted
replaced
1609 else: |
1609 else: |
1610 self.ui.warn(_("waiting for lock on %s held by %r\n") % |
1610 self.ui.warn(_("waiting for lock on %s held by %r\n") % |
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) |
1618 return l |
1618 return l |
1619 |
1619 |