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>
Paul Mackerras committed
Nov 18, 2008 at 21:40 UTC
e11601381e384898418c30bd537a9daa1210c300
1 file changed
+1
-1
gitk
+1
-1
@@ -7129,7 +7129,7 @@ proc gettreediffline {gdtf ids} {
7129
set treediffs($ids) $treediff
7130
}
7131
unset treepending
7132
- if {$cmitmode eq "tree"} {
7132
+ if {$cmitmode eq "tree" && [llength $diffids] == 1} {
7133
gettree $diffids
7134
} elseif {$ids != $diffids} {
7135
if {![info exists diffmergeid]} {