summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-02-22 06:40:25 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-02-22 06:40:25 (GMT)
commitb5e2f805e6bdbaae629399fea92deb053f4ca7cd (patch)
tree420f06c14d8b90a472aeea048bc400f1fed6fada
parentafdb4be0fc48da74e8f02fe5ca22777cb2d214ed (diff)
parent3baee1f3bf8e30f0fc67bbb1a49877bf0660fd29 (diff)
downloadgit-b5e2f805e6bdbaae629399fea92deb053f4ca7cd.zip
git-b5e2f805e6bdbaae629399fea92deb053f4ca7cd.tar.gz
git-b5e2f805e6bdbaae629399fea92deb053f4ca7cd.tar.bz2
Merge branch 'maint'
* maint: git-gui: Focus insertion point at end of strings in repository chooser git-gui: Avoid hardcoded Windows paths in Cygwin package files git-gui: Default TCL_PATH to same location as TCLTK_PATH git-gui: Paper bag fix error dialogs opening over the main window
-rw-r--r--Makefile18
-rw-r--r--lib/choose_repository.tcl4
-rw-r--r--lib/error.tcl6
3 files changed, 25 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 081d755..01e0a46 100644
--- a/Makefile
+++ b/Makefile
@@ -92,8 +92,12 @@ ifndef V
REMOVE_F1 = && echo ' ' REMOVE `basename "$$dst"` && $(RM_RF) "$$dst"
endif
-TCL_PATH ?= tclsh
TCLTK_PATH ?= wish
+ifeq (./,$(dir $(TCLTK_PATH)))
+ TCL_PATH ?= $(subst wish,tclsh,$(TCLTK_PATH))
+else
+ TCL_PATH ?= $(dir $(TCLTK_PATH))$(notdir $(subst wish,tclsh,$(TCLTK_PATH)))
+endif
ifeq ($(uname_S),Darwin)
TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app
@@ -127,7 +131,17 @@ GITGUI_MACOSXAPP :=
ifeq ($(uname_O),Cygwin)
GITGUI_SCRIPT := `cygpath --windows --absolute "$(GITGUI_SCRIPT)"`
- gg_libdir_sed_in := $(shell cygpath --windows --absolute "$(gg_libdir)")
+
+ # 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))
GITGUI_RELATIVE := 1
diff --git a/lib/choose_repository.tcl b/lib/choose_repository.tcl
index 86faf24..0adcf9d 100644
--- a/lib/choose_repository.tcl
+++ b/lib/choose_repository.tcl
@@ -11,6 +11,7 @@ field w_quit ; # Quit button
field o_cons ; # Console object (if active)
field w_types ; # List of type buttons in clone
field w_recentlist ; # Listbox containing recent repositories
+field w_localpath ; # Entry widget bound to local_path
field done 0 ; # Finished picking the repository?
field local_path {} ; # Where this repository is locally
@@ -385,6 +386,7 @@ method _do_new {} {
button $w_body.where.b \
-text [mc "Browse"] \
-command [cb _new_local_path]
+ set w_localpath $w_body.where.t
pack $w_body.where.b -side right
pack $w_body.where.l -side left
@@ -416,6 +418,7 @@ method _new_local_path {} {
return
}
set local_path $p
+ $w_localpath icursor end
}
method _do_new2 {} {
@@ -481,6 +484,7 @@ method _do_clone {} {
-text [mc "Browse"] \
-command [cb _new_local_path]
grid $args.where_l $args.where_t $args.where_b -sticky ew
+ set w_localpath $args.where_t
label $args.type_l -text [mc "Clone Type:"]
frame $args.type_f
diff --git a/lib/error.tcl b/lib/error.tcl
index 45800d5..08a2462 100644
--- a/lib/error.tcl
+++ b/lib/error.tcl
@@ -2,7 +2,11 @@
# Copyright (C) 2006, 2007 Shawn Pearce
proc _error_parent {} {
- return [grab current .]
+ set p [grab current .]
+ if {$p eq {}} {
+ return .
+ }
+ return $p
}
proc error_popup {msg} {