gitk 32.2 KB
Newer Older
1 2 3 4 5 6 7 8 9
#!/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.

10
# CVS $Revision: 1.15 $
11 12

proc getcommits {rargs} {
13
    global commits commfd phase canv mainfont
14 15 16 17
    if {$rargs == {}} {
	set rargs HEAD
    }
    set commits {}
18 19
    set phase getcommits
    if [catch {set commfd [open "|git-rev-tree $rargs" r]} err] {
P
Paul Mackerras 已提交
20
	puts stderr "Error executing git-rev-tree: $err"
21 22 23 24 25 26 27 28 29 30 31 32 33 34
	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
35 36
	# this works around what is apparently a bug in Tcl...
	fconfigure $commfd -blocking 1
37 38 39 40
	if {![catch {close $commfd} err]} {
	    after idle drawgraph
	    return
	}
41
	if {[string range $err 0 4] == "usage"} {
42 43 44 45
	    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.)"
46
	} else {
47
	    set err "Error reading commits: $err"
48
	}
49
	error_popup $err
50
	exit 1
51
    }
52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69

    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
70
	    } else {
71 72 73 74
		lappend parents($cid) $id
		incr nparents($cid)
		incr nchildren($id)
		lappend children($id) $cid
75 76
	    }
	}
77
	incr i
78 79 80 81
    }
}

proc readcommit {id} {
82
    global commitinfo
83 84 85 86 87 88 89
    set inhdr 1
    set comment {}
    set headline {}
    set auname {}
    set audate {}
    set comname {}
    set comdate {}
90 91
    if [catch {set contents [exec git-cat-file commit $id]}] return
    foreach line [split $contents "\n"] {
92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121
	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"]
    }
122 123
    set commitinfo($id) [list $headline $auname $audate \
			     $comname $comdate $comment]
124 125
}

126 127 128 129 130 131 132 133 134 135 136 137
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
}

138
proc makewindow {} {
139
    global canv canv2 canv3 linespc charspc ctext cflist textfont
140
    global sha1entry findtype findloc findstring fstring geometry
141 142 143 144

    menu .bar
    .bar add cascade -label "File" -menu .bar.file
    menu .bar.file
145
    .bar.file add command -label "Quit" -command doquit
146 147 148 149 150
    menu .bar.help
    .bar add cascade -label "Help" -menu .bar.help
    .bar.help add command -label "About gitk" -command about
    . configure -menu .bar

151 152 153 154 155 156 157 158 159
    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
    }
P
Paul Mackerras 已提交
160
    panedwindow .ctop -orient vertical
161 162
    if {[info exists geometry(width)]} {
	.ctop conf -width $geometry(width) -height $geometry(height)
163 164 165
	set texth [expr {$geometry(height) - $geometry(canvh) - 56}]
	set geometry(ctexth) [expr {($texth - 8) /
				    [font metrics $textfont -linespace]}]
166
    }
167 168 169 170 171 172 173 174 175 176
    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
177
    canvas $canv -height $geometry(canvh) -width $geometry(canv1) \
178 179
	-bg white -bd 0 \
	-yscrollincr $linespc -yscrollcommand "$cscroll set"
180 181
    .ctop.top.clist add $canv
    set canv2 .ctop.top.clist.canv2
182
    canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \
183
	-bg white -bd 0 -yscrollincr $linespc
184 185
    .ctop.top.clist add $canv2
    set canv3 .ctop.top.clist.canv3
186
    canvas $canv3 -height $geometry(canvh) -width $geometry(canv3) \
187
	-bg white -bd 0 -yscrollincr $linespc
188
    .ctop.top.clist add $canv3
189
    bind .ctop.top.clist <Configure> {resizeclistpanes %W %w}
190 191 192 193 194 195 196 197 198

    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 {}
199 200 201
    set fstring .ctop.top.bar.findstring
    entry $fstring -width 30 -font $textfont -textvariable findstring
    pack $fstring -side left -expand 1 -fill x
202 203 204 205 206 207 208
    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
209

210 211
    panedwindow .ctop.cdet -orient horizontal
    .ctop add .ctop.cdet
212 213
    frame .ctop.cdet.left
    set ctext .ctop.cdet.left.ctext
