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

Merge git://git.kernel.org/pub/scm/gitk/gitk

Browse Source 
* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix possible infinite loop and display corruption
This commit is contained in:
Junio C Hamano 2009-03-01 22:20:52 -08:00
commit f8c62880ef
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gitk-git/gitk
View File

@ -701,16 +701,17 @@ proc newvarc {view id} {
} }
proc splitvarc {p v} { proc splitvarc {p v} {
global varcid varcstart varccommits varctok global varcid varcstart varccommits varctok vtokmod
global vupptr vdownptr vleftptr vbackptr varcix varcrow vlastins global vupptr vdownptr vleftptr vbackptr varcix varcrow vlastins
set oa $varcid($v,$p) set oa $varcid($v,$p)
set otok [lindex $varctok($v) $oa]
set ac $varccommits($v,$oa) set ac $varccommits($v,$oa)
set i [lsearch -exact $varccommits($v,$oa) $p] set i [lsearch -exact $varccommits($v,$oa) $p]
if {$i <= 0} return if {$i <= 0} return
set na [llength $varctok($v)] set na [llength $varctok($v)]
# "%" sorts before "0"... # "%" sorts before "0"...
set tok "[lindex $varctok($v) $oa]%[strrep $i]" set tok "$otok%[strrep $i]"
lappend varctok($v) $tok lappend varctok($v) $tok
lappend varcrow($v) {} lappend varcrow($v) {}
lappend varcix($v) {} lappend varcix($v) {}
@ -730,6 +731,9 @@ proc splitvarc {p v} {
for {set b [lindex $vdownptr($v) $na]} {$b != 0} {set b [lindex $vleftptr($v) $b]} { for {set b [lindex $vdownptr($v) $na]} {$b != 0} {set b [lindex $vleftptr($v) $b]} {
lset vupptr($v) $b $na lset vupptr($v) $b $na
} }
if {[string compare $otok $vtokmod($v)] <= 0} {
modify_arc $v $oa
}
} }
proc renumbervarc {a v} { proc renumbervarc {a v} {
@ -3363,7 +3367,6 @@ proc external_blame {parent_idx {line {}}} {
# being given an absolute path... # being given an absolute path...
set f [make_relative $f] set f [make_relative $f]
lappend cmdline $base_commit $f lappend cmdline $base_commit $f
puts "cmdline={$cmdline}"
if {[catch {eval exec $cmdline &} err]} { if {[catch {eval exec $cmdline &} err]} {
error_popup "[mc "git gui blame: command failed:"] $err" error_popup "[mc "git gui blame: command failed:"] $err"
} }
@ -5731,7 +5734,6 @@ proc drawcommits {row {endrow {}}} {
optimize_rows $ro1 0 $r2 optimize_rows $ro1 0 $r2
if {$need_redisplay || $nrows_drawn > 2000} { if {$need_redisplay || $nrows_drawn > 2000} {
clear_display clear_display
drawvisible
} }
# make the lines join to already-drawn rows either side # make the lines join to already-drawn rows either side