Show More
@@ -50,10 +50,12 b' def trylock(ui, vfs, lockname, timeout, ' | |||||
50 | # show more details for new-style locks |
|
50 | # show more details for new-style locks | |
51 | if ':' in locker: |
|
51 | if ':' in locker: | |
52 | host, pid = locker.split(":", 1) |
|
52 | host, pid = locker.split(":", 1) | |
53 | msg = _("waiting for lock on %s held by process %r " |
|
53 | msg = (_("waiting for lock on %s held by process %r on host %r\n") | |
54 | "on host %r\n") % (l.desc, pid, host) |
|
54 | % (pycompat.bytestr(l.desc), pycompat.bytestr(pid), | |
|
55 | pycompat.bytestr(host))) | |||
55 | else: |
|
56 | else: | |
56 |
msg = _("waiting for lock on %s held by %r\n") |
|
57 | msg = (_("waiting for lock on %s held by %r\n") | |
|
58 | % (l.desc, pycompat.bytestr(locker))) | |||
57 | printer(msg) |
|
59 | printer(msg) | |
58 |
|
60 | |||
59 | l = lock(vfs, lockname, 0, *args, dolock=False, **kwargs) |
|
61 | l = lock(vfs, lockname, 0, *args, dolock=False, **kwargs) |
General Comments 0
You need to be logged in to leave comments.
Login now