214 215
    text $ctext -bg white -state disabled -font $textfont \
	-width $geometry(ctextw) -height $geometry(ctexth) \
216 217 218 219 220 221
	-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

222 223 224 225
    $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
226
    $ctext tag conf found -back yellow
227

228 229
    frame .ctop.cdet.right
    set cflist .ctop.cdet.right.cfiles
230
    listbox $cflist -bg white -selectmode extended -width $geometry(cflistw) \
231 232 233 234 235
	-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
236
    bind .ctop.cdet <Configure> {resizecdetpanes %W %w}
237

P
Paul Mackerras 已提交
238
    pack .ctop -side top -fill both -expand 1
239

240 241 242 243 244 245
    bindall <1> {selcanvline %x %y}
    bindall <B1-Motion> {selcanvline %x %y}
    bindall <ButtonRelease-4> "allcanvs yview scroll -5 u"
    bindall <ButtonRelease-5> "allcanvs yview scroll 5 u"
    bindall <2> "allcanvs scan mark 0 %y"
    bindall <B2-Motion> "allcanvs scan dragto 0 %y"
246 247 248 249
    bind . <Key-Up> "selnextline -1"
    bind . <Key-Down> "selnextline 1"
    bind . <Key-Prior> "allcanvs yview scroll -1 p"
    bind . <Key-Next> "allcanvs yview scroll 1 p"
250 251 252 253 254 255 256 257 258 259
    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
260
    bind . <Control-q> doquit
261 262 263
    bind . <Control-f> dofind
    bind . <Control-g> findnext
    bind . <Control-r> findprev
264 265 266 267
    bind . <Control-equal> {incrfont 1}
    bind . <Control-KP_Add> {incrfont 1}
    bind . <Control-minus> {incrfont -1}
    bind . <Control-KP_Subtract> {incrfont -1}
268
    bind $cflist <<ListboxSelect>> listboxsel
269
    bind . <Destroy> {savestuff %W}
270
    bind . <Button-1> "click %W"
271
    bind $fstring <Key-Return> dofind
272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293
}

# 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 .
    }
294 295 296 297 298 299
}

proc savestuff {w} {
    global canv canv2 canv3 ctext cflist mainfont textfont
    global stuffsaved
    if {$stuffsaved} return
300
    if {![winfo viewable .]} return
301 302 303 304 305 306
    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]"
307 308 309 310
	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]"
311 312 313 314 315 316 317 318 319 320
	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
321 322
}

323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374
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
}

375 376 377 378 379 380 381 382 383 384 385 386 387 388
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
}

389 390 391 392 393 394 395 396 397
proc about {} {
    set w .about
    if {[winfo exists $w]} {
	raise $w
	return
    }
    toplevel $w
    wm title $w "About gitk"
    message $w.m -text {
398
Gitk version 0.95
399 400 401 402 403

Copyright  2005 Paul Mackerras

Use and redistribute under the terms of the GNU General Public License

404
(CVS $Revision: 1.15 $)} \
405 406 407 408 409 410
	    -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
}

411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429
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
}

430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485
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
    }
}

