Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/localrepo.py @ 3688:d92dad355000

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -517,8 +517,8 @@ class localrepository(repo.repository):
         except lock.LockHeld, inst:
             if not wait:
                 raise
-            self.ui.warn(_("waiting for lock on %s held by %s\n") %
-                         (desc, inst.args[0]))
+            self.ui.warn(_("waiting for lock on %s held by %r\n") %
+                         (desc, inst.locker))
             # default to 600 seconds timeout
             l = lock.lock(lockname, int(self.ui.config("ui", "timeout", "600")),
                           releasefn, desc=desc)