Merge lp:~hid-iwata/qbzr/fix-1020530 into lp:qbzr/0.22

[IWATA Hidetaka]

Fix for https://bugs.launchpad.net/qbzr/+bug/1020530

=== modified file 'NEWS.txt'
--- NEWS.txt	2012-06-12 07:21:53 +0000
+++ NEWS.txt	2012-07-03 14:54:25 +0000
@@ -5,6 +5,12 @@
  * qlog:
    * Disable context menu items (view, annotate, save) for deleted files.
      (Alexander Belchenko, Bug #1009876)
+   * Fix - Some menus (show tree, view, annotate) don't work when Working
+     tree revision selected.
+     (IWATA Hidetaka, Bug #1020530)
+   * Some menus (tag, update, revert, ...) are disabled when Working tree
+     revision selected.
+     (IWATA Hidetaka, Bug #1020530)
 
 
 0.22.3 - 2012/05/23

=== modified file 'lib/log.py'
--- lib/log.py	2012-06-12 07:14:34 +0000
+++ lib/log.py	2012-07-03 14:54:25 +0000
@@ -752,20 +752,24 @@
         # not a dir
         paths, file_ids, alives = self._get_file_selection_paths_ids_and_alives()
         is_single_file = len(paths) == 1
+        wt_selected = top_revid.startswith(CURRENT_REVISION)
         menu_enabled = is_single_file and alives[0]
         self.file_list_context_menu_annotate.setEnabled(menu_enabled)
         self.file_list_context_menu_cat.setEnabled(menu_enabled)
+        menu_enabled = is_single_file and alives[0] and not wt_selected
         self.file_list_context_menu_save_old_file.setEnabled(menu_enabled)
+        self.file_list_context_menu_save_old_file.setVisible(menu_enabled)
 
         gv = self.log_list.log_model.graph_viz
         # It would be nice if there were more than one branch, that we
         # show a menu so the user can chose which branch actions should take
         # place in.
-        one_branch_with_tree = (len(gv.branches) == 1 and
-                                gv.branches[0].tree is not None)
+        menu_enabled = (len(gv.branches) == 1 and
+                        gv.branches[0].tree is not None and 
+                        not wt_selected)
 
-        self.file_list_context_menu_revert_file.setEnabled(one_branch_with_tree)
-        self.file_list_context_menu_revert_file.setVisible(one_branch_with_tree)
+        self.file_list_context_menu_revert_file.setEnabled(menu_enabled)
+        self.file_list_context_menu_revert_file.setVisible(menu_enabled)
 
         self.file_list_context_menu.popup(
             self.file_list.viewport().mapToGlobal(pos))
@@ -814,8 +818,12 @@
         (top_revid, old_revid), count = \
             self.log_list.get_selection_top_and_parent_revids_and_count()
         
-        branch = self.log_list.log_model.graph_viz.get_revid_branch(top_revid)
-        tree = branch.repository.revision_tree(top_revid)
+        gv = self.log_list.log_model.graph_viz
+        branch = gv.get_revid_branch(top_revid)
+        if top_revid.startswith(CURRENT_REVISION):
+            tree = gv.working_trees[top_revid]
+        else:
+            tree = branch.repository.revision_tree(top_revid)
         encoding = get_set_encoding(None, branch)
         window = QBzrCatWindow(filename = paths[0], tree = tree, parent=self,
             encoding=encoding)
@@ -881,7 +889,10 @@
         
         branch_info = \
             self.log_list.log_model.graph_viz.get_revid_branch_info(top_revid)
-        tree = branch_info.branch.repository.revision_tree(top_revid)
+        if top_revid.startswith(CURRENT_REVISION):
+            tree = branch_info.tree
+        else:
+            tree = branch_info.branch.repository.revision_tree(top_revid)
         window = AnnotateWindow(branch_info.branch, branch_info.tree, tree,
                                 paths[0], file_ids[0])
         window.show()

=== modified file 'lib/logwidget.py'
--- lib/logwidget.py	2011-08-05 13:01:37 +0000
+++ lib/logwidget.py	2012-07-03 14:54:25 +0000
@@ -571,10 +571,15 @@
     def show_revision_tree(self):
         from bzrlib.plugins.qbzr.lib.browse import BrowseWindow
         revid = str(self.currentIndex().data(logmodel.RevIdRole).toString())
-        revno = self.log_model.graph_viz.revid_rev[revid].revno_str
-        branch = self.log_model.graph_viz.get_revid_branch(revid)
-        window = BrowseWindow(branch, revision_id=revid,
-                              revision_spec=revno, parent=self)
+        gv = self.log_model.graph_viz
+        if revid.startswith(CURRENT_REVISION):
+            location = gv.working_trees[revid].abspath(u'')
+            window = BrowseWindow(location=location, parent=self)
+        else:
+            revno = gv.revid_rev[revid].revno_str
+            branch = gv.get_revid_branch(revid)
+            window = BrowseWindow(branch=branch, revision_id=revid,
+                                  revision_spec=revno, parent=self)
         window.show()
         self.window().windows.append(window)
 
@@ -582,6 +587,8 @@
         branch_count = len(self.log_model.graph_viz.branches)
         (top_revid, old_revid), count = \
               self.get_selection_top_and_parent_revids_and_count()
+
+        wt_selected = top_revid.startswith(CURRENT_REVISION)
          
         def filter_rev_ancestor(action, is_ancestor=True):
             branch_menu = action.menu()
@@ -595,17 +602,23 @@
             self.context_menu_show_tree.setVisible(count == 1)
         
         if self.action_commands:
-            self.context_menu_tag.setVisible(count == 1)
+            self.context_menu_tag.setVisible(count == 1 and not wt_selected)
             if count == 1:
                 filter_rev_ancestor(self.context_menu_tag)
-            self.context_menu_revert.setVisible(count == 1)
-            self.context_menu_update.setVisible(count == 1)
+            self.context_menu_revert.setVisible(count == 1 and not wt_selected)
+            self.context_menu_update.setVisible(count == 1 and not wt_selected)
             
             if branch_count>1:
-                filter_rev_ancestor(self.context_menu_cherry_pick,
-                                    is_ancestor=False)
+                if wt_selected:
+                    self.context_menu_cherry_pick.setVisible(False)
+                else:
+                    filter_rev_ancestor(self.context_menu_cherry_pick,
+                                        is_ancestor=False)
             
-            filter_rev_ancestor(self.context_menu_reverse_cherry_pick)
+            if wt_selected:
+                self.context_menu_reverse_cherry_pick.setVisible(False)
+            else:
+                filter_rev_ancestor(self.context_menu_reverse_cherry_pick)
             
         self.context_menu.popup(self.viewport().mapToGlobal(pos))