486
proc drawgraph {} {
487
    global parents children nparents nchildren commits
488
    global canv canv2 canv3 mainfont namefont canvx0 canvy0 canvy linespc
489
    global datemode cdate
490
    global lineid linehtag linentag linedtag commitinfo
491
    global nextcolor colormap numcommits
492
    global stopped phase redisplaying selectedline
493

494 495
    allcanvs delete all
    set start {}
496
    foreach id [array names nchildren] {
497 498 499
	if {$nchildren($id) == 0} {
	    lappend start $id
	}
500
	set ncleft($id) $nchildren($id)
501 502 503
	if {![info exists nparents($id)]} {
	    set nparents($id) 0
	}
504
    }
505
    if {$start == {}} {
506 507
	error_popup "Gitk: ERROR: No starting commits found"
	exit 1
508 509 510 511
    }

    set nextcolor 0
    foreach id $start {
512 513
	assigncolor $id
    }
514
    set todo $start
515
    set level [expr [llength $todo] - 1]
516
    set y2 $canvy0
517 518
    set nullentry -1
    set lineno -1
519
    set numcommits 0
520
    set phase drawgraph
521
    set lthickness [expr {($linespc / 9) + 1}]
522
    while 1 {
523
	set canvy $y2
524 525
	allcanvs conf -scrollregion \
	    [list 0 0 0 [expr $canvy + 0.5 * $linespc + 2]]
526
	update
527
	if {$stopped} break
528
	incr numcommits
529 530 531 532
	incr lineno
	set nlines [llength $todo]
	set id [lindex $todo $level]
	set lineid($lineno) $id
P
Paul Mackerras 已提交
533
	set actualparents {}
534 535
	if {[info exists parents($id)]} {
	    foreach p $parents($id) {
P
Paul Mackerras 已提交
536
		incr ncleft($p) -1
537 538 539 540
		if {![info exists commitinfo($p)]} {
		    readcommit $p
		    if {![info exists commitinfo($p)]} continue
		}
P
Paul Mackerras 已提交
541 542 543
		lappend actualparents $p
	    }
	}
544
	if {![info exists commitinfo($id)]} {
P
Paul Mackerras 已提交
545
	    readcommit $id
546 547 548
	    if {![info exists commitinfo($id)]} {
		set commitinfo($id) {"No commit information available"}
	    }
549 550 551
	}
	set x [expr $canvx0 + $level * $linespc]
	set y2 [expr $canvy + $linespc]
552
	if {[info exists linestarty($level)] && $linestarty($level) < $canvy} {
553
	    set t [$canv create line $x $linestarty($level) $x $canvy \
554
		       -width $lthickness -fill $colormap($id)]
555 556
	    $canv lower $t
	}
557
	set linestarty($level) $canvy
558 559 560 561 562
	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]
563 564
	$canv raise $t
	set xt [expr $canvx0 + $nlines * $linespc]
565 566 567
	set headline [lindex $commitinfo($id) 0]
	set name [lindex $commitinfo($id) 1]
	set date [lindex $commitinfo($id) 2]
568 569
	set linehtag($lineno) [$canv create text $xt $canvy -anchor w \
				   -text $headline -font $mainfont ]
570
	set linentag($lineno) [$canv2 create text 3 $canvy -anchor w \
571
				   -text $name -font $namefont]
572
	set linedtag($lineno) [$canv3 create text 3 $canvy -anchor w \
573
				 -text $date -font $mainfont]
P
Paul Mackerras 已提交
574 575
	if {!$datemode && [llength $actualparents] == 1} {
	    set p [lindex $actualparents 0]
576
	    if {$ncleft($p) == 0 && [lsearch -exact $todo $p] < 0} {
577
		assigncolor $p
578 579 580 581 582 583 584 585 586 587
		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
588 589 590 591
	    if {[info exists linestarty($i)]} {
		set oldstarty($i) $linestarty($i)
		unset linestarty($i)
	    }
592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607
	    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
P
Paul Mackerras 已提交
608
	foreach p $actualparents {
609 610
	    set k [lsearch -exact $todo $p]
	    if {$k < 0} {
611
		assigncolor $p
612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680
		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} {
681 682 683
		if {[info exists oldstarty($i)]} {
		    set linestarty($i) $oldstarty($i)
		}
684 685 686 687 688
		continue
	    }
	    set xi [expr {$canvx0 + $i * $linespc}]
	    set xj [expr {$canvx0 + $j * $linespc}]
	    set coords {}
689
	    if {[info exists oldstarty($i)] && $oldstarty($i) < $canvy} {
690 691 692 693 694 695 696 697 698
		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
699 700
	    set t [$canv create line $coords -width $lthickness \
		       -fill $colormap($dst)]
701 702 703 704 705 706
	    $canv lower $t
	    if {![info exists linestarty($j)]} {
		set linestarty($j) $y2
	    }
	}
    }
707 708 709 710 711 712 713 714 715 716 717 718
    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
	}
    }
719 720
}

721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740
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
}

