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

proc getcommits {rargs} {
11
    global commits commfd phase canv mainfont env
12
    global startmsecs nextupdate
P
Paul Mackerras 已提交
13
    global ctext maincursor textcursor leftover
14

15 16 17 18 19 20 21 22 23 24
    # 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
    }
25
    set commits {}
26
    set phase getcommits
27 28
    set startmsecs [clock clicks -milliseconds]
    set nextupdate [expr $startmsecs + 100]
29
    if [catch {
P
Paul Mackerras 已提交
30
	set parse_args [concat --default HEAD $rargs]
31 32
	set parsed_args [split [eval exec git-rev-parse $parse_args] "\n"]
    }] {
P
Paul Mackerras 已提交
33
	# if git-rev-parse failed for some reason...
34 35 36
	if {$rargs == {}} {
	    set rargs HEAD
	}
P
Paul Mackerras 已提交
37
	set parsed_args $rargs
38 39
    }
    if [catch {
P
Paul Mackerras 已提交
40
	set commfd [open "|git-rev-list --header --merge-order $parsed_args" r]
41
    } err] {
42
	puts stderr "Error executing git-rev-list: $err"
43 44
	exit 1
    }
P
Paul Mackerras 已提交
45 46 47
    set leftover {}
    fconfigure $commfd -blocking 0 -translation binary
    fileevent $commfd readable "getcommitlines $commfd"
48 49 50
    $canv delete all
    $canv create text 3 3 -anchor nw -text "Reading commits..." \
	-font $mainfont -tags textitems
51 52
    . config -cursor watch
    $ctext config -cursor watch
53 54
}

P
Paul Mackerras 已提交
55
proc getcommitlines {commfd}  {
56
    global commits parents cdate children nchildren
57
    global commitlisted phase commitinfo nextupdate
P
Paul Mackerras 已提交
58
    global stopped redisplaying leftover
59

P
Paul Mackerras 已提交
60 61
    set stuff [read $commfd]
    if {$stuff == {}} {
62
	if {![eof $commfd]} return
63 64
	# this works around what is apparently a bug in Tcl...
	fconfigure $commfd -blocking 1
65
	if {![catch {close $commfd} err]} {
66
	    after idle finishcommits
67 68
	    return
	}
69
	if {[string range $err 0 4] == "usage"} {
70 71 72 73
	    set err \
{Gitk: error reading commits: bad arguments to git-rev-list.
(Note: arguments to gitk are passed to git-rev-list
to allow selection of commits to be displayed.)}
74
	} else {
75
	    set err "Error reading commits: $err"
76
	}
77
	error_popup $err
78
	exit 1
79
    }
P
Paul Mackerras 已提交
80 81 82 83 84 85
    set start 0
    while 1 {
	set i [string first "\0" $stuff $start]
	if {$i < 0} {
	    set leftover [string range $stuff $start end]
	    return
86
	}
P
Paul Mackerras 已提交
87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114
	set cmit [string range $stuff $start [expr {$i - 1}]]
	if {$start == 0} {
	    set cmit "$leftover$cmit"
	}
	set start [expr {$i + 1}]
	if {![regexp {^([0-9a-f]{40})\n} $cmit match id]} {
	    error_popup "Can't parse git-rev-list output: {$cmit}"
	    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
		    }
115 116 117 118 119 120 121 122 123 124 125 126
		}
	    }
	}
    }
}

proc doupdate {} {
    global commfd nextupdate

    incr nextupdate 100
    fileevent $commfd readable {}
    update
P
Paul Mackerras 已提交
127
    fileevent $commfd readable "getcommitlines $commfd"
128 129 130
}

proc readcommit {id} {
P
Paul Mackerras 已提交
131 132 133 134 135
    if [catch {set contents [exec git-cat-file commit $id]}] return
    parsecommit $id $contents 0
}

