[MERGE] bzr info improvements, now with locking status

[Olaf Conradi]

On 01/05/06, Martin Pool <mbp at sourcefrog.net> wrote:
> On 30 Apr 2006, Olaf Conradi <oohlaf at gmail.com> wrote:
> > So at the moment TransportLock just returns NotImplementedError and
> > get_physical_lock_status returns false on it. We could pass that error
> > through to the caller.
>
> These formats are deprecated, so it's not really crucial that you
> display all information about them.  In any case OS locks are
> automatically collected when the process finishes and so information
> about stale locks is less interesting.
>
> I'd be OK just to leave it as notimplemented really.
>
> > The test case for oslocks needs to be adjusted to whatever we decide.
> > The test case is now marked skipped.

Adjusted the test cases to verify the locking section is hidden for
deprecated formats.

> +1 from me.
>
> Small but important point - these should be indented like this:
>
>    if (repository.get_physical_lock_status() or
>        (branch and branch.get_physical_lock_status()) or
>        (working and working.get_physical_lock_status())):
>
> otherwise it's unclear just how the parenthesis nest.

OK, changed.

Please merge from

http://deschacht.student.utwente.nl/bzr/bazaar-vcs/bzr.olaf.info

Cheers
 -Olaf