[Pkg-bazaar-commits] ./bzr-gtk/unstable r51: Rework some of the parameters to DiffWindow.set_diff() to be

[Jelmer Vernooij]

------------------------------------------------------------
revno: 51
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr-gtk
timestamp: Fri 2006-05-19 20:59:23 +0200
message:
  Rework some of the parameters to DiffWindow.set_diff() to be 
  more usable to other code.
modified:
  viz/bzrkapp.py
  viz/diffwin.py
-------------- next part --------------
=== modified file 'viz/bzrkapp.py'
--- a/viz/bzrkapp.py	2006-05-19 16:37:13 +0000
+++ b/viz/bzrkapp.py	2006-05-19 18:59:23 +0000
@@ -36,8 +36,11 @@
 
     def show_diff(self, branch, revid, parentid):
         """Open a new window to show a diff between the given revisions."""
-        window = DiffWindow(self)
-        window.set_diff(branch, revid, parentid)
+        window = DiffWindow()
+        rev_tree = branch.repository.revision_tree(revid)
+        parent_tree = branch.repository.revision_tree(parentid)
+        description = revid + " - " + branch.nick
+        window.set_diff(description, rev_tree, parent_tree)
         window.show()
 
     def _destroy_cb(self, widget):

=== modified file 'viz/diffwin.py'
--- a/viz/diffwin.py	2006-05-19 16:37:13 +0000
+++ b/viz/diffwin.py	2006-05-19 18:59:23 +0000
@@ -32,13 +32,11 @@
     differences between two revisions on a branch.
     """
 
-    def __init__(self, app=None):
+    def __init__(self):
         gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
         self.set_border_width(0)
         self.set_title("bzrk diff")
 
-        self.app = app
-
         # Use two thirds of the screen by default
         screen = self.get_screen()
         monitor = screen.get_monitor_geometry(0)
@@ -100,14 +98,14 @@
         scrollwin.add(sourceview)
         sourceview.show()
 
-    def set_diff(self, branch, revid, parentid):
+    def set_diff(self, description, rev_tree, parent_tree):
         """Set the differences showed by this window.
 
         Compares the two trees and populates the window with the
         differences.
         """
-        self.rev_tree = branch.repository.revision_tree(revid)
-        self.parent_tree = branch.repository.revision_tree(parentid)
+        self.rev_tree = rev_tree
+        self.parent_tree = parent_tree
 
         self.model.clear()
         delta = compare_trees(self.parent_tree, self.rev_tree)
@@ -136,7 +134,7 @@
                 self.model.append(titer, [ path, path ])
 
         self.treeview.expand_all()
-        self.set_title(revid + " - " + branch.nick + " - bzrk diff")
+        self.set_title(description + " - bzrk diff")
 
     def _treeview_cursor_cb(self, *args):
         """Callback for when the treeview cursor changes."""