gitk: Fix a bug in make_disporder

paulusmack · paulusmack · commit 17529cf9bc50 · 2008-01-12T21:46:31.000+11:00
The make_disporder function has an optimization where it assumed that
if displayorder was already long enough and the first entry in it for
a particular arc was non-null, then the whole arc was present.  This
turns out not to be true in some circumstances, since we can add a
commit to an arc (which truncates displayorder to the previous end of
that arc), then call make_disporder for later arcs (which will pad
displayorder with null elements), then call make_disporder for the
first arc - which won't update the null elements.

This fixes it by changing the optimization to check the last element
for the arc instead of the first.

Signed-off-by: Paul Mackerras &lt;paulus@samba.org&gt;
diff --git a/gitk b/gitk
@@ -853,7 +853,7 @@ proc make_disporder {start end} {
 		lappend displayorder $id
 		lappend parentlist $parents($curview,$id)
 	    }
-	} elseif {[lindex $displayorder $r] eq {}} {
+	} elseif {[lindex $displayorder [expr {$r + $al - 1}]] eq {}} {
 	    set i $r
 	    foreach id $varccommits($curview,$a) {
 		lset displayorder $i $id

Original file line number	Diff line number	Diff line change
`@@ -853,7 +853,7 @@ proc make_disporder {start end} {`
`853`	`853`	`lappend displayorder $id`
`854`	`854`	`lappend parentlist $parents($curview,$id)`
`855`	`855`	`}`
`856`		`- } elseif {[lindex $displayorder $r] eq {}} {`
	`856`	`+ } elseif {[lindex $displayorder [expr {$r + $al - 1}]] eq {}} {`
`857`	`857`	`set i $r`
`858`	`858`	`foreach id $varccommits($curview,$a) {`
`859`	`859`	`lset displayorder $i $id`