proc parsecommit {id contents listed} {
136 137
    global commitinfo children nchildren parents nparents cdate ncleft

138 139 140 141 142 143 144
    set inhdr 1
    set comment {}
    set headline {}
    set auname {}
    set audate {}
    set comname {}
    set comdate {}
145 146 147
    if {![info exists nchildren($id)]} {
	set children($id) {}
	set nchildren($id) 0
148
	set ncleft($id) 0
149 150 151
    }
    set parents($id) {}
    set nparents($id) 0
152
    foreach line [split $contents "\n"] {
153 154 155 156 157
	if {$inhdr} {
	    if {$line == {}} {
		set inhdr 0
	    } else {
		set tag [lindex $line 0]
158 159 160 161 162
		if {$tag == "parent"} {
		    set p [lindex $line 1]
		    if {![info exists nchildren($p)]} {
			set children($p) {}
			set nchildren($p) 0
163
			set ncleft($p) 0
164 165 166
		    }
		    lappend parents($id) $p
		    incr nparents($id)
167
		    # sometimes we get a commit that lists a parent twice...
P
Paul Mackerras 已提交
168
		    if {$listed && [lsearch -exact $children($p) $id] < 0} {
169 170
			lappend children($p) $id
			incr nchildren($p)
171
			incr ncleft($p)
172 173
		    }
		} elseif {$tag == "author"} {
174 175 176 177 178 179 180 181 182 183 184
		    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 == {}} {
185
		set headline [string trim $line]
186 187 188
	    } else {
		append comment "\n"
	    }
189 190 191 192 193
	    if {!$listed} {
		# git-rev-list indents the comment by 4 spaces;
		# if we got this via git-cat-file, add the indentation
		append comment "    "
	    }
194 195 196 197 198 199 200
	    append comment $line
	}
    }
    if {$audate != {}} {
	set audate [clock format $audate -format "%Y-%m-%d %H:%M:%S"]
    }
    if {$comdate != {}} {
201
	set cdate($id) $comdate
202 203
	set comdate [clock format $comdate -format "%Y-%m-%d %H:%M:%S"]
    }
204 205
    set commitinfo($id) [list $headline $auname $audate \
			     $comname $comdate $comment]
206 207
}

208
proc readrefs {} {
P
Paul Mackerras 已提交
209
    global tagids idtags headids idheads
210 211 212 213 214 215
    set tags [glob -nocomplain -types f .git/refs/tags/*]
    foreach f $tags {
	catch {
	    set fd [open $f r]
	    set line [read $fd]
	    if {[regexp {^[0-9a-f]{40}} $line id]} {
216 217 218
		set direct [file tail $f]
		set tagids($direct) $id
		lappend idtags($id) $direct
219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235
		set contents [split [exec git-cat-file tag $id] "\n"]
		set obj {}
		set type {}
		set tag {}
		foreach l $contents {
		    if {$l == {}} break
		    switch -- [lindex $l 0] {
			"object" {set obj [lindex $l 1]}
			"type" {set type [lindex $l 1]}
			"tag" {set tag [string range $l 4 end]}
		    }
		}
		if {$obj != {} && $type == "commit" && $tag != {}} {
		    set tagids($tag) $obj
		    lappend idtags($obj) $tag
		}
	    }
P
Paul Mackerras 已提交
236 237 238 239 240 241 242 243 244 245 246 247 248 249
	    close $fd
	}
    }
    set heads [glob -nocomplain -types f .git/refs/heads/*]
    foreach f $heads {
	catch {
	    set fd [open $f r]
	    set line [read $fd 40]
	    if {[regexp {^[0-9a-f]{40}} $line id]} {
		set head [file tail $f]
		set headids($head) $line
		lappend idheads($line) $head
	    }
	    close $fd
250 251 252 253
	}
    }
}

254 255 256 257 258 259 260 261 262 263 264 265
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
}

266
proc makewindow {} {
267
    global canv canv2 canv3 linespc charspc ctext cflist textfont
268 269
    global findtype findloc findstring fstring geometry
    global entries sha1entry sha1string sha1but
270
    global maincursor textcursor
271
    global rowctxmenu
272 273 274 275

    menu .bar
    .bar add cascade -label "File" -menu .bar.file
    menu .bar.file
276
    .bar.file add command -label "Quit" -command doquit
277 278 279 280 281
    menu .bar.help
    .bar add cascade -label "Help" -menu .bar.help
    .bar.help add command -label "About gitk" -command about
    . configure -menu .bar

282 283 284 285 286 287 288 289 290
    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 已提交
291
    panedwindow .ctop -orient vertical
292 293
    if {[info exists geometry(width)]} {
	.ctop conf -width $geometry(width) -height $geometry(height)
294 295 296
	set texth [expr {$geometry(height) - $geometry(canvh) - 56}]
	set geometry(ctexth) [expr {($texth - 8) /
				    [font metrics $textfont -linespace]}]
297
    }
298 299 300 301 302 303 304 305 306 307
    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
308
    canvas $canv -height $geometry(canvh) -width $geometry(canv1) \
309 310
	-bg white -bd 0 \
	-yscrollincr $linespc -yscrollcommand "$cscroll set"
311 312
    .ctop.top.clist add $canv
    set canv2 .ctop.top.clist.canv2
313
    canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \
314
	-bg white -bd 0 -yscrollincr $linespc
315 316
    .ctop.top.clist add $canv2
    set canv3 .ctop.top.clist.canv3
317
    canvas $canv3 -height $geometry(canvh) -width $geometry(canv3) \
318
	-bg white -bd 0 -yscrollincr $linespc
319
    .ctop.top.clist add $canv3
320
    bind .ctop.top.clist <Configure> {resizeclistpanes %W %w}
321 322

    set sha1entry .ctop.top.bar.sha1
323 324 325 326 327
    set entries $sha1entry
    set sha1but .ctop.top.bar.sha1label
    button $sha1but -text "SHA1 ID: " -state disabled -relief flat \
	-command gotocommit -width 8
    $sha1but conf -disabledforeground [$sha1but cget -foreground]
328
    pack .ctop.top.bar.sha1label -side left
329 330
    entry $sha1entry -width 40 -font $textfont -textvariable sha1string
    trace add variable sha1string write sha1change
331 332 333 334
    pack $sha1entry -side left -pady 2
    button .ctop.top.bar.findbut -text "Find" -command dofind
    pack .ctop.top.bar.findbut -side left
    set findstring {}
335
    set fstring .ctop.top.bar.findstring
336
    lappend entries $fstring
337 338
    entry $fstring -width 30 -font $textfont -textvariable findstring
    pack $fstring -side left -expand 1 -fill x
339 340 341 342 343 344 345
    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
346

347 348
    panedwindow .ctop.cdet -orient horizontal
    .ctop add .ctop.cdet
349 350
    frame .ctop.cdet.left
    set ctext .ctop.cdet.left.ctext
351 352
    text $ctext -bg white -state disabled -font $textfont \
	-width $geometry(ctextw) -height $geometry(ctexth) \
353 354 355 356 357 358
	-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

359 360 361 362
    $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
363
    $ctext tag conf found -back yellow
364

365 366
    frame .ctop.cdet.right
    set cflist .ctop.cdet.right.cfiles
367
    listbox $cflist -bg white -selectmode extended -width $geometry(cflistw) \
368 369 370 371 372
	-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
373
    bind .ctop.cdet <Configure> {resizecdetpanes %W %w}
374

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

377 378
    bindall <1> {selcanvline %W %x %y}
    #bindall <B1-Motion> {selcanvline %W %x %y}
379 380
    bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
    bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
381 382
    bindall <2> "allcanvs scan mark 0 %y"
    bindall <B2-Motion> "allcanvs scan dragto 0 %y"
383 384
    bind . <Key-Up> "selnextline -1"
    bind . <Key-Down> "selnextline 1"
385 386 387 388 389
    bind . <Key-Prior> "allcanvs yview scroll -1 pages"
    bind . <Key-Next> "allcanvs yview scroll 1 pages"
    bindkey <Key-Delete> "$ctext yview scroll -1 pages"
    bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
    bindkey <Key-space> "$ctext yview scroll 1 pages"
390 391
    bindkey p "selnextline -1"
    bindkey n "selnextline 1"
392 393 394
    bindkey b "$ctext yview scroll -1 pages"
    bindkey d "$ctext yview scroll 18 units"
    bindkey u "$ctext yview scroll -18 units"
395 396
    bindkey / findnext
    bindkey ? findprev
397
    bindkey f nextfile
398
    bind . <Control-q> doquit
399 400 401
    bind . <Control-f> dofind
    bind . <Control-g> findnext
    bind . <Control-r> findprev
402 403 404 405
    bind . <Control-equal> {incrfont 1}
    bind . <Control-KP_Add> {incrfont 1}
    bind . <Control-minus> {incrfont -1}
    bind . <Control-KP_Subtract> {incrfont -1}
406
    bind $cflist <<ListboxSelect>> listboxsel
407
    bind . <Destroy> {savestuff %W}
408
    bind . <Button-1> "click %W"
409
    bind $fstring <Key-Return> dofind
410
    bind $sha1entry <Key-Return> gotocommit
411
    bind $sha1entry <<PasteSelection>> clearsha1
412 413 414

    set maincursor [. cget -cursor]
    set textcursor [$ctext cget -cursor]
415

416 417 418 419 420 421
    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}
422
    $rowctxmenu add command -label "Make patch" -command mkpatch
423 424 425 426 427 428
}

# 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} {
429
    global entries
430 431 432 433 434
    bind . $ev $script
    set escript [bind Entry $ev]
    if {$escript == {}} {
	set escript [bind Entry <Key>]
    }
435 436 437
    foreach e $entries {
	bind $e $ev "$escript; break"
    }
438 439 440
}

# set the focus back to the toplevel for any click outside
441
# the entry widgets
442
proc click {w} {
443 444 445
    global entries
    foreach e $entries {
	if {$w == $e} return
446
    }
447
    focus .
448 449 450 451 452 453
}

proc savestuff {w} {
    global canv canv2 canv3 ctext cflist mainfont textfont
    global stuffsaved
    if {$stuffsaved} return
454
    if {![winfo viewable .]} return
455 456 457 458 459 460
    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]"
461 462 463 464
	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]"
465 466 467 468 469 470 471 472 473 474
	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
475 476
}

477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528
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
}

529 530 531 532 533 534 535 536 537 538 539 540 541 542
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
}

543 544 545 546 547 548 549 550 551
proc about {} {
    set w .about
    if {[winfo exists $w]} {
	raise $w
	return
    }
    toplevel $w
    wm title $w "About gitk"
    message $w.m -text {
552
Gitk version 1.2
553 554 555

Copyright  2005 Paul Mackerras

556
Use and redistribute under the terms of the GNU General Public License} \
557 558 559 560 561 562
	    -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
}

563 564 565
proc assigncolor {id} {
    global commitinfo colormap commcolors colors nextcolor
    global parents nparents children nchildren
566 567
    global cornercrossings crossings

568 569
    if [info exists colormap($id)] return
    set ncolors [llength $colors]
P
Paul Mackerras 已提交
570
    if {$nparents($id) <= 1 && $nchildren($id) == 1} {
571 572 573 574 575
	set child [lindex $children($id) 0]
	if {[info exists colormap($child)]
	    && $nparents($child) == 1} {
	    set colormap($id) $colormap($child)
	    return
576
	}
577 578
    }
    set badcolors {}
579 580 581 582 583 584
    if {[info exists cornercrossings($id)]} {
	foreach x $cornercrossings($id) {
	    if {[info exists colormap($x)]
		&& [lsearch -exact $badcolors $colormap($x)] < 0} {
		lappend badcolors $colormap($x)
	    }
585
	}
586 587 588 589 590 591 592 593 594 595 596
	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)
597 598
		}
	    }
599 600 601
	    if {[llength $badcolors] >= $ncolors} {
		set badcolors $origbad
	    }
602
	}
603
	set origbad $badcolors
604
    }
605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622
    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
	}
623 624 625 626 627
    }
    for {set i 0} {$i <= $ncolors} {incr i} {
	set c [lindex $colors $nextcolor]
	if {[incr nextcolor] >= $ncolors} {
	    set nextcolor 0
628
	}
629
	if {[lsearch -exact $badcolors $c]} break
630
    }
631
    set colormap($id) $c
632 633
}

634 635
proc initgraph {} {
    global canvy canvy0 lineno numcommits lthickness nextcolor linespc
P
Paul Mackerras 已提交
636
    global mainline sidelines
637
    global nchildren ncleft
638

639
    allcanvs delete all
640 641 642 643 644
    set nextcolor 0
    set canvy $canvy0
    set lineno -1
    set numcommits 0
    set lthickness [expr {int($linespc / 9) + 1}]
P
Paul Mackerras 已提交
645 646
    catch {unset mainline}
    catch {unset sidelines}
647
    foreach id [array names nchildren] {
648
	set ncleft($id) $nchildren($id)
649 650 651
    }
}

652 653 654 655 656 657
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"
658
    $canv bind $t <Button-1> "lineclick %x %y $id"
659 660
}

661
proc drawcommitline {level} {
662
    global parents children nparents nchildren todo
663 664
    global canv canv2 canv3 mainfont namefont canvx0 canvy linespc
    global lineid linehtag linentag linedtag commitinfo
665
    global colormap numcommits currentparents dupparents
666 667
    global oldlevel oldnlines oldtodo
    global idtags idline idheads
P
Paul Mackerras 已提交
668
    global lineno lthickness mainline sidelines
669
    global commitlisted rowtextx
670 671 672 673 674 675 676 677 678 679 680

    incr numcommits
    incr lineno
    set id [lindex $todo $level]
    set lineid($lineno) $id
    set idline($id) $lineno
    set ofill [expr {[info exists commitlisted($id)]? "blue": "white"}]
    if {![info exists commitinfo($id)]} {
	readcommit $id
	if {![info exists commitinfo($id)]} {
	    set commitinfo($id) {"No commit information available"}
681 682
	    set nparents($id) 0
	}
683
    }
P
Paul Mackerras 已提交
684
    assigncolor $id
685
    set currentparents {}
686
    set dupparents {}
687
    if {[info exists commitlisted($id)] && [info exists parents($id)]} {
688 689 690 691 692 693 694 695
	foreach p $parents($id) {
	    if {[lsearch -exact $currentparents $p] < 0} {
		lappend currentparents $p
	    } else {
		# remember that this parent was listed twice
		lappend dupparents $p
	    }
	}
696
    }
697 698 699 700 701
    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]]
P
Paul Mackerras 已提交
702 703 704
    if {[info exists mainline($id)]} {
	lappend mainline($id) $x $y1
	set t [$canv create line $mainline($id) \
705 706
		   -width $lthickness -fill $colormap($id)]
	$canv lower $t
707
	bindline $t $id
708
    }
P
Paul Mackerras 已提交
709 710 711 712 713 714 715 716 717 718
    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
	}
    }
719 720 721 722 723
    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
724
    $canv bind $t <1> {selcanvline {} %x %y}
725
    set xt [expr $canvx0 + [llength $todo] * $linespc]
P
Paul Mackerras 已提交
726 727
    if {[llength $currentparents] > 2} {
	set xt [expr {$xt + ([llength $currentparents] - 2) * $linespc}]
728
    }
729
    set rowtextx($lineno) $xt
730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749
    set marks {}
    set ntags 0
    if {[info exists idtags($id)]} {
	set marks $idtags($id)
	set ntags [llength $marks]
    }
    if {[info exists idheads($id)]} {
	set marks [concat $marks $idheads($id)]
    }
    if {$marks != {}} {
	set delta [expr {int(0.5 * ($linespc - $lthickness))}]
	set yt [expr $y1 - 0.5 * $linespc]
	set yb [expr $yt + $linespc - 1]
	set xvals {}
	set wvals {}
	foreach tag $marks {
	    set wid [font measure $mainfont $tag]
	    lappend xvals $xt
	    lappend wvals $wid
	    set xt [expr {$xt + $delta + $wid + $lthickness + $linespc}]
P
Paul Mackerras 已提交
750
	}
751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766
	set t [$canv create line $x $y1 [lindex $xvals end] $y1 \
		   -width $lthickness -fill black]
	$canv lower $t
	foreach tag $marks x $xvals wid $wvals {
	    set xl [expr $x + $delta]
	    set xr [expr $x + $delta + $wid + $lthickness]
	    if {[incr ntags -1] >= 0} {
		# draw a tag
		$canv create polygon $x [expr $yt + $delta] $xl $yt\
		    $xr $yt $xr $yb $xl $yb $x [expr $yb - $delta] \
		    -width 1 -outline black -fill yellow
	    } else {
		# draw a head
		set xl [expr $xl - $delta/2]
		$canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
		    -width 1 -outline black -fill green
767
	    }
768 769
	    $canv create text $xl $y1 -anchor w -text $tag \
		-font $mainfont
770
	}
771 772 773 774 775 776
    }
    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 ]
777
    $canv bind $linehtag($lineno) <Button-3> "rowmenu %X %Y $id"
778 779 780 781 782 783 784
    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 updatetodo {level noshortcut} {
P
Paul Mackerras 已提交
785 786 787
    global currentparents ncleft todo
    global mainline oldlevel oldtodo oldnlines
    global canvx0 canvy linespc mainline
788 789
    global commitinfo

P
Paul Mackerras 已提交
790 791 792
    set oldlevel $level
    set oldtodo $todo
    set oldnlines [llength $todo]
793 794
    if {!$noshortcut && [llength $currentparents] == 1} {
	set p [lindex $currentparents 0]
P
Paul Mackerras 已提交
795 796 797 798 799
	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]
800 801
	    set todo [lreplace $todo $level $level $p]
	    return 0
P
Paul Mackerras 已提交
802
	}
803 804 805 806 807 808 809 810 811 812
    }

    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} {
	    set todo [linsert $todo $i $p]
	    incr i
P
Paul Mackerras 已提交
813
	}
814 815 816 817
    }
    return 1
}

818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845
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
	    }
	}
    }
}

846
proc drawslants {} {
P
Paul Mackerras 已提交
847
    global canv mainline sidelines canvx0 canvy linespc
848
    global oldlevel oldtodo todo currentparents dupparents
849 850 851 852 853 854 855 856 857 858 859 860
    global lthickness linespc canvy colormap

    set y1 [expr $canvy - $linespc]
    set y2 $canvy
    set i -1
    foreach id $oldtodo {
	incr i
	if {$id == {}} continue
	set xi [expr {$canvx0 + $i * $linespc}]
	if {$i == $oldlevel} {
	    foreach p $currentparents {
		set j [lsearch -exact $todo $p]
861 862 863 864
		set coords [list $xi $y1]
		set xj [expr {$canvx0 + $j * $linespc}]
		if {$j < $i - 1} {
		    lappend coords [expr $xj + $linespc] $y1
865
		    notecrossings $p $j $i [expr {$j + 1}]
866 867
		} elseif {$j > $i + 1} {
		    lappend coords [expr $xj - $linespc] $y1
868
		    notecrossings $p $i $j [expr {$j - 1}]
869 870 871
		}
		if {[lsearch -exact $dupparents $p] >= 0} {
		    # draw a double-width line to indicate the doubled parent
872
		    lappend coords $xj $y2
P
Paul Mackerras 已提交
873 874 875
		    lappend sidelines($p) [list $coords 2]
		    if {![info exists mainline($p)]} {
			set mainline($p) [list $xj $y2]
876 877 878
		    }
		} else {
		    # normal case, no parent duplicated
P
Paul Mackerras 已提交
879
		    if {![info exists mainline($p)]} {
880 881 882
			if {$i != $j} {
			    lappend coords $xj $y2
			}
P
Paul Mackerras 已提交
883
			set mainline($p) $coords
884
		    } else {
885
			lappend coords $xj $y2
P
Paul Mackerras 已提交
886
			lappend sidelines($p) [list $coords 1]
887
		    }
P
Paul Mackerras 已提交
888
		}
889
	    }
890 891 892
	} elseif {[lindex $todo $i] != $id} {
	    set j [lsearch -exact $todo $id]
	    set xj [expr {$canvx0 + $j * $linespc}]
P
Paul Mackerras 已提交
893
	    lappend mainline($id) $xi $y1 $xj $y2
894
	}
895 896
    }
}
897

898
proc decidenext {{noread 0}} {
899 900 901
    global parents children nchildren ncleft todo
    global canv canv2 canv3 mainfont namefont canvx0 canvy linespc
    global datemode cdate
902
    global commitinfo
903 904
    global currentparents oldlevel oldnlines oldtodo
    global lineno lthickness
905

906 907 908 909 910
    # remove the null entry if present
    set nullentry [lsearch -exact $todo {}]
    if {$nullentry >= 0} {
	set todo [lreplace $todo $nullentry $nullentry]
    }
911

912 913 914 915 916 917 918 919
    # choose which one to do next time around
    set todol [llength $todo]
    set level -1
    set latest {}
    for {set k $todol} {[incr k -1] >= 0} {} {
	set p [lindex $todo $k]
	if {$ncleft($p) == 0} {
	    if {$datemode} {
920 921 922 923 924 925
		if {![info exists commitinfo($p)]} {
		    if {$noread} {
			return {}
		    }
		    readcommit $p
		}
926
		if {$latest == {} || $cdate($p) > $latest} {
927
		    set level $k
928
		    set latest $cdate($p)
929
		}
930 931 932
	    } else {
		set level $k
		break
933 934
	    }
	}
935 936 937 938 939
    }
    if {$level < 0} {
	if {$todo != {}} {
	    puts "ERROR: none of the pending commits can be done yet:"
	    foreach p $todo {
P
Paul Mackerras 已提交
940
		puts "  $p ($ncleft($p))"
941 942
	    }
	}
943 944
	return -1
    }
945

946 947 948 949 950 951 952
    # If we are reducing, put in a null entry
    if {$todol < $oldnlines} {
	if {$nullentry >= 0} {
	    set i $nullentry
	    while {$i < $todol
		   && [lindex $oldtodo $i] == [lindex $todo $i]} {
		incr i
953 954
	    }
	} else {
955 956 957 958
	    set i $oldlevel
	    if {$level >= $i} {
		incr i
	    }
959
	}
960 961 962 963 964 965 966 967 968
	if {$i < $todol} {
	    set todo [linsert $todo $i {}]
	    if {$level >= $i} {
		incr level
	    }
	}
    }
    return $level
}
969

970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985
proc drawcommit {id} {
    global phase todo nchildren datemode nextupdate
    global startcommits

    if {$phase != "incrdraw"} {
	set phase incrdraw
	set todo $id
	set startcommits $id
	initgraph
	drawcommitline 0
	updatetodo 0 $datemode
    } else {
	if {$nchildren($id) == 0} {
	    lappend todo $id
	    lappend startcommits $id
	}
986 987
	set level [decidenext 1]
	if {$level == {} || $id != [lindex $todo $level]} {
988 989 990 991 992 993
	    return
	}
	while 1 {
	    drawslants
	    drawcommitline $level
	    if {[updatetodo $level $datemode]} {
994 995
		set level [decidenext 1]
		if {$level == {}} break
996
	    }
997 998 999
	    set id [lindex $todo $level]
	    if {![info exists commitlisted($id)]} {
		break
1000
	    }
1001 1002 1003
	    if {[clock clicks -milliseconds] >= $nextupdate} {
		doupdate
		if {$stopped} break
1004
	    }
1005 1006 1007 1008 1009 1010 1011
	}
    }
}

proc finishcommits {} {
    global phase
    global startcommits
1012
    global canv mainfont ctext maincursor textcursor
1013 1014 1015 1016 1017 1018

    if {$phase != "incrdraw"} {
	$canv delete all
	$canv create text 3 3 -anchor nw -text "No commits selected" \
	    -font $mainfont -tags textitems
	set phase {}
1019 1020 1021 1022
    } else {
	drawslants
	set level [decidenext]
	drawrest $level [llength $startcommits]
1023
    }
1024 1025
    . config -cursor $maincursor
    $ctext config -cursor $textcursor
1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044
}

proc drawgraph {} {
    global nextupdate startmsecs startcommits todo

    if {$startcommits == {}} return
    set startmsecs [clock clicks -milliseconds]
    set nextupdate [expr $startmsecs + 100]
    initgraph
    set todo [lindex $startcommits 0]
    drawrest 0 1
}

proc drawrest {level startix} {
    global phase stopped redisplaying selectedline
    global datemode currentparents todo
    global numcommits
    global nextupdate startmsecs startcommits idline

1045 1046 1047 1048 1049 1050
    if {$level >= 0} {
	set phase drawgraph
	set startid [lindex $startcommits $startix]
	set startline -1
	if {$startid != {}} {
	    set startline $idline($startid)
1051
	}
1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074
	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
	    }
1075
	}
1076
    }
1077
    set phase {}
1078
    set drawmsecs [expr [clock clicks -milliseconds] - $startmsecs]
1079
    #puts "overall $drawmsecs ms for $numcommits commits"
1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090
    if {$redisplaying} {
	if {$stopped == 0 && [info exists selectedline]} {
	    selectline $selectedline
	}
	if {$stopped == 1} {
	    set stopped 0
	    after idle drawgraph
	} else {
	    set redisplaying 0
	}
    }
1091 1092
}

1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112
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
}

1113 1114 1115 1116
proc dofind {} {
    global findtype findloc findstring markedmatches commitinfo
    global numcommits lineid linehtag linentag linedtag
    global mainfont namefont canv canv2 canv3 selectedline
1117
    global matchinglines foundstring foundstrlen
1118
    unmarkmatches
1119
    focus .
1120 1121 1122
    set matchinglines {}
    set fldtypes {Headline Author Date Committer CDate Comment}
    if {$findtype == "IgnCase"} {
1123
	set foundstring [string tolower $findstring]
1124
    } else {
1125
	set foundstring $findstring
1126
    }
1127 1128
    set foundstrlen [string length $findstring]
    if {$foundstrlen == 0} return
1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142
    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
	    }
1143
	    set matches [findmatches $f]
1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156
	    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} {
1157
		findselectline $l
1158 1159 1160 1161 1162 1163 1164
		set didsel 1
	    }
	}
    }
    if {$matchinglines == {}} {
	bell
    } elseif {!$didsel} {
1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180
	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"
	}
1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192
    }
}

proc findnext {} {
    global matchinglines selectedline
    if {![info exists matchinglines]} {
	dofind
	return
    }
    if {![info exists selectedline]} return
    foreach l $matchinglines {
	if {$l > $selectedline} {
1193
	    findselectline $l
1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212
	    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 != {}} {
1213
	findselectline $prev
1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241
    } 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}
}

1242
proc selcanvline {w x y} {
1243
    global canv canvy0 ctext linespc selectedline
1244
    global lineid linehtag linentag linedtag rowtextx
1245
    set ymax [lindex [$canv cget -scrollregion] 3]
1246
    if {$ymax == {}} return
1247 1248 1249 1250 1251 1252
    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
    }
1253 1254 1255
    if {$w eq $canv} {
	if {![info exists rowtextx($l)] || $x < $rowtextx($l)} return
    }
1256
    unmarkmatches
1257 1258 1259 1260
    selectline $l
}

proc selectline {l} {
1261 1262
    global canv canv2 canv3 ctext commitinfo selectedline
    global lineid linehtag linentag linedtag
1263 1264
    global canvy0 linespc parents nparents
    global cflist currentid sha1entry diffids
1265
    global commentend seenfile idtags
1266
    $canv delete hover
1267
    if {![info exists lineid($l)] || ![info exists linehtag($l)]} return
1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279
    $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
1280
    set y [expr {$canvy0 + $l * $linespc}]
1281
    set ymax [lindex [$canv cget -scrollregion] 3]
1282 1283
    set ytop [expr {$y - $linespc - 1}]
    set ybot [expr {$y + $linespc + 1}]
1284
    set wnow [$canv yview]
1285 1286 1287 1288
    set wtop [expr [lindex $wnow 0] * $ymax]
    set wbot [expr [lindex $wnow 1] * $ymax]
    set wh [expr {$wbot - $wtop}]
    set newtop $wtop
1289
    if {$ytop < $wtop} {
1290 1291 1292 1293 1294 1295 1296
	if {$ybot < $wtop} {
	    set newtop [expr {$y - $wh / 2.0}]
	} else {
	    set newtop $ytop
	    if {$newtop > $wtop - $linespc} {
		set newtop [expr {$wtop - $linespc}]
	    }
1297
	}
1298 1299 1300 1301 1302 1303 1304 1305
    } elseif {$ybot > $wbot} {
	if {$ytop > $wbot} {
	    set newtop [expr {$y - $wh / 2.0}]
	} else {
	    set newtop [expr {$ybot - $wh}]
	    if {$newtop < $wtop + $linespc} {
		set newtop [expr {$wtop + $linespc}]
	    }
1306
	}
1307 1308 1309 1310 1311 1312
    }
    if {$newtop != $wtop} {
	if {$newtop < 0} {
	    set newtop 0
	}
	allcanvs yview moveto [expr $newtop * 1.0 / $ymax]
1313 1314 1315
    }
    set selectedline $l

1316
    set id $lineid($l)
1317
    set currentid $id
1318
    set diffids [concat $id $parents($id)]
1319 1320 1321 1322 1323
    $sha1entry delete 0 end
    $sha1entry insert 0 $id
    $sha1entry selection from 0
    $sha1entry selection to end

1324
    $ctext conf -state normal
1325
    $ctext delete 0.0 end
1326 1327
    $ctext mark set fmark.0 0.0
    $ctext mark gravity fmark.0 left
1328
    set info $commitinfo($id)
1329 1330
    $ctext insert end "Author: [lindex $info 1]  [lindex $info 2]\n"
    $ctext insert end "Committer: [lindex $info 3]  [lindex $info 4]\n"
1331 1332 1333 1334 1335 1336 1337
    if {[info exists idtags($id)]} {
	$ctext insert end "Tags:"
	foreach tag $idtags($id) {
	    $ctext insert end " $tag"
	}
	$ctext insert end "\n"
    }
1338
    $ctext insert end "\n"
1339 1340 1341
    $ctext insert end [lindex $info 5]
    $ctext insert end "\n"
    $ctext tag delete Comments
1342
    $ctext tag remove found 1.0 end
1343
    $ctext conf -state disabled
1344
    set commentend [$ctext index "end - 1c"]
1345 1346

    $cflist delete 0 end
1347
    $cflist insert end "Comments"
1348
    if {$nparents($id) == 1} {
1349
	startdiff
1350
    }
1351
    catch {unset seenfile}
1352
}
1353

1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365
proc startdiff {} {
    global treediffs diffids treepending

    if {![info exists treediffs($diffids)]} {
	if {![info exists treepending]} {
	    gettreediffs $diffids
	}
    } else {
	addtocflist $diffids
    }
}

1366 1367 1368 1369
proc selnextline {dir} {
    global selectedline
    if {![info exists selectedline]} return
    set l [expr $selectedline + $dir]
1370
    unmarkmatches
1371
    selectline $l
1372 1373
}

1374 1375 1376 1377
proc addtocflist {ids} {
    global diffids treediffs cflist
    if {$ids != $diffids} {
	gettreediffs $diffids
1378 1379
	return
    }
1380
    foreach f $treediffs($ids) {
1381 1382
	$cflist insert end $f
    }
1383
    getblobdiffs $ids
1384 1385
}

1386
proc gettreediffs {ids} {
1387
    global treediffs parents treepending
1388 1389 1390 1391
    set treepending $ids
    set treediffs($ids) {}
    set id [lindex $ids 0]
    set p [lindex $ids 1]
1392 1393
    if [catch {set gdtf [open "|git-diff-tree -r $p $id" r]}] return
    fconfigure $gdtf -blocking 0
1394
    fileevent $gdtf readable "gettreediffline $gdtf {$ids}"
1395 1396
}

1397
proc gettreediffline {gdtf ids} {
1398 1399 1400 1401 1402 1403
    global treediffs treepending
    set n [gets $gdtf line]
    if {$n < 0} {
	if {![eof $gdtf]} return
	close $gdtf
	unset treepending
1404
	addtocflist $ids
1405 1406
	return
    }
1407
    set file [lindex $line 5]
1408
    lappend treediffs($ids) $file
1409 1410
}

1411 1412 1413 1414 1415 1416
proc getblobdiffs {ids} {
    global diffopts blobdifffd env curdifftag curtagstart
    global diffindex difffilestart nextupdate

    set id [lindex $ids 0]
    set p [lindex $ids 1]
1417 1418 1419 1420 1421 1422
    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
1423
    set blobdifffd($ids) $bdf
1424 1425
    set curdifftag Comments
    set curtagstart 0.0
1426 1427
    set diffindex 0
    catch {unset difffilestart}
1428 1429
    fileevent $bdf readable "getblobdiffline $bdf {$ids}"
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
1430 1431
}

1432 1433
proc getblobdiffline {bdf ids} {
    global diffids blobdifffd ctext curdifftag curtagstart seenfile
1434
    global diffnexthead diffnextnote diffindex difffilestart
1435 1436
    global nextupdate

1437 1438 1439 1440
    set n [gets $bdf line]
    if {$n < 0} {
	if {[eof $bdf]} {
	    close $bdf
1441
	    if {$ids == $diffids && $bdf == $blobdifffd($ids)} {
1442
		$ctext tag add $curdifftag $curtagstart end
1443
		set seenfile($curdifftag) 1
1444 1445 1446 1447
	    }
	}
	return
    }
1448
    if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
1449 1450 1451
	return
    }
    $ctext conf -state normal
1452
    if {[regexp {^---[ \t]+([^/])*/(.*)} $line match s1 fname]} {
1453 1454 1455
	# start of a new file
	$ctext insert end "\n"
	$ctext tag add $curdifftag $curtagstart end
1456
	set seenfile($curdifftag) 1
1457
	set curtagstart [$ctext index "end - 1c"]
1458
	set header $fname
1459 1460
	if {[info exists diffnexthead]} {
	    set fname $diffnexthead
1461
	    set header "$diffnexthead ($diffnextnote)"
1462 1463
	    unset diffnexthead
	}
1464 1465
	set here [$ctext index "end - 1c"]
	set difffilestart($diffindex) $here
1466
	incr diffindex
1467 1468 1469
	# start mark names at fmark.1 for first file
	$ctext mark set fmark.$diffindex $here
	$ctext mark gravity fmark.$diffindex left
1470 1471
	set curdifftag "f:$fname"
	$ctext tag delete $curdifftag
1472
	set l [expr {(78 - [string length $header]) / 2}]
1473
	set pad [string range "----------------------------------------" 1 $l]
1474
	$ctext insert end "$pad $header $pad\n" filesep
1475 1476
    } elseif {[string range $line 0 2] == "+++"} {
	# no need to do anything with this
1477
    } elseif {[regexp {^Created: (.*) \((mode: *[0-7]*)\)} $line match fn m]} {
1478
	set diffnexthead $fn
1479
	set diffnextnote "created, mode $m"
1480 1481
    } elseif {[string range $line 0 8] == "Deleted: "} {
	set diffnexthead [string range $line 9 end]
1482
	set diffnextnote "deleted"
1483 1484 1485 1486 1487 1488 1489 1490
    } elseif {[regexp {^diff --git a/(.*) b/} $line match fn]} {
	# save the filename in case the next thing is "new file mode ..."
	set diffnexthead $fn
	set diffnextnote "modified"
    } elseif {[regexp {^new file mode ([0-7]+)} $line match m]} {
	set diffnextnote "new file, mode $m"
    } elseif {[string range $line 0 11] == "deleted file"} {
	set diffnextnote "deleted"
1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504
    } 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"
