comparison mercurial/localrepo.py @ 29883:0c8c388c7d62

lock: show more detail for new-style locks in lock waiting message (issue4752)

Improve the lock waiting warning message by explicitly saying that a host and
process are holding the lock. This nudges confused new users in the direction
of investigating the other process instead of removing the lock.

29882:307b20e5e505

                             inheritchecker=inheritchecker,
                             parentlock=parentlock)
        except error.LockHeld as inst:
            if not wait:
                raise
            self.ui.warn(_("waiting for lock on %s held by %r\n") %
                         (desc, inst.locker))
            # default to 600 seconds timeout
            l = lockmod.lock(vfs, lockname,
                             int(self.ui.config("ui", "timeout", "600")),
                             releasefn=releasefn, acquirefn=acquirefn,
                             desc=desc)

29883:0c8c388c7d62

                             inheritchecker=inheritchecker,
                             parentlock=parentlock)
        except error.LockHeld as inst:
            if not wait:
                raise
            # show more details for new-style locks
            if ':' in inst.locker:
                host, pid = inst.locker.split(":", 1)
                self.ui.warn(
                    _("waiting for lock on %s held by process %r "
                      "on host %r\n") % (desc, pid, host))
            else:
                self.ui.warn(_("waiting for lock on %s held by %r\n") %
                             (desc, inst.locker))
            # default to 600 seconds timeout
            l = lockmod.lock(vfs, lockname,
                             int(self.ui.config("ui", "timeout", "600")),
                             releasefn=releasefn, acquirefn=acquirefn,
                             desc=desc)