mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* 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
This commit is contained in:
Shawn O. Pearce
2007-09-09 05:03:56 -04:00
parent 4b08aa3fef c63fe3b2dc
commit b2bd31006f
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -78,8 +78,8 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
TCL_PATH_SQ = $(subst ','\'',$(TCL_PATH)) TCL_PATH_SQ = $(subst ','\'',$(TCL_PATH))
TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH)) TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
libdir ?= $(sharedir)/git-gui/lib gg_libdir ?= $(sharedir)/git-gui/lib
libdir_SQ = $(subst ','\'',$(libdir)) libdir_SQ = $(subst ','\'',$(gg_libdir))
exedir = $(dir $(gitexecdir))share/git-gui/lib exedir = $(dir $(gitexecdir))share/git-gui/lib
exedir_SQ = $(subst ','\'',$(exedir)) exedir_SQ = $(subst ','\'',$(exedir))
@ -107,7 +107,7 @@ $(GITGUI_BUILT_INS): git-gui
XGETTEXT ?= xgettext XGETTEXT ?= xgettext
MSGFMT ?= msgfmt MSGFMT ?= msgfmt
msgsdir ?= $(libdir)/msgs msgsdir = $(gg_libdir)/msgs
msgsdir_SQ = $(subst ','\'',$(msgsdir)) msgsdir_SQ = $(subst ','\'',$(msgsdir))
PO_TEMPLATE = po/git-gui.pot PO_TEMPLATE = po/git-gui.pot
ALL_POFILES = $(wildcard po/*.po) ALL_POFILES = $(wildcard po/*.po)
@ -143,7 +143,7 @@ TRACK_VARS = \
$(subst ','\'',TCL_PATH='$(TCL_PATH_SQ)') \ $(subst ','\'',TCL_PATH='$(TCL_PATH_SQ)') \
$(subst ','\'',TCLTK_PATH='$(TCLTK_PATH_SQ)') \ $(subst ','\'',TCLTK_PATH='$(TCLTK_PATH_SQ)') \
$(subst ','\'',gitexecdir='$(gitexecdir_SQ)') \ $(subst ','\'',gitexecdir='$(gitexecdir_SQ)') \
$(subst ','\'',libdir='$(libdir_SQ)') \ $(subst ','\'',gg_libdir='$(libdir_SQ)') \
#end TRACK_VARS #end TRACK_VARS
GIT-GUI-VARS: .FORCE-GIT-GUI-VARS GIT-GUI-VARS: .FORCE-GIT-GUI-VARS

2
git-gui.sh
View File

@ -42,6 +42,8 @@ if {[catch {package require Tcl 8.4} err]
exit 1 exit 1
} }
rename send {} ; # What an evil concept...
###################################################################### ######################################################################
## ##
## locate our library ## locate our library

18
lib/index.tcl
View File

@ -13,7 +13,8 @@ proc update_indexinfo {msg pathList after} {
if {$batch > 25} {set batch 25} if {$batch > 25} {set batch 25}
ui_status [format \ ui_status [format \
"$msg... %i/%i files (%.2f%%)" \ "%s... %i/%i files (%.2f%%)" \
$msg \
$update_index_cp \ $update_index_cp \
$totalCnt \ $totalCnt \
0.0] 0.0]
@ -68,7 +69,8 @@ proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
} }
ui_status [format \ ui_status [format \
"$msg... %i/%i files (%.2f%%)" \ "%s... %i/%i files (%.2f%%)" \
$msg \
$update_index_cp \ $update_index_cp \
$totalCnt \ $totalCnt \
[expr {100.0 * $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} if {$batch > 25} {set batch 25}
ui_status [format \ ui_status [format \
"$msg... %i/%i files (%.2f%%)" \ "%s... %i/%i files (%.2f%%)" \
$msg \
$update_index_cp \ $update_index_cp \
$totalCnt \ $totalCnt \
0.0] 0.0]
@ -145,7 +148,8 @@ proc write_update_index {fd pathList totalCnt batch msg after} {
} }
ui_status [format \ ui_status [format \
"$msg... %i/%i files (%.2f%%)" \ "%s... %i/%i files (%.2f%%)" \
$msg \
$update_index_cp \ $update_index_cp \
$totalCnt \ $totalCnt \
[expr {100.0 * $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} if {$batch > 25} {set batch 25}
ui_status [format \ ui_status [format \
"$msg... %i/%i files (%.2f%%)" \ "%s... %i/%i files (%.2f%%)" \
$msg
$update_index_cp \ $update_index_cp \
$totalCnt \ $totalCnt \
0.0] 0.0]
@ -218,7 +223,8 @@ proc write_checkout_index {fd pathList totalCnt batch msg after} {
} }
ui_status [format \ ui_status [format \
"$msg... %i/%i files (%.2f%%)" \ "%s... %i/%i files (%.2f%%)" \
$msg \
$update_index_cp \ $update_index_cp \
$totalCnt \ $totalCnt \
[expr {100.0 * $update_index_cp / $totalCnt}]] [expr {100.0 * $update_index_cp / $totalCnt}]]