Merge branch 'maint'

spearce · spearce · commit fe813d4e8042 · 2007-06-20T23:27:08.000-04:00
* maint:
  git-gui: Bind Tab/Shift-Tab to cycle between panes in blame
  git-gui: Correctly install to /usr/bin on Cygwin
diff --git a/Makefile b/Makefile
@@ -7,6 +7,8 @@ GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 	@$(SHELL_PATH) ./GIT-VERSION-GEN
 -include GIT-VERSION-FILE
 
+uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
+
 SCRIPT_SH = git-gui.sh
 GITGUI_BUILT_INS = git-citool
 ALL_PROGRAMS = $(GITGUI_BUILT_INS) $(patsubst %.sh,%,$(SCRIPT_SH))
@@ -82,8 +84,12 @@ exedir_SQ = $(subst ','\'',$(exedir))
 
 $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
 	$(QUIET_GEN)rm -f $@ $@+ && \
+	GITGUI_RELATIVE= && \
 	if test '$(exedir_SQ)' = '$(libdir_SQ)'; then \
-		GITGUI_RELATIVE=1; \
+		if test "$(uname_O)" = Cygwin; \
+		then GITGUI_RELATIVE= ; \
+		else GITGUI_RELATIVE=1; \
+		fi; \
 	fi && \
 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 		-e 's|^exec wish "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' \
diff --git a/lib/blame.tcl b/lib/blame.tcl
@@ -272,6 +272,8 @@ constructor new {i_commit i_path} {
 			set cursorW %W
 			tk_popup $w.ctxm %X %Y
 		"
+		bind $i <Shift-Tab> "[list focus $w_cviewer];break"
+		bind $i <Tab>       "[list focus $w_cviewer];break"
 	}
 
 	foreach i [concat $w_columns $w_cviewer] {
@@ -287,8 +289,10 @@ constructor new {i_commit i_path} {
 		bind $i <Control-Key-f> {catch {%W yview scroll  1 pages};break}
 	}
 
+	bind $w_cviewer <Shift-Tab> "[list focus $w_file];break"
+	bind $w_cviewer <Tab>       "[list focus $w_file];break"
 	bind $w_cviewer <Button-1> [list focus $w_cviewer]
-	bind $top <Visibility> [list focus $top]
+	bind $w_file    <Visibility> [list focus $w_file]
 
 	grid configure $w.header -sticky ew
 	grid configure $w.file_pane -sticky nsew

Original file line number	Diff line number	Diff line change
`@@ -272,6 +272,8 @@ constructor new {i_commit i_path} {`
`272`	`272`	`set cursorW %W`
`273`	`273`	`tk_popup $w.ctxm %X %Y`
`274`	`274`	`"`
	`275`	`+ bind $i <Shift-Tab> "[list focus $w_cviewer];break"`
	`276`	`+ bind $i <Tab> "[list focus $w_cviewer];break"`
`275`	`277`	`}`
`276`	`278`
`277`	`279`	`foreach i [concat $w_columns $w_cviewer] {`
`@@ -287,8 +289,10 @@ constructor new {i_commit i_path} {`
`287`	`289`	`bind $i <Control-Key-f> {catch {%W yview scroll 1 pages};break}`
`288`	`290`	`}`
`289`	`291`
	`292`	`+ bind $w_cviewer <Shift-Tab> "[list focus $w_file];break"`
	`293`	`+ bind $w_cviewer <Tab> "[list focus $w_file];break"`
`290`	`294`	`bind $w_cviewer <Button-1> [list focus $w_cviewer]`
`291`		`- bind $top <Visibility> [list focus $top]`
	`295`	`+ bind $w_file <Visibility> [list focus $w_file]`
`292`	`296`
`293`	`297`	`grid configure $w.header -sticky ew`
`294`	`298`	`grid configure $w.file_pane -sticky nsew`