[BUG] rsync plugin doesn't find compare_trees

[John A Meinel]

William Dodé wrote:

>Hi,
>
>In the last revno (835) rsync plugin doesn't find compare_trees in
>bzrlib. This patch find compare_trees in bzrlib.diff
>
>*** modified file 'plugins/rsync/rsync_update.py'
>--- plugins/rsync/rsync_update.py 
>+++ plugins/rsync/rsync_update.py 
>@@ -6,6 +6,7 @@
> 
> import os
> import bzrlib
>+import bzrlib.diff
> 
> _rsync_location = 'x-rsync-data'
> _parent_locations = ['parent', 'pull', 'x-pull']
>@@ -42,7 +43,7 @@
>     for path, file_class, kind, file_id in new_tree.list_files():
>         if file_class == '?':
>             return False
>-    delta = bzrlib.compare_trees(old_tree, new_tree, want_unchanged=False)
>+    delta = bzrlib.diff.compare_trees(old_tree, new_tree, want_unchanged=False)
>     if len(delta.added) > 0 or len(delta.removed) > 0 or \
>         len(delta.modified) > 0:
>         return False
>  
>
You don't have the latest version of my rsync plugin. The one shipped 
with bzr.dev is not up-to-date.
If you want the original, you can get it at:
http://bzr.arbash-meinel.com/plugins/bzr-rsync/

Mainline is only 1 patch behind, though. (Similar patch to what you did).

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050705/7a025d21/attachment.pgp