# and distributed under the terms of the GNU General Public Licence,
# either version 2, or (at your option) any later version.
-# CVS $Revision: 1.24 $
-
proc getcommits {rargs} {
- global commits commfd phase canv mainfont
+ global commits commfd phase canv mainfont env
global startmsecs nextupdate
- global ctext maincursor textcursor nlines
+ global ctext maincursor textcursor leftover
- if {$rargs == {}} {
- set rargs HEAD
+ # check that we can find a .git directory somewhere...
+ if {[info exists env(GIT_DIR)]} {
+ set gitdir $env(GIT_DIR)
+ } else {
+ set gitdir ".git"
+ }
+ if {![file isdirectory $gitdir]} {
+ error_popup "Cannot find the git directory \"$gitdir\"."
+ exit 1
}
set commits {}
set phase getcommits
set startmsecs [clock clicks -milliseconds]
set nextupdate [expr $startmsecs + 100]
- if [catch {set commfd [open "|git-rev-list --merge-order $rargs" r]} err] {
+ if [catch {
+ set parse_args [concat --default HEAD $rargs]
+ set parsed_args [split [eval exec git-rev-parse $parse_args] "\n"]
+ }] {
+ # if git-rev-parse failed for some reason...
+ if {$rargs == {}} {
+ set rargs HEAD
+ }
+ set parsed_args $rargs
+ }
+ if [catch {
+ set commfd [open "|git-rev-list --header --topo-order $parsed_args" r]
+ } err] {
puts stderr "Error executing git-rev-list: $err"
exit 1
}
- set nlines 0
- fconfigure $commfd -blocking 0
- fileevent $commfd readable "getcommitline $commfd"
+ set leftover {}
+ fconfigure $commfd -blocking 0 -translation binary
+ fileevent $commfd readable "getcommitlines $commfd"
$canv delete all
$canv create text 3 3 -anchor nw -text "Reading commits..." \
-font $mainfont -tags textitems
$ctext config -cursor watch
}
-proc getcommitline {commfd} {
- global commits parents cdate children nchildren ncleft
+proc getcommitlines {commfd} {
+ global commits parents cdate children nchildren
global commitlisted phase commitinfo nextupdate
- global stopped redisplaying nlines
+ global stopped redisplaying leftover
- set n [gets $commfd line]
- if {$n < 0} {
+ set stuff [read $commfd]
+ if {$stuff == {}} {
if {![eof $commfd]} return
# this works around what is apparently a bug in Tcl...
fconfigure $commfd -blocking 1
error_popup $err
exit 1
}
- incr nlines
- 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"
+ set start 0
+ while 1 {
+ set i [string first "\0" $stuff $start]
+ if {$i < 0} {
+ append leftover [string range $stuff $start end]
+ return
}
- }
- 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
+ set cmit [string range $stuff $start [expr {$i - 1}]]
+ if {$start == 0} {
+ set cmit "$leftover$cmit"
+ set leftover {}
+ }
+ set start [expr {$i + 1}]
+ if {![regexp {^([0-9a-f]{40})\n} $cmit match id]} {
+ set shortcmit $cmit
+ if {[string length $shortcmit] > 80} {
+ set shortcmit "[string range $shortcmit 0 80]..."
+ }
+ error_popup "Can't parse git-rev-list output: {$shortcmit}"
+ exit 1
+ }
+ set cmit [string range $cmit 41 end]
+ lappend commits $id
+ set commitlisted($id) 1
+ parsecommit $id $cmit 1
+ 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 nextupdate 100
fileevent $commfd readable {}
update
- fileevent $commfd readable "getcommitline $commfd"
+ fileevent $commfd readable "getcommitlines $commfd"
}
proc readcommit {id} {
+ if [catch {set contents [exec git-cat-file commit $id]}] return
+ parsecommit $id $contents 0
+}
+
+proc parsecommit {id contents listed} {
global commitinfo children nchildren parents nparents cdate ncleft
- global noreadobj
set inhdr 1
set comment {}
}
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 == {}} {
}
lappend parents($id) $p
incr nparents($id)
- if {[lsearch -exact $children($p) $id] < 0} {
+ # sometimes we get a commit that lists a parent twice...
+ if {$listed && [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}]
}
} else {
if {$comment == {}} {
- set headline $line
+ set headline [string trim $line]
} else {
append comment "\n"
}
+ if {!$listed} {
+ # git-rev-list indents the comment by 4 spaces;
+ # if we got this via git-cat-file, add the indentation
+ append comment " "
+ }
append comment $line
}
}
global findtype findloc findstring fstring geometry
global entries sha1entry sha1string sha1but
global maincursor textcursor
- global linectxmenu
+ global rowctxmenu
menu .bar
.bar add cascade -label "File" -menu .bar.file
pack .ctop -side top -fill both -expand 1
- bindall <1> {selcanvline %x %y}
- bindall <B1-Motion> {selcanvline %x %y}
+ bindall <1> {selcanvline %W %x %y}
+ #bindall <B1-Motion> {selcanvline %W %x %y}
bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
bindall <2> "allcanvs scan mark 0 %y"
bind . <Button-1> "click %W"
bind $fstring <Key-Return> dofind
bind $sha1entry <Key-Return> gotocommit
+ bind $sha1entry <<PasteSelection>> clearsha1
set maincursor [. cget -cursor]
set textcursor [$ctext cget -cursor]
- set linectxmenu .linectxmenu
- menu $linectxmenu -tearoff 0
- $linectxmenu add command -label "Select" -command lineselect
+ set rowctxmenu .rowctxmenu
+ menu $rowctxmenu -tearoff 0
+ $rowctxmenu add command -label "Diff this -> selected" \
+ -command {diffvssel 0}
+ $rowctxmenu add command -label "Diff selected -> this" \
+ -command {diffvssel 1}
+ $rowctxmenu add command -label "Make patch" -command mkpatch
+ $rowctxmenu add command -label "Create tag" -command mktag
+ $rowctxmenu add command -label "Write commit to file" -command writecommit
}
# when we make a key binding for the toplevel, make sure
toplevel $w
wm title $w "About gitk"
message $w.m -text {
-Gitk version 1.1
+Gitk version 1.2
Copyright © 2005 Paul Mackerras
-Use and redistribute under the terms of the GNU General Public License
-
-(CVS $Revision: 1.24 $)} \
+Use and redistribute under the terms of the GNU General Public License} \
-justify center -aspect 400
pack $w.m -side top -fill x -padx 20 -pady 20
button $w.ok -text Close -command "destroy $w"
proc assigncolor {id} {
global commitinfo colormap commcolors colors nextcolor
global parents nparents children nchildren
+ global cornercrossings crossings
+
if [info exists colormap($id)] return
set ncolors [llength $colors]
- if {$nparents($id) == 1 && $nchildren($id) == 1} {
+ if {$nparents($id) <= 1 && $nchildren($id) == 1} {
set child [lindex $children($id) 0]
if {[info exists colormap($child)]
&& $nparents($child) == 1} {
}
}
set badcolors {}
- foreach child $children($id) {
- if {[info exists colormap($child)]
- && [lsearch -exact $badcolors $colormap($child)] < 0} {
- lappend badcolors $colormap($child)
+ if {[info exists cornercrossings($id)]} {
+ foreach x $cornercrossings($id) {
+ if {[info exists colormap($x)]
+ && [lsearch -exact $badcolors $colormap($x)] < 0} {
+ lappend badcolors $colormap($x)
+ }
}
- 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 {}
+ }
+ }
+ set origbad $badcolors
+ if {[llength $badcolors] < $ncolors - 1} {
+ if {[info exists crossings($id)]} {
+ foreach x $crossings($id) {
+ if {[info exists colormap($x)]
+ && [lsearch -exact $badcolors $colormap($x)] < 0} {
+ lappend badcolors $colormap($x)
}
}
+ if {[llength $badcolors] >= $ncolors} {
+ set badcolors $origbad
+ }
}
+ set origbad $badcolors
}
- if {[llength $badcolors] >= $ncolors} {
- set badcolors {}
+ if {[llength $badcolors] < $ncolors - 1} {
+ 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 $origbad
+ }
}
for {set i 0} {$i <= $ncolors} {incr i} {
set c [lindex $colors $nextcolor]
proc initgraph {} {
global canvy canvy0 lineno numcommits lthickness nextcolor linespc
- global glines
+ global mainline sidelines
global nchildren ncleft
allcanvs delete all
set lineno -1
set numcommits 0
set lthickness [expr {int($linespc / 9) + 1}]
- catch {unset glines}
+ catch {unset mainline}
+ catch {unset sidelines}
foreach id [array names nchildren] {
set ncleft($id) $nchildren($id)
}
}
+proc bindline {t id} {
+ global canv
+
+ $canv bind $t <Enter> "lineenter %x %y $id"
+ $canv bind $t <Motion> "linemotion %x %y $id"
+ $canv bind $t <Leave> "lineleave $id"
+ $canv bind $t <Button-1> "lineclick %x %y $id"
+}
+
proc drawcommitline {level} {
- global parents children nparents nchildren ncleft todo
+ global parents children nparents nchildren todo
global canv canv2 canv3 mainfont namefont canvx0 canvy linespc
- global datemode cdate
global lineid linehtag linentag linedtag commitinfo
- global colormap numcommits currentparents
+ global colormap numcommits currentparents dupparents
global oldlevel oldnlines oldtodo
global idtags idline idheads
- global lineno lthickness glines
- global commitlisted
+ global lineno lthickness mainline sidelines
+ global commitlisted rowtextx idpos
incr numcommits
incr lineno
set nparents($id) 0
}
}
+ assigncolor $id
set currentparents {}
+ set dupparents {}
if {[info exists commitlisted($id)] && [info exists parents($id)]} {
- set currentparents $parents($id)
+ foreach p $parents($id) {
+ if {[lsearch -exact $currentparents $p] < 0} {
+ lappend currentparents $p
+ } else {
+ # remember that this parent was listed twice
+ lappend dupparents $p
+ }
+ }
}
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 glines($id)]} {
- lappend glines($id) $x $y1
- set t [$canv create line $glines($id) \
+ if {[info exists mainline($id)]} {
+ lappend mainline($id) $x $y1
+ set t [$canv create line $mainline($id) \
-width $lthickness -fill $colormap($id)]
$canv lower $t
- $canv bind $t <Button-3> "linemenu %X %Y $id"
- $canv bind $t <Enter> "lineenter %x %y $id"
- $canv bind $t <Motion> "linemotion %x %y $id"
- $canv bind $t <Leave> "lineleave $id"
+ bindline $t $id
+ }
+ if {[info exists sidelines($id)]} {
+ foreach ls $sidelines($id) {
+ set coords [lindex $ls 0]
+ set thick [lindex $ls 1]
+ set t [$canv create line $coords -fill $colormap($id) \
+ -width [expr {$thick * $lthickness}]]
+ $canv lower $t
+ bindline $t $id
+ }
}
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
+ $canv bind $t <1> {selcanvline {} %x %y}
set xt [expr $canvx0 + [llength $todo] * $linespc]
- if {$nparents($id) > 2} {
- set xt [expr {$xt + ($nparents($id) - 2) * $linespc}]
+ if {[llength $currentparents] > 2} {
+ set xt [expr {$xt + ([llength $currentparents] - 2) * $linespc}]
+ }
+ set rowtextx($lineno) $xt
+ set idpos($id) [list $x $xt $y1]
+ if {[info exists idtags($id)] || [info exists idheads($id)]} {
+ set xt [drawtags $id $x $xt $y1]
}
+ 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 ]
+ $canv bind $linehtag($lineno) <Button-3> "rowmenu %X %Y $id"
+ 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]
+}
+
+proc drawtags {id x xt y1} {
+ global idtags idheads
+ global linespc lthickness
+ global canv mainfont
+
set marks {}
set ntags 0
if {[info exists idtags($id)]} {
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 t [$canv create line $x $y1 [lindex $xvals end] $y1 \
- -width $lthickness -fill black]
- $canv lower $t
- $canv bind $t <Button-3> "linemenu %X %Y $id"
- $canv bind $t <Enter> "lineenter %x %y $id"
- $canv bind $t <Motion> "linemotion %x %y $id"
- $canv bind $t <Leave> "lineleave $id"
- 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
+ if {$marks eq {}} {
+ return $xt
+ }
+
+ 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 t [$canv create line $x $y1 [lindex $xvals end] $y1 \
+ -width $lthickness -fill black -tags tag.$id]
+ $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 -tags tag.$id
+ } 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 -tags tag.$id
}
+ $canv create text $xl $y1 -anchor w -text $tag \
+ -font $mainfont -tags tag.$id
}
- 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]
+ return $xt
}
proc updatetodo {level noshortcut} {
- global datemode currentparents ncleft todo
- global glines oldlevel oldtodo oldnlines
- global canvx0 canvy linespc glines
+ global currentparents ncleft todo
+ global mainline oldlevel oldtodo oldnlines
+ global canvx0 canvy linespc mainline
global commitinfo
- foreach p $currentparents {
- if {![info exists commitinfo($p)]} {
- readcommit $p
- }
- }
- set x [expr $canvx0 + $level * $linespc]
- set y [expr $canvy - $linespc]
+ set oldlevel $level
+ set oldtodo $todo
+ set oldnlines [llength $todo]
if {!$noshortcut && [llength $currentparents] == 1} {
set p [lindex $currentparents 0]
- if {$ncleft($p) == 0 && [lsearch -exact $todo $p] < 0} {
- assigncolor $p
- set glines($p) [list $x $y]
+ if {$ncleft($p) == 1 && [lsearch -exact $todo $p] < 0} {
+ set ncleft($p) 0
+ set x [expr $canvx0 + $level * $linespc]
+ set y [expr $canvy - $linespc]
+ set mainline($p) [list $x $y]
set todo [lreplace $todo $level $level $p]
return 0
}
}
- 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
}
return 1
}
+proc notecrossings {id lo hi corner} {
+ global oldtodo crossings cornercrossings
+
+ for {set i $lo} {[incr i] < $hi} {} {
+ set p [lindex $oldtodo $i]
+ if {$p == {}} continue
+ if {$i == $corner} {
+ if {![info exists cornercrossings($id)]
+ || [lsearch -exact $cornercrossings($id) $p] < 0} {
+ lappend cornercrossings($id) $p
+ }
+ if {![info exists cornercrossings($p)]
+ || [lsearch -exact $cornercrossings($p) $id] < 0} {
+ lappend cornercrossings($p) $id
+ }
+ } else {
+ if {![info exists crossings($id)]
+ || [lsearch -exact $crossings($id) $p] < 0} {
+ lappend crossings($id) $p
+ }
+ if {![info exists crossings($p)]
+ || [lsearch -exact $crossings($p) $id] < 0} {
+ lappend crossings($p) $id
+ }
+ }
+ }
+}
+
proc drawslants {} {
- global canv glines canvx0 canvy linespc
- global oldlevel oldtodo todo currentparents
+ global canv mainline sidelines canvx0 canvy linespc
+ global oldlevel oldtodo todo currentparents dupparents
global lthickness linespc canvy colormap
set y1 [expr $canvy - $linespc]
if {$i == $oldlevel} {
foreach p $currentparents {
set j [lsearch -exact $todo $p]
- if {$i == $j && ![info exists glines($p)]} {
- set glines($p) [list $xi $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
- }
+ set coords [list $xi $y1]
+ set xj [expr {$canvx0 + $j * $linespc}]
+ if {$j < $i - 1} {
+ lappend coords [expr $xj + $linespc] $y1
+ notecrossings $p $j $i [expr {$j + 1}]
+ } elseif {$j > $i + 1} {
+ lappend coords [expr $xj - $linespc] $y1
+ notecrossings $p $i $j [expr {$j - 1}]
+ }
+ if {[lsearch -exact $dupparents $p] >= 0} {
+ # draw a double-width line to indicate the doubled parent
lappend coords $xj $y2
- if {![info exists glines($p)]} {
- set glines($p) $coords
+ lappend sidelines($p) [list $coords 2]
+ if {![info exists mainline($p)]} {
+ set mainline($p) [list $xj $y2]
+ }
+ } else {
+ # normal case, no parent duplicated
+ if {![info exists mainline($p)]} {
+ if {$i != $j} {
+ lappend coords $xj $y2
+ }
+ set mainline($p) $coords
} else {
- set t [$canv create line $coords -width $lthickness \
- -fill $colormap($p)]
- $canv lower $t
- $canv bind $t <Button-3> "linemenu %X %Y $p"
- $canv bind $t <Enter> "lineenter %x %y $p"
- $canv bind $t <Motion> "linemotion %x %y $p"
- $canv bind $t <Leave> "lineleave $p"
+ lappend coords $xj $y2
+ lappend sidelines($p) [list $coords 1]
}
}
}
} elseif {[lindex $todo $i] != $id} {
set j [lsearch -exact $todo $id]
set xj [expr {$canvx0 + $j * $linespc}]
- lappend glines($id) $xi $y1 $xj $y2
+ lappend mainline($id) $xi $y1 $xj $y2
}
}
}
-proc decidenext {} {
+proc decidenext {{noread 0}} {
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 commitinfo
global currentparents oldlevel oldnlines oldtodo
global lineno lthickness
set p [lindex $todo $k]
if {$ncleft($p) == 0} {
if {$datemode} {
+ if {![info exists commitinfo($p)]} {
+ if {$noread} {
+ return {}
+ }
+ readcommit $p
+ }
if {$latest == {} || $cdate($p) > $latest} {
set level $k
set latest $cdate($p)
if {$todo != {}} {
puts "ERROR: none of the pending commits can be done yet:"
foreach p $todo {
- puts " $p"
+ puts " $p ($ncleft($p))"
}
}
return -1
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]} {
+ set level [decidenext 1]
+ if {$level == {} || $id != [lindex $todo $level]} {
return
}
while 1 {
drawslants
drawcommitline $level
if {[updatetodo $level $datemode]} {
- set level [decidenext]
+ set level [decidenext 1]
+ if {$level == {}} break
}
set id [lindex $todo $level]
if {![info exists commitlisted($id)]} {
proc finishcommits {} {
global phase
global startcommits
- global ctext maincursor textcursor
+ global canv mainfont 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
+ } else {
+ drawslants
+ set level [decidenext]
+ drawrest $level [llength $startcommits]
}
- drawslants
- set level [decidenext]
- drawrest $level [llength $startcommits]
. config -cursor $maincursor
$ctext config -cursor $textcursor
}
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 {$level >= 0} {
+ set phase drawgraph
+ set startid [lindex $startcommits $startix]
+ set startline -1
+ if {$startid != {}} {
+ set startline $idline($startid)
}
- if {[clock clicks -milliseconds] >= $nextupdate} {
- update
- incr nextupdate 100
+ 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 {}
catch {unset matchinglines}
}
-proc selcanvline {x y} {
+proc selcanvline {w x y} {
global canv canvy0 ctext linespc selectedline
- global lineid linehtag linentag linedtag
+ global lineid linehtag linentag linedtag rowtextx
set ymax [lindex [$canv cget -scrollregion] 3]
if {$ymax == {}} return
set yfrac [lindex [$canv yview] 0]
if {$l < 0} {
set l 0
}
- if {[info exists selectedline] && $selectedline == $l} return
+ if {$w eq $canv} {
+ if {![info exists rowtextx($l)] || $x < $rowtextx($l)} return
+ }
unmarkmatches
selectline $l
}
proc selectline {l} {
global canv canv2 canv3 ctext commitinfo selectedline
global lineid linehtag linentag linedtag
- global canvy0 linespc nparents treepending
- global cflist treediffs currentid sha1entry
+ global canvy0 linespc parents nparents
+ global cflist currentid sha1entry diffids
global commentend seenfile idtags
$canv delete hover
if {![info exists lineid($l)] || ![info exists linehtag($l)]} return
set id $lineid($l)
set currentid $id
+ set diffids [concat $id $parents($id)]
$sha1entry delete 0 end
$sha1entry insert 0 $id
$sha1entry selection from 0
$ctext conf -state normal
$ctext delete 0.0 end
+ $ctext mark set fmark.0 0.0
+ $ctext mark gravity fmark.0 left
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"
set commentend [$ctext index "end - 1c"]
$cflist delete 0 end
+ $cflist insert end "Comments"
if {$nparents($id) == 1} {
- if {![info exists treediffs($id)]} {
- if {![info exists treepending]} {
- gettreediffs $id
- }
- } else {
- addtocflist $id
- }
+ startdiff
}
catch {unset seenfile}
}
+proc startdiff {} {
+ global treediffs diffids treepending
+
+ if {![info exists treediffs($diffids)]} {
+ if {![info exists treepending]} {
+ gettreediffs $diffids
+ }
+ } else {
+ addtocflist $diffids
+ }
+}
+
proc selnextline {dir} {
global selectedline
if {![info exists selectedline]} return
selectline $l
}
-proc addtocflist {id} {
- global currentid treediffs cflist treepending
- if {$id != $currentid} {
- gettreediffs $currentid
+proc addtocflist {ids} {
+ global diffids treediffs cflist
+ if {$ids != $diffids} {
+ gettreediffs $diffids
return
}
- $cflist insert end "All files"
- foreach f $treediffs($currentid) {
+ foreach f $treediffs($ids) {
$cflist insert end $f
}
- getblobdiffs $id
+ getblobdiffs $ids
}
-proc gettreediffs {id} {
+proc gettreediffs {ids} {
global treediffs parents treepending
- set treepending $id
- set treediffs($id) {}
- set p [lindex $parents($id) 0]
+ set treepending $ids
+ set treediffs($ids) {}
+ set id [lindex $ids 0]
+ set p [lindex $ids 1]
if [catch {set gdtf [open "|git-diff-tree -r $p $id" r]}] return
fconfigure $gdtf -blocking 0
- fileevent $gdtf readable "gettreediffline $gdtf $id"
+ fileevent $gdtf readable "gettreediffline $gdtf {$ids}"
}
-proc gettreediffline {gdtf id} {
+proc gettreediffline {gdtf ids} {
global treediffs treepending
set n [gets $gdtf line]
if {$n < 0} {
if {![eof $gdtf]} return
close $gdtf
unset treepending
- addtocflist $id
+ addtocflist $ids
return
}
set file [lindex $line 5]
- lappend treediffs($id) $file
+ lappend treediffs($ids) $file
}
-proc getblobdiffs {id} {
- global parents diffopts blobdifffd env curdifftag curtagstart
- global diffindex difffilestart
- set p [lindex $parents($id) 0]
+proc getblobdiffs {ids} {
+ global diffopts blobdifffd env curdifftag curtagstart
+ global diffindex difffilestart nextupdate
+
+ set id [lindex $ids 0]
+ set p [lindex $ids 1]
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 blobdifffd($ids) $bdf
set curdifftag Comments
set curtagstart 0.0
set diffindex 0
catch {unset difffilestart}
- fileevent $bdf readable "getblobdiffline $bdf $id"
+ fileevent $bdf readable "getblobdiffline $bdf {$ids}"
+ set nextupdate [expr {[clock clicks -milliseconds] + 100}]
}
-proc getblobdiffline {bdf id} {
- global currentid blobdifffd ctext curdifftag curtagstart seenfile
+proc getblobdiffline {bdf ids} {
+ global diffids blobdifffd ctext curdifftag curtagstart seenfile
global diffnexthead diffnextnote diffindex difffilestart
+ global nextupdate
+
set n [gets $bdf line]
if {$n < 0} {
if {[eof $bdf]} {
close $bdf
- if {$id == $currentid && $bdf == $blobdifffd($id)} {
+ if {$ids == $diffids && $bdf == $blobdifffd($ids)} {
$ctext tag add $curdifftag $curtagstart end
set seenfile($curdifftag) 1
}
}
return
}
- if {$id != $currentid || $bdf != $blobdifffd($id)} {
+ if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
return
}
$ctext conf -state normal
set header "$diffnexthead ($diffnextnote)"
unset diffnexthead
}
- set difffilestart($diffindex) [$ctext index "end - 1c"]
+ set here [$ctext index "end - 1c"]
+ set difffilestart($diffindex) $here
incr diffindex
+ # start mark names at fmark.1 for first file
+ $ctext mark set fmark.$diffindex $here
+ $ctext mark gravity fmark.$diffindex left
set curdifftag "f:$fname"
$ctext tag delete $curdifftag
set l [expr {(78 - [string length $header]) / 2}]
}
}
$ctext conf -state disabled
+ if {[clock clicks -milliseconds] >= $nextupdate} {
+ incr nextupdate 100
+ fileevent $bdf readable {}
+ update
+ fileevent $bdf readable "getblobdiffline $bdf {$ids}"
+ }
}
proc nextfile {} {
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 sel [lsort [$cflist curselection]]
+ if {$sel eq {}} return
+ set first [lindex $sel 0]
+ catch {$ctext yview fmark.$first}
}
proc setcoords {} {
redisplay
}
+proc clearsha1 {} {
+ global sha1entry sha1string
+ if {[string length $sha1string] == 40} {
+ $sha1entry delete 0 end
+ }
+}
+
proc sha1change {n1 n2 op} {
global sha1string currentid sha1but
if {$sha1string == {}
error_popup "$type $sha1string is not known"
}
-proc linemenu {x y id} {
- global linectxmenu linemenuid
- set linemenuid $id
- $linectxmenu post $x $y
-}
-
-proc lineselect {} {
- global linemenuid idline
- if {[info exists linemenuid] && [info exists idline($linemenuid)]} {
- selectline $idline($linemenuid)
- }
-}
-
proc lineenter {x y id} {
global hoverx hovery hoverid hovertimer
global commitinfo canv
$canv raise $t
}
+proc lineclick {x y id} {
+ global ctext commitinfo children cflist canv
+
+ unmarkmatches
+ $canv delete hover
+ # fill the details pane with info about this line
+ $ctext conf -state normal
+ $ctext delete 0.0 end
+ $ctext insert end "Parent:\n "
+ catch {destroy $ctext.$id}
+ button $ctext.$id -text "Go:" -command "selbyid $id" \
+ -padx 4 -pady 0
+ $ctext window create end -window $ctext.$id -align center
+ set info $commitinfo($id)
+ $ctext insert end "\t[lindex $info 0]\n"
+ $ctext insert end "\tAuthor:\t[lindex $info 1]\n"
+ $ctext insert end "\tDate:\t[lindex $info 2]\n"
+ $ctext insert end "\tID:\t$id\n"
+ if {[info exists children($id)]} {
+ $ctext insert end "\nChildren:"
+ foreach child $children($id) {
+ $ctext insert end "\n "
+ catch {destroy $ctext.$child}
+ button $ctext.$child -text "Go:" -command "selbyid $child" \
+ -padx 4 -pady 0
+ $ctext window create end -window $ctext.$child -align center
+ set info $commitinfo($child)
+ $ctext insert end "\t[lindex $info 0]"
+ }
+ }
+ $ctext conf -state disabled
+
+ $cflist delete 0 end
+}
+
+proc selbyid {id} {
+ global idline
+ if {[info exists idline($id)]} {
+ selectline $idline($id)
+ }
+}
+
+proc mstime {} {
+ global startmstime
+ if {![info exists startmstime]} {
+ set startmstime [clock clicks -milliseconds]
+ }
+ return [format "%.3f" [expr {([clock click -milliseconds] - $startmstime) / 1000.0}]]
+}
+
+proc rowmenu {x y id} {
+ global rowctxmenu idline selectedline rowmenuid
+
+ if {![info exists selectedline] || $idline($id) eq $selectedline} {
+ set state disabled
+ } else {
+ set state normal
+ }
+ $rowctxmenu entryconfigure 0 -state $state
+ $rowctxmenu entryconfigure 1 -state $state
+ $rowctxmenu entryconfigure 2 -state $state
+ set rowmenuid $id
+ tk_popup $rowctxmenu $x $y
+}
+
+proc diffvssel {dirn} {
+ global rowmenuid selectedline lineid
+ global ctext cflist
+ global diffids commitinfo
+
+ if {![info exists selectedline]} return
+ if {$dirn} {
+ set oldid $lineid($selectedline)
+ set newid $rowmenuid
+ } else {
+ set oldid $rowmenuid
+ set newid $lineid($selectedline)
+ }
+ $ctext conf -state normal
+ $ctext delete 0.0 end
+ $ctext mark set fmark.0 0.0
+ $ctext mark gravity fmark.0 left
+ $cflist delete 0 end
+ $cflist insert end "Top"
+ $ctext insert end "From $oldid\n "
+ $ctext insert end [lindex $commitinfo($oldid) 0]
+ $ctext insert end "\n\nTo $newid\n "
+ $ctext insert end [lindex $commitinfo($newid) 0]
+ $ctext insert end "\n"
+ $ctext conf -state disabled
+ $ctext tag delete Comments
+ $ctext tag remove found 1.0 end
+ set diffids [list $newid $oldid]
+ startdiff
+}
+
+proc mkpatch {} {
+ global rowmenuid currentid commitinfo patchtop patchnum
+
+ if {![info exists currentid]} return
+ set oldid $currentid
+ set oldhead [lindex $commitinfo($oldid) 0]
+ set newid $rowmenuid
+ set newhead [lindex $commitinfo($newid) 0]
+ set top .patch
+ set patchtop $top
+ catch {destroy $top}
+ toplevel $top
+ label $top.title -text "Generate patch"
+ grid $top.title - -pady 10
+ label $top.from -text "From:"
+ entry $top.fromsha1 -width 40 -relief flat
+ $top.fromsha1 insert 0 $oldid
+ $top.fromsha1 conf -state readonly
+ grid $top.from $top.fromsha1 -sticky w
+ entry $top.fromhead -width 60 -relief flat
+ $top.fromhead insert 0 $oldhead
+ $top.fromhead conf -state readonly
+ grid x $top.fromhead -sticky w
+ label $top.to -text "To:"
+ entry $top.tosha1 -width 40 -relief flat
+ $top.tosha1 insert 0 $newid
+ $top.tosha1 conf -state readonly
+ grid $top.to $top.tosha1 -sticky w
+ entry $top.tohead -width 60 -relief flat
+ $top.tohead insert 0 $newhead
+ $top.tohead conf -state readonly
+ grid x $top.tohead -sticky w
+ button $top.rev -text "Reverse" -command mkpatchrev -padx 5
+ grid $top.rev x -pady 10
+ label $top.flab -text "Output file:"
+ entry $top.fname -width 60
+ $top.fname insert 0 [file normalize "patch$patchnum.patch"]
+ incr patchnum
+ grid $top.flab $top.fname -sticky w
+ frame $top.buts
+ button $top.buts.gen -text "Generate" -command mkpatchgo
+ button $top.buts.can -text "Cancel" -command mkpatchcan
+ grid $top.buts.gen $top.buts.can
+ grid columnconfigure $top.buts 0 -weight 1 -uniform a
+ grid columnconfigure $top.buts 1 -weight 1 -uniform a
+ grid $top.buts - -pady 10 -sticky ew
+ focus $top.fname
+}
+
+proc mkpatchrev {} {
+ global patchtop
+
+ set oldid [$patchtop.fromsha1 get]
+ set oldhead [$patchtop.fromhead get]
+ set newid [$patchtop.tosha1 get]
+ set newhead [$patchtop.tohead get]
+ foreach e [list fromsha1 fromhead tosha1 tohead] \
+ v [list $newid $newhead $oldid $oldhead] {
+ $patchtop.$e conf -state normal
+ $patchtop.$e delete 0 end
+ $patchtop.$e insert 0 $v
+ $patchtop.$e conf -state readonly
+ }
+}
+
+proc mkpatchgo {} {
+ global patchtop
+
+ set oldid [$patchtop.fromsha1 get]
+ set newid [$patchtop.tosha1 get]
+ set fname [$patchtop.fname get]
+ if {[catch {exec git-diff-tree -p $oldid $newid >$fname &} err]} {
+ error_popup "Error creating patch: $err"
+ }
+ catch {destroy $patchtop}
+ unset patchtop
+}
+
+proc mkpatchcan {} {
+ global patchtop
+
+ catch {destroy $patchtop}
+ unset patchtop
+}
+
+proc mktag {} {
+ global rowmenuid mktagtop commitinfo
+
+ set top .maketag
+ set mktagtop $top
+ catch {destroy $top}
+ toplevel $top
+ label $top.title -text "Create tag"
+ grid $top.title - -pady 10
+ label $top.id -text "ID:"
+ entry $top.sha1 -width 40 -relief flat
+ $top.sha1 insert 0 $rowmenuid
+ $top.sha1 conf -state readonly
+ grid $top.id $top.sha1 -sticky w
+ entry $top.head -width 60 -relief flat
+ $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
+ $top.head conf -state readonly
+ grid x $top.head -sticky w
+ label $top.tlab -text "Tag name:"
+ entry $top.tag -width 60
+ grid $top.tlab $top.tag -sticky w
+ frame $top.buts
+ button $top.buts.gen -text "Create" -command mktaggo
+ button $top.buts.can -text "Cancel" -command mktagcan
+ grid $top.buts.gen $top.buts.can
+ grid columnconfigure $top.buts 0 -weight 1 -uniform a
+ grid columnconfigure $top.buts 1 -weight 1 -uniform a
+ grid $top.buts - -pady 10 -sticky ew
+ focus $top.tag
+}
+
+proc domktag {} {
+ global mktagtop env tagids idtags
+ global idpos idline linehtag canv selectedline
+
+ set id [$mktagtop.sha1 get]
+ set tag [$mktagtop.tag get]
+ if {$tag == {}} {
+ error_popup "No tag name specified"
+ return
+ }
+ if {[info exists tagids($tag)]} {
+ error_popup "Tag \"$tag\" already exists"
+ return
+ }
+ if {[catch {
+ set dir ".git"
+ if {[info exists env(GIT_DIR)]} {
+ set dir $env(GIT_DIR)
+ }
+ set fname [file join $dir "refs/tags" $tag]
+ set f [open $fname w]
+ puts $f $id
+ close $f
+ } err]} {
+ error_popup "Error creating tag: $err"
+ return
+ }
+
+ set tagids($tag) $id
+ lappend idtags($id) $tag
+ $canv delete tag.$id
+ set xt [eval drawtags $id $idpos($id)]
+ $canv coords $linehtag($idline($id)) $xt [lindex $idpos($id) 2]
+ if {[info exists selectedline] && $selectedline == $idline($id)} {
+ selectline $selectedline
+ }
+}
+
+proc mktagcan {} {
+ global mktagtop
+
+ catch {destroy $mktagtop}
+ unset mktagtop
+}
+
+proc mktaggo {} {
+ domktag
+ mktagcan
+}
+
+proc writecommit {} {
+ global rowmenuid wrcomtop commitinfo wrcomcmd
+
+ set top .writecommit
+ set wrcomtop $top
+ catch {destroy $top}
+ toplevel $top
+ label $top.title -text "Write commit to file"
+ grid $top.title - -pady 10
+ label $top.id -text "ID:"
+ entry $top.sha1 -width 40 -relief flat
+ $top.sha1 insert 0 $rowmenuid
+ $top.sha1 conf -state readonly
+ grid $top.id $top.sha1 -sticky w
+ entry $top.head -width 60 -relief flat
+ $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
+ $top.head conf -state readonly
+ grid x $top.head -sticky w
+ label $top.clab -text "Command:"
+ entry $top.cmd -width 60 -textvariable wrcomcmd
+ grid $top.clab $top.cmd -sticky w -pady 10
+ label $top.flab -text "Output file:"
+ entry $top.fname -width 60
+ $top.fname insert 0 [file normalize "commit-[string range $rowmenuid 0 6]"]
+ grid $top.flab $top.fname -sticky w
+ frame $top.buts
+ button $top.buts.gen -text "Write" -command wrcomgo
+ button $top.buts.can -text "Cancel" -command wrcomcan
+ grid $top.buts.gen $top.buts.can
+ grid columnconfigure $top.buts 0 -weight 1 -uniform a
+ grid columnconfigure $top.buts 1 -weight 1 -uniform a
+ grid $top.buts - -pady 10 -sticky ew
+ focus $top.fname
+}
+
+proc wrcomgo {} {
+ global wrcomtop
+
+ set id [$wrcomtop.sha1 get]
+ set cmd "echo $id | [$wrcomtop.cmd get]"
+ set fname [$wrcomtop.fname get]
+ if {[catch {exec sh -c $cmd >$fname &} err]} {
+ error_popup "Error writing commit: $err"
+ }
+ catch {destroy $wrcomtop}
+ unset wrcomtop
+}
+
+proc wrcomcan {} {
+ global wrcomtop
+
+ catch {destroy $wrcomtop}
+ unset wrcomtop
+}
+
proc doquit {} {
global stopped
set stopped 100
set datemode 0
set boldnames 0
set diffopts "-U 5 -p"
+set wrcomcmd "git-diff-tree --stdin -p --pretty"
set mainfont {Helvetica 9}
set textfont {Courier 9}
}
}
-set noreadobj [catch {load libreadobj.so.0.0}]
set stopped 0
set redisplaying 0
set stuffsaved 0
+set patchnum 0
setcoords
makewindow
readrefs
projects / git.git / blobdiff