[Pkg-bazaar-commits] ./bzr-gtk/unstable r71: (phanatic) compare_trees deprecated in 0.9

[Szilveszter Farkas (Phanatic)]

------------------------------------------------------------
revno: 71
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: integration
timestamp: Fri 2006-08-11 09:28:44 +0200
message:
  (phanatic) compare_trees deprecated in 0.9
modified:
  viz/diffwin.py
-------------- next part --------------
=== modified file 'viz/diffwin.py'
--- a/viz/diffwin.py	2006-06-19 18:28:49 +0000
+++ b/viz/diffwin.py	2006-08-11 07:28:44 +0000
@@ -21,7 +21,11 @@
 except ImportError:
     have_gtksourceview = False
 
-from bzrlib.delta import compare_trees
+import bzrlib
+if bzrlib.version_info < (0, 9):
+    # function deprecated in 0.9
+    from bzrlib.delta import compare_trees
+
 from bzrlib.diff import show_diff_trees
 from bzrlib.errors import NoSuchFile
 
@@ -109,7 +113,10 @@
         self.parent_tree = parent_tree
 
         self.model.clear()
-        delta = compare_trees(self.parent_tree, self.rev_tree)
+        if bzrlib.version_info < (0, 9):
+            delta = compare_trees(self.parent_tree, self.rev_tree)
+        else:
+            delta = self.rev_tree.changes_from(self.parent_tree)
 
         self.model.append(None, [ "Complete Diff", "" ])