741 742 743 744
proc dofind {} {
    global findtype findloc findstring markedmatches commitinfo
    global numcommits lineid linehtag linentag linedtag
    global mainfont namefont canv canv2 canv3 selectedline
745
    global matchinglines foundstring foundstrlen
746
    unmarkmatches
747
    focus .
748 749 750
    set matchinglines {}
    set fldtypes {Headline Author Date Committer CDate Comment}
    if {$findtype == "IgnCase"} {
751
	set foundstring [string tolower $findstring]
752
    } else {
753
	set foundstring $findstring
754
    }
755 756
    set foundstrlen [string length $findstring]
    if {$foundstrlen == 0} return
757 758 759 760 761 762 763 764 765 766 767 768 769 770
    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
	    }
771
	    set matches [findmatches $f]
772 773 774 775 776 777 778 779 780 781 782 783 784
	    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} {
785
		findselectline $l
786 787 788 789 790 791 792
		set didsel 1
	    }
	}
    }
    if {$matchinglines == {}} {
	bell
    } elseif {!$didsel} {
793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808
	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"
	}
809 810 811 812 813 814 815 816 817 818 819 820
    }
}

proc findnext {} {
    global matchinglines selectedline
    if {![info exists matchinglines]} {
	dofind
	return
    }
    if {![info exists selectedline]} return
    foreach l $matchinglines {
	if {$l > $selectedline} {
821
	    findselectline $l
822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840
	    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 != {}} {
841
	findselectline $prev
842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869
    } 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}
}

870 871
proc selcanvline {x y} {
    global canv canvy0 ctext linespc selectedline
872
    global lineid linehtag linentag linedtag
873 874 875 876 877 878 879 880
    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
881
    unmarkmatches
882 883 884 885
    selectline $l
}

proc selectline {l} {
886 887
    global canv canv2 canv3 ctext commitinfo selectedline
    global lineid linehtag linentag linedtag
888
    global canvy0 linespc nparents treepending
889
    global cflist treediffs currentid sha1entry
890
    global commentend seenfile numcommits
891
    if {![info exists lineid($l)] || ![info exists linehtag($l)]} return
892 893 894 895 896 897 898 899 900 901 902 903
    $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
904
    set y [expr {$canvy0 + $l * $linespc}]
905 906 907
    set ymax [lindex [$canv cget -scrollregion] 3]
    set ytop [expr {($y - $linespc / 2.0 - 1) / $ymax}]
    set ybot [expr {($y + $linespc / 2.0 + 1) / $ymax}]
908
    set wnow [$canv yview]
909 910 911 912 913 914
    set scrincr [expr {$linespc * 1.0 / $ymax}]
    set wtop [lindex $wnow 0]
    if {$ytop < $wtop} {
	if {$ytop > $wtop - $scrincr} {
	    set ytop [expr {$wtop - $scrincr}]
	}
915
	allcanvs yview moveto $ytop
916
    } elseif {$ybot > [lindex $wnow 1]} {
917 918 919 920 921 922
	set wh [expr {[lindex $wnow 1] - $wtop}]
	set ytop [expr {$ybot - $wh}]
	if {$ytop < $wtop + $scrincr} {
	    set ytop [expr {$wtop + $scrincr}]
	}
	allcanvs yview moveto $ytop
923 924 925
    }
    set selectedline $l

926
    set id $lineid($l)
927 928 929 930 931 932 933
    $sha1entry conf -state normal
    $sha1entry delete 0 end
    $sha1entry insert 0 $id
    $sha1entry selection from 0
    $sha1entry selection to end
    $sha1entry conf -state readonly

934
    $ctext conf -state normal
935 936
    $ctext delete 0.0 end
    set info $commitinfo($id)
937 938
    $ctext insert end "Author: [lindex $info 1]  [lindex $info 2]\n"
    $ctext insert end "Committer: [lindex $info 3]  [lindex $info 4]\n"
939
    $ctext insert end "\n"
940 941 942
    $ctext insert end [lindex $info 5]
    $ctext insert end "\n"
    $ctext tag delete Comments
943
    $ctext tag remove found 1.0 end
944
    $ctext conf -state disabled
945
    set commentend [$ctext index "end - 1c"]
946 947

    $cflist delete 0 end
948
    set currentid $id
949 950
    if {$nparents($id) == 1} {
	if {![info exists treediffs($id)]} {
951 952 953 954 955
	    if {![info exists treepending]} {
		gettreediffs $id
	    }
	} else {
	    addtocflist $id
956 957
	}
    }
958
    catch {unset seenfile}
959
}
960

