gitk: Index [fnvr]highlights by id rather than row

paulusmack · paulusmack · commit 476ca63dbc65 · 2008-01-07T22:16:31.000+11:00
This means that we don't have to keep clearing them out whenever we
change the row numbers for some commits.

Signed-off-by: Paul Mackerras &lt;paulus@samba.org&gt;
diff --git a/gitk b/gitk
@@ -661,7 +661,6 @@ proc vtokcmp {v a b} {
 
 proc modify_arc {v a {lim {}}} {
     global varctok vtokmod varcmod varcrow vupptr curview vrowmod varccommits
-    global vhighlights nhighlights fhighlights rhighlights
 
     set vtokmod($v) [lindex $varctok($v) $a]
     set varcmod($v) $a
@@ -680,10 +679,6 @@ proc modify_arc {v a {lim {}}} {
 	set vrowmod($v) $r
 	undolayout $r
     }
-    catch {unset nhighlights}
-    catch {unset fhighlights}
-    catch {unset vhighlights}
-    catch {unset rhighlights}
 }
 
 proc update_arcrows {v} {
@@ -2850,20 +2845,20 @@ proc showview {n} {
 
 # Stuff relating to the highlighting facility
 
-proc ishighlighted {row} {
+proc ishighlighted {id} {
     global vhighlights fhighlights nhighlights rhighlights
 
-    if {[info exists nhighlights($row)] && $nhighlights($row) > 0} {
-	return $nhighlights($row)
+    if {[info exists nhighlights($id)] && $nhighlights($id) > 0} {
+	return $nhighlights($id)
     }
-    if {[info exists vhighlights($row)] && $vhighlights($row) > 0} {
-	return $vhighlights($row)
+    if {[info exists vhighlights($id)] && $vhighlights($id) > 0} {
+	return $vhighlights($id)
     }
-    if {[info exists fhighlights($row)] && $fhighlights($row) > 0} {
-	return $fhighlights($row)
+    if {[info exists fhighlights($id)] && $fhighlights($id) > 0} {
+	return $fhighlights($id)
     }
-    if {[info exists rhighlights($row)] && $rhighlights($row) > 0} {
-	return $rhighlights($row)
+    if {[info exists rhighlights($id)] && $rhighlights($id) > 0} {
+	return $rhighlights($id)
     }
     return 0
 }
@@ -2901,7 +2896,7 @@ proc unbolden {} {
 
     set stillbold {}
     foreach row $boldrows {
-	if {![ishighlighted $row]} {
+	if {![ishighlighted [commitonrow $row]]} {
 	    bolden $row mainfont
 	} else {
 	    lappend stillbold $row
@@ -2911,7 +2906,7 @@ proc unbolden {} {
 }
 
 proc addvhighlight {n} {
-    global hlview viewcomplete curview vhl_done vhighlights commitidx
+    global hlview viewcomplete curview vhl_done commitidx
 
     if {[info exists hlview]} {
 	delvhighlight
@@ -2950,7 +2945,7 @@ proc vhighlightmore {} {
 		if {![highlighted $row]} {
 		    bolden $row mainfontbold
 		}
-		set vhighlights($row) 1
+		set vhighlights($id) 1
 	    }
 	}
     }
@@ -2961,12 +2956,12 @@ proc askvhighlight {row id} {
     global hlview vhighlights iddrawn
 
     if {[commitinview $id $hlview]} {
-	if {[info exists iddrawn($id)] && ![ishighlighted $row]} {
+	if {[info exists iddrawn($id)] && ![ishighlighted $id]} {
 	    bolden $row mainfontbold
 	}
-	set vhighlights($row) 1
+	set vhighlights($id) 1
     } else {
-	set vhighlights($row) 0
+	set vhighlights($id) 0
     }
 }
 
@@ -3104,7 +3099,7 @@ proc askfilehighlight {row id} {
     global filehighlight fhighlights fhl_list
 
     lappend fhl_list $id
-    set fhighlights($row) -1
+    set fhighlights($id) -1
     puts $filehighlight $id
 }
 
@@ -3122,18 +3117,16 @@ proc readfhighlight {} {
 	if {$i < 0} continue
 	for {set j 0} {$j < $i} {incr j} {
 	    set id [lindex $fhl_list $j]
-	    if {[commitinview $id $curview]} {
-		set fhighlights([rowofcommit $id]) 0
-	    }
+	    set fhighlights($id) 0
 	}
 	set fhl_list [lrange $fhl_list [expr {$i+1}] end]
 	if {$line eq {}} continue
 	if {![commitinview $line $curview]} continue
 	set row [rowofcommit $line]
-	if {[info exists iddrawn($line)] && ![ishighlighted $row]} {
+	if {[info exists iddrawn($line)] && ![ishighlighted $line]} {
 	    bolden $row mainfontbold
 	}
-	set fhighlights($row) 1
+	set fhighlights($line) 1
     }
     if {[eof $filehighlight]} {
 	# strange...
@@ -3182,7 +3175,7 @@ proc askfindhighlight {row id} {
 	}
     }
     if {$isbold && [info exists iddrawn($id)]} {
-	if {![ishighlighted $row]} {
+	if {![ishighlighted $id]} {
 	    bolden $row mainfontbold
 	    if {$isbold > 1} {
 		bolden_name $row mainfontbold
@@ -3192,7 +3185,7 @@ proc askfindhighlight {row id} {
 	    markrowmatches $row $id
 	}
     }
-    set nhighlights($row) $isbold
+    set nhighlights($id) $isbold
 }
 
 proc markrowmatches {row id} {
@@ -3230,7 +3223,7 @@ proc vrel_change {name ix op} {
 # prepare for testing whether commits are descendents or ancestors of a
 proc rhighlight_sel {a} {
     global descendent desc_todo ancestor anc_todo
-    global highlight_related rhighlights
+    global highlight_related
 
     catch {unset descendent}
     set desc_todo [list $a]
@@ -3337,11 +3330,11 @@ proc askrelhighlight {row id} {
 	}
     }
     if {[info exists iddrawn($id)]} {
-	if {$isbold && ![ishighlighted $row]} {
+	if {$isbold && ![ishighlighted $id]} {
 	    bolden $row mainfontbold
 	}
     }
-    set rhighlights($row) $isbold
+    set rhighlights($id) $isbold
 }
 
 # Graph layout functions
@@ -4408,7 +4401,7 @@ proc drawcmittext {id row col} {
     set date [formatdate $date]
     set font mainfont
     set nfont mainfont
-    set isbold [ishighlighted $row]
+    set isbold [ishighlighted $id]
     if {$isbold > 0} {
 	lappend boldrows $row
 	set font mainfontbold
@@ -4445,16 +4438,16 @@ proc drawcmitrow {row} {
     if {$row >= $numcommits} return
 
     set id [lindex $displayorder $row]
-    if {[info exists hlview] && ![info exists vhighlights($row)]} {
+    if {[info exists hlview] && ![info exists vhighlights($id)]} {
 	askvhighlight $row $id
     }
-    if {[info exists filehighlight] && ![info exists fhighlights($row)]} {
+    if {[info exists filehighlight] && ![info exists fhighlights($id)]} {
 	askfilehighlight $row $id
     }
-    if {$findpattern ne {} && ![info exists nhighlights($row)]} {
+    if {$findpattern ne {} && ![info exists nhighlights($id)]} {
 	askfindhighlight $row $id
     }
-    if {$highlight_related ne [mc "None"] && ![info exists rhighlights($row)]} {
+    if {$highlight_related ne [mc "None"] && ![info exists rhighlights($id)]} {
 	askrelhighlight $row $id
     }
     if {![info exists iddrawn($id)]} {
@@ -5045,15 +5038,15 @@ proc findmore {} {
 		set arowend [expr {$arow + [llength $ids]}]
 	    }
 	    set id [lindex $ids [expr {$l - $arow}]]
-	    if {![info exists fhighlights($l)]} {
-		# this sets fhighlights($l) to -1
+	    if {![info exists fhighlights($id)]} {
+		# this sets fhighlights($id) to -1
 		askfilehighlight $l $id
 	    }
-	    if {$fhighlights($l) > 0} {
+	    if {$fhighlights($id) > 0} {
 		set found $domore
 		break
 	    }
-	    if {$fhighlights($l) < 0} {
+	    if {$fhighlights($id) < 0} {
 		if {$domore} {
 		    set domore 0
 		    set findcurline [expr {$l - $find_dirn}]

Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,6 @@ proc vtokcmp {v a b} {`
`661`	`661`
`662`	`662`	`proc modify_arc {v a {lim {}}} {`
`663`	`663`	`global varctok vtokmod varcmod varcrow vupptr curview vrowmod varccommits`
`664`		`- global vhighlights nhighlights fhighlights rhighlights`
`665`	`664`
`666`	`665`	`set vtokmod($v) [lindex $varctok($v) $a]`
`667`	`666`	`set varcmod($v) $a`
`@@ -680,10 +679,6 @@ proc modify_arc {v a {lim {}}} {`
`680`	`679`	`set vrowmod($v) $r`
`681`	`680`	`undolayout $r`
`682`	`681`	`}`
`683`		`- catch {unset nhighlights}`
`684`		`- catch {unset fhighlights}`
`685`		`- catch {unset vhighlights}`
`686`		`- catch {unset rhighlights}`
`687`	`682`	`}`
`688`	`683`
`689`	`684`	`proc update_arcrows {v} {`
`@@ -2850,20 +2845,20 @@ proc showview {n} {`
`2850`	`2845`
`2851`	`2846`	`# Stuff relating to the highlighting facility`
`2852`	`2847`
`2853`		`-proc ishighlighted {row} {`
	`2848`	`+proc ishighlighted {id} {`
`2854`	`2849`	`global vhighlights fhighlights nhighlights rhighlights`
`2855`	`2850`
`2856`		`- if {[info exists nhighlights($row)] && $nhighlights($row) > 0} {`
`2857`		`- return $nhighlights($row)`
	`2851`	`+ if {[info exists nhighlights($id)] && $nhighlights($id) > 0} {`
	`2852`	`+ return $nhighlights($id)`
`2858`	`2853`	`}`
`2859`		`- if {[info exists vhighlights($row)] && $vhighlights($row) > 0} {`
`2860`		`- return $vhighlights($row)`
	`2854`	`+ if {[info exists vhighlights($id)] && $vhighlights($id) > 0} {`
	`2855`	`+ return $vhighlights($id)`
`2861`	`2856`	`}`
`2862`		`- if {[info exists fhighlights($row)] && $fhighlights($row) > 0} {`
`2863`		`- return $fhighlights($row)`
	`2857`	`+ if {[info exists fhighlights($id)] && $fhighlights($id) > 0} {`
	`2858`	`+ return $fhighlights($id)`
`2864`	`2859`	`}`
`2865`		`- if {[info exists rhighlights($row)] && $rhighlights($row) > 0} {`
`2866`		`- return $rhighlights($row)`
	`2860`	`+ if {[info exists rhighlights($id)] && $rhighlights($id) > 0} {`
	`2861`	`+ return $rhighlights($id)`
`2867`	`2862`	`}`
`2868`	`2863`	`return 0`
`2869`	`2864`	`}`
`@@ -2901,7 +2896,7 @@ proc unbolden {} {`
`2901`	`2896`
`2902`	`2897`	`set stillbold {}`
`2903`	`2898`	`foreach row $boldrows {`
`2904`		`- if {![ishighlighted $row]} {`
	`2899`	`+ if {![ishighlighted [commitonrow $row]]} {`
`2905`	`2900`	`bolden $row mainfont`
`2906`	`2901`	`} else {`
`2907`	`2902`	`lappend stillbold $row`
`@@ -2911,7 +2906,7 @@ proc unbolden {} {`
`2911`	`2906`	`}`
`2912`	`2907`
`2913`	`2908`	`proc addvhighlight {n} {`
`2914`		`- global hlview viewcomplete curview vhl_done vhighlights commitidx`
	`2909`	`+ global hlview viewcomplete curview vhl_done commitidx`
`2915`	`2910`
`2916`	`2911`	`if {[info exists hlview]} {`
`2917`	`2912`	`delvhighlight`
`@@ -2950,7 +2945,7 @@ proc vhighlightmore {} {`
`2950`	`2945`	`if {![highlighted $row]} {`
`2951`	`2946`	`bolden $row mainfontbold`
`2952`	`2947`	`}`
`2953`		`- set vhighlights($row) 1`
	`2948`	`+ set vhighlights($id) 1`
`2954`	`2949`	`}`
`2955`	`2950`	`}`
`2956`	`2951`	`}`
`@@ -2961,12 +2956,12 @@ proc askvhighlight {row id} {`
`2961`	`2956`	`global hlview vhighlights iddrawn`
`2962`	`2957`
`2963`	`2958`	`if {[commitinview $id $hlview]} {`
`2964`		`- if {[info exists iddrawn($id)] && ![ishighlighted $row]} {`
	`2959`	`+ if {[info exists iddrawn($id)] && ![ishighlighted $id]} {`
`2965`	`2960`	`bolden $row mainfontbold`
`2966`	`2961`	`}`
`2967`		`- set vhighlights($row) 1`
	`2962`	`+ set vhighlights($id) 1`
`2968`	`2963`	`} else {`
`2969`		`- set vhighlights($row) 0`
	`2964`	`+ set vhighlights($id) 0`
`2970`	`2965`	`}`
`2971`	`2966`	`}`
`2972`	`2967`
`@@ -3104,7 +3099,7 @@ proc askfilehighlight {row id} {`
`3104`	`3099`	`global filehighlight fhighlights fhl_list`
`3105`	`3100`
`3106`	`3101`	`lappend fhl_list $id`
`3107`		`- set fhighlights($row) -1`
	`3102`	`+ set fhighlights($id) -1`
`3108`	`3103`	`puts $filehighlight $id`
`3109`	`3104`	`}`
`3110`	`3105`
`@@ -3122,18 +3117,16 @@ proc readfhighlight {} {`
`3122`	`3117`	`if {$i < 0} continue`
`3123`	`3118`	`for {set j 0} {$j < $i} {incr j} {`
`3124`	`3119`	`set id [lindex $fhl_list $j]`
`3125`		`- if {[commitinview $id $curview]} {`
`3126`		`- set fhighlights([rowofcommit $id]) 0`
`3127`		`- }`
	`3120`	`+ set fhighlights($id) 0`
`3128`	`3121`	`}`
`3129`	`3122`	`set fhl_list [lrange $fhl_list [expr {$i+1}] end]`
`3130`	`3123`	`if {$line eq {}} continue`
`3131`	`3124`	`if {![commitinview $line $curview]} continue`
`3132`	`3125`	`set row [rowofcommit $line]`
`3133`		`- if {[info exists iddrawn($line)] && ![ishighlighted $row]} {`
	`3126`	`+ if {[info exists iddrawn($line)] && ![ishighlighted $line]} {`
`3134`	`3127`	`bolden $row mainfontbold`
`3135`	`3128`	`}`
`3136`		`- set fhighlights($row) 1`
	`3129`	`+ set fhighlights($line) 1`
`3137`	`3130`	`}`
`3138`	`3131`	`if {[eof $filehighlight]} {`
`3139`	`3132`	`# strange...`
`@@ -3182,7 +3175,7 @@ proc askfindhighlight {row id} {`
`3182`	`3175`	`}`
`3183`	`3176`	`}`
`3184`	`3177`	`if {$isbold && [info exists iddrawn($id)]} {`
`3185`		`- if {![ishighlighted $row]} {`
	`3178`	`+ if {![ishighlighted $id]} {`
`3186`	`3179`	`bolden $row mainfontbold`
`3187`	`3180`	`if {$isbold > 1} {`
`3188`	`3181`	`bolden_name $row mainfontbold`
`@@ -3192,7 +3185,7 @@ proc askfindhighlight {row id} {`
`3192`	`3185`	`markrowmatches $row $id`
`3193`	`3186`	`}`
`3194`	`3187`	`}`
`3195`		`- set nhighlights($row) $isbold`
	`3188`	`+ set nhighlights($id) $isbold`
`3196`	`3189`	`}`
`3197`	`3190`
`3198`	`3191`	`proc markrowmatches {row id} {`
`@@ -3230,7 +3223,7 @@ proc vrel_change {name ix op} {`
`3230`	`3223`	`# prepare for testing whether commits are descendents or ancestors of a`
`3231`	`3224`	`proc rhighlight_sel {a} {`
`3232`	`3225`	`global descendent desc_todo ancestor anc_todo`
`3233`		`- global highlight_related rhighlights`
	`3226`	`+ global highlight_related`
`3234`	`3227`
`3235`	`3228`	`catch {unset descendent}`
`3236`	`3229`	`set desc_todo [list $a]`
`@@ -3337,11 +3330,11 @@ proc askrelhighlight {row id} {`
`3337`	`3330`	`}`
`3338`	`3331`	`}`
`3339`	`3332`	`if {[info exists iddrawn($id)]} {`
`3340`		`- if {$isbold && ![ishighlighted $row]} {`
	`3333`	`+ if {$isbold && ![ishighlighted $id]} {`
`3341`	`3334`	`bolden $row mainfontbold`
`3342`	`3335`	`}`
`3343`	`3336`	`}`
`3344`		`- set rhighlights($row) $isbold`
	`3337`	`+ set rhighlights($id) $isbold`
`3345`	`3338`	`}`
`3346`	`3339`
`3347`	`3340`	`# Graph layout functions`
`@@ -4408,7 +4401,7 @@ proc drawcmittext {id row col} {`
`4408`	`4401`	`set date [formatdate $date]`
`4409`	`4402`	`set font mainfont`
`4410`	`4403`	`set nfont mainfont`
`4411`		`- set isbold [ishighlighted $row]`
	`4404`	`+ set isbold [ishighlighted $id]`
`4412`	`4405`	`if {$isbold > 0} {`
`4413`	`4406`	`lappend boldrows $row`
`4414`	`4407`	`set font mainfontbold`
`@@ -4445,16 +4438,16 @@ proc drawcmitrow {row} {`
`4445`	`4438`	`if {$row >= $numcommits} return`
`4446`	`4439`
`4447`	`4440`	`set id [lindex $displayorder $row]`
`4448`		`- if {[info exists hlview] && ![info exists vhighlights($row)]} {`
	`4441`	`+ if {[info exists hlview] && ![info exists vhighlights($id)]} {`
`4449`	`4442`	`askvhighlight $row $id`
`4450`	`4443`	`}`
`4451`		`- if {[info exists filehighlight] && ![info exists fhighlights($row)]} {`
	`4444`	`+ if {[info exists filehighlight] && ![info exists fhighlights($id)]} {`
`4452`	`4445`	`askfilehighlight $row $id`
`4453`	`4446`	`}`
`4454`		`- if {$findpattern ne {} && ![info exists nhighlights($row)]} {`
	`4447`	`+ if {$findpattern ne {} && ![info exists nhighlights($id)]} {`
`4455`	`4448`	`askfindhighlight $row $id`
`4456`	`4449`	`}`
`4457`		`- if {$highlight_related ne [mc "None"] && ![info exists rhighlights($row)]} {`
	`4450`	`+ if {$highlight_related ne [mc "None"] && ![info exists rhighlights($id)]} {`
`4458`	`4451`	`askrelhighlight $row $id`
`4459`	`4452`	`}`
`4460`	`4453`	`if {![info exists iddrawn($id)]} {`
`@@ -5045,15 +5038,15 @@ proc findmore {} {`
`5045`	`5038`	`set arowend [expr {$arow + [llength $ids]}]`
`5046`	`5039`	`}`
`5047`	`5040`	`set id [lindex $ids [expr {$l - $arow}]]`
`5048`		`- if {![info exists fhighlights($l)]} {`
`5049`		`- # this sets fhighlights($l) to -1`
	`5041`	`+ if {![info exists fhighlights($id)]} {`
	`5042`	`+ # this sets fhighlights($id) to -1`
`5050`	`5043`	`askfilehighlight $l $id`
`5051`	`5044`	`}`
`5052`		`- if {$fhighlights($l) > 0} {`
	`5045`	`+ if {$fhighlights($id) > 0} {`
`5053`	`5046`	`set found $domore`
`5054`	`5047`	`break`
`5055`	`5048`	`}`
`5056`		`- if {$fhighlights($l) < 0} {`
	`5049`	`+ if {$fhighlights($id) < 0} {`
`5057`	`5050`	`if {$domore} {`
`5058`	`5051`	`set domore 0`
`5059`	`5052`	`set findcurline [expr {$l - $find_dirn}]`