[MERGE] Wait for locks

[John Arbash Meinel]

David Allouche wrote:
> I did not review the code, but I have a small UI nit.
> 
> John Arbash Meinel wrote:
>> liliana % ./bzr pull
>> Using saved location: /home/jameinel/dev/bzr/bzr.dev
>> Unable to obtain lock file:///home/jameinel/dev/bzr/.bzr/repository/lock
>> held by john at arbash-meinel.com on host liliana [process #6791]
>> locked 4 minutes, 32 seconds ago
>> Will continue to try for 3599 seconds
> 
> Humans are bad at base-60 arithmetic. What about displaying something a
> bit more readable?
> 
>     Will continue to try until 13:46:23
> 
> That is, give the time (using locale time format if possible) when the
> command will fail if it cannot acquire the lock. That is much more
> useful when looking at the output of a command that has been blocked for
> some time already.
> 
> Regardless, that's already a big improvement in its current form.

I agree with you, especially since we aren't updating the screen, the
absolute time probably makes the most sense.

It would be nice if this could get into 0.11. But we've kind of been
stuffing a lot at the last minute. So I'll leave it up to others to decide.

Just as an example, I did a 'bzr commit' where I locked the local
repository, and the bound repository, this is what the screen looks like:


liliana % ./bzr commit -m ...
Unable to obtain lock file:///home/jameinel/dev/bzr/.bzr/repository/lock
held by john at arbash-meinel.com on host liliana [process #30110]
locked 85 minutes, 26 seconds ago
Will continue to try until 19:32:33

Lock owner changed for lock
file:///home/jameinel/dev/bzr/.bzr/repository/lock
held by john at arbash-meinel.com on host liliana [process #30110]
locked 1 second ago
Will continue to try until 19:32:33

Unable to obtain lock
sftp://juju/srv/bzr/public/branches/bzr/.bzr/repository/lock
held by john at arbash-meinel.com on host juju.arbash-meinel.com [process
#3412]
locked 6 seconds ago
Will continue to try until 19:36:22

modified bzrlib/lockdir.py
modified bzrlib/tests/test_lockdir.py

You need a passphrase to unlock the secret key for
user: "John A Meinel <john at arbash-meinel.com>"
1024-bit DSA key, ID 848D0003, created 2004-02-24


It is a little bit verbose, but it tells you what you need to know, and
it paused without problems for approx 5min while I went and got setup to
lock the remote repository.

John
=:->
-------------- next part --------------
A non-text attachment was scrubbed...
Name: wait-until-time.diff
Type: text/x-patch
Size: 4917 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060922/495a40ca/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060922/495a40ca/attachment.pgp