1505 1506 1507
	} elseif {$x == "\\"} {
	    # e.g. "\ No newline at end of file"
	    $ctext insert end "$line\n" filesep
1508 1509 1510 1511 1512
	} else {
	    # Something else we don't recognize
	    if {$curdifftag != "Comments"} {
		$ctext insert end "\n"
		$ctext tag add $curdifftag $curtagstart end
1513
		set seenfile($curdifftag) 1
1514 1515 1516 1517 1518 1519 1520
		set curtagstart [$ctext index "end - 1c"]
		set curdifftag Comments
	    }
	    $ctext insert end "$line\n" filesep
	}
    }
    $ctext conf -state disabled
1521 1522 1523 1524 1525 1526
    if {[clock clicks -milliseconds] >= $nextupdate} {
	incr nextupdate 100
	fileevent $bdf readable {}
	update
	fileevent $bdf readable "getblobdiffline $bdf {$ids}"
    }
1527 1528
}

1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539
proc nextfile {} {
    global difffilestart ctext
    set here [$ctext index @0,0]
    for {set i 0} {[info exists difffilestart($i)]} {incr i} {
	if {[$ctext compare $difffilestart($i) > $here]} {
	    $ctext yview $difffilestart($i)
	    break
	}
    }
}

1540
proc listboxsel {} {
1541
    global ctext cflist currentid treediffs seenfile
1542
    if {![info exists currentid]} return
1543 1544 1545 1546
    set sel [lsort [$cflist curselection]]
    if {$sel eq {}} return
    set first [lindex $sel 0]
    catch {$ctext yview fmark.$first}
1547 1548
}

