#!/bin/sh # Tcl ignores the next line -*- tcl -*- \ exec wish "$0" -- "${1+$@}" # Copyright (C) 2005 Paul Mackerras. All rights reserved. # This program is free software; it may be used, copied, modified # and distributed under the terms of the GNU General Public Licence, # either version 2, or (at your option) any later version. # CVS $Revision: 1.13 $ 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 } proc getcommitline {commfd} { global commits parents cdate nparents children nchildren set n [gets $commfd line] if {$n < 0} { if {![eof $commfd]} return if {![catch {close $commfd} err]} { after idle drawgraph return } if {[string range $err 0 4] == "usage"} { puts stderr "Error reading commits: bad arguments to git-rev-tree" puts stderr "Note: arguments to gitk are passed to git-rev-tree" puts stderr " to allow selection of commits to be displayed" } else { puts stderr "Error reading commits: $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 } } incr i } } proc readcommit {id} { global commitinfo set inhdr 1 set comment {} set headline {} set auname {} set audate {} set comname {} set comdate {} foreach line [split [exec git-cat-file commit $id] "\n"] { if {$inhdr} { if {$line == {}} { set inhdr 0 } else { set tag [lindex $line 0] if {$tag == "author"} { set x [expr {[llength $line] - 2}] set audate [lindex $line $x] set auname [lrange $line 1 [expr {$x - 1}]] } elseif {$tag == "committer"} { set x [expr {[llength $line] - 2}] set comdate [lindex $line $x] set comname [lrange $line 1 [expr {$x - 1}]] } } } else { if {$comment == {}} { set headline $line } else { append comment "\n" } append comment $line } } if {$audate != {}} { set audate [clock format $audate -format "%Y-%m-%d %H:%M:%S"] } if {$comdate != {}} { set comdate [clock format $comdate -format "%Y-%m-%d %H:%M:%S"] } set commitinfo($id) [list $headline $auname $audate \ $comname $comdate $comment] } proc makewindow {} { global canv canv2 canv3 linespc charspc ctext cflist textfont global sha1entry findtype findloc findstring 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 if {[info exists geometry(width)]} { .ctop conf -width $geometry(width) -height $geometry(height) } 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.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.top.clist add $canv2 set canv3 .ctop.top.clist.canv3 canvas $canv3 -height $geometry(canvh) -width $geometry(canv3) \ -bg white -bd 0 -yscrollincr $linespc .ctop.top.clist add $canv3 bind .ctop.top.clist {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 {} entry .ctop.top.bar.findstring -width 30 -font $textfont \ -textvariable findstring pack .ctop.top.bar.findstring -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 if {[info exists geometry(cdeth)]} { .ctop.cdet conf -height $geometry(cdeth) } .ctop add .ctop.cdet frame .ctop.cdet.left set ctext .ctop.cdet.left.ctext 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 if {[info exists geometry(detlw)]} { .ctop.cdet.left conf -width $geometry(detlw) } $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 frame .ctop.cdet.right set cflist .ctop.cdet.right.cfiles listbox $cflist -width $geometry(cflistw) -bg white -selectmode extended \ -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 if {[info exists geometry(detsash)]} { eval .ctop.cdet sash place 0 $geometry(detsash) } bind .ctop.cdet {resizecdetpanes %W %w} pack .ctop -side top -fill both -expand 1 bindall <1> {selcanvline %x %y} bindall {selcanvline %x %y} bindall "allcanvs yview scroll -5 u" bindall "allcanvs yview scroll 5 u" bindall <2> "allcanvs scan mark 0 %y" bindall "allcanvs scan dragto 0 %y" bind . "selnextline -1" bind . "selnextline 1" bind . p "selnextline -1" bind . n "selnextline 1" bind . "allcanvs yview scroll -1 p" bind . "allcanvs yview scroll 1 p" bind . "$ctext yview scroll -1 p" bind . "$ctext yview scroll -1 p" bind . "$ctext yview scroll 1 p" bind . b "$ctext yview scroll -1 p" bind . d "$ctext yview scroll 18 u" bind . u "$ctext yview scroll -18 u" bind . Q doquit bind . doquit bind . dofind bind . findnext bind . findprev bind . {incrfont 1} bind . {incrfont 1} bind . {incrfont -1} bind . {incrfont -1} bind $cflist <> listboxsel bind . {savestuff %W} } proc savestuff {w} { global canv canv2 canv3 ctext cflist mainfont textfont global stuffsaved if {$stuffsaved} 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) [winfo width $canv]" puts $f "set geometry(canv2) [winfo width $canv2]" puts $f "set geometry(canv3) [winfo width $canv3]" puts $f "set geometry(canvh) [winfo height $canv]" puts $f "set geometry(cdeth) [winfo height .ctop.cdet]" set wid [expr {([winfo width $ctext] - 8) \ / [font measure $textfont "0"]}] set ht [expr {([winfo height $ctext] - 8) \ / [font metrics $textfont -linespace]}] puts $f "set geometry(ctextw) $wid" puts $f "set geometry(ctexth) $ht" 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 { global canv canv2 canv3 eval $canv $args eval $canv2 $args eval $canv3 $args } proc bindall {event action} { global canv canv2 canv3 bind $canv $event $action bind $canv2 $event $action 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 0.91 Copyright © 2005 Paul Mackerras Use and redistribute under the terms of the GNU General Public License (CVS $Revision: 1.13 $)} \ -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 } } 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 commitinfo global nextcolor colormap numcommits global stopped phase redisplaying selectedline allcanvs delete all set start {} foreach id $commits { if {$nchildren($id) == 0} { lappend start $id } set ncleft($id) $nchildren($id) } if {$start == {}} { $canv create text 3 3 -anchor nw -font $mainfont \ -text "ERROR: No starting commits found" set phase {} return } set nextcolor 0 foreach id $start { assigncolor $id } set todo $start set level [expr [llength $todo] - 1] set y2 $canvy0 set nullentry -1 set lineno -1 set numcommits 0 set phase drawgraph while 1 { set canvy $y2 allcanvs conf -scrollregion [list 0 0 0 $canvy] 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)]} { incr ncleft($p) -1 lappend actualparents $p } } if {![info exists commitinfo($id)]} { readcommit $id } 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 2 -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] $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 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]] } } if {$nullentry >= 0} { set todo [lreplace $todo $nullentry $nullentry] if {$nullentry < $level} { incr level -1 } } set todo [lreplace $todo $level $level] if {$nullentry > $level} { incr nullentry -1 } 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 } } lappend lines [list $oldlevel $p] } # 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 { 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" } } break } # 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 } } } else { set nullentry -1 } 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 } 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) } lappend coords $xi $canvy if {$j < $i - 1} { lappend coords [expr $xj + $linespc] $canvy } elseif {$j > $i + 1} { lappend coords [expr $xj - $linespc] $canvy } lappend coords $xj $y2 set t [$canv create line $coords -width 2 -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 dofind {} { global findtype findloc findstring markedmatches commitinfo global numcommits lineid linehtag linentag linedtag global mainfont namefont canv canv2 canv3 selectedline global matchinglines unmarkmatches set matchinglines {} set fldtypes {Headline Author Date Committer CDate Comment} if {$findtype == "IgnCase"} { set fstr [string tolower $findstring] } else { set fstr $findstring } set mlen [string length $findstring] if {$mlen == 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 } if {$findtype == "Regexp"} { set matches [regexp -indices -all -inline $fstr $f] } else { if {$findtype == "IgnCase"} { set str [string tolower $f] } else { set str $f } set matches {} set i 0 while {[set j [string first $fstr $str $i]] >= 0} { lappend matches [list $j [expr $j+$mlen-1]] set i [expr $j + $mlen] } } 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} { selectline $l set didsel 1 } } } if {$matchinglines == {}} { bell } elseif {!$didsel} { selectline [lindex $matchinglines 0] } } proc findnext {} { global matchinglines selectedline if {![info exists matchinglines]} { dofind return } if {![info exists selectedline]} return foreach l $matchinglines { if {$l > $selectedline} { selectline $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 != {}} { selectline $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 set ymax [lindex [$canv cget -scrollregion] 3] set yfrac [lindex [$canv yview] 0] set y [expr {$y + $yfrac * $ymax}] set l [expr {int(($y - $canvy0) / $linespc + 0.5)}] if {$l < 0} { 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 sha1entry 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 [$canv cget -selectbackground]] $canv lower $t $canv2 delete secsel set t [eval $canv2 create rect [$canv2 bbox $linentag($l)] -outline {{}} \ -tags secsel -fill [$canv2 cget -selectbackground]] $canv2 lower $t $canv3 delete secsel set t [eval $canv3 create rect [$canv3 bbox $linedtag($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 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 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 5] $ctext insert end "\n" $ctext tag delete Comments $ctext conf -state disabled $cflist delete 0 end set currentid $id if {$nparents($id) == 1} { if {![info exists treediffs($id)]} { if {![info exists treepending]} { gettreediffs $id } } else { addtocflist $id } } } proc selnextline {dir} { global selectedline if {![info exists selectedline]} return set l [expr $selectedline + $dir] unmarkmatches selectline $l } proc addtocflist {id} { global currentid treediffs cflist treepending if {$id != $currentid} { gettreediffs $currentid return } $cflist insert end "All files" foreach f $treediffs($currentid) { $cflist insert end $f } getblobdiffs $id } proc gettreediffs {id} { global treediffs parents treepending set treepending $id set treediffs($id) {} set p [lindex $parents($id) 0] if [catch {set gdtf [open "|git-diff-tree -r $p $id" r]}] return fconfigure $gdtf -blocking 0 fileevent $gdtf readable "gettreediffline $gdtf $id" } proc gettreediffline {gdtf id} { global treediffs treepending set n [gets $gdtf line] if {$n < 0} { if {![eof $gdtf]} return close $gdtf unset treepending addtocflist $id return } set type [lindex $line 1] set file [lindex $line 3] if {$type == "blob"} { lappend treediffs($id) $file } } 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" } proc getblobdiffline {bdf id} { global currentid blobdifffd ctext curdifftag curtagstart 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 } } 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 curtagstart [$ctext index "end - 1c"] set curdifftag "f:$fname" $ctext tag delete $curdifftag set l [expr {(78 - [string length $fname]) / 2}] set pad [string range "----------------------------------------" 1 $l] $ctext insert end "$pad $fname $pad\n" filesep } elseif {[string range $line 0 2] == "+++"} { # no need to do anything with this } 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" } else { # Something else we don't recognize if {$curdifftag != "Comments"} { $ctext insert end "\n" $ctext tag add $curdifftag $curtagstart end set curtagstart [$ctext index "end - 1c"] set curdifftag Comments } $ctext insert end "$line\n" filesep } } $ctext conf -state disabled } proc listboxsel {} { global ctext cflist currentid treediffs 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) { $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}] $ctext tag conf "f:$f" -elide $elide incr i } } } 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] } 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 } } 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 namefont $mainfont set textfont {Courier 9} if {$boldnames} { lappend namefont bold } set colors {green red blue magenta darkgrey brown orange} set colorbycommitter false catch {source ~/.gitk} 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