Rev 469: Merge fix for View Changes menu option. in file:///data/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-gtk/trunk/

------------------------------------------------------------
revno: 469
revision-id: jelmer at samba.org-20080425200344-1s2gp5qnoq15fu1o
parent: jelmer at samba.org-20080425195456-odfm2gf6g6qbfhyj
parent: javierder at gmail.com-20080414233638-4p6bwrkvdwp4zwt0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-04-25 21:03:44 +0100
message:
  Merge fix for View Changes menu option.
modified:
  NEWS                           news-20070325173539-3va57o99cz3o57xe-1
  viz/branchwin.py               branchwin.py-20051016222514-15fd120652fcf25c
    ------------------------------------------------------------
    revno: 463.3.1
    revision-id: javierder at gmail.com-20080414233638-4p6bwrkvdwp4zwt0
    parent: argentina at gmail.com-20080411002500-cydpxmb18msies2v
    committer: Javier Derderian <javierder at gmail.com>
    branch nick: bug.215350
    timestamp: Mon 2008-04-14 20:36:38 -0300
    message:
      Fixed menu entry 'View Changes'. Bug #215350
    modified:
      viz/branchwin.py               branchwin.py-20051016222514-15fd120652fcf25c
=== modified file 'NEWS'
--- a/NEWS	2008-04-25 19:48:06 +0000
+++ b/NEWS	2008-04-25 20:03:44 +0000
@@ -45,6 +45,8 @@
   * Fixed underscores in tags being interpreted as mnemonics in the viz. (#201733, 
     Daniel Schierbeck)
 
+  * Fixed change view menu in viz. (Javier Derderian, #215350)
+
  FEATURES
  
   * Only check for old Bazaar versions that are known to be incompatible and 

=== modified file 'viz/branchwin.py'
--- a/viz/branchwin.py	2008-04-25 19:41:23 +0000
+++ b/viz/branchwin.py	2008-04-25 20:03:44 +0000
@@ -195,12 +195,12 @@
 
         revision_menu_diff = gtk.MenuItem("View Changes")
         revision_menu_diff.connect('activate', 
-                lambda w: self.treeview.show_diff())
+                self._menu_diff_cb)
         
         revision_menu_compare = gtk.MenuItem("Compare with...")
         revision_menu_compare.connect('activate',
                 self._compare_with_cb)
-        
+
         revision_menu_tag = gtk.MenuItem("Tag Revision")
         revision_menu_tag.connect('activate', self._tag_revision_cb)
 
@@ -363,7 +363,19 @@
 
         self.show_diff(revision.revision_id, parent_id)
         self.treeview.grab_focus()
-    
+        
+    def _menu_diff_cb(self,w):
+        (path, focus) = self.treeview.treeview.get_cursor()
+        revid = self.treeview.model[path][treemodel.REVID]
+        
+        parentids = self.branch.repository.revision_parents(revid)
+
+        if len(parentids) == 0:
+            parentid = NULL_REVISION
+        else:
+            parentid = parentids[0]
+        
+        self.show_diff(revid,parentid)    
 
     def _back_clicked_cb(self, *args):
         """Callback for when the back button is clicked."""