1549 1550 1551 1552 1553 1554
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]
1555
}
1556

1557 1558 1559 1560 1561
proc redisplay {} {
    global selectedline stopped redisplaying phase
    if {$stopped > 1} return
    if {$phase == "getcommits"} return
    set redisplaying 1
1562
    if {$phase == "drawgraph" || $phase == "incrdraw"} {
1563 1564 1565 1566 1567 1568 1569 1570
	set stopped 1
    } else {
	drawgraph
    }
}

proc incrfont {inc} {
    global mainfont namefont textfont selectedline ctext canv phase
1571
    global stopped entries
1572 1573 1574 1575 1576 1577 1578
    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]
1579 1580 1581
    foreach e $entries {
	$e conf -font $mainfont
    }
1582 1583 1584 1585 1586
    if {$phase == "getcommits"} {
	$canv itemconf textitems -font $mainfont
    }
    redisplay
}
1587

1588 1589 1590 1591 1592 1593 1594
proc clearsha1 {} {
    global sha1entry sha1string
    if {[string length $sha1string] == 40} {
	$sha1entry delete 0 end
    }
}

1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631
proc sha1change {n1 n2 op} {
    global sha1string currentid sha1but
    if {$sha1string == {}
	|| ([info exists currentid] && $sha1string == $currentid)} {
	set state disabled
    } else {
	set state normal
    }
    if {[$sha1but cget -state] == $state} return
    if {$state == "normal"} {
	$sha1but conf -state normal -relief raised -text "Goto: "
    } else {
	$sha1but conf -state disabled -relief flat -text "SHA1 ID: "
    }
}

