undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with gitk.

Browse Source 
This merges commit
    466e4fdd66
from gitk into our head commit
    ef0bd2e6e6

Sincerely,
    jit-merge command.
This commit is contained in:
Junio C Hamano 2005-08-10 13:18:11 -07:00
commit e8c80638ab
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gitk
View File

@ -18,7 +18,7 @@ proc gitdir {} {
proc getcommits {rargs} { proc getcommits {rargs} {
global commits commfd phase canv mainfont env global commits commfd phase canv mainfont env
global startmsecs nextupdate global startmsecs nextupdate ncmupdate
global ctext maincursor textcursor leftover global ctext maincursor textcursor leftover
# check that we can find a .git directory somewhere... # check that we can find a .git directory somewhere...
@ -31,6 +31,7 @@ proc getcommits {rargs} {
set phase getcommits set phase getcommits
set startmsecs [clock clicks -milliseconds] set startmsecs [clock clicks -milliseconds]
set nextupdate [expr $startmsecs + 100] set nextupdate [expr $startmsecs + 100]
set ncmupdate 0
if [catch { if [catch {
set parse_args [concat --default HEAD $rargs] set parse_args [concat --default HEAD $rargs]
set parsed_args [split [eval exec git-rev-parse $parse_args] "\n"] set parsed_args [split [eval exec git-rev-parse $parse_args] "\n"]
@ -49,7 +50,7 @@ proc getcommits {rargs} {
} }
set leftover {} set leftover {}
fconfigure $commfd -blocking 0 -translation lf fconfigure $commfd -blocking 0 -translation lf
fileevent $commfd readable "getcommitlines $commfd" fileevent $commfd readable [list getcommitlines $commfd]
$canv delete all $canv delete all
$canv create text 3 3 -anchor nw -text "Reading commits..." \ $canv create text 3 3 -anchor nw -text "Reading commits..." \
-font $mainfont -tags textitems -font $mainfont -tags textitems
@ -61,6 +62,7 @@ proc getcommitlines {commfd} {
global commits parents cdate children nchildren global commits parents cdate children nchildren
global commitlisted phase commitinfo nextupdate global commitlisted phase commitinfo nextupdate
global stopped redisplaying leftover global stopped redisplaying leftover
global numcommits ncmupdate
set stuff [read $commfd] set stuff [read $commfd]
if {$stuff == {}} { if {$stuff == {}} {
@ -108,8 +110,10 @@ to allow selection of commits to be displayed.)}
set commitlisted($id) 1 set commitlisted($id) 1
parsecommit $id $cmit 1 parsecommit $id $cmit 1
drawcommit $id drawcommit $id
if {[clock clicks -milliseconds] >= $nextupdate} { if {[clock clicks -milliseconds] >= $nextupdate
&& $numcommits >= $ncmupdate + 100} {
doupdate doupdate
set ncmupdate $numcommits
} }
while {$redisplaying} { while {$redisplaying} {
set redisplaying 0 set redisplaying 0
@ -119,8 +123,10 @@ to allow selection of commits to be displayed.)}
foreach id $commits { foreach id $commits {
drawcommit $id drawcommit $id
if {$stopped} break if {$stopped} break
if {[clock clicks -milliseconds] >= $nextupdate} { if {[clock clicks -milliseconds] >= $nextupdate
&& $numcommits >= $ncmupdate + 100} {
doupdate doupdate
set ncmupdate $numcommits
} }
} }
} }
@ -134,7 +140,7 @@ proc doupdate {} {
incr nextupdate 100 incr nextupdate 100
fileevent $commfd readable {} fileevent $commfd readable {}
update update
fileevent $commfd readable "getcommitlines $commfd" fileevent $commfd readable [list getcommitlines $commfd]
} }
proc readcommit {id} { proc readcommit {id} {
@ -1090,7 +1096,7 @@ proc decidenext {{noread 0}} {
proc drawcommit {id} { proc drawcommit {id} {
global phase todo nchildren datemode nextupdate global phase todo nchildren datemode nextupdate
global startcommits global startcommits numcommits ncmupdate
if {$phase != "incrdraw"} { if {$phase != "incrdraw"} {
set phase incrdraw set phase incrdraw
@ -1119,8 +1125,10 @@ proc drawcommit {id} {
if {![info exists commitlisted($id)]} { if {![info exists commitlisted($id)]} {
break break
} }
if {[clock clicks -milliseconds] >= $nextupdate} { if {[clock clicks -milliseconds] >= $nextupdate
&& $numcommits >= $ncmupdate} {
doupdate doupdate
set ncmupdate $numcommits
if {$stopped} break if {$stopped} break
} }
} }
@ -1158,11 +1166,12 @@ proc settextcursor {c} {
} }
proc drawgraph {} { proc drawgraph {} {
global nextupdate startmsecs startcommits todo global nextupdate startmsecs startcommits todo ncmupdate
if {$startcommits == {}} return if {$startcommits == {}} return
set startmsecs [clock clicks -milliseconds] set startmsecs [clock clicks -milliseconds]
set nextupdate [expr $startmsecs + 100] set nextupdate [expr $startmsecs + 100]
set ncmupdate 0
initgraph initgraph
set todo [lindex $startcommits 0] set todo [lindex $startcommits 0]
drawrest 0 1 drawrest 0 1
@ -1171,7 +1180,7 @@ proc drawgraph {} {
proc drawrest {level startix} { proc drawrest {level startix} {
global phase stopped redisplaying selectedline global phase stopped redisplaying selectedline
global datemode currentparents todo global datemode currentparents todo
global numcommits global numcommits ncmupdate
global nextupdate startmsecs startcommits idline global nextupdate startmsecs startcommits idline
if {$level >= 0} { if {$level >= 0} {
@ -1200,9 +1209,11 @@ proc drawrest {level startix} {
if {$level < 0} break if {$level < 0} break
drawslants $level drawslants $level
} }
if {[clock clicks -milliseconds] >= $nextupdate} { if {[clock clicks -milliseconds] >= $nextupdate
&& $numcommits >= $ncmupdate + 100} {
update update
incr nextupdate 100 incr nextupdate 100
set ncmupdate $numcommits
} }
} }
} }