[MERGE] ftp transport, dsilver's branch

[Martin Pool]

On 31 Jan 2006, Matthieu Moy <Matthieu.Moy at imag.fr> wrote:
> Hi,
> 
> I've updated again my ftp branch. I believe it's ready for merging
> now (I also made ftp put atomic, and throw the correct exception when
> stat-ing an inexistant file - otherwise, one can't push to a new
> location).

Hi Matthieu

>   http://test.bzr.free.fr/branches/bzr.ftp/

+1 from me with a couple of queries.

> === modified file 'NEWS'
> --- NEWS	
> +++ NEWS	
> @@ -1,4 +1,9 @@
>  bzr development version
> +
> +  IMPROVEMENTS:
> +
> +    * The ftp transport now tries to reconnect after a temporary
> +      failure. ftp put is made atomic.

Should also mention that connections are cached and credit yourself and
Daniel.

There are some other lines in NEWS that come up in the diff that seem to
relate to changes already merged; they can be fixed up in the merge.

> === modified file 'bzrlib/_changeset.py'
> --- bzrlib/_changeset.py	
> +++ bzrlib/_changeset.py	
> @@ -647,7 +647,8 @@
>  
>          :rtype: bool
>          """
> -
> +        if None in (self.parent, self.new_parent, self.name, self.new_name):
> +            return False
>          return (self.parent != self.new_parent or self.name != self.new_name)
>  
>      def is_deletion(self, reverse=False):

I'm not sure off hand why None would be  accepted there and should just
return False - could you add a comment?  (Maybe you got this from
Aaron?)

Cheers
-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060201/8177b15b/attachment.pgp