Merge branch 'maint'

diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index 7e715a6865858e35babf30e624c16314cdc2c2ec..694834ab7a515667dbd14b38165fbe74b37a0349 100644 (file)
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -17,7 +17,7 @@ proc clear_diff {} {
 }
 
 proc reshow_diff {} {
-       global ui_status_value file_states file_lists
+       global file_states file_lists
        global current_diff_path current_diff_side
 
        set p $current_diff_path
@@ -49,13 +49,13 @@ A rescan will be automatically started to find other files which may have the sa
 
        clear_diff
        display_file $path __
-       rescan {set ui_status_value {Ready.}} 0
+       rescan ui_ready 0
 }
 
 proc show_diff {path w {lno {}}} {
        global file_states file_lists
        global is_3way_diff diff_active repo_config
-       global ui_diff ui_status_value ui_index ui_workdir
+       global ui_diff ui_index ui_workdir
        global current_diff_path current_diff_side current_diff_header
 
        if {$diff_active || ![lock_index read]} return
@@ -78,26 +78,47 @@ proc show_diff {path w {lno {}}} {
        set current_diff_path $path
        set current_diff_side $w
        set current_diff_header {}
-       set ui_status_value "Loading diff of [escape_path $path]..."
+       ui_status "Loading diff of [escape_path $path]..."
 
        # - Git won't give us the diff, there's nothing to compare to!
        #
        if {$m eq {_O}} {
                set max_sz [expr {128 * 1024}]
+               set type unknown
                if {[catch {
-                               set fd [open $path r]
-                               set content [read $fd $max_sz]
-                               close $fd
-                               set sz [file size $path]
+                               set type [file type $path]
+                               switch -- $type {
+                               directory {
+                                       set type submodule
+                                       set content {}
+                                       set sz 0
+                               }
+                               link {
+                                       set content [file readlink $path]
+                                       set sz [string length $content]
+                               }
+                               file {
+                                       set fd [open $path r]
+                                       fconfigure $fd -eofchar {}
+                                       set content [read $fd $max_sz]
+                                       close $fd
+                                       set sz [file size $path]
+                               }
+                               default {
+                                       error "'$type' not supported"
+                               }
+                               }
                        } err ]} {
                        set diff_active 0
                        unlock_index
-                       set ui_status_value "Unable to display [escape_path $path]"
+                       ui_status "Unable to display [escape_path $path]"
                        error_popup "Error loading file:\n\n$err"
                        return
                }
                $ui_diff conf -state normal
-               if {![catch {set type [exec file $path]}]} {
+               if {$type eq {submodule}} {
+                       $ui_diff insert end "* Git Repository (subproject)\n" d_@
+               } elseif {![catch {set type [exec file $path]}]} {
                        set n [string length $path]
                        if {[string equal -length $n $path $type]} {
                                set type [string range $type $n end]
@@ -127,11 +148,11 @@ proc show_diff {path w {lno {}}} {
                $ui_diff conf -state disabled
                set diff_active 0
                unlock_index
-               set ui_status_value {Ready.}
+               ui_ready
                return
        }
 
-       set cmd [list | git]
+       set cmd [list]
        if {$w eq $ui_index} {
                lappend cmd diff-index
                lappend cmd --cached
@@ -145,7 +166,7 @@ proc show_diff {path w {lno {}}} {
 
        lappend cmd -p
        lappend cmd --no-color
-       if {$repo_config(gui.diffcontext) > 0} {
+       if {$repo_config(gui.diffcontext) >= 0} {
                lappend cmd "-U$repo_config(gui.diffcontext)"
        }
        if {$w eq $ui_index} {
@@ -154,10 +175,10 @@ proc show_diff {path w {lno {}}} {
        lappend cmd --
        lappend cmd $path
 
-       if {[catch {set fd [open $cmd r]} err]} {
+       if {[catch {set fd [eval git_read --nice $cmd]} err]} {
                set diff_active 0
                unlock_index
-               set ui_status_value "Unable to display [escape_path $path]"
+               ui_status "Unable to display [escape_path $path]"
                error_popup "Error loading diff:\n\n$err"
                return
        }
@@ -170,7 +191,7 @@ proc show_diff {path w {lno {}}} {
 }
 
 proc read_diff {fd} {
-       global ui_diff ui_status_value diff_active
+       global ui_diff diff_active
        global is_3way_diff current_diff_header
 
        $ui_diff conf -state normal
@@ -197,6 +218,7 @@ proc read_diff {fd} {
                if {[string match {mode *} $line]
                        || [string match {new file *} $line]
                        || [string match {deleted file *} $line]
+                       || [string match {deleted symlink} $line]
                        || [string match {Binary files * and * differ} $line]
                        || $line eq {\ No newline at end of file}
                        || [regexp {^\* Unmerged path } $line]} {
@@ -256,7 +278,7 @@ proc read_diff {fd} {
                close $fd
                set diff_active 0
                unlock_index
-               set ui_status_value {Ready.}
+               ui_ready
 
                if {[$ui_diff index end] eq {2.0}} {
                        handle_empty_diff
@@ -271,7 +293,7 @@ proc apply_hunk {x y} {
        if {$current_diff_path eq {} || $current_diff_header eq {}} return
        if {![lock_index apply_hunk]} return
 
-       set apply_cmd {git apply --cached --whitespace=nowarn}
+       set apply_cmd {apply --cached --whitespace=nowarn}
        set mi [lindex $file_states($current_diff_path) 0]
        if {$current_diff_side eq $ui_index} {
                set mode unstage
@@ -301,7 +323,7 @@ proc apply_hunk {x y} {
        }
 
        if {[catch {
-               set p [open "| $apply_cmd" w]
+               set p [eval git_write $apply_cmd]
                fconfigure $p -translation binary -encoding binary
                puts -nonewline $p $current_diff_header
                puts -nonewline $p [$ui_diff get $s_lno $e_lno]