961 962 963 964
proc selnextline {dir} {
    global selectedline
    if {![info exists selectedline]} return
    set l [expr $selectedline + $dir]
965
    unmarkmatches
966
    selectline $l
967 968
}

969 970 971 972 973 974
proc addtocflist {id} {
    global currentid treediffs cflist treepending
    if {$id != $currentid} {
	gettreediffs $currentid
	return
    }
975
    $cflist insert end "All files"
976 977 978
    foreach f $treediffs($currentid) {
	$cflist insert end $f
    }
979
    getblobdiffs $id
980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008
}

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
    }
}

1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024
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} {
1025 1026
    global currentid blobdifffd ctext curdifftag curtagstart seenfile
    global diffnexthead
1027 1028 1029 1030 1031 1032
    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
1033
		set seenfile($curdifftag) 1
1034 1035 1036 1037 1038 1039 1040 1041
	    }
	}
	return
    }
    if {$id != $currentid || $bdf != $blobdifffd($id)} {
	return
    }
    $ctext conf -state normal
1042
    if {[regexp {^---[ \t]+([^/])*/(.*)} $line match s1 fname]} {
1043 1044 1045
	# start of a new file
	$ctext insert end "\n"
	$ctext tag add $curdifftag $curtagstart end
1046
	set seenfile($curdifftag) 1
1047
	set curtagstart [$ctext index "end - 1c"]
1048 1049 1050 1051
	if {[info exists diffnexthead]} {
	    set fname $diffnexthead
	    unset diffnexthead
	}
1052 1053 1054 1055 1056 1057 1058
	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
1059 1060 1061 1062
    } elseif {[regexp {^Created: (.*) \(mode: *[0-7]*\)} $line match fn]} {
	set diffnexthead $fn
    } elseif {[string range $line 0 8] == "Deleted: "} {
	set diffnexthead [string range $line 9 end]
1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081
    } 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
1082
		set seenfile($curdifftag) 1
1083 1084 1085 1086 1087 1088 1089 1090 1091 1092
		set curtagstart [$ctext index "end - 1c"]
		set curdifftag Comments
	    }
	    $ctext insert end "$line\n" filesep
	}
    }
    $ctext conf -state disabled
}

proc listboxsel {} {
1093
    global ctext cflist currentid treediffs seenfile
1094
    if {![info exists currentid]} return
1095 1096 1097 1098 1099
    set sel [$cflist curselection]
    if {$sel == {} || [lsearch -exact $sel 0] >= 0} {
	# show everything
	$ctext tag conf Comments -elide 0
	foreach f $treediffs($currentid) {
1100 1101 1102
	    if [info exists seenfile(f:$f)] {
		$ctext tag conf "f:$f" -elide 0
	    }
1103 1104 1105 1106 1107 1108 1109
	}
    } 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}]
1110 1111 1112
	    if [info exists seenfile(f:$f)] {
		$ctext tag conf "f:$f" -elide $elide
	    }
1113 1114 1115
	    incr i
	}
    }
1116 1117
}

1118 1119 1120 1121 1122 1123
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]
1124
}
1125

1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152
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
}
1153

1154 1155 1156 1157 1158
proc doquit {} {
    global stopped
    set stopped 100
    destroy .
}
1159

1160 1161 1162 1163
# defaults...
set datemode 0
set boldnames 0
set diffopts "-U 5 -p"
1164

1165 1166 1167 1168 1169 1170 1171 1172
set mainfont {Helvetica 9}
set textfont {Courier 9}

set colors {green red blue magenta darkgrey brown orange}
set colorbycommitter false

catch {source ~/.gitk}

1173 1174 1175 1176 1177
set namefont $mainfont
if {$boldnames} {
    lappend namefont bold
}

1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192
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
	}
    }
1193
}
1194 1195 1196

set stopped 0
set redisplaying 0
1197
set stuffsaved 0
1198 1199 1200
setcoords
makewindow
getcommits $revtreeargs