Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 35207:d210723b73e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 66ecde8a704d
children 1b758105b5c7
comparison
equal deleted inserted replaced
35206:278f1feee73a 35207:d210723b73e5
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