[MERGE] Cause 32 less test skips, take 2: cloning_metadir RPC support for branch refs

[Andrew Bennetts]

Unfortunately for me, Robert's BzrDir.cloning_metadir RPC landed before my
patch to reduce test skips.  It turns out that Robert's branch breaks some
of the tests I re-enabled!  The BzrDir.cloning_metadir RPC was failing on
the server-side if the branch in a bzrdir was actually a branch reference.

This patch fixes that, by extending the return value of the RPC slightly to
be able to distinguish between “the branch format of the cloning metadir is
X” and “the branch here is a branch reference, so here's the referenced URL
and you can go ask it for the cloning metadir branch format.”

I'm not completely sure this is a great interface, but it is sufficient for
the client to cope with branch references without resorting to the VFS
fallback logic.

So here's the updated patch.  The test_bzrdir.py changes are the same as
before I think, but obvious the RPC changes are new.

-Andrew.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: less-skips-4075.patch
Type: text/x-diff
Size: 22498 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090305/3dee80c7/attachment.bin