# and distributed under the terms of the GNU General Public Licence,
# either version 2, or (at your option) any later version.
-# CVS $Revision: 1.5 $
+# CVS $Revision: 1.16 $
-set datemode 0
-set boldnames 0
-set revtreeargs {}
-
-set mainfont {Helvetica 9}
-set namefont $mainfont
-if {$boldnames} {
- lappend namefont bold
+proc getcommits {rargs} {
+ global commits commfd phase canv mainfont
+ 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"
+ exit 1
+ }
+ fconfigure $commfd -blocking 0
+ fileevent $commfd readable "getcommitline $commfd"
+ $canv delete all
+ $canv create text 3 3 -anchor nw -text "Reading commits..." \
+ -font $mainfont -tags textitems
}
-catch {source ~/.gitk}
-foreach arg $argv {
- switch -regexp -- $arg {
- "^$" { }
- "^-d" { set datemode 1 }
- "^-b" { set boldnames 1 }
- "^-.*" {
- puts stderr "unrecognized option $arg"
- exit 1
+proc getcommitline {commfd} {
+ global commits parents cdate nparents children nchildren
+ 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
+ return
}
- default {
- lappend revtreeargs $arg
+ 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.)"
+ } else {
+ set err "Error reading commits: $err"
}
+ error_popup $err
+ exit 1
}
-}
-proc getcommits {rargs} {
- global commits parents cdate nparents children nchildren
- if {$rargs == {}} {
- set rargs HEAD
- }
- set commits {}
- foreach c [split [eval exec git-rev-tree $rargs] "\n"] {
- set i 0
- set cid {}
- foreach f $c {
- if {$i == 0} {
- set d $f
+ 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 {
- 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
- }
+ lappend parents($cid) $id
+ incr nparents($cid)
+ incr nchildren($id)
+ lappend children($id) $cid
}
- incr i
}
+ incr i
}
}
proc readcommit {id} {
- global commitinfo commitsummary
+ global commitinfo
set inhdr 1
set comment {}
set headline {}
set audate {}
set comname {}
set comdate {}
- foreach line [split [exec git-cat-file commit $id] "\n"] {
+ if [catch {set contents [exec git-cat-file commit $id]}] return
+ foreach line [split $contents "\n"] {
if {$inhdr} {
if {$line == {}} {
set inhdr 0
if {$comdate != {}} {
set comdate [clock format $comdate -format "%Y-%m-%d %H:%M:%S"]
}
- set commitinfo($id) [list $comment $auname $audate $comname $comdate]
- set commitsummary($id) [list $headline $auname $audate]
+ set commitinfo($id) [list $headline $auname $audate \
+ $comname $comdate $comment]
+}
+
+proc error_popup msg {
+ set w .error
+ toplevel $w
+ wm transient $w .
+ message $w.m -text $msg -justify center -aspect 400
+ pack $w.m -side top -fill x -padx 20 -pady 20
+ button $w.ok -text OK -command "destroy $w"
+ pack $w.ok -side bottom -fill x
+ bind $w <Visibility> "grab $w; focus $w"
+ tkwait window $w
}
proc makewindow {} {
- global canv canv2 canv3 linespc charspc ctext cflist
+ global canv canv2 canv3 linespc charspc ctext cflist textfont
+ global sha1entry findtype findloc findstring fstring geometry
+
+ menu .bar
+ .bar add cascade -label "File" -menu .bar.file
+ menu .bar.file
+ .bar.file add command -label "Quit" -command doquit
+ menu .bar.help
+ .bar add cascade -label "Help" -menu .bar.help
+ .bar.help add command -label "About gitk" -command about
+ . configure -menu .bar
+
+ if {![info exists geometry(canv1)]} {
+ set geometry(canv1) [expr 45 * $charspc]
+ set geometry(canv2) [expr 30 * $charspc]
+ set geometry(canv3) [expr 15 * $charspc]
+ set geometry(canvh) [expr 25 * $linespc + 4]
+ set geometry(ctextw) 80
+ set geometry(ctexth) 30
+ set geometry(cflistw) 30
+ }
panedwindow .ctop -orient vertical
- panedwindow .ctop.clist -orient horizontal -sashpad 0 -handlesize 4
- .ctop add .ctop.clist
- set canv .ctop.clist.canv
- set cscroll .ctop.clist.dates.csb
- canvas $canv -height [expr 30 * $linespc + 4] -width [expr 45 * $charspc] \
+ if {[info exists geometry(width)]} {
+ .ctop conf -width $geometry(width) -height $geometry(height)
+ set texth [expr {$geometry(height) - $geometry(canvh) - 56}]
+ set geometry(ctexth) [expr {($texth - 8) /
+ [font metrics $textfont -linespace]}]
+ }
+ frame .ctop.top
+ frame .ctop.top.bar
+ pack .ctop.top.bar -side bottom -fill x
+ set cscroll .ctop.top.csb
+ scrollbar $cscroll -command {allcanvs yview} -highlightthickness 0
+ pack $cscroll -side right -fill y
+ panedwindow .ctop.top.clist -orient horizontal -sashpad 0 -handlesize 4
+ pack .ctop.top.clist -side top -fill both -expand 1
+ .ctop add .ctop.top
+ set canv .ctop.top.clist.canv
+ canvas $canv -height $geometry(canvh) -width $geometry(canv1) \
-bg white -bd 0 \
-yscrollincr $linespc -yscrollcommand "$cscroll set"
- .ctop.clist add $canv
- set canv2 .ctop.clist.canv2
- canvas $canv2 -height [expr 30 * $linespc +4] -width [expr 30 * $charspc] \
+ .ctop.top.clist add $canv
+ set canv2 .ctop.top.clist.canv2
+ canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \
-bg white -bd 0 -yscrollincr $linespc
- .ctop.clist add $canv2
- frame .ctop.clist.dates
- .ctop.clist add .ctop.clist.dates
- set canv3 .ctop.clist.dates.canv3
- canvas $canv3 -height [expr 30 * $linespc +4] -width [expr 15 * $charspc] \
+ .ctop.top.clist add $canv2
+ set canv3 .ctop.top.clist.canv3
+ canvas $canv3 -height $geometry(canvh) -width $geometry(canv3) \
-bg white -bd 0 -yscrollincr $linespc
- scrollbar $cscroll -command {allcanvs yview} -highlightthickness 0
- pack .ctop.clist.dates.csb -side right -fill y
- pack $canv3 -side left -fill both -expand 1
+ .ctop.top.clist add $canv3
+ bind .ctop.top.clist <Configure> {resizeclistpanes %W %w}
+
+ set sha1entry .ctop.top.bar.sha1
+ label .ctop.top.bar.sha1label -text "SHA1 ID: "
+ pack .ctop.top.bar.sha1label -side left
+ entry $sha1entry -width 40 -font $textfont -state readonly
+ 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
+ entry $fstring -width 30 -font $textfont -textvariable findstring
+ pack $fstring -side left -expand 1 -fill x
+ set findtype Exact
+ tk_optionMenu .ctop.top.bar.findtype findtype Exact IgnCase Regexp
+ set findloc "All fields"
+ tk_optionMenu .ctop.top.bar.findloc findloc "All fields" Headline \
+ Comments Author Committer
+ pack .ctop.top.bar.findloc -side right
+ pack .ctop.top.bar.findtype -side right
panedwindow .ctop.cdet -orient horizontal
.ctop add .ctop.cdet
frame .ctop.cdet.left
set ctext .ctop.cdet.left.ctext
- text $ctext -bg white -state disabled \
+ text $ctext -bg white -state disabled -font $textfont \
+ -width $geometry(ctextw) -height $geometry(ctexth) \
-yscrollcommand ".ctop.cdet.left.sb set"
scrollbar .ctop.cdet.left.sb -command "$ctext yview"
pack .ctop.cdet.left.sb -side right -fill y
pack $ctext -side left -fill both -expand 1
.ctop.cdet add .ctop.cdet.left
+ $ctext tag conf filesep -font [concat $textfont bold]
+ $ctext tag conf hunksep -back blue -fore white
+ $ctext tag conf d0 -back "#ff8080"
+ $ctext tag conf d1 -back green
+ $ctext tag conf found -back yellow
+
frame .ctop.cdet.right
set cflist .ctop.cdet.right.cfiles
- listbox $cflist -width 30 -bg white \
+ listbox $cflist -bg white -selectmode extended -width $geometry(cflistw) \
-yscrollcommand ".ctop.cdet.right.sb set"
scrollbar .ctop.cdet.right.sb -command "$cflist yview"
pack .ctop.cdet.right.sb -side right -fill y
pack $cflist -side left -fill both -expand 1
.ctop.cdet add .ctop.cdet.right
+ bind .ctop.cdet <Configure> {resizecdetpanes %W %w}
pack .ctop -side top -fill both -expand 1
bindall <ButtonRelease-5> "allcanvs yview scroll 5 u"
bindall <2> "allcanvs scan mark 0 %y"
bindall <B2-Motion> "allcanvs scan dragto 0 %y"
- bind . <Key-Prior> "allcanvs yview scroll -1 p"
- bind . <Key-Next> "allcanvs yview scroll 1 p"
- bind . <Key-Delete> "allcanvs yview scroll -1 p"
- bind . <Key-BackSpace> "allcanvs yview scroll -1 p"
- bind . <Key-space> "allcanvs yview scroll 1 p"
bind . <Key-Up> "selnextline -1"
bind . <Key-Down> "selnextline 1"
- bind . Q "set stopped 1; destroy ."
+ 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"
+ 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 / findnext
+ bindkey ? findprev
+ bind . <Control-q> doquit
+ bind . <Control-f> dofind
+ bind . <Control-g> findnext
+ bind . <Control-r> findprev
+ bind . <Control-equal> {incrfont 1}
+ bind . <Control-KP_Add> {incrfont 1}
+ bind . <Control-minus> {incrfont -1}
+ bind . <Control-KP_Subtract> {incrfont -1}
+ bind $cflist <<ListboxSelect>> listboxsel
+ bind . <Destroy> {savestuff %W}
+ bind . <Button-1> "click %W"
+ bind $fstring <Key-Return> dofind
+}
+
+# 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
+ bind . $ev $script
+ set escript [bind Entry $ev]
+ if {$escript == {}} {
+ set escript [bind Entry <Key>]
+ }
+ bind $fstring $ev "$escript; break"
+}
+
+# set the focus back to the toplevel for any click outside
+# the find string entry widget
+proc click {w} {
+ global fstring
+ if {$w != $fstring} {
+ focus .
+ }
+}
+
+proc savestuff {w} {
+ global canv canv2 canv3 ctext cflist mainfont textfont
+ global stuffsaved
+ if {$stuffsaved} return
+ if {![winfo viewable .]} return
+ catch {
+ set f [open "~/.gitk-new" w]
+ puts $f "set mainfont {$mainfont}"
+ puts $f "set textfont {$textfont}"
+ puts $f "set geometry(width) [winfo width .ctop]"
+ puts $f "set geometry(height) [winfo height .ctop]"
+ puts $f "set geometry(canv1) [expr [winfo width $canv]-2]"
+ puts $f "set geometry(canv2) [expr [winfo width $canv2]-2]"
+ puts $f "set geometry(canv3) [expr [winfo width $canv3]-2]"
+ puts $f "set geometry(canvh) [expr [winfo height $canv]-2]"
+ set wid [expr {([winfo width $ctext] - 8) \
+ / [font measure $textfont "0"]}]
+ puts $f "set geometry(ctextw) $wid"
+ set wid [expr {([winfo width $cflist] - 11) \
+ / [font measure [$cflist cget -font] "0"]}]
+ puts $f "set geometry(cflistw) $wid"
+ close $f
+ file rename -force "~/.gitk-new" "~/.gitk"
+ }
+ set stuffsaved 1
+}
+
+proc resizeclistpanes {win w} {
+ global oldwidth
+ if [info exists oldwidth($win)] {
+ set s0 [$win sash coord 0]
+ set s1 [$win sash coord 1]
+ if {$w < 60} {
+ set sash0 [expr {int($w/2 - 2)}]
+ set sash1 [expr {int($w*5/6 - 2)}]
+ } else {
+ set factor [expr {1.0 * $w / $oldwidth($win)}]
+ set sash0 [expr {int($factor * [lindex $s0 0])}]
+ set sash1 [expr {int($factor * [lindex $s1 0])}]
+ if {$sash0 < 30} {
+ set sash0 30
+ }
+ if {$sash1 < $sash0 + 20} {
+ set sash1 [expr $sash0 + 20]
+ }
+ if {$sash1 > $w - 10} {
+ set sash1 [expr $w - 10]
+ if {$sash0 > $sash1 - 20} {
+ set sash0 [expr $sash1 - 20]
+ }
+ }
+ }
+ $win sash place 0 $sash0 [lindex $s0 1]
+ $win sash place 1 $sash1 [lindex $s1 1]
+ }
+ set oldwidth($win) $w
+}
+
+proc resizecdetpanes {win w} {
+ global oldwidth
+ if [info exists oldwidth($win)] {
+ set s0 [$win sash coord 0]
+ if {$w < 60} {
+ set sash0 [expr {int($w*3/4 - 2)}]
+ } else {
+ set factor [expr {1.0 * $w / $oldwidth($win)}]
+ set sash0 [expr {int($factor * [lindex $s0 0])}]
+ if {$sash0 < 45} {
+ set sash0 45
+ }
+ if {$sash0 > $w - 15} {
+ set sash0 [expr $w - 15]
+ }
+ }
+ $win sash place 0 $sash0 [lindex $s0 1]
+ }
+ set oldwidth($win) $w
}
proc allcanvs args {
bind $canv3 $event $action
}
+proc about {} {
+ set w .about
+ if {[winfo exists $w]} {
+ raise $w
+ return
+ }
+ toplevel $w
+ wm title $w "About gitk"
+ message $w.m -text {
+Gitk version 1.0
+
+Copyright © 2005 Paul Mackerras
+
+Use and redistribute under the terms of the GNU General Public License
+
+(CVS $Revision: 1.16 $)} \
+ -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
return $tmp
}
-proc drawgraph {start} {
+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
+ }
+ }
+ 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)
+ }
+ 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
+ }
+ 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 commitsummary
+ global lineid linehtag linentag linedtag commitinfo
+ global nextcolor colormap numcommits
+ global stopped phase redisplaying selectedline
- set colors {green red blue magenta darkgrey brown orange}
- set ncolors [llength $colors]
- set nextcolor 0
- set colormap($start) [lindex $colors 0]
- foreach id $commits {
+ allcanvs delete all
+ set start {}
+ foreach id [array names nchildren] {
+ if {$nchildren($id) == 0} {
+ lappend start $id
+ }
set ncleft($id) $nchildren($id)
+ if {![info exists nparents($id)]} {
+ set nparents($id) 0
+ }
+ }
+ if {$start == {}} {
+ error_popup "Gitk: ERROR: No starting commits found"
+ exit 1
+ }
+
+ set nextcolor 0
+ foreach id $start {
+ assigncolor $id
}
- set todo [list $start]
- set level 0
+ set todo $start
+ set level [expr [llength $todo] - 1]
set y2 $canvy0
- set linestarty(0) $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 $canvy]
+ 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 {}
- foreach p $parents($id) {
- if {[info exists ncleft($p)]} {
+ 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 commitsummary($id)]} {
+ 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 {$linestarty($level) < $canvy} {
+ if {[info exists linestarty($level)] && $linestarty($level) < $canvy} {
set t [$canv create line $x $linestarty($level) $x $canvy \
- -width 2 -fill $colormap($id)]
+ -width $lthickness -fill $colormap($id)]
$canv lower $t
- set linestarty($level) $canvy
}
- set t [$canv create oval [expr $x - 4] [expr $canvy - 4] \
- [expr $x + 3] [expr $canvy + 3] \
- -fill blue -outline black -width 1]
+ 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 $commitsummary($id) 0]
- set name [lindex $commitsummary($id) 1]
- set date [lindex $commitsummary($id) 2]
+ 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 \
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]
- set colormap($p) $colormap($id)
continue
}
}
set lines {}
for {set i 0} {$i < $nlines} {incr i} {
if {[lindex $todo $i] == {}} continue
- set oldstarty($i) $linestarty($i)
+ if {[info exists linestarty($i)]} {
+ set oldstarty($i) $linestarty($i)
+ unset linestarty($i)
+ }
if {$i != $level} {
lappend lines [list $i [lindex $todo $i]]
}
}
- unset linestarty
if {$nullentry >= 0} {
set todo [lreplace $todo $nullentry $nullentry]
if {$nullentry < $level} {
}
}
- set badcolors [list $colormap($id)]
- foreach p $actualparents {
- if {[info exists colormap($p)]} {
- lappend badcolors $colormap($p)
- }
- }
set todo [lreplace $todo $level $level]
if {$nullentry > $level} {
incr nullentry -1
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
}
- if {$nparents($id) == 1 && $nparents($p) == 1
- && $nchildren($p) == 1} {
- set colormap($p) $colormap($id)
- } else {
- for {set j 0} {$j <= $ncolors} {incr j} {
- if {[incr nextcolor] >= $ncolors} {
- set nextcolor 0
- }
- set c [lindex $colors $nextcolor]
- # make sure the incoming and outgoing colors differ
- if {[lsearch -exact $badcolors $c] < 0} break
- }
- set colormap($p) $c
- lappend badcolors $c
- }
}
lappend lines [list $oldlevel $p]
}
set dst [lindex $l 1]
set j [lsearch -exact $todo $dst]
if {$i == $j} {
- set linestarty($i) $oldstarty($i)
+ if {[info exists oldstarty($i)]} {
+ set linestarty($i) $oldstarty($i)
+ }
continue
}
set xi [expr {$canvx0 + $i * $linespc}]
set xj [expr {$canvx0 + $j * $linespc}]
set coords {}
- if {$oldstarty($i) < $canvy} {
+ if {[info exists oldstarty($i)] && $oldstarty($i) < $canvy} {
lappend coords $xi $oldstarty($i)
}
lappend coords $xi $canvy
lappend coords [expr $xj - $linespc] $canvy
}
lappend coords $xj $y2
- set t [$canv create line $coords -width 2 -fill $colormap($dst)]
+ set t [$canv create line $coords -width $lthickness \
+ -fill $colormap($dst)]
$canv lower $t
if {![info exists linestarty($j)]} {
set linestarty($j) $y2
}
}
}
+ set phase {}
+ if {$redisplaying} {
+ if {$stopped == 0 && [info exists selectedline]} {
+ selectline $selectedline
+ }
+ if {$stopped == 1} {
+ set stopped 0
+ after idle drawgraph
+ } else {
+ set redisplaying 0
+ }
+ }
+}
+
+proc findmatches {f} {
+ global findtype foundstring foundstrlen
+ if {$findtype == "Regexp"} {
+ set matches [regexp -indices -all -inline $foundstring $f]
+ } else {
+ if {$findtype == "IgnCase"} {
+ set str [string tolower $f]
+ } else {
+ set str $f
+ }
+ set matches {}
+ set i 0
+ while {[set j [string first $foundstring $str $i]] >= 0} {
+ lappend matches [list $j [expr $j+$foundstrlen-1]]
+ set i [expr $j + $foundstrlen]
+ }
+ }
+ return $matches
+}
+
+proc dofind {} {
+ global findtype findloc findstring markedmatches commitinfo
+ global numcommits lineid linehtag linentag linedtag
+ global mainfont namefont canv canv2 canv3 selectedline
+ global matchinglines foundstring foundstrlen
+ unmarkmatches
+ focus .
+ set matchinglines {}
+ set fldtypes {Headline Author Date Committer CDate Comment}
+ if {$findtype == "IgnCase"} {
+ set foundstring [string tolower $findstring]
+ } else {
+ set foundstring $findstring
+ }
+ set foundstrlen [string length $findstring]
+ if {$foundstrlen == 0} return
+ if {![info exists selectedline]} {
+ set oldsel -1
+ } else {
+ set oldsel $selectedline
+ }
+ set didsel 0
+ for {set l 0} {$l < $numcommits} {incr l} {
+ set id $lineid($l)
+ set info $commitinfo($id)
+ set doesmatch 0
+ foreach f $info ty $fldtypes {
+ if {$findloc != "All fields" && $findloc != $ty} {
+ continue
+ }
+ set matches [findmatches $f]
+ if {$matches == {}} continue
+ set doesmatch 1
+ if {$ty == "Headline"} {
+ markmatches $canv $l $f $linehtag($l) $matches $mainfont
+ } elseif {$ty == "Author"} {
+ markmatches $canv2 $l $f $linentag($l) $matches $namefont
+ } elseif {$ty == "Date"} {
+ markmatches $canv3 $l $f $linedtag($l) $matches $mainfont
+ }
+ }
+ if {$doesmatch} {
+ lappend matchinglines $l
+ if {!$didsel && $l > $oldsel} {
+ findselectline $l
+ set didsel 1
+ }
+ }
+ }
+ if {$matchinglines == {}} {
+ bell
+ } elseif {!$didsel} {
+ findselectline [lindex $matchinglines 0]
+ }
+}
+
+proc findselectline {l} {
+ global findloc commentend ctext
+ selectline $l
+ if {$findloc == "All fields" || $findloc == "Comments"} {
+ # highlight the matches in the comments
+ set f [$ctext get 1.0 $commentend]
+ set matches [findmatches $f]
+ foreach match $matches {
+ set start [lindex $match 0]
+ set end [expr [lindex $match 1] + 1]
+ $ctext tag add found "1.0 + $start c" "1.0 + $end c"
+ }
+ }
+}
+
+proc findnext {} {
+ global matchinglines selectedline
+ if {![info exists matchinglines]} {
+ dofind
+ return
+ }
+ if {![info exists selectedline]} return
+ foreach l $matchinglines {
+ if {$l > $selectedline} {
+ findselectline $l
+ return
+ }
+ }
+ bell
+}
+
+proc findprev {} {
+ global matchinglines selectedline
+ if {![info exists matchinglines]} {
+ dofind
+ return
+ }
+ if {![info exists selectedline]} return
+ set prev {}
+ foreach l $matchinglines {
+ if {$l >= $selectedline} break
+ set prev $l
+ }
+ if {$prev != {}} {
+ findselectline $prev
+ } else {
+ bell
+ }
+}
+
+proc markmatches {canv l str tag matches font} {
+ set bbox [$canv bbox $tag]
+ set x0 [lindex $bbox 0]
+ set y0 [lindex $bbox 1]
+ set y1 [lindex $bbox 3]
+ foreach match $matches {
+ set start [lindex $match 0]
+ set end [lindex $match 1]
+ if {$start > $end} continue
+ set xoff [font measure $font [string range $str 0 [expr $start-1]]]
+ set xlen [font measure $font [string range $str 0 [expr $end]]]
+ set t [$canv create rect [expr $x0+$xoff] $y0 [expr $x0+$xlen+2] $y1 \
+ -outline {} -tags matches -fill yellow]
+ $canv lower $t
+ }
+}
+
+proc unmarkmatches {} {
+ global matchinglines
+ allcanvs delete matches
+ catch {unset matchinglines}
}
proc selcanvline {x y} {
global canv canvy0 ctext linespc selectedline
- global lineid linehtag linentag linedtag commitinfo
+ global lineid linehtag linentag linedtag
set ymax [lindex [$canv cget -scrollregion] 3]
set yfrac [lindex [$canv yview] 0]
set y [expr {$y + $yfrac * $ymax}]
set l 0
}
if {[info exists selectedline] && $selectedline == $l} return
+ unmarkmatches
selectline $l
}
proc selectline {l} {
global canv canv2 canv3 ctext commitinfo selectedline
global lineid linehtag linentag linedtag
- global canvy canvy0 linespc nparents treepending
- global cflist treediffs currentid
+ global canvy0 linespc nparents treepending
+ global cflist treediffs currentid sha1entry
+ global commentend seenfile numcommits
if {![info exists lineid($l)] || ![info exists linehtag($l)]} return
$canv delete secsel
set t [eval $canv create rect [$canv bbox $linehtag($l)] -outline {{}} \
-tags secsel -fill [$canv3 cget -selectbackground]]
$canv3 lower $t
set y [expr {$canvy0 + $l * $linespc}]
- set ytop [expr {($y - $linespc / 2.0) / $canvy}]
- set ybot [expr {($y + $linespc / 2.0) / $canvy}]
+ set ymax [lindex [$canv cget -scrollregion] 3]
+ set ytop [expr {$y - $linespc - 1}]
+ set ybot [expr {$y + $linespc + 1}]
set wnow [$canv yview]
- if {$ytop < [lindex $wnow 0]} {
- allcanvs yview moveto $ytop
- } elseif {$ybot > [lindex $wnow 1]} {
- set wh [expr {[lindex $wnow 1] - [lindex $wnow 0]}]
- allcanvs yview moveto [expr {$ybot - $wh}]
+ set wtop [expr [lindex $wnow 0] * $ymax]
+ set wbot [expr [lindex $wnow 1] * $ymax]
+ set wh [expr {$wbot - $wtop}]
+ set newtop $wtop
+ if {$ytop < $wtop} {
+ if {$ybot < $wtop} {
+ set newtop [expr {$y - $wh / 2.0}]
+ } else {
+ set newtop $ytop
+ if {$newtop > $wtop - $linespc} {
+ set newtop [expr {$wtop - $linespc}]
+ }
+ }
+ } elseif {$ybot > $wbot} {
+ if {$ytop > $wbot} {
+ set newtop [expr {$y - $wh / 2.0}]
+ } else {
+ set newtop [expr {$ybot - $wh}]
+ if {$newtop < $wtop + $linespc} {
+ set newtop [expr {$wtop + $linespc}]
+ }
+ }
+ }
+ if {$newtop != $wtop} {
+ if {$newtop < 0} {
+ set newtop 0
+ }
+ allcanvs yview moveto [expr $newtop * 1.0 / $ymax]
}
set selectedline $l
set id $lineid($l)
+ $sha1entry conf -state normal
+ $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"
$ctext insert end "\n"
- $ctext insert end [lindex $info 0]
+ $ctext insert end [lindex $info 5]
+ $ctext insert end "\n"
+ $ctext tag delete Comments
+ $ctext tag remove found 1.0 end
$ctext conf -state disabled
+ set commentend [$ctext index "end - 1c"]
$cflist delete 0 end
set currentid $id
addtocflist $id
}
}
+ catch {unset seenfile}
+}
+proc selnextline {dir} {
+ global selectedline
+ if {![info exists selectedline]} return
+ set l [expr $selectedline + $dir]
+ unmarkmatches
+ selectline $l
}
proc addtocflist {id} {
gettreediffs $currentid
return
}
+ $cflist insert end "All files"
foreach f $treediffs($currentid) {
$cflist insert end $f
}
+ getblobdiffs $id
}
proc gettreediffs {id} {
}
}
-proc selnextline {dir} {
- global selectedline
- if {![info exists selectedline]} return
- set l [expr $selectedline + $dir]
- selectline $l
+proc getblobdiffs {id} {
+ global parents diffopts blobdifffd env curdifftag curtagstart
+ set p [lindex $parents($id) 0]
+ set env(GIT_DIFF_OPTS) $diffopts
+ if [catch {set bdf [open "|git-diff-tree -r -p $p $id" r]} err] {
+ puts "error getting diffs: $err"
+ return
+ }
+ fconfigure $bdf -blocking 0
+ set blobdifffd($id) $bdf
+ set curdifftag Comments
+ set curtagstart 0.0
+ fileevent $bdf readable "getblobdiffline $bdf $id"
}
-getcommits $revtreeargs
+proc getblobdiffline {bdf id} {
+ global currentid blobdifffd ctext curdifftag curtagstart seenfile
+ global diffnexthead diffnextnote
+ set n [gets $bdf line]
+ if {$n < 0} {
+ if {[eof $bdf]} {
+ close $bdf
+ if {$id == $currentid && $bdf == $blobdifffd($id)} {
+ $ctext tag add $curdifftag $curtagstart end
+ set seenfile($curdifftag) 1
+ }
+ }
+ return
+ }
+ if {$id != $currentid || $bdf != $blobdifffd($id)} {
+ return
+ }
+ $ctext conf -state normal
+ if {[regexp {^---[ \t]+([^/])*/(.*)} $line match s1 fname]} {
+ # start of a new file
+ $ctext insert end "\n"
+ $ctext tag add $curdifftag $curtagstart end
+ set seenfile($curdifftag) 1
+ set curtagstart [$ctext index "end - 1c"]
+ set header $fname
+ if {[info exists diffnexthead]} {
+ set fname $diffnexthead
+ set header "$diffnexthead ($diffnextnote)"
+ unset diffnexthead
+ }
+ set curdifftag "f:$fname"
+ $ctext tag delete $curdifftag
+ set l [expr {(78 - [string length $header]) / 2}]
+ set pad [string range "----------------------------------------" 1 $l]
+ $ctext insert end "$pad $header $pad\n" filesep
+ } elseif {[string range $line 0 2] == "+++"} {
+ # no need to do anything with this
+ } elseif {[regexp {^Created: (.*) \((mode: *[0-7]*)\)} $line match fn m]} {
+ set diffnexthead $fn
+ set diffnextnote "created, mode $m"
+ } elseif {[string range $line 0 8] == "Deleted: "} {
+ set diffnexthead [string range $line 9 end]
+ set diffnextnote "deleted"
+ } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
+ $line match f1l f1c f2l f2c rest]} {
+ $ctext insert end "\t" hunksep
+ $ctext insert end " $f1l " d0 " $f2l " d1
+ $ctext insert end " $rest \n" hunksep
+ } else {
+ set x [string range $line 0 0]
+ if {$x == "-" || $x == "+"} {
+ set tag [expr {$x == "+"}]
+ set line [string range $line 1 end]
+ $ctext insert end "$line\n" d$tag
+ } elseif {$x == " "} {
+ set line [string range $line 1 end]
+ $ctext insert end "$line\n"
+ } elseif {$x == "\\"} {
+ # e.g. "\ No newline at end of file"
+ $ctext insert end "$line\n" filesep
+ } else {
+ # Something else we don't recognize
+ if {$curdifftag != "Comments"} {
+ $ctext insert end "\n"
+ $ctext tag add $curdifftag $curtagstart end
+ set seenfile($curdifftag) 1
+ set curtagstart [$ctext index "end - 1c"]
+ set curdifftag Comments
+ }
+ $ctext insert end "$line\n" filesep
+ }
+ }
+ $ctext conf -state disabled
+}
-set linespc [font metrics $mainfont -linespace]
-set charspc [font measure $mainfont "m"]
+proc listboxsel {} {
+ global ctext cflist currentid treediffs seenfile
+ if {![info exists currentid]} return
+ set sel [$cflist curselection]
+ if {$sel == {} || [lsearch -exact $sel 0] >= 0} {
+ # show everything
+ $ctext tag conf Comments -elide 0
+ foreach f $treediffs($currentid) {
+ if [info exists seenfile(f:$f)] {
+ $ctext tag conf "f:$f" -elide 0
+ }
+ }
+ } else {
+ # just show selected files
+ $ctext tag conf Comments -elide 1
+ set i 1
+ foreach f $treediffs($currentid) {
+ set elide [expr {[lsearch -exact $sel $i] < 0}]
+ if [info exists seenfile(f:$f)] {
+ $ctext tag conf "f:$f" -elide $elide
+ }
+ incr i
+ }
+ }
+}
-set canvy0 [expr 3 + 0.5 * $linespc]
-set canvx0 [expr 3 + 0.5 * $linespc]
-set namex [expr 45 * $charspc]
-set datex [expr 75 * $charspc]
+proc setcoords {} {
+ global linespc charspc canvx0 canvy0 mainfont
+ set linespc [font metrics $mainfont -linespace]
+ set charspc [font measure $mainfont "m"]
+ set canvy0 [expr 3 + 0.5 * $linespc]
+ set canvx0 [expr 3 + 0.5 * $linespc]
+}
-makewindow
+proc redisplay {} {
+ global selectedline stopped redisplaying phase
+ if {$stopped > 1} return
+ if {$phase == "getcommits"} return
+ set redisplaying 1
+ if {$phase == "drawgraph"} {
+ set stopped 1
+ } else {
+ drawgraph
+ }
+}
-set start {}
-foreach id $commits {
- if {$nchildren($id) == 0} {
- set start $id
- break
+proc incrfont {inc} {
+ global mainfont namefont textfont selectedline ctext canv phase
+ global stopped
+ unmarkmatches
+ set mainfont [lreplace $mainfont 1 1 [expr {[lindex $mainfont 1] + $inc}]]
+ set namefont [lreplace $namefont 1 1 [expr {[lindex $namefont 1] + $inc}]]
+ set textfont [lreplace $textfont 1 1 [expr {[lindex $textfont 1] + $inc}]]
+ setcoords
+ $ctext conf -font $textfont
+ $ctext tag conf filesep -font [concat $textfont bold]
+ if {$phase == "getcommits"} {
+ $canv itemconf textitems -font $mainfont
}
+ redisplay
+}
+
+proc doquit {} {
+ global stopped
+ set stopped 100
+ destroy .
+}
+
+# defaults...
+set datemode 0
+set boldnames 0
+set diffopts "-U 5 -p"
+
+set mainfont {Helvetica 9}
+set textfont {Courier 9}
+
+set colors {green red blue magenta darkgrey brown orange}
+set colorbycommitter false
+
+catch {source ~/.gitk}
+
+set namefont $mainfont
+if {$boldnames} {
+ lappend namefont bold
}
-if {$start != {}} {
- drawgraph $start
+
+set revtreeargs {}
+foreach arg $argv {
+ 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 stopped 0
+set redisplaying 0
+set stuffsaved 0
+setcoords
+makewindow
+getcommits $revtreeargs
projects / git.git / blobdiff