[MERGE] Wait for locks

[David Allouche]

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.

-- 
                                                            -- ddaa

-------------- 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/20060921/b0fcc48f/attachment.pgp