equal
deleted
inserted
replaced
515 try: |
515 try: |
516 l = lock.lock(lockname, 0, releasefn, desc=desc) |
516 l = lock.lock(lockname, 0, releasefn, desc=desc) |
517 except lock.LockHeld, inst: |
517 except lock.LockHeld, inst: |
518 if not wait: |
518 if not wait: |
519 raise |
519 raise |
520 self.ui.warn(_("waiting for lock on %s held by %s\n") % |
520 self.ui.warn(_("waiting for lock on %s held by %r\n") % |
521 (desc, inst.args[0])) |
521 (desc, inst.locker)) |
522 # default to 600 seconds timeout |
522 # default to 600 seconds timeout |
523 l = lock.lock(lockname, int(self.ui.config("ui", "timeout", "600")), |
523 l = lock.lock(lockname, int(self.ui.config("ui", "timeout", "600")), |
524 releasefn, desc=desc) |
524 releasefn, desc=desc) |
525 if acquirefn: |
525 if acquirefn: |
526 acquirefn() |
526 acquirefn() |