git-gui: ensure the file in the diff pane is in the list of selected files

diff --git a/lib/shortcut.tcl b/lib/shortcut.tcl
index ebf72e44521feac5619842227f61e4e5f26a819a..78878ef89d11210d614fc8b3d2957705611bdaa3 100644 (file)
--- a/lib/shortcut.tcl
+++ b/lib/shortcut.tcl
@@ -2,30 +2,29 @@
 # Copyright (C) 2006, 2007 Shawn Pearce
 
 proc do_windows_shortcut {} {
-       global argv0
-
+       global _gitworktree
        set fn [tk_getSaveFile \
                -parent . \
-               -title "[appname] ([reponame]): Create Desktop Icon" \
-               -initialfile "Git [reponame].bat"]
+               -title [append "[appname] ([reponame]): " [mc "Create Desktop Icon"]] \
+               -initialfile "Git [reponame].lnk"]
        if {$fn != {}} {
+               if {[file extension $fn] ne {.lnk}} {
+                       set fn ${fn}.lnk
+               }
                if {[catch {
-                               set fd [open $fn w]
-                               puts $fd "@ECHO Entering [reponame]"
-                               puts $fd "@ECHO Starting git-gui... please wait..."
-                               puts $fd "@SET PATH=[file normalize [gitexec]];%PATH%"
-                               puts $fd "@SET GIT_DIR=[file normalize [gitdir]]"
-                               puts -nonewline $fd "@\"[info nameofexecutable]\""
-                               puts $fd " \"[file normalize $argv0]\""
-                               close $fd
+                               win32_create_lnk $fn [list \
+                                       [info nameofexecutable] \
+                                       [file normalize $::argv0] \
+                                       ] \
+                                       [file normalize $_gitworktree]
                        } err]} {
-                       error_popup "Cannot write script:\n\n$err"
+                       error_popup [strcat [mc "Cannot write shortcut:"] "\n\n$err"]
                }
        }
 }
 
 proc do_cygwin_shortcut {} {
-       global argv0
+       global argv0 _gitworktree
 
        if {[catch {
                set desktop [exec cygpath \
@@ -38,39 +37,29 @@ proc do_cygwin_shortcut {} {
        }
        set fn [tk_getSaveFile \
                -parent . \
-               -title "[appname] ([reponame]): Create Desktop Icon" \
+               -title [append "[appname] ([reponame]): " [mc "Create Desktop Icon"]] \
                -initialdir $desktop \
-               -initialfile "Git [reponame].bat"]
+               -initialfile "Git [reponame].lnk"]
        if {$fn != {}} {
+               if {[file extension $fn] ne {.lnk}} {
+                       set fn ${fn}.lnk
+               }
                if {[catch {
-                               set fd [open $fn w]
                                set sh [exec cygpath \
                                        --windows \
                                        --absolute \
-                                       /bin/sh]
+                                       /bin/sh.exe]
                                set me [exec cygpath \
                                        --unix \
                                        --absolute \
                                        $argv0]
-                               set gd [exec cygpath \
-                                       --unix \
-                                       --absolute \
-                                       [gitdir]]
-                               set gw [exec cygpath \
-                                       --windows \
-                                       --absolute \
-                                       [file dirname [gitdir]]]
-                               regsub -all ' $me "'\\''" me
-                               regsub -all ' $gd "'\\''" gd
-                               puts $fd "@ECHO Entering $gw"
-                               puts $fd "@ECHO Starting git-gui... please wait..."
-                               puts -nonewline $fd "@\"$sh\" --login -c \""
-                               puts -nonewline $fd "GIT_DIR='$gd'"
-                               puts -nonewline $fd " '$me'"
-                               puts $fd "&\""
-                               close $fd
+                               win32_create_lnk $fn [list \
+                                       $sh -c \
+                                       "CHERE_INVOKING=1 source /etc/profile;[sq $me] &" \
+                                       ] \
+                                       [file normalize $_gitworktree]
                        } err]} {
-                       error_popup "Cannot write script:\n\n$err"
+                       error_popup [strcat [mc "Cannot write shortcut:"] "\n\n$err"]
                }
        }
 }
@@ -80,10 +69,13 @@ proc do_macosx_app {} {
 
        set fn [tk_getSaveFile \
                -parent . \
-               -title "[appname] ([reponame]): Create Desktop Icon" \
+               -title [append "[appname] ([reponame]): " [mc "Create Desktop Icon"]] \
                -initialdir [file join $env(HOME) Desktop] \
                -initialfile "Git [reponame].app"]
        if {$fn != {}} {
+               if {[file extension $fn] ne {.app}} {
+                       set fn ${fn}.app
+               }
                if {[catch {
                                set Contents [file join $fn Contents]
                                set MacOS [file join $Contents MacOS]
@@ -117,25 +109,32 @@ proc do_macosx_app {} {
                                close $fd
 
                                set fd [open $exe w]
-                               set gd [file normalize [gitdir]]
-                               set ep [file normalize [gitexec]]
-                               regsub -all ' $gd "'\\''" gd
-                               regsub -all ' $ep "'\\''" ep
                                puts $fd "#!/bin/sh"
-                               foreach name [array names env] {
-                                       if {[string match GIT_* $name]} {
-                                               regsub -all ' $env($name) "'\\''" v
-                                               puts $fd "export $name='$v'"
+                               foreach name [lsort [array names env]] {
+                                       set value $env($name)
+                                       switch -- $name {
+                                       GIT_DIR { set value [file normalize [gitdir]] }
+                                       }
+
+                                       switch -glob -- $name {
+                                       SSH_* -
+                                       GIT_* {
+                                               puts $fd "if test \"z\$$name\" = z; then"
+                                               puts $fd "  export $name=[sq $value]"
+                                               puts $fd "fi &&"
+                                       }
                                        }
                                }
-                               puts $fd "export PATH='$ep':\$PATH"
-                               puts $fd "export GIT_DIR='$gd'"
-                               puts $fd "exec [file normalize $argv0]"
+                               puts $fd "export PATH=[sq [file dirname $::_git]]:\$PATH &&"
+                               puts $fd "cd [sq [file normalize [pwd]]] &&"
+                               puts $fd "exec \\"
+                               puts $fd " [sq [info nameofexecutable]] \\"
+                               puts $fd " [sq [file normalize $argv0]]"
                                close $fd
 
                                file attributes $exe -permissions u+x,g+x,o+x
                        } err]} {
-                       error_popup "Cannot write icon:\n\n$err"
+                       error_popup [strcat [mc "Cannot write icon:"] "\n\n$err"]
                }
        }
 }