[Pkg-bazaar-commits] ./bzr-gtk/unstable r72: Update for bzr 0.10.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 72
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr-gtk
timestamp: Sun 2006-08-13 03:29:57 +0200
message:
  Update for bzr 0.10.
modified:
  commit.py
-------------- next part --------------
=== modified file 'commit.py'
--- a/commit.py	2006-07-24 15:02:00 +0000
+++ b/commit.py	2006-08-13 01:29:57 +0000
@@ -19,7 +19,11 @@
 import gobject
 import gtk
 import pango
-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
 
 class GCommitDialog(gtk.Dialog):
     """ Commit Dialog """
@@ -31,7 +35,10 @@
 
         self.old_tree = tree.branch.repository.revision_tree(tree.branch.last_revision())
         self.pending_merges = tree.pending_merges()
-        self.delta = compare_trees(self.old_tree, tree)
+        if bzrlib.version_info < (0, 9):
+            self.delta = compare_trees(self.old_tree, tree)
+        else:
+            self.delta = tree.changes_from(self.old_tree)
 
         self._create()