summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-09-09 09:03:56 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-09-09 09:04:43 (GMT)
commitb2bd31006f02debe1ddf4fa8b73c52281516a871 (patch)
treec4a6e62ea1901d2a92e385ed323a5be6b5988531
parent4b08aa3fef4258bf27f1bfa11fb9c0a8315c61aa (diff)
parentc63fe3b2dc90120a4bdba7194f92efc2f3c342ed (diff)
downloadgit-b2bd31006f02debe1ddf4fa8b73c52281516a871.zip
git-b2bd31006f02debe1ddf4fa8b73c52281516a871.tar.gz
git-b2bd31006f02debe1ddf4fa8b73c52281516a871.tar.bz2
Merge branch 'maint'
* maint: git-gui: Avoid use of libdir in Makefile git-gui: Disable Tk send in all git-gui sessions git-gui: lib/index.tcl: handle files with % in the filename properly
-rw-r--r--Makefile8
-rwxr-xr-xgit-gui.sh2
-rw-r--r--lib/index.tcl18
3 files changed, 18 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index df6f6b7..5b1ff91 100644
--- a/Makefile
+++ b/Makefile
@@ -78,8 +78,8 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
TCL_PATH_SQ = $(subst ','\'',$(TCL_PATH))
TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
-libdir ?= $(sharedir)/git-gui/lib
-libdir_SQ = $(subst ','\'',$(libdir))
+gg_libdir ?= $(sharedir)/git-gui/lib
+libdir_SQ = $(subst ','\'',$(gg_libdir))
exedir = $(dir $(gitexecdir))share/git-gui/lib
exedir_SQ = $(subst ','\'',$(exedir))
@@ -107,7 +107,7 @@ $(GITGUI_BUILT_INS): git-gui
XGETTEXT ?= xgettext
MSGFMT ?= msgfmt
-msgsdir ?= $(libdir)/msgs
+msgsdir = $(gg_libdir)/msgs
msgsdir_SQ = $(subst ','\'',$(msgsdir))
PO_TEMPLATE = po/git-gui.pot
ALL_POFILES = $(wildcard po/*.po)
@@ -143,7 +143,7 @@ TRACK_VARS = \
$(subst ','\'',TCL_PATH='$(TCL_PATH_SQ)') \
$(subst ','\'',TCLTK_PATH='$(TCLTK_PATH_SQ)') \
$(subst ','\'',gitexecdir='$(gitexecdir_SQ)') \
- $(subst ','\'',libdir='$(libdir_SQ)') \
+ $(subst ','\'',gg_libdir='$(libdir_SQ)') \
#end TRACK_VARS
GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
diff --git a/git-gui.sh b/git-gui.sh
index b3d447e..daab7e4 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -42,6 +42,8 @@ if {[catch {package require Tcl 8.4} err]
exit 1
}
+rename send {} ; # What an evil concept...
+
######################################################################
##
## locate our library
diff --git a/lib/index.tcl b/lib/index.tcl
index b3f5e17..78e2101 100644
--- a/lib/index.tcl
+++ b/lib/index.tcl
@@ -13,7 +13,8 @@ proc update_indexinfo {msg pathList after} {
if {$batch > 25} {set batch 25}
ui_status [format \
- "$msg... %i/%i files (%.2f%%)" \
+ "%s... %i/%i files (%.2f%%)" \
+ $msg \
$update_index_cp \
$totalCnt \
0.0]
@@ -68,7 +69,8 @@ proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
}
ui_status [format \
- "$msg... %i/%i files (%.2f%%)" \
+ "%s... %i/%i files (%.2f%%)" \
+ $msg \
$update_index_cp \
$totalCnt \
[expr {100.0 * $update_index_cp / $totalCnt}]]
@@ -86,7 +88,8 @@ proc update_index {msg pathList after} {
if {$batch > 25} {set batch 25}
ui_status [format \
- "$msg... %i/%i files (%.2f%%)" \
+ "%s... %i/%i files (%.2f%%)" \
+ $msg \
$update_index_cp \
$totalCnt \
0.0]
@@ -145,7 +148,8 @@ proc write_update_index {fd pathList totalCnt batch msg after} {
}
ui_status [format \
- "$msg... %i/%i files (%.2f%%)" \
+ "%s... %i/%i files (%.2f%%)" \
+ $msg \
$update_index_cp \
$totalCnt \
[expr {100.0 * $update_index_cp / $totalCnt}]]
@@ -163,7 +167,8 @@ proc checkout_index {msg pathList after} {
if {$batch > 25} {set batch 25}
ui_status [format \
- "$msg... %i/%i files (%.2f%%)" \
+ "%s... %i/%i files (%.2f%%)" \
+ $msg
$update_index_cp \
$totalCnt \
0.0]
@@ -218,7 +223,8 @@ proc write_checkout_index {fd pathList totalCnt batch msg after} {
}
ui_status [format \
- "$msg... %i/%i files (%.2f%%)" \
+ "%s... %i/%i files (%.2f%%)" \
+ $msg \
$update_index_cp \
$totalCnt \
[expr {100.0 * $update_index_cp / $totalCnt}]]