From: Paul Mackerras <paulus@samba.org>
Date: Tue, 18 Nov 2008 10:40:32 +0000 (+1100)
Subject: gitk: Fix context menu items for generating diffs when in tree mode
X-Git-Tag: v1.6.1-rc2~32^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e11601381e384898418c30bd537a9daa1210c300;p=git.git

gitk: Fix context menu items for generating diffs when in tree mode

Currently, if you invoke the "diff this -> selected" or "diff selected
-> this" and gitk is in "Tree" mode rather than "Patch" mode, the
diff display pane will just show the header but not the actual diff,
unless gitk has done the diff before and thus has the list of files
that differ.  This was because the logic in gettreediffline that
checked whether we had moved on to doing something else checked the
mode (Tree or Patch) before checking whether the ids we're diffing
had changed.

This fixes it.  The new logic in gettreediffline is slightly hacky
and relies on the fact that the Tree/Patch mode only applies when
we're looking at a single commit, not at the diff between two commits.

Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/gitk b/gitk
index f7f177621..9bdaafe40 100755
--- a/gitk
+++ b/gitk
@@ -7129,7 +7129,7 @@ proc gettreediffline {gdtf ids} {
 	set treediffs($ids) $treediff
     }
     unset treepending
-    if {$cmitmode eq "tree"} {
+    if {$cmitmode eq "tree" && [llength $diffids] == 1} {
 	gettree $diffids
     } elseif {$ids != $diffids} {
 	if {![info exists diffmergeid]} {