[2nd PATCH] Re: any more sftp fixes?

[Matthieu Moy]

Matthieu Moy <Matthieu.Moy at imag.fr> writes:

> $ ~/dev/sftp-fix/bzr push sftp://moy@localhost/%2ftmp/foobar
> Password: 
> bzr: ERROR: No WorkingTree exists for {'base': 'sftp://moy@localhost/%2Ftmp/foobar'}(base).
>
> I suppose I should read this as
>
> "dear user,
>
> I'm sorry to inform you that bzr is not (yet ?) able to update remote
> working trees when doing a push. Please, run "bzr revert" from the
> remote location if you want to do so.
>
> Best Regards,
>
> The bzr team"
>
> ;-).

I find it much clearer with the following:

--- a/home/moy/dev/sftp-fix/bzrlib/branch.py
+++ b/home/moy/dev/sftp-fix/bzrlib/branch.py
@@ -1024,6 +1024,8 @@
                 if not overwrite:
                     raise
                 self.set_revision_history(source.revision_history())
+            except NoWorkingTree:
+                bzrlib.trace.warning('Pull is not able to update a remote working tree. Leaving it as it is.')
             new_count = len(self.revision_history())
             return new_count - old_count
         finally:



which gives:

$ ~/dev/sftp-fix/bzr push sftp://moy@localhost/%2ftmp/foobar
bzr: WARNING: Pull is not able to update a remote working tree. Leaving it as it is.                                                                        
1 revision(s) pushed.
$

-- 
Matthieu