Show More
@@ -1290,8 +1290,15 b' class localrepository(object):' | |||||
1290 | except error.LockHeld as inst: |
|
1290 | except error.LockHeld as inst: | |
1291 | if not wait: |
|
1291 | if not wait: | |
1292 | raise |
|
1292 | raise | |
1293 | self.ui.warn(_("waiting for lock on %s held by %r\n") % |
|
1293 | # show more details for new-style locks | |
1294 |
|
|
1294 | if ':' in inst.locker: | |
|
1295 | host, pid = inst.locker.split(":", 1) | |||
|
1296 | self.ui.warn( | |||
|
1297 | _("waiting for lock on %s held by process %r " | |||
|
1298 | "on host %r\n") % (desc, pid, host)) | |||
|
1299 | else: | |||
|
1300 | self.ui.warn(_("waiting for lock on %s held by %r\n") % | |||
|
1301 | (desc, inst.locker)) | |||
1295 | # default to 600 seconds timeout |
|
1302 | # default to 600 seconds timeout | |
1296 | l = lockmod.lock(vfs, lockname, |
|
1303 | l = lockmod.lock(vfs, lockname, | |
1297 | int(self.ui.config("ui", "timeout", "600")), |
|
1304 | int(self.ui.config("ui", "timeout", "600")), |
@@ -60,7 +60,7 b' One process waiting for another' | |||||
60 | > > preup 2>&1 |
|
60 | > > preup 2>&1 | |
61 | $ wait |
|
61 | $ wait | |
62 | $ cat preup |
|
62 | $ cat preup | |
63 |
waiting for lock on working directory of b held by '* |
|
63 | waiting for lock on working directory of b held by process '*' on host '*' (glob) | |
64 | got lock after * seconds (glob) |
|
64 | got lock after * seconds (glob) | |
65 | $ cat stdout |
|
65 | $ cat stdout | |
66 | adding b |
|
66 | adding b |
General Comments 0
You need to be logged in to leave comments.
Login now