gitk: add external diff file rename detection

If a file is renamed between commits and an external diff is started
through gitk on the original or the renamed file name,
gitk is unable to open the renamed file in the external diff editor.
It fails to fetch the renamed file from git, because it fetches it
using its original path in contrast to using the renamed path of the
file.
Detect the rename and open the external diff with the original and
the renamed file instead of no file (fetch the renamed file path and
name from git) no matter if the original or the renamed file is
selected in gitk.

Signed-off-by: Tobias Boesch <[email protected]>

Author: ToBoMi

gitk-git/gitk

@@ -3775,6 +3775,34 @@ proc external_diff_get_one_file {diffid filename diffdir} {
                "revision $diffid"]
 }
 
+proc check_for_renames_in_diff {filepath} { # renames
+    global difffilestart ctext
+
+    set filename [file tail $filepath]
+    set renames {}
+    
+    foreach loc $difffilestart {
+        set loc_line_end [string map {.0 .end} $loc]
+        set ctext_line [$ctext get $loc $loc_line_end]
+        if {[string first $filename $ctext_line] != -1} {
+            set from_line_loc "$loc + 2 lines"
+            set to_line_loc "$loc + 3 lines"
+            set ren_from_line [$ctext get $from_line_loc [string map {.0 .end} $from_line_loc]]
+            set ren_to_line [$ctext get $to_line_loc [string map {.0 .end} $to_line_loc]]
+            if {[string match "rename from *" $ren_from_line]
+                && [string match "rename to *" $ren_to_line]} {
+                set ren_from [string range $ren_from_line 12 end]
+                set ren_to [string range $ren_to_line 10 end]
+                lappend renames $ren_from
+                lappend renames $ren_to
+                break
+            }
+        }
+    }
+    
+    return $renames
+}
+
 proc external_diff {} {
     global nullid nullid2
     global flist_menu_file
@@ -3805,8 +3833,16 @@ proc external_diff {} {
     if {$diffdir eq {}} return
 
     # gather files to diff
-    set difffromfile [external_diff_get_one_file $diffidfrom $flist_menu_file $diffdir]
-    set difftofile [external_diff_get_one_file $diffidto $flist_menu_file $diffdir]
+    set renames [check_for_renames_in_diff $diffidfrom $diffidto $flist_menu_file]
+    set renamefrom [lindex $renames 0]
+    set renameto [lindex $renames 1]
+    if { ($renamefrom != {}) && ($renameto != {}) } {
+        set difffromfile [external_diff_get_one_file $diffidfrom $renamefrom $diffdir]
+        set difftofile [external_diff_get_one_file $diffidto $renameto $diffdir]
+    } else {
+        set difffromfile [external_diff_get_one_file $diffidfrom $flist_menu_file $diffdir]
+        set difftofile [external_diff_get_one_file $diffidto $flist_menu_file $diffdir]
+    }
 
     if {$difffromfile ne {} && $difftofile ne {}} {
         set cmd [list [shellsplit $extdifftool] $difffromfile $difftofile]