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

gitk: Make commitdata an array rather than a list

Browse Source 
This turns out to be slightly simpler and faster, and will make
things a little easier when we do multiple view support.

Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras
2006-03-18 10:04:48 +11:00
parent b06bc2a078
commit f7a3e8d254
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gitk
View File

@ -35,7 +35,6 @@ proc parse_args {rargs} {
proc start_rev_list {rlargs} { proc start_rev_list {rlargs} {
global startmsecs nextupdate ncmupdate global startmsecs nextupdate ncmupdate
global commfd leftover tclencoding datemode global commfd leftover tclencoding datemode
global commitdata
set startmsecs [clock clicks -milliseconds] set startmsecs [clock clicks -milliseconds]
set nextupdate [expr {$startmsecs + 100}] set nextupdate [expr {$startmsecs + 100}]
@ -53,7 +52,6 @@ proc start_rev_list {rlargs} {
exit 1 exit 1
} }
set leftover {} set leftover {}
set commitdata {}
fconfigure $commfd -blocking 0 -translation lf fconfigure $commfd -blocking 0 -translation lf
if {$tclencoding != {}} { if {$tclencoding != {}} {
fconfigure $commfd -encoding $tclencoding fconfigure $commfd -encoding $tclencoding
@ -137,8 +135,8 @@ proc getcommitlines {commfd} {
set id [lindex $ids 0] set id [lindex $ids 0]
set olds [lrange $ids 1 end] set olds [lrange $ids 1 end]
set commitlisted($id) 1 set commitlisted($id) 1
updatechildren $id [lrange $ids 1 end] updatechildren $id $olds
lappend commitdata [string range $cmit [expr {$j + 1}] end] set commitdata($id) [string range $cmit [expr {$j + 1}] end]
set commitrow($id) $commitidx set commitrow($id) $commitidx
incr commitidx incr commitidx
lappend displayorder $id lappend displayorder $id
@ -266,15 +264,11 @@ proc parsecommit {id contents listed} {
$comname $comdate $comment] $comname $comdate $comment]
} }
proc getcommit {id {row {}}} { proc getcommit {id} {
global commitdata commitrow commitinfo nparents global commitdata commitinfo nparents
if {$row eq {}} { if {[info exists commitdata($id)]} {
if {![info exists commitrow($id)]} {return 0} parsecommit $id $commitdata($id) 1
set row $commitrow($id)
}
if {$row < [llength $commitdata]} {
parsecommit $id [lindex $commitdata $row] 1
} else { } else {
readcommit $id readcommit $id
if {![info exists commitinfo($id)]} { if {![info exists commitinfo($id)]} {
@ -1341,7 +1335,6 @@ proc drawcmitrow {row} {
global displayorder rowidlist global displayorder rowidlist
global idrowranges idrangedrawn iddrawn global idrowranges idrangedrawn iddrawn
global commitinfo commitlisted parents numcommits global commitinfo commitlisted parents numcommits
global commitdata
if {$row >= $numcommits} return if {$row >= $numcommits} return
foreach id [lindex $rowidlist $row] { foreach id [lindex $rowidlist $row] {
@ -1369,7 +1362,7 @@ proc drawcmitrow {row} {
return return
} }
if {![info exists commitinfo($id)]} { if {![info exists commitinfo($id)]} {
getcommit $id $row getcommit $id
} }
assigncolor $id assigncolor $id
if {[info exists commitlisted($id)] && [info exists parents($id)] if {[info exists commitlisted($id)] && [info exists parents($id)]
@ -1723,7 +1716,8 @@ proc dofind {} {
set didsel 0 set didsel 0
set fldtypes {Headline Author Date Committer CDate Comment} set fldtypes {Headline Author Date Committer CDate Comment}
set l -1 set l -1
foreach d $commitdata { foreach id $displayorder {
set d $commitdata($id)
incr l incr l
if {$findtype == "Regexp"} { if {$findtype == "Regexp"} {
set doesmatch [regexp $foundstring $d] set doesmatch [regexp $foundstring $d]
@ -1733,9 +1727,8 @@ proc dofind {} {
set doesmatch [string match $matchstring $d] set doesmatch [string match $matchstring $d]
} }
if {!$doesmatch} continue if {!$doesmatch} continue
set id [lindex $displayorder $l]
if {![info exists commitinfo($id)]} { if {![info exists commitinfo($id)]} {
getcommit $id $l getcommit $id
} }
set info $commitinfo($id) set info $commitinfo($id)
set doesmatch 0 set doesmatch 0