Merge git://repo.or.cz/git-gui

gitster · gitster · commit 529f8c6ea6c1 · 2009-12-09T15:38:51.000-08:00
* git://repo.or.cz/git-gui:
  git-gui: suppress RenderBadPicture X error caused by Tk bug
  git-gui: Increase blame viewer usability on MacOS.
  git-gui: search 4 directories to improve statistic of gc hint
  git gui: make current branch default in "remote delete branch" merge check
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
@@ -2052,6 +2052,11 @@ proc do_quit {{rc {1}}} {
 	}
 
 	set ret_code $rc
+
+	# Briefly enable send again, working around Tk bug
+	# http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
+	tk appname [appname]
+
 	destroy .
 }
 
diff --git a/git-gui/lib/blame.tcl b/git-gui/lib/blame.tcl
@@ -1245,6 +1245,18 @@ method _open_tooltip {cur_w} {
 
 	$tooltip_t conf -state disabled
 	_position_tooltip $this
+
+	# On MacOS raising a window causes it to acquire focus.
+	# Tk 8.5 on MacOS seems to properly support wm transient,
+	# so we can safely counter the effect there.
+	if {$::have_tk85 && [is_MacOSX]} {
+		update
+		if {$w eq {}} {
+			raise .
+		} else {
+			raise $w
+		}
+	}
 }
 
 method _position_tooltip {} {
@@ -1268,7 +1280,9 @@ method _position_tooltip {} {
 	append g $pos_y
 
 	wm geometry $tooltip_wm $g
-	raise $tooltip_wm
+	if {![is_MacOSX]} {
+		raise $tooltip_wm
+	}
 }
 
 method _hide_tooltip {} {
diff --git a/git-gui/lib/database.tcl b/git-gui/lib/database.tcl
@@ -89,27 +89,26 @@ proc do_fsck_objects {} {
 }
 
 proc hint_gc {} {
-	set object_limit 8
+	set ndirs 1
+	set limit 8
 	if {[is_Windows]} {
-		set object_limit 1
+		set ndirs 4
+		set limit 1
 	}
 
-	set objects_current [llength [glob \
-		-directory [gitdir objects 42] \
+	set count [llength [glob \
 		-nocomplain \
-		-tails \
 		-- \
-		*]]
+		[gitdir objects 4\[0-[expr {$ndirs-1}]\]/*]]]
 
-	if {$objects_current >= $object_limit} {
-		set objects_current [expr {$objects_current * 250}]
-		set object_limit    [expr {$object_limit    * 250}]
+	if {$count >= $limit * $ndirs} {
+		set objects_current [expr {$count * 256/$ndirs}]
 		if {[ask_popup \
 			[mc "This repository currently has approximately %i loose objects.
 
-To maintain optimal performance it is strongly recommended that you compress the database when more than %i loose objects exist.
+To maintain optimal performance it is strongly recommended that you compress the database.
 
-Compress the database now?" $objects_current $object_limit]] eq yes} {
+Compress the database now?" $objects_current]] eq yes} {
 			do_gc
 		}
 	}
diff --git a/git-gui/lib/remote_branch_delete.tcl b/git-gui/lib/remote_branch_delete.tcl
@@ -250,6 +250,8 @@ method _write_url        {args} { set urltype url    }
 method _write_check_head {args} { set checktype head }
 
 method _write_head_list {args} {
+	global current_branch
+
 	$head_m delete 0 end
 	foreach abr $head_list {
 		$head_m insert end radiobutton \
@@ -258,7 +260,11 @@ method _write_head_list {args} {
 			-variable @check_head
 	}
 	if {[lsearch -exact -sorted $head_list $check_head] < 0} {
-		set check_head {}
+		if {[lsearch -exact -sorted $head_list $current_branch] < 0} {
+			set check_head {}
+		} else {
+			set check_head $current_branch
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2052,6 +2052,11 @@ proc do_quit {{rc {1}}} {`
`2052`	`2052`	`}`
`2053`	`2053`
`2054`	`2054`	`set ret_code $rc`
	`2055`	`+`
	`2056`	`+ # Briefly enable send again, working around Tk bug`
	`2057`	`+ # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997`
	`2058`	`+ tk appname [appname]`
	`2059`	`+`
`2055`	`2060`	`destroy .`
`2056`	`2061`	`}`
`2057`	`2062`
Original file line number	Diff line number	Diff line change
`@@ -250,6 +250,8 @@ method _write_url {args} { set urltype url }`
`250`	`250`	`method _write_check_head {args} { set checktype head }`
`251`	`251`
`252`	`252`	`method _write_head_list {args} {`
	`253`	`+ global current_branch`
	`254`	`+`
`253`	`255`	`$head_m delete 0 end`
`254`	`256`	`foreach abr $head_list {`
`255`	`257`	`$head_m insert end radiobutton \`
`@@ -258,7 +260,11 @@ method _write_head_list {args} {`
`258`	`260`	`-variable @check_head`
`259`	`261`	`}`
`260`	`262`	`if {[lsearch -exact -sorted $head_list $check_head] < 0} {`
`261`		`- set check_head {}`
	`263`	`+ if {[lsearch -exact -sorted $head_list $current_branch] < 0} {`
	`264`	`+ set check_head {}`
	`265`	`+ } else {`
	`266`	`+ set check_head $current_branch`
	`267`	`+ }`
`262`	`268`	`}`
`263`	`269`	`}`
`264`	`270`