unintuitive context menu option(s) about git-cola

[davvid]

Thanks again for the sug. The Diff widget's right-click menu now displays the selection and hunk staging actions before any of the whole-file staging actions.

[sthalik]

FWIW, this seems to do the job: context-menu.patch.txt

diff --git cola/widgets/diff.py cola/widgets/diff.py
index 40200b42..104c1c56 100644
--- cola/widgets/diff.py
+++ cola/widgets/diff.py
@@ -976,7 +976,7 @@ class DiffEditor(DiffTextEdit):
         add_action = menu_actions.append
         edit_actions_added = False
 
-        if model.is_stageable() or model.is_unstageable():
+        if (model.is_stageable() or model.is_unstageable()) and not self.has_selection():
             if (model.is_amend_mode() and s.staged) or not self.model.is_stageable():
                 self.stage_or_unstage.setText(N_('Unstage'))
                 self.stage_or_unstage.setIcon(icons.remove())