Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 3688:d92dad355000
Corrected "waiting for lock on repository FOO held by BAR" message.
BAR was the error number and not the locker name.
Use repr on BAR, so problems can be detected easier.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 20 Nov 2006 19:55:59 +0100 |
| parents | d5dd0a2a44bc |
| children | 8ae88ed2a3b6 |
comparison
equal
deleted
inserted
replaced
| 3687:d5dd0a2a44bc | 3688:d92dad355000 |
|---|---|
| 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() |