# HG changeset patch # User Thomas Arendsen Hein # Date 1164048959 -3600 # Node ID d92dad3550009c45d0891471fae979cb86422e89 # Parent d5dd0a2a44bca707ff7fc76ae99fd2847ab59571 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. diff -r d5dd0a2a44bc -r d92dad355000 mercurial/localrepo.py --- a/mercurial/localrepo.py Mon Nov 20 19:41:49 2006 +0100 +++ b/mercurial/localrepo.py Mon Nov 20 19:55:59 2006 +0100 @@ -517,8 +517,8 @@ 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)