# and distributed under the terms of the GNU General Public Licence,
# either version 2, or (at your option) any later version.
-# CVS $Revision: 1.17 $
+# CVS $Revision: 1.23 $
proc getcommits {rargs} {
global commits commfd phase canv mainfont
+ global startmsecs nextupdate
+ global ctext maincursor textcursor
+
if {$rargs == {}} {
set rargs HEAD
}
set commits {}
set phase getcommits
- if [catch {set commfd [open "|git-rev-tree $rargs" r]} err] {
- puts stderr "Error executing git-rev-tree: $err"
+ set startmsecs [clock clicks -milliseconds]
+ set nextupdate [expr $startmsecs + 100]
+ if [catch {set commfd [open "|git-rev-list --merge-order $rargs" r]} err] {
+ puts stderr "Error executing git-rev-list: $err"
exit 1
}
fconfigure $commfd -blocking 0
$canv delete all
$canv create text 3 3 -anchor nw -text "Reading commits..." \
-font $mainfont -tags textitems
+ . config -cursor watch
+ $ctext config -cursor watch
}
proc getcommitline {commfd} {
- global commits parents cdate nparents children nchildren
+ global commits parents cdate children nchildren ncleft
+ global commitlisted phase commitinfo nextupdate
+ global stopped redisplaying
+
set n [gets $commfd line]
if {$n < 0} {
if {![eof $commfd]} return
# this works around what is apparently a bug in Tcl...
fconfigure $commfd -blocking 1
if {![catch {close $commfd} err]} {
- after idle drawgraph
+ after idle finishcommits
return
}
if {[string range $err 0 4] == "usage"} {
- set err "\
-Gitk: error reading commits: bad arguments to git-rev-tree.\n\
-(Note: arguments to gitk are passed to git-rev-tree\
-to allow selection of commits to be displayed.)"
+ set err \
+{Gitk: error reading commits: bad arguments to git-rev-list.
+(Note: arguments to gitk are passed to git-rev-list
+to allow selection of commits to be displayed.)}
} else {
set err "Error reading commits: $err"
}
error_popup $err
exit 1
}
-
- set i 0
- set cid {}
- foreach f $line {
- if {$i == 0} {
- set d $f
- } else {
- set id [lindex [split $f :] 0]
- if {![info exists nchildren($id)]} {
- set children($id) {}
- set nchildren($id) 0
- }
- if {$i == 1} {
- set cid $id
- lappend commits $id
- set parents($id) {}
- set cdate($id) $d
- set nparents($id) 0
- } else {
- lappend parents($cid) $id
- incr nparents($cid)
- incr nchildren($id)
- lappend children($id) $cid
+ if {![regexp {^[0-9a-f]{40}$} $line id]} {
+ error_popup "Can't parse git-rev-list output: {$line}"
+ exit 1
+ }
+ lappend commits $id
+ set commitlisted($id) 1
+ if {![info exists commitinfo($id)]} {
+ readcommit $id
+ }
+ foreach p $parents($id) {
+ if {[info exists commitlisted($p)]} {
+ puts "oops, parent $p before child $id"
+ }
+ }
+ drawcommit $id
+ if {[clock clicks -milliseconds] >= $nextupdate} {
+ doupdate
+ }
+ while {$redisplaying} {
+ set redisplaying 0
+ if {$stopped == 1} {
+ set stopped 0
+ set phase "getcommits"
+ foreach id $commits {
+ drawcommit $id
+ if {$stopped} break
+ if {[clock clicks -milliseconds] >= $nextupdate} {
+ doupdate
+ }
}
}
- incr i
}
}
+proc doupdate {} {
+ global commfd nextupdate
+
+ incr nextupdate 100
+ fileevent $commfd readable {}
+ update
+ fileevent $commfd readable "getcommitline $commfd"
+}
+
proc readcommit {id} {
- global commitinfo
+ global commitinfo children nchildren parents nparents cdate ncleft
+ global noreadobj
+
set inhdr 1
set comment {}
set headline {}
set audate {}
set comname {}
set comdate {}
- if [catch {set contents [exec git-cat-file commit $id]}] return
+ if {![info exists nchildren($id)]} {
+ set children($id) {}
+ set nchildren($id) 0
+ set ncleft($id) 0
+ }
+ set parents($id) {}
+ set nparents($id) 0
+ if {$noreadobj} {
+ if [catch {set contents [exec git-cat-file commit $id]}] return
+ } else {
+ if [catch {set x [readobj $id]}] return
+ if {[lindex $x 0] != "commit"} return
+ set contents [lindex $x 1]
+ }
foreach line [split $contents "\n"] {
if {$inhdr} {
if {$line == {}} {
set inhdr 0
} else {
set tag [lindex $line 0]
- if {$tag == "author"} {
+ if {$tag == "parent"} {
+ set p [lindex $line 1]
+ if {![info exists nchildren($p)]} {
+ set children($p) {}
+ set nchildren($p) 0
+ set ncleft($p) 0
+ }
+ lappend parents($id) $p
+ incr nparents($id)
+ if {[lsearch -exact $children($p) $id] < 0} {
+ lappend children($p) $id
+ incr nchildren($p)
+ incr ncleft($p)
+ } else {
+ puts "child $id already in $p's list??"
+ }
+ } elseif {$tag == "author"} {
set x [expr {[llength $line] - 2}]
set audate [lindex $line $x]
set auname [lrange $line 1 [expr {$x - 1}]]
set audate [clock format $audate -format "%Y-%m-%d %H:%M:%S"]
}
if {$comdate != {}} {
+ set cdate($id) $comdate
set comdate [clock format $comdate -format "%Y-%m-%d %H:%M:%S"]
}
set commitinfo($id) [list $headline $auname $audate \
$comname $comdate $comment]
}
+proc readrefs {} {
+ global tagids idtags headids idheads
+ set tags [glob -nocomplain -types f .git/refs/tags/*]
+ foreach f $tags {
+ catch {
+ set fd [open $f r]
+ set line [read $fd]
+ if {[regexp {^[0-9a-f]{40}} $line id]} {
+ set direct [file tail $f]
+ set tagids($direct) $id
+ lappend idtags($id) $direct
+ set contents [split [exec git-cat-file tag $id] "\n"]
+ set obj {}
+ set type {}
+ set tag {}
+ foreach l $contents {
+ if {$l == {}} break
+ switch -- [lindex $l 0] {
+ "object" {set obj [lindex $l 1]}
+ "type" {set type [lindex $l 1]}
+ "tag" {set tag [string range $l 4 end]}
+ }
+ }
+ if {$obj != {} && $type == "commit" && $tag != {}} {
+ set tagids($tag) $obj
+ lappend idtags($obj) $tag
+ }
+ }
+ close $fd
+ }
+ }
+ set heads [glob -nocomplain -types f .git/refs/heads/*]
+ foreach f $heads {
+ catch {
+ set fd [open $f r]
+ set line [read $fd 40]
+ if {[regexp {^[0-9a-f]{40}} $line id]} {
+ set head [file tail $f]
+ set headids($head) $line
+ lappend idheads($line) $head
+ }
+ close $fd
+ }
+ }
+}
+
proc error_popup msg {
set w .error
toplevel $w
proc makewindow {} {
global canv canv2 canv3 linespc charspc ctext cflist textfont
- global sha1entry findtype findloc findstring fstring geometry
+ global findtype findloc findstring fstring geometry
+ global entries sha1entry sha1string sha1but
+ global maincursor textcursor
menu .bar
.bar add cascade -label "File" -menu .bar.file
bind .ctop.top.clist <Configure> {resizeclistpanes %W %w}
set sha1entry .ctop.top.bar.sha1
- label .ctop.top.bar.sha1label -text "SHA1 ID: "
+ set entries $sha1entry
+ set sha1but .ctop.top.bar.sha1label
+ button $sha1but -text "SHA1 ID: " -state disabled -relief flat \
+ -command gotocommit -width 8
+ $sha1but conf -disabledforeground [$sha1but cget -foreground]
pack .ctop.top.bar.sha1label -side left
- entry $sha1entry -width 40 -font $textfont -state readonly
+ entry $sha1entry -width 40 -font $textfont -textvariable sha1string
+ trace add variable sha1string write sha1change
pack $sha1entry -side left -pady 2
button .ctop.top.bar.findbut -text "Find" -command dofind
pack .ctop.top.bar.findbut -side left
set findstring {}
set fstring .ctop.top.bar.findstring
+ lappend entries $fstring
entry $fstring -width 30 -font $textfont -textvariable findstring
pack $fstring -side left -expand 1 -fill x
set findtype Exact
bindall <1> {selcanvline %x %y}
bindall <B1-Motion> {selcanvline %x %y}
- bindall <ButtonRelease-4> "allcanvs yview scroll -5 u"
- bindall <ButtonRelease-5> "allcanvs yview scroll 5 u"
+ bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
+ bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
bindall <2> "allcanvs scan mark 0 %y"
bindall <B2-Motion> "allcanvs scan dragto 0 %y"
bind . <Key-Up> "selnextline -1"
bind . <Key-Down> "selnextline 1"
- bind . <Key-Prior> "allcanvs yview scroll -1 p"
- bind . <Key-Next> "allcanvs yview scroll 1 p"
- bindkey <Key-Delete> "$ctext yview scroll -1 p"
- bindkey <Key-BackSpace> "$ctext yview scroll -1 p"
- bindkey <Key-space> "$ctext yview scroll 1 p"
+ bind . <Key-Prior> "allcanvs yview scroll -1 pages"
+ bind . <Key-Next> "allcanvs yview scroll 1 pages"
+ bindkey <Key-Delete> "$ctext yview scroll -1 pages"
+ bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
+ bindkey <Key-space> "$ctext yview scroll 1 pages"
bindkey p "selnextline -1"
bindkey n "selnextline 1"
- bindkey b "$ctext yview scroll -1 p"
- bindkey d "$ctext yview scroll 18 u"
- bindkey u "$ctext yview scroll -18 u"
+ bindkey b "$ctext yview scroll -1 pages"
+ bindkey d "$ctext yview scroll 18 units"
+ bindkey u "$ctext yview scroll -18 units"
bindkey / findnext
bindkey ? findprev
bindkey f nextfile
bind . <Destroy> {savestuff %W}
bind . <Button-1> "click %W"
bind $fstring <Key-Return> dofind
+ bind $sha1entry <Key-Return> gotocommit
+
+ set maincursor [. cget -cursor]
+ set textcursor [$ctext cget -cursor]
}
# when we make a key binding for the toplevel, make sure
# it doesn't get triggered when that key is pressed in the
# find string entry widget.
proc bindkey {ev script} {
- global fstring
+ global entries
bind . $ev $script
set escript [bind Entry $ev]
if {$escript == {}} {
set escript [bind Entry <Key>]
}
- bind $fstring $ev "$escript; break"
+ foreach e $entries {
+ bind $e $ev "$escript; break"
+ }
}
# set the focus back to the toplevel for any click outside
-# the find string entry widget
+# the entry widgets
proc click {w} {
- global fstring
- if {$w != $fstring} {
- focus .
+ global entries
+ foreach e $entries {
+ if {$w == $e} return
}
+ focus .
}
proc savestuff {w} {
toplevel $w
wm title $w "About gitk"
message $w.m -text {
-Gitk version 1.0
+Gitk version 1.1
Copyright © 2005 Paul Mackerras
Use and redistribute under the terms of the GNU General Public License
-(CVS $Revision: 1.17 $)} \
+(CVS $Revision: 1.23 $)} \
-justify center -aspect 400
pack $w.m -side top -fill x -padx 20 -pady 20
button $w.ok -text Close -command "destroy $w"
pack $w.ok -side bottom
}
-proc truncatetofit {str width font} {
- if {[font measure $font $str] <= $width} {
- return $str
- }
- set best 0
- set bad [string length $str]
- set tmp $str
- while {$best < $bad - 1} {
- set try [expr {int(($best + $bad) / 2)}]
- set tmp "[string range $str 0 [expr $try-1]]..."
- if {[font measure $font $tmp] <= $width} {
- set best $try
- } else {
- set bad $try
- }
- }
- return $tmp
-}
-
proc assigncolor {id} {
global commitinfo colormap commcolors colors nextcolor
- global colorbycommitter
global parents nparents children nchildren
if [info exists colormap($id)] return
set ncolors [llength $colors]
- if {$colorbycommitter} {
- if {![info exists commitinfo($id)]} {
- readcommit $id
- }
- set comm [lindex $commitinfo($id) 3]
- if {![info exists commcolors($comm)]} {
- set commcolors($comm) [lindex $colors $nextcolor]
- if {[incr nextcolor] >= $ncolors} {
- set nextcolor 0
- }
+ if {$nparents($id) == 1 && $nchildren($id) == 1} {
+ set child [lindex $children($id) 0]
+ if {[info exists colormap($child)]
+ && $nparents($child) == 1} {
+ set colormap($id) $colormap($child)
+ return
}
- set colormap($id) $commcolors($comm)
- } else {
- if {$nparents($id) == 1 && $nchildren($id) == 1} {
- set child [lindex $children($id) 0]
- if {[info exists colormap($child)]
- && $nparents($child) == 1} {
- set colormap($id) $colormap($child)
- return
- }
+ }
+ set badcolors {}
+ foreach child $children($id) {
+ if {[info exists colormap($child)]
+ && [lsearch -exact $badcolors $colormap($child)] < 0} {
+ lappend badcolors $colormap($child)
}
- set badcolors {}
- foreach child $children($id) {
- if {[info exists colormap($child)]
- && [lsearch -exact $badcolors $colormap($child)] < 0} {
- lappend badcolors $colormap($child)
- }
- if {[info exists parents($child)]} {
- foreach p $parents($child) {
- if {[info exists colormap($p)]
- && [lsearch -exact $badcolors $colormap($p)] < 0} {
- lappend badcolors $colormap($p)
- }
+ if {[info exists parents($child)]} {
+ foreach p $parents($child) {
+ if {[info exists colormap($p)]
+ && [lsearch -exact $badcolors $colormap($p)] < 0} {
+ lappend badcolors $colormap($p)
}
}
}
- if {[llength $badcolors] >= $ncolors} {
- set badcolors {}
- }
- for {set i 0} {$i <= $ncolors} {incr i} {
- set c [lindex $colors $nextcolor]
- if {[incr nextcolor] >= $ncolors} {
- set nextcolor 0
- }
- if {[lsearch -exact $badcolors $c]} break
+ }
+ if {[llength $badcolors] >= $ncolors} {
+ set badcolors {}
+ }
+ for {set i 0} {$i <= $ncolors} {incr i} {
+ set c [lindex $colors $nextcolor]
+ if {[incr nextcolor] >= $ncolors} {
+ set nextcolor 0
}
- set colormap($id) $c
+ if {[lsearch -exact $badcolors $c]} break
}
+ set colormap($id) $c
}
-proc drawgraph {} {
- global parents children nparents nchildren commits
- global canv canv2 canv3 mainfont namefont canvx0 canvy0 canvy linespc
- global datemode cdate
- global lineid linehtag linentag linedtag commitinfo
- global nextcolor colormap numcommits
- global stopped phase redisplaying selectedline
+proc initgraph {} {
+ global canvy canvy0 lineno numcommits lthickness nextcolor linespc
+ global linestarty
+ global nchildren ncleft
allcanvs delete all
- set start {}
+ set nextcolor 0
+ set canvy $canvy0
+ set lineno -1
+ set numcommits 0
+ set lthickness [expr {int($linespc / 9) + 1}]
+ catch {unset linestarty}
foreach id [array names nchildren] {
- if {$nchildren($id) == 0} {
- lappend start $id
- }
set ncleft($id) $nchildren($id)
- if {![info exists nparents($id)]} {
+ }
+}
+
+proc drawcommitline {level} {
+ global parents children nparents nchildren ncleft todo
+ global canv canv2 canv3 mainfont namefont canvx0 canvy linespc
+ global datemode cdate
+ global lineid linehtag linentag linedtag commitinfo
+ global colormap numcommits currentparents
+ global oldlevel oldnlines oldtodo
+ global idtags idline idheads
+ global lineno lthickness linestarty
+ global commitlisted
+
+ incr numcommits
+ incr lineno
+ set id [lindex $todo $level]
+ set lineid($lineno) $id
+ set idline($id) $lineno
+ set ofill [expr {[info exists commitlisted($id)]? "blue": "white"}]
+ if {![info exists commitinfo($id)]} {
+ readcommit $id
+ if {![info exists commitinfo($id)]} {
+ set commitinfo($id) {"No commit information available"}
set nparents($id) 0
}
}
- if {$start == {}} {
- error_popup "Gitk: ERROR: No starting commits found"
- exit 1
+ set currentparents {}
+ if {[info exists commitlisted($id)] && [info exists parents($id)]} {
+ set currentparents $parents($id)
}
-
- set nextcolor 0
- foreach id $start {
- assigncolor $id
+ set x [expr $canvx0 + $level * $linespc]
+ set y1 $canvy
+ set canvy [expr $canvy + $linespc]
+ allcanvs conf -scrollregion \
+ [list 0 0 0 [expr $y1 + 0.5 * $linespc + 2]]
+ if {[info exists linestarty($id)] && $linestarty($id) < $y1} {
+ set t [$canv create line $x $linestarty($id) $x $y1 \
+ -width $lthickness -fill $colormap($id)]
+ $canv lower $t
}
- set todo $start
- set level [expr [llength $todo] - 1]
- set y2 $canvy0
- set nullentry -1
- set lineno -1
- set numcommits 0
- set phase drawgraph
- set lthickness [expr {($linespc / 9) + 1}]
- while 1 {
- set canvy $y2
- allcanvs conf -scrollregion \
- [list 0 0 0 [expr $canvy + 0.5 * $linespc + 2]]
- update
- if {$stopped} break
- incr numcommits
- incr lineno
- set nlines [llength $todo]
- set id [lindex $todo $level]
- set lineid($lineno) $id
- set actualparents {}
- if {[info exists parents($id)]} {
- foreach p $parents($id) {
- incr ncleft($p) -1
- if {![info exists commitinfo($p)]} {
- readcommit $p
- if {![info exists commitinfo($p)]} continue
- }
- lappend actualparents $p
- }
- }
- if {![info exists commitinfo($id)]} {
- readcommit $id
- if {![info exists commitinfo($id)]} {
- set commitinfo($id) {"No commit information available"}
- }
- }
- set x [expr $canvx0 + $level * $linespc]
- set y2 [expr $canvy + $linespc]
- if {[info exists linestarty($level)] && $linestarty($level) < $canvy} {
- set t [$canv create line $x $linestarty($level) $x $canvy \
- -width $lthickness -fill $colormap($id)]
- $canv lower $t
+ set orad [expr {$linespc / 3}]
+ set t [$canv create oval [expr $x - $orad] [expr $y1 - $orad] \
+ [expr $x + $orad - 1] [expr $y1 + $orad - 1] \
+ -fill $ofill -outline black -width 1]
+ $canv raise $t
+ set xt [expr $canvx0 + [llength $todo] * $linespc]
+ if {$nparents($id) > 2} {
+ set xt [expr {$xt + ($nparents($id) - 2) * $linespc}]
+ }
+ set marks {}
+ set ntags 0
+ if {[info exists idtags($id)]} {
+ set marks $idtags($id)
+ set ntags [llength $marks]
+ }
+ if {[info exists idheads($id)]} {
+ set marks [concat $marks $idheads($id)]
+ }
+ if {$marks != {}} {
+ set delta [expr {int(0.5 * ($linespc - $lthickness))}]
+ set yt [expr $y1 - 0.5 * $linespc]
+ set yb [expr $yt + $linespc - 1]
+ set xvals {}
+ set wvals {}
+ foreach tag $marks {
+ set wid [font measure $mainfont $tag]
+ lappend xvals $xt
+ lappend wvals $wid
+ set xt [expr {$xt + $delta + $wid + $lthickness + $linespc}]
}
- set linestarty($level) $canvy
- set ofill [expr {[info exists parents($id)]? "blue": "white"}]
- set orad [expr {$linespc / 3}]
- set t [$canv create oval [expr $x - $orad] [expr $canvy - $orad] \
- [expr $x + $orad - 1] [expr $canvy + $orad - 1] \
- -fill $ofill -outline black -width 1]
- $canv raise $t
- set xt [expr $canvx0 + $nlines * $linespc]
- set headline [lindex $commitinfo($id) 0]
- set name [lindex $commitinfo($id) 1]
- set date [lindex $commitinfo($id) 2]
- set linehtag($lineno) [$canv create text $xt $canvy -anchor w \
- -text $headline -font $mainfont ]
- set linentag($lineno) [$canv2 create text 3 $canvy -anchor w \
- -text $name -font $namefont]
- set linedtag($lineno) [$canv3 create text 3 $canvy -anchor w \
- -text $date -font $mainfont]
- if {!$datemode && [llength $actualparents] == 1} {
- set p [lindex $actualparents 0]
- if {$ncleft($p) == 0 && [lsearch -exact $todo $p] < 0} {
- assigncolor $p
- set todo [lreplace $todo $level $level $p]
- continue
+ set t [$canv create line $x $y1 [lindex $xvals end] $y1 \
+ -width $lthickness -fill black]
+ $canv lower $t
+ foreach tag $marks x $xvals wid $wvals {
+ set xl [expr $x + $delta]
+ set xr [expr $x + $delta + $wid + $lthickness]
+ if {[incr ntags -1] >= 0} {
+ # draw a tag
+ $canv create polygon $x [expr $yt + $delta] $xl $yt\
+ $xr $yt $xr $yb $xl $yb $x [expr $yb - $delta] \
+ -width 1 -outline black -fill yellow
+ } else {
+ # draw a head
+ set xl [expr $xl - $delta/2]
+ $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
+ -width 1 -outline black -fill green
}
+ $canv create text $xl $y1 -anchor w -text $tag \
+ -font $mainfont
}
+ }
+ set headline [lindex $commitinfo($id) 0]
+ set name [lindex $commitinfo($id) 1]
+ set date [lindex $commitinfo($id) 2]
+ set linehtag($lineno) [$canv create text $xt $y1 -anchor w \
+ -text $headline -font $mainfont ]
+ set linentag($lineno) [$canv2 create text 3 $y1 -anchor w \
+ -text $name -font $namefont]
+ set linedtag($lineno) [$canv3 create text 3 $y1 -anchor w \
+ -text $date -font $mainfont]
+}
- set oldtodo $todo
- set oldlevel $level
- set lines {}
- for {set i 0} {$i < $nlines} {incr i} {
- if {[lindex $todo $i] == {}} continue
- if {[info exists linestarty($i)]} {
- set oldstarty($i) $linestarty($i)
- unset linestarty($i)
- }
- if {$i != $level} {
- lappend lines [list $i [lindex $todo $i]]
- }
+proc updatetodo {level noshortcut} {
+ global datemode currentparents ncleft todo
+ global linestarty oldlevel oldtodo oldnlines
+ global canvy linespc
+ global commitinfo
+
+ foreach p $currentparents {
+ if {![info exists commitinfo($p)]} {
+ readcommit $p
}
- if {$nullentry >= 0} {
- set todo [lreplace $todo $nullentry $nullentry]
- if {$nullentry < $level} {
- incr level -1
- }
+ }
+ if {!$noshortcut && [llength $currentparents] == 1} {
+ set p [lindex $currentparents 0]
+ if {$ncleft($p) == 0 && [lsearch -exact $todo $p] < 0} {
+ assigncolor $p
+ set linestarty($p) [expr $canvy - $linespc]
+ set todo [lreplace $todo $level $level $p]
+ return 0
}
+ }
- set todo [lreplace $todo $level $level]
- if {$nullentry > $level} {
- incr nullentry -1
+ set oldlevel $level
+ set oldtodo $todo
+ set oldnlines [llength $todo]
+ set todo [lreplace $todo $level $level]
+ set i $level
+ foreach p $currentparents {
+ incr ncleft($p) -1
+ set k [lsearch -exact $todo $p]
+ if {$k < 0} {
+ assigncolor $p
+ set todo [linsert $todo $i $p]
+ incr i
}
- set i $level
- foreach p $actualparents {
- set k [lsearch -exact $todo $p]
- if {$k < 0} {
- assigncolor $p
- set todo [linsert $todo $i $p]
- if {$nullentry >= $i} {
- incr nullentry
+ }
+ return 1
+}
+
+proc drawslants {} {
+ global canv linestarty canvx0 canvy linespc
+ global oldlevel oldtodo todo currentparents
+ global lthickness linespc canvy colormap
+
+ set y1 [expr $canvy - $linespc]
+ set y2 $canvy
+ set i -1
+ foreach id $oldtodo {
+ incr i
+ if {$id == {}} continue
+ set xi [expr {$canvx0 + $i * $linespc}]
+ if {$i == $oldlevel} {
+ foreach p $currentparents {
+ set j [lsearch -exact $todo $p]
+ if {$i == $j && ![info exists linestarty($p)]} {
+ set linestarty($p) $y1
+ } else {
+ set xj [expr {$canvx0 + $j * $linespc}]
+ set coords [list $xi $y1]
+ if {$j < $i - 1} {
+ lappend coords [expr $xj + $linespc] $y1
+ } elseif {$j > $i + 1} {
+ lappend coords [expr $xj - $linespc] $y1
+ }
+ lappend coords $xj $y2
+ set t [$canv create line $coords -width $lthickness \
+ -fill $colormap($p)]
+ $canv lower $t
+ if {![info exists linestarty($p)]} {
+ set linestarty($p) $y2
+ }
}
}
- lappend lines [list $oldlevel $p]
+ } elseif {[lindex $todo $i] != $id} {
+ set j [lsearch -exact $todo $id]
+ set xj [expr {$canvx0 + $j * $linespc}]
+ set coords {}
+ if {[info exists linestarty($id)] && $linestarty($id) < $y1} {
+ lappend coords $xi $linestarty($id)
+ }
+ lappend coords $xi $y1 $xj $y2
+ set t [$canv create line $coords -width $lthickness \
+ -fill $colormap($id)]
+ $canv lower $t
+ set linestarty($id) $y2
}
+ }
+}
- # choose which one to do next time around
- set todol [llength $todo]
- set level -1
- set latest {}
- for {set k $todol} {[incr k -1] >= 0} {} {
- set p [lindex $todo $k]
- if {$p == {}} continue
- if {$ncleft($p) == 0} {
- if {$datemode} {
- if {$latest == {} || $cdate($p) > $latest} {
- set level $k
- set latest $cdate($p)
- }
- } else {
+proc decidenext {} {
+ global parents children nchildren ncleft todo
+ global canv canv2 canv3 mainfont namefont canvx0 canvy linespc
+ global datemode cdate
+ global lineid linehtag linentag linedtag commitinfo
+ global currentparents oldlevel oldnlines oldtodo
+ global lineno lthickness
+
+ # remove the null entry if present
+ set nullentry [lsearch -exact $todo {}]
+ if {$nullentry >= 0} {
+ set todo [lreplace $todo $nullentry $nullentry]
+ }
+
+ # choose which one to do next time around
+ set todol [llength $todo]
+ set level -1
+ set latest {}
+ for {set k $todol} {[incr k -1] >= 0} {} {
+ set p [lindex $todo $k]
+ if {$ncleft($p) == 0} {
+ if {$datemode} {
+ if {$latest == {} || $cdate($p) > $latest} {
set level $k
- break
+ set latest $cdate($p)
}
+ } else {
+ set level $k
+ break
}
}
- if {$level < 0} {
- if {$todo != {}} {
- puts "ERROR: none of the pending commits can be done yet:"
- foreach p $todo {
- puts " $p"
- }
+ }
+ if {$level < 0} {
+ if {$todo != {}} {
+ puts "ERROR: none of the pending commits can be done yet:"
+ foreach p $todo {
+ puts " $p"
}
- break
}
+ return -1
+ }
- # If we are reducing, put in a null entry
- if {$todol < $nlines} {
- if {$nullentry >= 0} {
- set i $nullentry
- while {$i < $todol
- && [lindex $oldtodo $i] == [lindex $todo $i]} {
- incr i
- }
- } else {
- set i $oldlevel
- if {$level >= $i} {
- incr i
- }
- }
- if {$i >= $todol} {
- set nullentry -1
- } else {
- set nullentry $i
- set todo [linsert $todo $nullentry {}]
- if {$level >= $i} {
- incr level
- }
+ # If we are reducing, put in a null entry
+ if {$todol < $oldnlines} {
+ if {$nullentry >= 0} {
+ set i $nullentry
+ while {$i < $todol
+ && [lindex $oldtodo $i] == [lindex $todo $i]} {
+ incr i
}
} else {
- set nullentry -1
+ set i $oldlevel
+ if {$level >= $i} {
+ incr i
+ }
+ }
+ if {$i < $todol} {
+ set todo [linsert $todo $i {}]
+ if {$level >= $i} {
+ incr level
+ }
}
+ }
+ return $level
+}
- foreach l $lines {
- set i [lindex $l 0]
- set dst [lindex $l 1]
- set j [lsearch -exact $todo $dst]
- if {$i == $j} {
- if {[info exists oldstarty($i)]} {
- set linestarty($i) $oldstarty($i)
- }
- continue
+proc drawcommit {id} {
+ global phase todo nchildren datemode nextupdate
+ global startcommits
+
+ if {$phase != "incrdraw"} {
+ set phase incrdraw
+ set todo $id
+ set startcommits $id
+ initgraph
+ assigncolor $id
+ drawcommitline 0
+ updatetodo 0 $datemode
+ } else {
+ if {$nchildren($id) == 0} {
+ lappend todo $id
+ lappend startcommits $id
+ assigncolor $id
+ }
+ set level [decidenext]
+ if {$id != [lindex $todo $level]} {
+ return
+ }
+ while 1 {
+ drawslants
+ drawcommitline $level
+ if {[updatetodo $level $datemode]} {
+ set level [decidenext]
}
- set xi [expr {$canvx0 + $i * $linespc}]
- set xj [expr {$canvx0 + $j * $linespc}]
- set coords {}
- if {[info exists oldstarty($i)] && $oldstarty($i) < $canvy} {
- lappend coords $xi $oldstarty($i)
+ set id [lindex $todo $level]
+ if {![info exists commitlisted($id)]} {
+ break
}
- lappend coords $xi $canvy
- if {$j < $i - 1} {
- lappend coords [expr $xj + $linespc] $canvy
- } elseif {$j > $i + 1} {
- lappend coords [expr $xj - $linespc] $canvy
+ if {[clock clicks -milliseconds] >= $nextupdate} {
+ doupdate
+ if {$stopped} break
}
- lappend coords $xj $y2
- set t [$canv create line $coords -width $lthickness \
- -fill $colormap($dst)]
- $canv lower $t
- if {![info exists linestarty($j)]} {
- set linestarty($j) $y2
+ }
+ }
+}
+
+proc finishcommits {} {
+ global phase
+ global startcommits
+ global ctext maincursor textcursor
+
+ if {$phase != "incrdraw"} {
+ $canv delete all
+ $canv create text 3 3 -anchor nw -text "No commits selected" \
+ -font $mainfont -tags textitems
+ set phase {}
+ return
+ }
+ drawslants
+ set level [decidenext]
+ drawrest $level [llength $startcommits]
+ . config -cursor $maincursor
+ $ctext config -cursor $textcursor
+}
+
+proc drawgraph {} {
+ global nextupdate startmsecs startcommits todo
+
+ if {$startcommits == {}} return
+ set startmsecs [clock clicks -milliseconds]
+ set nextupdate [expr $startmsecs + 100]
+ 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 nextupdate startmsecs startcommits idline
+
+ set phase drawgraph
+ set startid [lindex $startcommits $startix]
+ set startline -1
+ if {$startid != {}} {
+ set startline $idline($startid)
+ }
+ while 1 {
+ if {$stopped} break
+ drawcommitline $level
+ set hard [updatetodo $level $datemode]
+ if {$numcommits == $startline} {
+ lappend todo $startid
+ set hard 1
+ incr startix
+ set startid [lindex $startcommits $startix]
+ set startline -1
+ if {$startid != {}} {
+ set startline $idline($startid)
}
}
+ if {$hard} {
+ set level [decidenext]
+ if {$level < 0} break
+ drawslants
+ }
+ if {[clock clicks -milliseconds] >= $nextupdate} {
+ update
+ incr nextupdate 100
+ }
}
set phase {}
+ set drawmsecs [expr [clock clicks -milliseconds] - $startmsecs]
+ puts "overall $drawmsecs ms for $numcommits commits"
if {$redisplaying} {
if {$stopped == 0 && [info exists selectedline]} {
selectline $selectedline
global canv canvy0 ctext linespc selectedline
global lineid linehtag linentag linedtag
set ymax [lindex [$canv cget -scrollregion] 3]
+ if {$ymax == {}} return
set yfrac [lindex [$canv yview] 0]
set y [expr {$y + $yfrac * $ymax}]
set l [expr {int(($y - $canvy0) / $linespc + 0.5)}]
global lineid linehtag linentag linedtag
global canvy0 linespc nparents treepending
global cflist treediffs currentid sha1entry
- global commentend seenfile numcommits
+ global commentend seenfile idtags
if {![info exists lineid($l)] || ![info exists linehtag($l)]} return
$canv delete secsel
set t [eval $canv create rect [$canv bbox $linehtag($l)] -outline {{}} \
set selectedline $l
set id $lineid($l)
- $sha1entry conf -state normal
+ set currentid $id
$sha1entry delete 0 end
$sha1entry insert 0 $id
$sha1entry selection from 0
$sha1entry selection to end
- $sha1entry conf -state readonly
$ctext conf -state normal
$ctext delete 0.0 end
set info $commitinfo($id)
$ctext insert end "Author: [lindex $info 1] [lindex $info 2]\n"
$ctext insert end "Committer: [lindex $info 3] [lindex $info 4]\n"
+ if {[info exists idtags($id)]} {
+ $ctext insert end "Tags:"
+ foreach tag $idtags($id) {
+ $ctext insert end " $tag"
+ }
+ $ctext insert end "\n"
+ }
$ctext insert end "\n"
$ctext insert end [lindex $info 5]
$ctext insert end "\n"
set commentend [$ctext index "end - 1c"]
$cflist delete 0 end
- set currentid $id
if {$nparents($id) == 1} {
if {![info exists treediffs($id)]} {
if {![info exists treepending]} {
addtocflist $id
return
}
- set type [lindex $line 1]
- set file [lindex $line 3]
- if {$type == "blob"} {
- lappend treediffs($id) $file
- }
+ set file [lindex $line 5]
+ lappend treediffs($id) $file
}
proc getblobdiffs {id} {
if {$stopped > 1} return
if {$phase == "getcommits"} return
set redisplaying 1
- if {$phase == "drawgraph"} {
+ if {$phase == "drawgraph" || $phase == "incrdraw"} {
set stopped 1
} else {
drawgraph
proc incrfont {inc} {
global mainfont namefont textfont selectedline ctext canv phase
- global stopped
+ global stopped entries
unmarkmatches
set mainfont [lreplace $mainfont 1 1 [expr {[lindex $mainfont 1] + $inc}]]
set namefont [lreplace $namefont 1 1 [expr {[lindex $namefont 1] + $inc}]]
setcoords
$ctext conf -font $textfont
$ctext tag conf filesep -font [concat $textfont bold]
+ foreach e $entries {
+ $e conf -font $mainfont
+ }
if {$phase == "getcommits"} {
$canv itemconf textitems -font $mainfont
}
redisplay
}
+proc sha1change {n1 n2 op} {
+ global sha1string currentid sha1but
+ if {$sha1string == {}
+ || ([info exists currentid] && $sha1string == $currentid)} {
+ set state disabled
+ } else {
+ set state normal
+ }
+ if {[$sha1but cget -state] == $state} return
+ if {$state == "normal"} {
+ $sha1but conf -state normal -relief raised -text "Goto: "
+ } else {
+ $sha1but conf -state disabled -relief flat -text "SHA1 ID: "
+ }
+}
+
+proc gotocommit {} {
+ global sha1string currentid idline tagids
+ if {$sha1string == {}
+ || ([info exists currentid] && $sha1string == $currentid)} return
+ if {[info exists tagids($sha1string)]} {
+ set id $tagids($sha1string)
+ } else {
+ set id [string tolower $sha1string]
+ }
+ if {[info exists idline($id)]} {
+ selectline $idline($id)
+ return
+ }
+ if {[regexp {^[0-9a-fA-F]{40}$} $sha1string]} {
+ set type "SHA1 id"
+ } else {
+ set type "Tag"
+ }
+ error_popup "$type $sha1string is not known"
+}
+
proc doquit {} {
global stopped
set stopped 100
set textfont {Courier 9}
set colors {green red blue magenta darkgrey brown orange}
-set colorbycommitter false
catch {source ~/.gitk}
switch -regexp -- $arg {
"^$" { }
"^-b" { set boldnames 1 }
- "^-c" { set colorbycommitter 1 }
"^-d" { set datemode 1 }
- "^-.*" {
- puts stderr "unrecognized option $arg"
- exit 1
- }
default {
lappend revtreeargs $arg
}
}
}
+set noreadobj [catch {load libreadobj.so.0.0}]
set stopped 0
set redisplaying 0
set stuffsaved 0
setcoords
makewindow
+readrefs
getcommits $revtreeargs