proc gotocommit {} {
    global sha1string currentid idline tagids
    if {$sha1string == {}
	|| ([info exists currentid] && $sha1string == $currentid)} return
    if {[info exists tagids($sha1string)]} {
	set id $tagids($sha1string)
    } else {
	set id [string tolower $sha1string]
    }
    if {[info exists idline($id)]} {
	selectline $idline($id)
	return
    }
    if {[regexp {^[0-9a-fA-F]{40}$} $sha1string]} {
	set type "SHA1 id"
    } else {
	set type "Tag"
    }
    error_popup "$type $sha1string is not known"
}

1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694
proc lineenter {x y id} {
    global hoverx hovery hoverid hovertimer
    global commitinfo canv

    if {![info exists commitinfo($id)]} return
    set hoverx $x
    set hovery $y
    set hoverid $id
    if {[info exists hovertimer]} {
	after cancel $hovertimer
    }
    set hovertimer [after 500 linehover]
    $canv delete hover
}

proc linemotion {x y id} {
    global hoverx hovery hoverid hovertimer

    if {[info exists hoverid] && $id == $hoverid} {
	set hoverx $x
	set hovery $y
	if {[info exists hovertimer]} {
	    after cancel $hovertimer
	}
	set hovertimer [after 500 linehover]
    }
}

