Merge branch 'ml/cygwin-fixes'
Remove some code supporting ancient Cygwin Tcl/Tk versions. Also fix exploring working directory and making desktop shortcuts on Cygwin. * ml/cygwin-fixes: git-gui - use mkshortcut on Cygwin git-gui - use cygstart to browse on Cygwin git-gui - remove obsolete Cygwin specific code git gui Makefile - remove Cygwin modificationsmaint
Pratyush Yadav
commit
e25cbdf357
19
Makefile
19
Makefile
|
|
@ -138,25 +138,10 @@ GITGUI_SCRIPT := $$0
|
|||
GITGUI_RELATIVE :=
|
||||
GITGUI_MACOSXAPP :=
|
||||
|
||||
ifeq ($(uname_O),Cygwin)
|
||||
GITGUI_SCRIPT := `cygpath --windows --absolute "$(GITGUI_SCRIPT)"`
|
||||
|
||||
# Is this a Cygwin Tcl/Tk binary? If so it knows how to do
|
||||
# POSIX path translation just like cygpath does and we must
|
||||
# keep libdir in POSIX format so Cygwin packages of git-gui
|
||||
# work no matter where the user installs them.
|
||||
#
|
||||
ifeq ($(shell echo 'puts [file normalize /]' | '$(TCL_PATH_SQ)'),$(shell cygpath --mixed --absolute /))
|
||||
gg_libdir_sed_in := $(gg_libdir)
|
||||
else
|
||||
gg_libdir_sed_in := $(shell cygpath --windows --absolute "$(gg_libdir)")
|
||||
endif
|
||||
else
|
||||
ifeq ($(exedir),$(gg_libdir))
|
||||
ifeq ($(exedir),$(gg_libdir))
|
||||
GITGUI_RELATIVE := 1
|
||||
endif
|
||||
gg_libdir_sed_in := $(gg_libdir)
|
||||
endif
|
||||
gg_libdir_sed_in := $(gg_libdir)
|
||||
ifeq ($(uname_S),Darwin)
|
||||
ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y)
|
||||
GITGUI_MACOSXAPP := YesPlease
|
||||
|
|
|
|||
110
git-gui.sh
110
git-gui.sh
|
|
@ -84,14 +84,7 @@ proc _which {what args} {
|
|||
global env _search_exe _search_path
|
||||
|
||||
if {$_search_path eq {}} {
|
||||
if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
|
||||
set _search_path [split [exec cygpath \
|
||||
--windows \
|
||||
--path \
|
||||
--absolute \
|
||||
$env(PATH)] {;}]
|
||||
set _search_exe .exe
|
||||
} elseif {[is_Windows]} {
|
||||
if {[is_Windows]} {
|
||||
set gitguidir [file dirname [info script]]
|
||||
regsub -all ";" $gitguidir "\\;" gitguidir
|
||||
set env(PATH) "$gitguidir;$env(PATH)"
|
||||
|
|
@ -342,15 +335,8 @@ proc gitexec {args} {
|
|||
if {[catch {set _gitexec [git --exec-path]} err]} {
|
||||
error "Git not installed?\n\n$err"
|
||||
}
|
||||
if {[is_Cygwin]} {
|
||||
set _gitexec [exec cygpath \
|
||||
--windows \
|
||||
--absolute \
|
||||
$_gitexec]
|
||||
} else {
|
||||
set _gitexec [file normalize $_gitexec]
|
||||
}
|
||||
}
|
||||
if {$args eq {}} {
|
||||
return $_gitexec
|
||||
}
|
||||
|
|
@ -364,15 +350,8 @@ proc githtmldir {args} {
|
|||
# Git not installed or option not yet supported
|
||||
return {}
|
||||
}
|
||||
if {[is_Cygwin]} {
|
||||
set _githtmldir [exec cygpath \
|
||||
--windows \
|
||||
--absolute \
|
||||
$_githtmldir]
|
||||
} else {
|
||||
set _githtmldir [file normalize $_githtmldir]
|
||||
}
|
||||
}
|
||||
if {$args eq {}} {
|
||||
return $_githtmldir
|
||||
}
|
||||
|
|
@ -1318,9 +1297,6 @@ if {$_gitdir eq "."} {
|
|||
set _gitdir [pwd]
|
||||
}
|
||||
|
||||
if {![file isdirectory $_gitdir] && [is_Cygwin]} {
|
||||
catch {set _gitdir [exec cygpath --windows $_gitdir]}
|
||||
}
|
||||
if {![file isdirectory $_gitdir]} {
|
||||
catch {wm withdraw .}
|
||||
error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
|
||||
|
|
@ -1332,11 +1308,7 @@ apply_config
|
|||
|
||||
# v1.7.0 introduced --show-toplevel to return the canonical work-tree
|
||||
if {[package vcompare $_git_version 1.7.0] >= 0} {
|
||||
if { [is_Cygwin] } {
|
||||
catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]}
|
||||
} else {
|
||||
set _gitworktree [git rev-parse --show-toplevel]
|
||||
}
|
||||
} else {
|
||||
# try to set work tree from environment, core.worktree or use
|
||||
# cdup to obtain a relative path to the top of the worktree. If
|
||||
|
|
@ -1561,24 +1533,8 @@ proc rescan {after {honor_trustmtime 1}} {
|
|||
}
|
||||
}
|
||||
|
||||
if {[is_Cygwin]} {
|
||||
set is_git_info_exclude {}
|
||||
proc have_info_exclude {} {
|
||||
global is_git_info_exclude
|
||||
|
||||
if {$is_git_info_exclude eq {}} {
|
||||
if {[catch {exec test -f [gitdir info exclude]}]} {
|
||||
set is_git_info_exclude 0
|
||||
} else {
|
||||
set is_git_info_exclude 1
|
||||
}
|
||||
}
|
||||
return $is_git_info_exclude
|
||||
}
|
||||
} else {
|
||||
proc have_info_exclude {} {
|
||||
proc have_info_exclude {} {
|
||||
return [file readable [gitdir info exclude]]
|
||||
}
|
||||
}
|
||||
|
||||
proc rescan_stage2 {fd after} {
|
||||
|
|
@ -2318,7 +2274,9 @@ proc do_git_gui {} {
|
|||
|
||||
# Get the system-specific explorer app/command.
|
||||
proc get_explorer {} {
|
||||
if {[is_Cygwin] || [is_Windows]} {
|
||||
if {[is_Cygwin]} {
|
||||
set explorer "/bin/cygstart.exe --explore"
|
||||
} elseif {[is_Windows]} {
|
||||
set explorer "explorer.exe"
|
||||
} elseif {[is_MacOSX]} {
|
||||
set explorer "open"
|
||||
|
|
@ -3112,10 +3070,6 @@ if {[is_MacOSX]} {
|
|||
set doc_path [githtmldir]
|
||||
if {$doc_path ne {}} {
|
||||
set doc_path [file join $doc_path index.html]
|
||||
|
||||
if {[is_Cygwin]} {
|
||||
set doc_path [exec cygpath --mixed $doc_path]
|
||||
}
|
||||
}
|
||||
|
||||
if {[file isfile $doc_path]} {
|
||||
|
|
@ -4087,60 +4041,6 @@ set file_lists($ui_workdir) [list]
|
|||
wm title . "[appname] ([reponame]) [file normalize $_gitworktree]"
|
||||
focus -force $ui_comm
|
||||
|
||||
# -- Warn the user about environmental problems. Cygwin's Tcl
|
||||
# does *not* pass its env array onto any processes it spawns.
|
||||
# This means that git processes get none of our environment.
|
||||
#
|
||||
if {[is_Cygwin]} {
|
||||
set ignored_env 0
|
||||
set suggest_user {}
|
||||
set msg [mc "Possible environment issues exist.
|
||||
|
||||
The following environment variables are probably
|
||||
going to be ignored by any Git subprocess run
|
||||
by %s:
|
||||
|
||||
" [appname]]
|
||||
foreach name [array names env] {
|
||||
switch -regexp -- $name {
|
||||
{^GIT_INDEX_FILE$} -
|
||||
{^GIT_OBJECT_DIRECTORY$} -
|
||||
{^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
|
||||
{^GIT_DIFF_OPTS$} -
|
||||
{^GIT_EXTERNAL_DIFF$} -
|
||||
{^GIT_PAGER$} -
|
||||
{^GIT_TRACE$} -
|
||||
{^GIT_CONFIG$} -
|
||||
{^GIT_(AUTHOR|COMMITTER)_DATE$} {
|
||||
append msg " - $name\n"
|
||||
incr ignored_env
|
||||
}
|
||||
{^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
|
||||
append msg " - $name\n"
|
||||
incr ignored_env
|
||||
set suggest_user $name
|
||||
}
|
||||
}
|
||||
}
|
||||
if {$ignored_env > 0} {
|
||||
append msg [mc "
|
||||
This is due to a known issue with the
|
||||
Tcl binary distributed by Cygwin."]
|
||||
|
||||
if {$suggest_user ne {}} {
|
||||
append msg [mc "
|
||||
|
||||
A good replacement for %s
|
||||
is placing values for the user.name and
|
||||
user.email settings into your personal
|
||||
~/.gitconfig file.
|
||||
" $suggest_user]
|
||||
}
|
||||
warn_popup $msg
|
||||
}
|
||||
unset ignored_env msg suggest_user name
|
||||
}
|
||||
|
||||
# -- Only initialize complex UI if we are going to stay running.
|
||||
#
|
||||
if {[is_enabled transport]} {
|
||||
|
|
|
|||
|
|
@ -174,9 +174,6 @@ constructor pick {} {
|
|||
-foreground blue \
|
||||
-underline 1
|
||||
set home $::env(HOME)
|
||||
if {[is_Cygwin]} {
|
||||
set home [exec cygpath --windows --absolute $home]
|
||||
}
|
||||
set home "[file normalize $home]/"
|
||||
set hlen [string length $home]
|
||||
foreach p $sorted_recent {
|
||||
|
|
@ -374,18 +371,6 @@ proc _objdir {path} {
|
|||
return $objdir
|
||||
}
|
||||
|
||||
if {[is_Cygwin]} {
|
||||
set objdir [file join $path .git objects.lnk]
|
||||
if {[file isfile $objdir]} {
|
||||
return [win32_read_lnk $objdir]
|
||||
}
|
||||
|
||||
set objdir [file join $path objects.lnk]
|
||||
if {[file isfile $objdir]} {
|
||||
return [win32_read_lnk $objdir]
|
||||
}
|
||||
}
|
||||
|
||||
return {}
|
||||
}
|
||||
|
||||
|
|
@ -623,12 +608,6 @@ method _do_clone2 {} {
|
|||
}
|
||||
|
||||
set giturl $origin_url
|
||||
if {[is_Cygwin] && [file isdirectory $giturl]} {
|
||||
set giturl [exec cygpath --unix --absolute $giturl]
|
||||
if {$clone_type eq {shared}} {
|
||||
set objdir [exec cygpath --unix --absolute $objdir]
|
||||
}
|
||||
}
|
||||
|
||||
if {[file exists $local_path]} {
|
||||
error_popup [mc "Location %s already exists." $local_path]
|
||||
|
|
@ -668,12 +647,8 @@ method _do_clone2 {} {
|
|||
fconfigure $f_cp -translation binary -encoding binary
|
||||
cd $objdir
|
||||
while {[gets $f_in line] >= 0} {
|
||||
if {[is_Cygwin]} {
|
||||
puts $f_cp [exec cygpath --unix --absolute $line]
|
||||
} else {
|
||||
puts $f_cp [file normalize $line]
|
||||
}
|
||||
}
|
||||
close $f_in
|
||||
close $f_cp
|
||||
cd $pwd
|
||||
|
|
|
|||
|
|
@ -27,13 +27,10 @@ proc do_windows_shortcut {} {
|
|||
}
|
||||
|
||||
proc do_cygwin_shortcut {} {
|
||||
global argv0 _gitworktree
|
||||
global argv0 _gitworktree oguilib
|
||||
|
||||
if {[catch {
|
||||
set desktop [exec cygpath \
|
||||
--windows \
|
||||
--absolute \
|
||||
--long-name \
|
||||
--desktop]
|
||||
}]} {
|
||||
set desktop .
|
||||
|
|
@ -48,19 +45,19 @@ proc do_cygwin_shortcut {} {
|
|||
set fn ${fn}.lnk
|
||||
}
|
||||
if {[catch {
|
||||
set sh [exec cygpath \
|
||||
--windows \
|
||||
--absolute \
|
||||
/bin/sh.exe]
|
||||
set me [exec cygpath \
|
||||
--unix \
|
||||
--absolute \
|
||||
$argv0]
|
||||
win32_create_lnk $fn [list \
|
||||
$sh -c \
|
||||
"CHERE_INVOKING=1 source /etc/profile;[sq $me] &" \
|
||||
] \
|
||||
[file normalize $_gitworktree]
|
||||
set repodir [file normalize $_gitworktree]
|
||||
set shargs {-c \
|
||||
"CHERE_INVOKING=1 \
|
||||
source /etc/profile; \
|
||||
git gui"}
|
||||
exec /bin/mkshortcut.exe \
|
||||
--arguments $shargs \
|
||||
--desc "git-gui on $repodir" \
|
||||
--icon $oguilib/git-gui.ico \
|
||||
--name $fn \
|
||||
--show min \
|
||||
--workingdir $repodir \
|
||||
/bin/sh.exe
|
||||
} err]} {
|
||||
error_popup [strcat [mc "Cannot write shortcut:"] "\n\n$err"]
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue