[merge] allow 'bzr branch' even if parent is not accessible
Robert Collins
robertc at robertcollins.net
Tue Aug 1 07:27:24 BST 2006
On Mon, 2006-07-31 at 18:12 -0500, John Arbash Meinel wrote:
> John Arbash Meinel wrote:
> > After the changes Larstiq and I did, to make .bzr/branch/parent a
> > relative path, it is possible to have paths that are not accessible or
> > valid from a different access mechanism.
> >
> > https://launchpad.net/products/bzr/+bug/52976
> >
> > Typically this manifests itself when someone does a local branch to a
> > publicly served location. So the relative path is their filesystem, and
> > only a portion of this is served by http.
>
> ...
>
> Attached is an updated version of the patch. Now 'branch.get_parent()'
> will raise an InaccessibleParent error if it cannot return a full url to
> the parent.
> And then 'copy_content_into()' handles that exception when appropriate.
>
> I've added tests that all branch implementations do the right thing.
>
> Seeking a +1 to merge this for 0.9.
Hi. I like the general approach here, but I'm concerned about requiring
all branch implementations to be accessible over HTTP to run this test.
(I know that all our builtin ones do, but others, like the hg plugin's
one are not ...). So I propose a transport ChrootServer which will
Chroot an existing transport connection. If asked for the local path, it
gives the result from the existing transport, but if asked for .base,
abspath etc it gives a chrooted form of the same, which will allow us to
trigger normalisation failures. This is of more general use too - the
smartserver will require such a feature and its likely we can make the
two the same.
I'd rather not bring in the branch_implementations/test_http.py script
at all, though I agree this is needed for 0.9 to avoid a regression [in
a previously untested use case, but still ..]
Martin and I will probably do an rc1 without this, but with a note in
the release notes about this being nearly ready and targeted for it.
Rob
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060801/d20853ce/attachment.pgp
More information about the bazaar
mailing list