[MERGE] Add BzrDir.get_branch_stacked_on_url

[Jonathan Lange]

On Tue, Sep 2, 2008 at 11:24 AM, Robert Collins
<robertc at robertcollins.net> wrote:
> On Mon, 2008-09-01 at 20:21 -0400, Aaron Bentley wrote:
>> Jonathan Lange wrote:
>> > On Tue, Sep 2, 2008 at 9:58 AM, Aaron Bentley <aaron at aaronbentley.com> wrote:
>> >> Aaron Bentley has voted comment.
>> >> Status is now: Waiting
>> >> Comment:
>> >> Why?  Does Branch.open hit the stacked_on_url?
>> >>
>> >
>> > Yes, it does.
>>
>> Well, I'm not opposed to this as a stop-gap as long as you file a bug
>> that we shouldn't open fallback branches until we know that we need them.
>
> stacked_on_branches are always needed today, for the repository, branch
> history etc to operate correctly. The repository has no way to call-back
> to the branch to ask for other locations, and I'm not sure that would be
> a good way to construct it anyhow.
>
>> The patch as it stands assumes too much about the way branches are
>> configured.  This would fail spectacularly with a Subversion branch, if
>> they supported stacking.
>
> I agree that the BzrDirMetaDir implementation should indirect through
> the format object of the branch though I will note that bzr-svn branches
> are not a problem: subversion branches have their own BzrDir
> implementation which means they already have an indirection point.
>

Here's a new patch that does this.

I hope it satisfies.

jml
-------------- next part --------------
A non-text attachment was scrubbed...
Name: stacked-branch-url-2.patch
Type: text/x-diff
Size: 17901 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080903/56cbd90c/attachment-0001.bin