proc getcommits {rargs} {
global commits commfd phase canv mainfont env
- global startmsecs nextupdate
+ global startmsecs nextupdate ncmupdate
global ctext maincursor textcursor leftover
# check that we can find a .git directory somewhere...
set phase getcommits
set startmsecs [clock clicks -milliseconds]
set nextupdate [expr $startmsecs + 100]
+ set ncmupdate 1
if [catch {
set parse_args [concat --default HEAD $rargs]
set parsed_args [split [eval exec git-rev-parse $parse_args] "\n"]
}
set leftover {}
fconfigure $commfd -blocking 0 -translation lf
- fileevent $commfd readable "getcommitlines $commfd"
+ fileevent $commfd readable [list getcommitlines $commfd]
$canv delete all
$canv create text 3 3 -anchor nw -text "Reading commits..." \
-font $mainfont -tags textitems
parsecommit $id $cmit 1
drawcommit $id
if {[clock clicks -milliseconds] >= $nextupdate} {
- doupdate
+ doupdate 1
}
while {$redisplaying} {
set redisplaying 0
drawcommit $id
if {$stopped} break
if {[clock clicks -milliseconds] >= $nextupdate} {
- doupdate
+ doupdate 1
}
}
}
}
}
-proc doupdate {} {
- global commfd nextupdate
+proc doupdate {reading} {
+ global commfd nextupdate numcommits ncmupdate
- incr nextupdate 100
- fileevent $commfd readable {}
+ if {$reading} {
+ fileevent $commfd readable {}
+ }
update
- fileevent $commfd readable "getcommitlines $commfd"
+ set nextupdate [expr {[clock clicks -milliseconds] + 100}]
+ if {$numcommits < 100} {
+ set ncmupdate [expr {$numcommits + 1}]
+ } elseif {$numcommits < 10000} {
+ set ncmupdate [expr {$numcommits + 10}]
+ } else {
+ set ncmupdate [expr {$numcommits + 100}]
+ }
+ if {$reading} {
+ fileevent $commfd readable [list getcommitlines $commfd]
+ }
}
proc readcommit {id} {
proc parsecommit {id contents listed} {
global commitinfo children nchildren parents nparents cdate ncleft
+ global grafts
set inhdr 1
set comment {}
}
set parents($id) {}
set nparents($id) 0
+ set grafted 0
+ if {[info exists grafts($id)]} {
+ set grafted 1
+ set parents($id) $grafts($id)
+ set nparents($id) [llength $grafts($id)]
+ if {$listed} {
+ foreach p $grafts($id) {
+ if {![info exists nchildren($p)]} {
+ set children($p) [list $id]
+ set nchildren($p) 1
+ set ncleft($p) 1
+ } elseif {[lsearch -exact $children($p) $id] < 0} {
+ lappend children($p) $id
+ incr nchildren($p)
+ incr ncleft($p)
+ }
+ }
+ }
+ }
foreach line [split $contents "\n"] {
if {$inhdr} {
if {$line == {}} {
set inhdr 0
} else {
set tag [lindex $line 0]
- if {$tag == "parent"} {
+ if {$tag == "parent" && !$grafted} {
set p [lindex $line 1]
if {![info exists nchildren($p)]} {
set children($p) {}
}
}
+proc readgrafts {} {
+ global grafts env
+ catch {
+ set graftfile info/grafts
+ if {[info exists env(GIT_GRAFT_FILE)]} {
+ set graftfile $env(GIT_GRAFT_FILE)
+ }
+ set fd [open [gitdir]/$graftfile r]
+ while {[gets $fd line] >= 0} {
+ if {[string match "#*" $line]} continue
+ set ok 1
+ foreach x $line {
+ if {![regexp {^[0-9a-f]{40}$} $x]} {
+ set ok 0
+ break
+ }
+ }
+ if {$ok} {
+ set id [lindex $line 0]
+ set grafts($id) [lrange $line 1 end]
+ }
+ }
+ close $fd
+ }
+}
+
proc error_popup msg {
set w .error
toplevel $w
proc drawcommit {id} {
global phase todo nchildren datemode nextupdate
- global startcommits
+ global startcommits numcommits ncmupdate
if {$phase != "incrdraw"} {
set phase incrdraw
if {![info exists commitlisted($id)]} {
break
}
- if {[clock clicks -milliseconds] >= $nextupdate} {
- doupdate
+ if {[clock clicks -milliseconds] >= $nextupdate
+ && $numcommits >= $ncmupdate} {
+ doupdate 1
if {$stopped} break
}
}
}
proc drawgraph {} {
- global nextupdate startmsecs startcommits todo
+ global nextupdate startmsecs startcommits todo ncmupdate
if {$startcommits == {}} return
set startmsecs [clock clicks -milliseconds]
set nextupdate [expr $startmsecs + 100]
+ set ncmupdate 1
initgraph
set todo [lindex $startcommits 0]
drawrest 0 1
proc drawrest {level startix} {
global phase stopped redisplaying selectedline
global datemode currentparents todo
- global numcommits
+ global numcommits ncmupdate
global nextupdate startmsecs startcommits idline
if {$level >= 0} {
if {$level < 0} break
drawslants $level
}
- if {[clock clicks -milliseconds] >= $nextupdate} {
- update
- incr nextupdate 100
+ if {[clock clicks -milliseconds] >= $nextupdate
+ && $numcommits >= $ncmupdate} {
+ doupdate 0
}
}
}
setcoords
makewindow
readrefs
+readgrafts
getcommits $revtreeargs