Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 1789:d5248726d22f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with mercurial/tonfa
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 22 Feb 2006 08:04:46 +0100
parents 2e0a288ca93e 750b9cd83965
children 8a7a24b96697
comparison
equal deleted inserted replaced
1786:ffb584a182d1 1789:d5248726d22f
268 l = lock.lock(self.join(lockname), 0, releasefn) 268 l = lock.lock(self.join(lockname), 0, releasefn)
269 except lock.LockHeld, inst: 269 except lock.LockHeld, inst:
270 if not wait: 270 if not wait:
271 raise inst 271 raise inst
272 self.ui.warn(_("waiting for lock held by %s\n") % inst.args[0]) 272 self.ui.warn(_("waiting for lock held by %s\n") % inst.args[0])
273 l = lock.lock(self.join(lockname), wait, releasefn) 273 try:
274 # default to 600 seconds timeout
275 l = lock.lock(self.join(lockname),
276 int(self.ui.config("ui", "timeout") or 600),
277 releasefn)
278 except lock.LockHeld, inst:
279 raise util.Abort(_("timeout while waiting for "
280 "lock held by %s") % inst.args[0])
274 if acquirefn: 281 if acquirefn:
275 acquirefn() 282 acquirefn()
276 return l 283 return l
277 284
278 def lock(self, wait=1): 285 def lock(self, wait=1):