proc lineleave {id} {
    global hoverid hovertimer canv

    if {[info exists hoverid] && $id == $hoverid} {
	$canv delete hover
	if {[info exists hovertimer]} {
	    after cancel $hovertimer
	    unset hovertimer
	}
	unset hoverid
    }
}

proc linehover {} {
    global hoverx hovery hoverid hovertimer
    global canv linespc lthickness
    global commitinfo mainfont

    set text [lindex $commitinfo($hoverid) 0]
    set ymax [lindex [$canv cget -scrollregion] 3]
    if {$ymax == {}} return
    set yfrac [lindex [$canv yview] 0]
    set x [expr {$hoverx + 2 * $linespc}]
    set y [expr {$hovery + $yfrac * $ymax - $linespc / 2}]
    set x0 [expr {$x - 2 * $lthickness}]
    set y0 [expr {$y - 2 * $lthickness}]
    set x1 [expr {$x + [font measure $mainfont $text] + 2 * $lthickness}]
    set y1 [expr {$y + $linespc + 2 * $lthickness}]
    set t [$canv create rectangle $x0 $y0 $x1 $y1 \
	       -fill \#ffff80 -outline black -width 1 -tags hover]
    $canv raise $t
    set t [$canv create text $x $y -anchor nw -text $text -tags hover]
    $canv raise $t
}

1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754
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
1755
    $rowctxmenu entryconfigure 2 -state $state
1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790
    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
}

