[merge] pull and merge can connect to any Transport

[John Arbash Meinel]

Alexander Belchenko wrote:
> John Arbash Meinel пишет:

...

>> I agree, though, that doing:
>>
>> bzr pull bundle
>>
>> Is nicer when you want to work in that format.
>>
>> How about I go refactor the bundle stuff so that it can take a
>> Transport, and create a convenience function that both merge and pull
>> can use.
> 
> As far as Aaron is happy with this 'odd' use case then having native
> support for pulling in bundles patches is good idea.
> 
> In fact I need a support for pulling bundles because I try to build
> effective work interaction with one my remote co-worker who lives under
> firewalls and exchanging bundles via e-mails is easiest way to keep our
> development branches up-to-date.
> 
> -- 
> Alexander

Well, I went ahead and did the refactoring. The attached bundle depends
on some of my earlier changes because of bugs I found in bzrlib.urlutils.

But basically the attached bundle implements a 'read_bundle_from_url'
which traps all sorts of Transport errors (which happen if you try to
read a directory like it is a file).

Transport.get('dir/') has undefined results, and the various transports
implement it very differently. Sftp doesn't fail until you try and
'read()' from the file handle. Some raise NoSuchFile, others just raise
a generic PathError.

But this seems to work, and it includes tests against all transports.
The branch is available from:
http://bzr.arbash-meinel.com/branches/bzr/bundle-fixes/

John
=:->
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: pull-from-bundle.diff
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20060615/ad738adb/attachment.diff 
-------------- 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/20060615/ad738adb/attachment.pgp