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

* 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
This commit is contained in:
Junio C Hamano
2009-12-09 15:38:51 -08:00
4 changed files with 37 additions and 13 deletions

View File

@ -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
}
}