1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874
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 -
    label $top.from -text "From:"
    entry $top.fromsha1 -width 40
    $top.fromsha1 insert 0 $oldid
    $top.fromsha1 conf -state readonly
    grid $top.from $top.fromsha1 -sticky w
    entry $top.fromhead -width 60
    $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
    $top.tosha1 insert 0 $newid
    $top.tosha1 conf -state readonly
    grid $top.to $top.tosha1 -sticky w
    entry $top.tohead -width 60
    $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
    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
}

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
}

1875 1876 1877 1878 1879
proc doquit {} {
    global stopped
    set stopped 100
    destroy .
}
1880

1881 1882 1883 1884
# defaults...
set datemode 0
set boldnames 0
set diffopts "-U 5 -p"
1885

1886 1887 1888 1889 1890 1891 1892
set mainfont {Helvetica 9}
set textfont {Courier 9}

set colors {green red blue magenta darkgrey brown orange}

catch {source ~/.gitk}

1893 1894 1895 1896 1897
set namefont $mainfont
if {$boldnames} {
    lappend namefont bold
}

1898 1899 1900 1901 1902 1903 1904 1905 1906 1907
set revtreeargs {}
foreach arg $argv {
    switch -regexp -- $arg {
	"^$" { }
	"^-b" { set boldnames 1 }
	"^-d" { set datemode 1 }
	default {
	    lappend revtreeargs $arg
	}
    }
1908
}
1909 1910 1911

set stopped 0
set redisplaying 0
1912
set stuffsaved 0
1913
set patchnum 0
1914 1915
setcoords
makewindow
1916
readrefs
1917
getcommits $revtreeargs