gitk 256.1 KB
Newer Older
1 2
#!/bin/sh
# Tcl ignores the next line -*- tcl -*- \
3
exec wish "$0" -- "$@"
4

P
Paul Mackerras 已提交
5
# Copyright (C) 2005-2006 Paul Mackerras.  All rights reserved.
6 7 8 9
# 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 11 12 13 14
proc gitdir {} {
    global env
    if {[info exists env(GIT_DIR)]} {
	return $env(GIT_DIR)
    } else {
15
	return [exec git rev-parse --git-dir]
16 17 18
    }
}

19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
# A simple scheduler for compute-intensive stuff.
# The aim is to make sure that event handlers for GUI actions can
# run at least every 50-100 ms.  Unfortunately fileevent handlers are
# run before X event handlers, so reading from a fast source can
# make the GUI completely unresponsive.
proc run args {
    global isonrunq runq

    set script $args
    if {[info exists isonrunq($script)]} return
    if {$runq eq {}} {
	after idle dorunq
    }
    lappend runq [list {} $script]
    set isonrunq($script) 1
}

proc filerun {fd script} {
    fileevent $fd readable [list filereadable $fd $script]
}

proc filereadable {fd script} {
    global runq

    fileevent $fd readable {}
    if {$runq eq {}} {
	after idle dorunq
    }
    lappend runq [list $fd $script]
}

50 51 52 53 54 55 56 57 58 59 60 61
proc nukefile {fd} {
    global runq

    for {set i 0} {$i < [llength $runq]} {} {
	if {[lindex $runq $i 0] eq $fd} {
	    set runq [lreplace $runq $i $i]
	} else {
	    incr i
	}
    }
}

62 63 64 65 66
proc dorunq {} {
    global isonrunq runq

    set tstart [clock clicks -milliseconds]
    set t0 $tstart
67
    while {[llength $runq] > 0} {
68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92
	set fd [lindex $runq 0 0]
	set script [lindex $runq 0 1]
	set repeat [eval $script]
	set t1 [clock clicks -milliseconds]
	set t [expr {$t1 - $t0}]
	set runq [lrange $runq 1 end]
	if {$repeat ne {} && $repeat} {
	    if {$fd eq {} || $repeat == 2} {
		# script returns 1 if it wants to be readded
		# file readers return 2 if they could do more straight away
		lappend runq [list $fd $script]
	    } else {
		fileevent $fd readable [list filereadable $fd $script]
	    }
	} elseif {$fd eq {}} {
	    unset isonrunq($script)
	}
	set t0 $t1
	if {$t1 - $tstart >= 80} break
    }
    if {$runq ne {}} {
	after idle dorunq
    }
}

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 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142
proc unmerged_files {files} {
    global nr_unmerged

    # find the list of unmerged files
    set mlist {}
    set nr_unmerged 0
    if {[catch {
	set fd [open "| git ls-files -u" r]
    } err]} {
	show_error {} . "[mc "Couldn't get list of unmerged files:"] $err"
	exit 1
    }
    while {[gets $fd line] >= 0} {
	set i [string first "\t" $line]
	if {$i < 0} continue
	set fname [string range $line [expr {$i+1}] end]
	if {[lsearch -exact $mlist $fname] >= 0} continue
	incr nr_unmerged
	if {$files eq {} || [path_filter $files $fname]} {
	    lappend mlist $fname
	}
    }
    catch {close $fd}
    return $mlist
}

proc parseviewargs {n arglist} {
    global viewargs vdatemode vmergeonly

    set vdatemode($n) 0
    set vmergeonly($n) 0
    set glargs {}
    foreach arg $viewargs($n) {
	switch -glob -- $arg {
	    "-d" -
	    "--date-order" {
		set vdatemode($n) 1
	    }
	    "--merge" {
		set vmergeonly($n) 1
		lappend glargs $arg
	    }
	    default {
		lappend glargs $arg
	    }
	}
    }
    return $glargs
}

143
# Start off a git log process and arrange to read its output
144
proc start_rev_list {view} {
145 146 147
    global startmsecs commitidx viewcomplete
    global commfd leftover tclencoding
    global viewargs viewargscmd vactualargs viewfiles vfilelimit
148
    global showlocalchanges commitinterest mainheadid
149
    global progressdirn progresscoords proglastnc curview
150
    global viewactive loginstance viewinstances vmergeonly
151
    global pending_select mainheadid
152 153

    set startmsecs [clock clicks -milliseconds]
154
    set commitidx($view) 0
155 156 157
    # these are set this way for the error exits
    set viewcomplete($view) 1
    set viewactive($view) 0
158 159
    varcinit $view

160 161 162 163 164 165
    set args $viewargs($view)
    if {$viewargscmd($view) ne {}} {
	if {[catch {
	    set str [exec sh -c $viewargscmd($view)]
	} err]} {
	    error_popup "Error executing --argscmd command: $err"
166
	    return 0
167 168 169
	}
	set args [concat $args [split $str "\n"]]
    }
170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189
    set args [parseviewargs $view $args]
    set vactualargs($view) $args

    set files $viewfiles($view)
    if {$vmergeonly($view)} {
	set files [unmerged_files $files]
	if {$files eq {}} {
	    global nr_unmerged
	    if {$nr_unmerged == 0} {
		error_popup [mc "No files selected: --merge specified but\
			     no files are unmerged."]
	    } else {
		error_popup [mc "No files selected: --merge specified but\
			     no unmerged files are within file limit."]
	    }
	    return 0
	}
    }
    set vfilelimit($view) $files

190
    if {[catch {
191
	set fd [open [concat | git log --no-color -z --pretty=raw --parents \
192
			 --boundary $args "--" $files] r]
193
    } err]} {
P
Paul Mackerras 已提交
194
	error_popup "[mc "Error executing git log:"] $err"
195
	return 0
196
    }
197 198 199 200
    set i [incr loginstance]
    set viewinstances($view) [list $i]
    set commfd($i) $fd
    set leftover($i) {}
201 202 203
    if {$showlocalchanges} {
	lappend commitinterest($mainheadid) {dodiffindex}
    }
204
    fconfigure $fd -blocking 0 -translation lf -eofchar {}
205
    if {$tclencoding != {}} {
206
	fconfigure $fd -encoding $tclencoding
207
    }
208
    filerun $fd [list getcommitlines $fd $i $view 0]
209
    nowbusy $view [mc "Reading"]
210 211 212 213
    if {$view == $curview} {
	set progressdirn 1
	set progresscoords {0 0}
	set proglastnc 0
214
	set pending_select $mainheadid
215
    }
216 217 218
    set viewcomplete($view) 0
    set viewactive($view) 1
    return 1
219 220
}

221 222
proc stop_rev_list {view} {
    global commfd viewinstances leftover
223

224 225 226 227 228 229 230 231 232 233
    foreach inst $viewinstances($view) {
	set fd $commfd($inst)
	catch {
	    set pid [pid $fd]
	    exec kill $pid
	}
	catch {close $fd}
	nukefile $fd
	unset commfd($inst)
	unset leftover($inst)
234
    }
235
    set viewinstances($view) {}
236 237
}

238
proc getcommits {} {
239
    global canv curview need_redisplay viewactive
240

241
    initlayout
242 243 244 245 246 247
    if {[start_rev_list $curview]} {
	show_status [mc "Reading commits..."]
	set need_redisplay 1
    } else {
	show_status [mc "No commits selected"]
    }
248 249
}

250
proc updatecommits {} {
251
    global curview vactualargs vfilelimit viewinstances
P
Paul Mackerras 已提交
252
    global viewactive viewcomplete loginstance tclencoding mainheadid
253
    global startmsecs commfd showneartags showlocalchanges leftover
254
    global mainheadid pending_select
P
Paul Mackerras 已提交
255
    global isworktree
256

P
Paul Mackerras 已提交
257
    set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}]
258
    set oldmainid $mainheadid
259
    rereadrefs
260 261 262 263 264 265 266 267
    if {$showlocalchanges} {
	if {$mainheadid ne $oldmainid} {
	    dohidelocalchanges
	}
	if {[commitinview $mainheadid $curview]} {
	    dodiffindex
	}
    }
268 269 270
    set view $curview
    if {[catch {
	set fd [open [concat | git log --no-color -z --pretty=raw --parents \
271 272
			  --boundary $vactualargs($view) --not [seeds $view] \
			  "--" $vfilelimit($view)] r]
273 274 275 276 277 278 279 280 281 282 283 284 285 286 287
    } err]} {
	error_popup "Error executing git log: $err"
	exit 1
    }
    if {$viewactive($view) == 0} {
	set startmsecs [clock clicks -milliseconds]
    }
    set i [incr loginstance]
    lappend viewinstances($view) $i
    set commfd($i) $fd
    set leftover($i) {}
    fconfigure $fd -blocking 0 -translation lf -eofchar {}
    if {$tclencoding != {}} {
	fconfigure $fd -encoding $tclencoding
    }
288
    filerun $fd [list getcommitlines $fd $i $view 1]
289 290
    incr viewactive($view)
    set viewcomplete($view) 0
291
    set pending_select $mainheadid
292 293 294 295 296 297 298 299 300
    nowbusy $view "Reading"
    if {$showneartags} {
	getallcommits
    }
}

proc reloadcommits {} {
    global curview viewcomplete selectedline currentid thickerline
    global showneartags treediffs commitinterest cached_commitrow
301
    global progresscoords targetid
302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320

    if {!$viewcomplete($curview)} {
	stop_rev_list $curview
	set progresscoords {0 0}
	adjustprogress
    }
    resetvarcs $curview
    catch {unset selectedline}
    catch {unset currentid}
    catch {unset thickerline}
    catch {unset treediffs}
    readrefs
    changedrefs
    if {$showneartags} {
	getallcommits
    }
    clear_display
    catch {unset commitinterest}
    catch {unset cached_commitrow}
321
    catch {unset targetid}
322 323
    setcanvscroll
    getcommits
324
    return 0
325 326
}

327 328 329 330 331 332 333 334 335 336 337 338 339
# This makes a string representation of a positive integer which
# sorts as a string in numerical order
proc strrep {n} {
    if {$n < 16} {
	return [format "%x" $n]
    } elseif {$n < 256} {
	return [format "x%.2x" $n]
    } elseif {$n < 65536} {
	return [format "y%.4x" $n]
    }
    return [format "z%.8x" $n]
}

340 341 342 343
# Procedures used in reordering commits from git log (without
# --topo-order) into the order for display.

proc varcinit {view} {
344 345
    global varcstart vupptr vdownptr vleftptr vbackptr varctok varcrow
    global vtokmod varcmod vrowmod varcix vlastins
346 347 348 349 350

    set varcstart($view) {{}}
    set vupptr($view) {0}
    set vdownptr($view) {0}
    set vleftptr($view) {0}
351
    set vbackptr($view) {0}
352 353 354 355
    set varctok($view) {{}}
    set varcrow($view) {{}}
    set vtokmod($view) {}
    set varcmod($view) 0
356
    set vrowmod($view) 0
357
    set varcix($view) {{}}
358
    set vlastins($view) {0}
359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378
}

proc resetvarcs {view} {
    global varcid varccommits parents children vseedcount ordertok

    foreach vid [array names varcid $view,*] {
	unset varcid($vid)
	unset children($vid)
	unset parents($vid)
    }
    # some commits might have children but haven't been seen yet
    foreach vid [array names children $view,*] {
	unset children($vid)
    }
    foreach va [array names varccommits $view,*] {
	unset varccommits($va)
    }
    foreach vd [array names vseedcount $view,*] {
	unset vseedcount($vd)
    }
379
    catch {unset ordertok}
380 381
}

382 383 384 385 386 387 388 389 390 391 392 393 394
# returns a list of the commits with no children
proc seeds {v} {
    global vdownptr vleftptr varcstart

    set ret {}
    set a [lindex $vdownptr($v) 0]
    while {$a != 0} {
	lappend ret [lindex $varcstart($v) $a]
	set a [lindex $vleftptr($v) $a]
    }
    return $ret
}

395
proc newvarc {view id} {
396
    global varcid varctok parents children vdatemode
397 398
    global vupptr vdownptr vleftptr vbackptr varcrow varcix varcstart
    global commitdata commitinfo vseedcount varccommits vlastins
399 400 401

    set a [llength $varctok($view)]
    set vid $view,$id
402
    if {[llength $children($vid)] == 0 || $vdatemode($view)} {
403 404 405 406 407 408 409 410 411 412 413 414 415 416 417
	if {![info exists commitinfo($id)]} {
	    parsecommit $id $commitdata($id) 1
	}
	set cdate [lindex $commitinfo($id) 4]
	if {![string is integer -strict $cdate]} {
	    set cdate 0
	}
	if {![info exists vseedcount($view,$cdate)]} {
	    set vseedcount($view,$cdate) -1
	}
	set c [incr vseedcount($view,$cdate)]
	set cdate [expr {$cdate ^ 0xffffffff}]
	set tok "s[strrep $cdate][strrep $c]"
    } else {
	set tok {}
418 419 420 421 422 423 424 425 426
    }
    set ka 0
    if {[llength $children($vid)] > 0} {
	set kid [lindex $children($vid) end]
	set k $varcid($view,$kid)
	if {[string compare [lindex $varctok($view) $k] $tok] > 0} {
	    set ki $kid
	    set ka $k
	    set tok [lindex $varctok($view) $k]
427
	}
428 429
    }
    if {$ka != 0} {
430 431 432 433
	set i [lsearch -exact $parents($view,$ki) $id]
	set j [expr {[llength $parents($view,$ki)] - 1 - $i}]
	append tok [strrep $j]
    }
434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457
    set c [lindex $vlastins($view) $ka]
    if {$c == 0 || [string compare $tok [lindex $varctok($view) $c]] < 0} {
	set c $ka
	set b [lindex $vdownptr($view) $ka]
    } else {
	set b [lindex $vleftptr($view) $c]
    }
    while {$b != 0 && [string compare $tok [lindex $varctok($view) $b]] >= 0} {
	set c $b
	set b [lindex $vleftptr($view) $c]
    }
    if {$c == $ka} {
	lset vdownptr($view) $ka $a
	lappend vbackptr($view) 0
    } else {
	lset vleftptr($view) $c $a
	lappend vbackptr($view) $c
    }
    lset vlastins($view) $ka $a
    lappend vupptr($view) $ka
    lappend vleftptr($view) $b
    if {$b != 0} {
	lset vbackptr($view) $b $a
    }
458 459 460 461 462
    lappend varctok($view) $tok
    lappend varcstart($view) $id
    lappend vdownptr($view) 0
    lappend varcrow($view) {}
    lappend varcix($view) {}
463
    set varccommits($view,$a) {}
464
    lappend vlastins($view) 0
465 466 467 468 469
    return $a
}

proc splitvarc {p v} {
    global varcid varcstart varccommits varctok
470
    global vupptr vdownptr vleftptr vbackptr varcix varcrow vlastins
471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488

    set oa $varcid($v,$p)
    set ac $varccommits($v,$oa)
    set i [lsearch -exact $varccommits($v,$oa) $p]
    if {$i <= 0} return
    set na [llength $varctok($v)]
    # "%" sorts before "0"...
    set tok "[lindex $varctok($v) $oa]%[strrep $i]"
    lappend varctok($v) $tok
    lappend varcrow($v) {}
    lappend varcix($v) {}
    set varccommits($v,$oa) [lrange $ac 0 [expr {$i - 1}]]
    set varccommits($v,$na) [lrange $ac $i end]
    lappend varcstart($v) $p
    foreach id $varccommits($v,$na) {
	set varcid($v,$id) $na
    }
    lappend vdownptr($v) [lindex $vdownptr($v) $oa]
489
    lappend vlastins($v) [lindex $vlastins($v) $oa]
490
    lset vdownptr($v) $oa $na
491
    lset vlastins($v) $oa 0
492 493
    lappend vupptr($v) $oa
    lappend vleftptr($v) 0
494
    lappend vbackptr($v) 0
495 496 497 498 499 500 501
    for {set b [lindex $vdownptr($v) $na]} {$b != 0} {set b [lindex $vleftptr($v) $b]} {
	lset vupptr($v) $b $na
    }
}

proc renumbervarc {a v} {
    global parents children varctok varcstart varccommits
502
    global vupptr vdownptr vleftptr vbackptr vlastins varcid vtokmod vdatemode
503 504 505 506

    set t1 [clock clicks -milliseconds]
    set todo {}
    set isrelated($a) 1
507
    set kidchanged($a) 1
508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530
    set ntot 0
    while {$a != 0} {
	if {[info exists isrelated($a)]} {
	    lappend todo $a
	    set id [lindex $varccommits($v,$a) end]
	    foreach p $parents($v,$id) {
		if {[info exists varcid($v,$p)]} {
		    set isrelated($varcid($v,$p)) 1
		}
	    }
	}
	incr ntot
	set b [lindex $vdownptr($v) $a]
	if {$b == 0} {
	    while {$a != 0} {
		set b [lindex $vleftptr($v) $a]
		if {$b != 0} break
		set a [lindex $vupptr($v) $a]
	    }
	}
	set a $b
    }
    foreach a $todo {
531
	if {![info exists kidchanged($a)]} continue
532
	set id [lindex $varcstart($v) $a]
533 534 535 536 537
	if {[llength $children($v,$id)] > 1} {
	    set children($v,$id) [lsort -command [list vtokcmp $v] \
				      $children($v,$id)]
	}
	set oldtok [lindex $varctok($v) $a]
538
	if {!$vdatemode($v)} {
539 540 541 542 543
	    set tok {}
	} else {
	    set tok $oldtok
	}
	set ka 0
544 545
	set kid [last_real_child $v,$id]
	if {$kid ne {}} {
546 547 548 549 550
	    set k $varcid($v,$kid)
	    if {[string compare [lindex $varctok($v) $k] $tok] > 0} {
		set ki $kid
		set ka $k
		set tok [lindex $varctok($v) $k]
551 552
	    }
	}
553
	if {$ka != 0} {
554 555 556 557
	    set i [lsearch -exact $parents($v,$ki) $id]
	    set j [expr {[llength $parents($v,$ki)] - 1 - $i}]
	    append tok [strrep $j]
	}
558 559 560 561 562 563 564 565 566 567 568 569
	if {$tok eq $oldtok} {
	    continue
	}
	set id [lindex $varccommits($v,$a) end]
	foreach p $parents($v,$id) {
	    if {[info exists varcid($v,$p)]} {
		set kidchanged($varcid($v,$p)) 1
	    } else {
		set sortkids($p) 1
	    }
	}
	lset varctok($v) $a $tok
570 571
	set b [lindex $vupptr($v) $a]
	if {$b != $ka} {
572 573
	    if {[string compare [lindex $varctok($v) $ka] $vtokmod($v)] < 0} {
		modify_arc $v $ka
574
	    }
575 576
	    if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} {
		modify_arc $v $b
577
	    }
578 579 580 581
	    set c [lindex $vbackptr($v) $a]
	    set d [lindex $vleftptr($v) $a]
	    if {$c == 0} {
		lset vdownptr($v) $b $d
582
	    } else {
583 584 585 586
		lset vleftptr($v) $c $d
	    }
	    if {$d != 0} {
		lset vbackptr($v) $d $c
587
	    }
588 589 590
	    if {[lindex $vlastins($v) $b] == $a} {
		lset vlastins($v) $b $c
	    }
591
	    lset vupptr($v) $a $ka
592 593 594 595 596 597 598 599 600 601 602 603
	    set c [lindex $vlastins($v) $ka]
	    if {$c == 0 || \
		    [string compare $tok [lindex $varctok($v) $c]] < 0} {
		set c $ka
		set b [lindex $vdownptr($v) $ka]
	    } else {
		set b [lindex $vleftptr($v) $c]
	    }
	    while {$b != 0 && \
		      [string compare $tok [lindex $varctok($v) $b]] >= 0} {
		set c $b
		set b [lindex $vleftptr($v) $c]
604
	    }
605 606 607 608 609 610
	    if {$c == $ka} {
 		lset vdownptr($v) $ka $a
		lset vbackptr($v) $a 0
	    } else {
		lset vleftptr($v) $c $a
		lset vbackptr($v) $a $c
611
	    }
612 613 614 615 616 617 618 619 620 621 622
	    lset vleftptr($v) $a $b
	    if {$b != 0} {
		lset vbackptr($v) $b $a
	    }
	    lset vlastins($v) $ka $a
	}
    }
    foreach id [array names sortkids] {
	if {[llength $children($v,$id)] > 1} {
	    set children($v,$id) [lsort -command [list vtokcmp $v] \
				      $children($v,$id)]
623 624 625 626 627 628
	}
    }
    set t2 [clock clicks -milliseconds]
    #puts "renumbervarc did [llength $todo] of $ntot arcs in [expr {$t2-$t1}]ms"
}

629 630 631
# Fix up the graph after we have found out that in view $v,
# $p (a commit that we have already seen) is actually the parent
# of the last commit in arc $a.
632
proc fix_reversal {p a v} {
P
Paul Mackerras 已提交
633
    global varcid varcstart varctok vupptr
634 635 636 637 638 639

    set pa $varcid($v,$p)
    if {$p ne [lindex $varcstart($v) $pa]} {
	splitvarc $p $v
	set pa $varcid($v,$p)
    }
P
Paul Mackerras 已提交
640 641 642 643
    # seeds always need to be renumbered
    if {[lindex $vupptr($v) $pa] == 0 ||
	[string compare [lindex $varctok($v) $a] \
	     [lindex $varctok($v) $pa]] > 0} {
644 645 646 647 648
	renumbervarc $pa $v
    }
}

proc insertrow {id p v} {
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 681 682
    global cmitlisted children parents varcid varctok vtokmod
    global varccommits ordertok commitidx numcommits curview
    global targetid targetrow

    readcommit $id
    set vid $v,$id
    set cmitlisted($vid) 1
    set children($vid) {}
    set parents($vid) [list $p]
    set a [newvarc $v $id]
    set varcid($vid) $a
    if {[string compare [lindex $varctok($v) $a] $vtokmod($v)] < 0} {
	modify_arc $v $a
    }
    lappend varccommits($v,$a) $id
    set vp $v,$p
    if {[llength [lappend children($vp) $id]] > 1} {
	set children($vp) [lsort -command [list vtokcmp $v] $children($vp)]
	catch {unset ordertok}
    }
    fix_reversal $p $a $v
    incr commitidx($v)
    if {$v == $curview} {
	set numcommits $commitidx($v)
	setcanvscroll
	if {[info exists targetid]} {
	    if {![comes_before $targetid $p]} {
		incr targetrow
	    }
	}
    }
}

proc insertfakerow {id p} {
683
    global varcid varccommits parents children cmitlisted
684
    global commitidx varctok vtokmod targetid targetrow curview numcommits
685

686
    set v $curview
687 688 689
    set a $varcid($v,$p)
    set i [lsearch -exact $varccommits($v,$a) $p]
    if {$i < 0} {
690
	puts "oops: insertfakerow can't find [shortids $p] on arc $a"
691 692 693 694 695
	return
    }
    set children($v,$id) {}
    set parents($v,$id) [list $p]
    set varcid($v,$id) $a
696
    lappend children($v,$p) $id
697
    set cmitlisted($v,$id) 1
698
    set numcommits [incr commitidx($v)]
699 700
    # note we deliberately don't update varcstart($v) even if $i == 0
    set varccommits($v,$a) [linsert $varccommits($v,$a) $i $id]
701
    modify_arc $v $a $i
702 703 704 705 706
    if {[info exists targetid]} {
	if {![comes_before $targetid $p]} {
	    incr targetrow
	}
    }
707
    setcanvscroll
708
    drawvisible
709 710
}

711
proc removefakerow {id} {
712
    global varcid varccommits parents children commitidx
713
    global varctok vtokmod cmitlisted currentid selectedline
714
    global targetid curview numcommits
715

716
    set v $curview
717
    if {[llength $parents($v,$id)] != 1} {
718
	puts "oops: removefakerow [shortids $id] has [llength $parents($v,$id)] parents"
719 720 721 722 723 724
	return
    }
    set p [lindex $parents($v,$id) 0]
    set a $varcid($v,$id)
    set i [lsearch -exact $varccommits($v,$a) $id]
    if {$i < 0} {
725
	puts "oops: removefakerow can't find [shortids $id] on arc $a"
726 727 728 729 730 731 732
	return
    }
    unset varcid($v,$id)
    set varccommits($v,$a) [lreplace $varccommits($v,$a) $i $i]
    unset parents($v,$id)
    unset children($v,$id)
    unset cmitlisted($v,$id)
733
    set numcommits [incr commitidx($v) -1]
734 735 736 737
    set j [lsearch -exact $children($v,$p) $id]
    if {$j >= 0} {
	set children($v,$p) [lreplace $children($v,$p) $j $j]
    }
738
    modify_arc $v $a $i
739 740 741 742
    if {[info exist currentid] && $id eq $currentid} {
	unset currentid
	unset selectedline
    }
743 744 745
    if {[info exists targetid] && $targetid eq $id} {
	set targetid $p
    }
746
    setcanvscroll
747
    drawvisible
748 749
}

750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773
proc first_real_child {vp} {
    global children nullid nullid2

    foreach id $children($vp) {
	if {$id ne $nullid && $id ne $nullid2} {
	    return $id
	}
    }
    return {}
}

proc last_real_child {vp} {
    global children nullid nullid2

    set kids $children($vp)
    for {set i [llength $kids]} {[incr i -1] >= 0} {} {
	set id [lindex $kids $i]
	if {$id ne $nullid && $id ne $nullid2} {
	    return $id
	}
    }
    return {}
}

774 775 776 777 778 779 780
proc vtokcmp {v a b} {
    global varctok varcid

    return [string compare [lindex $varctok($v) $varcid($v,$a)] \
		[lindex $varctok($v) $varcid($v,$b)]]
}

781 782
# This assumes that if lim is not given, the caller has checked that
# arc a's token is less than $vtokmod($v)
783 784
proc modify_arc {v a {lim {}}} {
    global varctok vtokmod varcmod varcrow vupptr curview vrowmod varccommits
785

786 787 788 789 790 791 792 793
    if {$lim ne {}} {
	set c [string compare [lindex $varctok($v) $a] $vtokmod($v)]
	if {$c > 0} return
	if {$c == 0} {
	    set r [lindex $varcrow($v) $a]
	    if {$r ne {} && $vrowmod($v) <= $r + $lim} return
	}
    }
794 795 796 797 798
    set vtokmod($v) [lindex $varctok($v) $a]
    set varcmod($v) $a
    if {$v == $curview} {
	while {$a != 0 && [lindex $varcrow($v) $a] eq {}} {
	    set a [lindex $vupptr($v) $a]
799
	    set lim {}
800
	}
801 802 803 804 805 806 807 808
	set r 0
	if {$a != 0} {
	    if {$lim eq {}} {
		set lim [llength $varccommits($v,$a)]
	    }
	    set r [expr {[lindex $varcrow($v) $a] + $lim}]
	}
	set vrowmod($v) $r
P
Paul Mackerras 已提交
809
	undolayout $r
810 811 812
    }
}

813
proc update_arcrows {v} {
814
    global vtokmod varcmod vrowmod varcrow commitidx currentid selectedline
P
Paul Mackerras 已提交
815
    global varcid vrownum varcorder varcix varccommits
816
    global vupptr vdownptr vleftptr varctok
P
Paul Mackerras 已提交
817
    global displayorder parentlist curview cached_commitrow
818

819 820 821 822 823 824 825 826
    if {$vrowmod($v) == $commitidx($v)} return
    if {$v == $curview} {
	if {[llength $displayorder] > $vrowmod($v)} {
	    set displayorder [lrange $displayorder 0 [expr {$vrowmod($v) - 1}]]
	    set parentlist [lrange $parentlist 0 [expr {$vrowmod($v) - 1}]]
	}
	catch {unset cached_commitrow}
    }
827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 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 870 871
    set narctot [expr {[llength $varctok($v)] - 1}]
    set a $varcmod($v)
    while {$a != 0 && [lindex $varcix($v) $a] eq {}} {
	# go up the tree until we find something that has a row number,
	# or we get to a seed
	set a [lindex $vupptr($v) $a]
    }
    if {$a == 0} {
	set a [lindex $vdownptr($v) 0]
	if {$a == 0} return
	set vrownum($v) {0}
	set varcorder($v) [list $a]
	lset varcix($v) $a 0
	lset varcrow($v) $a 0
	set arcn 0
	set row 0
    } else {
	set arcn [lindex $varcix($v) $a]
	if {[llength $vrownum($v)] > $arcn + 1} {
	    set vrownum($v) [lrange $vrownum($v) 0 $arcn]
	    set varcorder($v) [lrange $varcorder($v) 0 $arcn]
	}
	set row [lindex $varcrow($v) $a]
    }
    while {1} {
	set p $a
	incr row [llength $varccommits($v,$a)]
	# go down if possible
	set b [lindex $vdownptr($v) $a]
	if {$b == 0} {
	    # if not, go left, or go up until we can go left
	    while {$a != 0} {
		set b [lindex $vleftptr($v) $a]
		if {$b != 0} break
		set a [lindex $vupptr($v) $a]
	    }
	    if {$a == 0} break
	}
	set a $b
	incr arcn
	lappend vrownum($v) $row
	lappend varcorder($v) $a
	lset varcix($v) $a $arcn
	lset varcrow($v) $a $row
    }
872 873 874
    set vtokmod($v) [lindex $varctok($v) $p]
    set varcmod($v) $p
    set vrowmod($v) $row
875 876 877 878 879 880 881 882 883 884 885 886 887 888 889
    if {[info exists currentid]} {
	set selectedline [rowofcommit $currentid]
    }
}

# Test whether view $v contains commit $id
proc commitinview {id v} {
    global varcid

    return [info exists varcid($v,$id)]
}

# Return the row number for commit $id in the current view
proc rowofcommit {id} {
    global varcid varccommits varcrow curview cached_commitrow
890
    global varctok vtokmod
891 892 893 894 895 896 897

    set v $curview
    if {![info exists varcid($v,$id)]} {
	puts "oops rowofcommit no arc for [shortids $id]"
	return {}
    }
    set a $varcid($v,$id)
898
    if {[string compare [lindex $varctok($v) $a] $vtokmod($v)] >= 0} {
899 900
	update_arcrows $v
    }
901 902 903
    if {[info exists cached_commitrow($id)]} {
	return $cached_commitrow($id)
    }
904 905 906 907 908 909 910 911 912 913
    set i [lsearch -exact $varccommits($v,$a) $id]
    if {$i < 0} {
	puts "oops didn't find commit [shortids $id] in arc $a"
	return {}
    }
    incr i [lindex $varcrow($v) $a]
    set cached_commitrow($id) $i
    return $i
}

914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929
# Returns 1 if a is on an earlier row than b, otherwise 0
proc comes_before {a b} {
    global varcid varctok curview

    set v $curview
    if {$a eq $b || ![info exists varcid($v,$a)] || \
	    ![info exists varcid($v,$b)]} {
	return 0
    }
    if {$varcid($v,$a) != $varcid($v,$b)} {
	return [expr {[string compare [lindex $varctok($v) $varcid($v,$a)] \
			   [lindex $varctok($v) $varcid($v,$b)]] < 0}]
    }
    return [expr {[rowofcommit $a] < [rowofcommit $b]}]
}

930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952
proc bsearch {l elt} {
    if {[llength $l] == 0 || $elt <= [lindex $l 0]} {
	return 0
    }
    set lo 0
    set hi [llength $l]
    while {$hi - $lo > 1} {
	set mid [expr {int(($lo + $hi) / 2)}]
	set t [lindex $l $mid]
	if {$elt < $t} {
	    set hi $mid
	} elseif {$elt > $t} {
	    set lo $mid
	} else {
	    return $mid
	}
    }
    return $lo
}

# Make sure rows $start..$end-1 are valid in displayorder and parentlist
proc make_disporder {start end} {
    global vrownum curview commitidx displayorder parentlist
953
    global varccommits varcorder parents vrowmod varcrow
954 955
    global d_valid_start d_valid_end

956
    if {$end > $vrowmod($curview)} {
957 958
	update_arcrows $curview
    }
959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978
    set ai [bsearch $vrownum($curview) $start]
    set start [lindex $vrownum($curview) $ai]
    set narc [llength $vrownum($curview)]
    for {set r $start} {$ai < $narc && $r < $end} {incr ai} {
	set a [lindex $varcorder($curview) $ai]
	set l [llength $displayorder]
	set al [llength $varccommits($curview,$a)]
	if {$l < $r + $al} {
	    if {$l < $r} {
		set pad [ntimes [expr {$r - $l}] {}]
		set displayorder [concat $displayorder $pad]
		set parentlist [concat $parentlist $pad]
	    } elseif {$l > $r} {
		set displayorder [lrange $displayorder 0 [expr {$r - 1}]]
		set parentlist [lrange $parentlist 0 [expr {$r - 1}]]
	    }
	    foreach id $varccommits($curview,$a) {
		lappend displayorder $id
		lappend parentlist $parents($curview,$id)
	    }
979
	} elseif {[lindex $displayorder [expr {$r + $al - 1}]] eq {}} {
980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003
	    set i $r
	    foreach id $varccommits($curview,$a) {
		lset displayorder $i $id
		lset parentlist $i $parents($curview,$id)
		incr i
	    }
	}
	incr r $al
    }
}

proc commitonrow {row} {
    global displayorder

    set id [lindex $displayorder $row]
    if {$id eq {}} {
	make_disporder $row [expr {$row + 1}]
	set id [lindex $displayorder $row]
    }
    return $id
}

proc closevarcs {v} {
    global varctok varccommits varcid parents children
1004
    global cmitlisted commitidx commitinterest vtokmod
1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023

    set missing_parents 0
    set scripts {}
    set narcs [llength $varctok($v)]
    for {set a 1} {$a < $narcs} {incr a} {
	set id [lindex $varccommits($v,$a) end]
	foreach p $parents($v,$id) {
	    if {[info exists varcid($v,$p)]} continue
	    # add p as a new commit
	    incr missing_parents
	    set cmitlisted($v,$p) 0
	    set parents($v,$p) {}
	    if {[llength $children($v,$p)] == 1 &&
		[llength $parents($v,$id)] == 1} {
		set b $a
	    } else {
		set b [newvarc $v $p]
	    }
	    set varcid($v,$p) $b
1024 1025
	    if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} {
		modify_arc $v $b
1026
	    }
1027
	    lappend varccommits($v,$b) $p
1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043
	    incr commitidx($v)
	    if {[info exists commitinterest($p)]} {
		foreach script $commitinterest($p) {
		    lappend scripts [string map [list "%I" $p] $script]
		}
		unset commitinterest($id)
	    }
	}
    }
    if {$missing_parents > 0} {
	foreach s $scripts {
	    eval $s
	}
    }
}

1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063
# Use $rwid as a substitute for $id, i.e. reparent $id's children to $rwid
# Assumes we already have an arc for $rwid.
proc rewrite_commit {v id rwid} {
    global children parents varcid varctok vtokmod varccommits

    foreach ch $children($v,$id) {
	# make $rwid be $ch's parent in place of $id
	set i [lsearch -exact $parents($v,$ch) $id]
	if {$i < 0} {
	    puts "oops rewrite_commit didn't find $id in parent list for $ch"
	}
	set parents($v,$ch) [lreplace $parents($v,$ch) $i $i $rwid]
	# add $ch to $rwid's children and sort the list if necessary
	if {[llength [lappend children($v,$rwid) $ch]] > 1} {
	    set children($v,$rwid) [lsort -command [list vtokcmp $v] \
					$children($v,$rwid)]
	}
	# fix the graph after joining $id to $rwid
	set a $varcid($v,$ch)
	fix_reversal $rwid $a $v
1064 1065 1066
	# parentlist is wrong for the last element of arc $a
	# even if displayorder is right, hence the 3rd arg here
	modify_arc $v $a [expr {[llength $varccommits($v,$a)] - 1}]
1067 1068 1069 1070
    }
}

proc getcommitlines {fd inst view updating}  {
P
Paul Mackerras 已提交
1071
    global cmitlisted commitinterest leftover
1072
    global commitidx commitdata vdatemode
1073
    global parents children curview hlview
1074
    global idpending ordertok
1075
    global varccommits varcid varctok vtokmod vfilelimit
1076

1077
    set stuff [read $fd 500000]
1078
    # git log doesn't terminate the last commit with a null...
1079
    if {$stuff == {} && $leftover($inst) ne {} && [eof $fd]} {
1080 1081
	set stuff "\0"
    }
P
Paul Mackerras 已提交
1082
    if {$stuff == {}} {
1083 1084 1085
	if {![eof $fd]} {
	    return 1
	}
1086 1087 1088 1089 1090 1091
	global commfd viewcomplete viewactive viewname progresscoords
	global viewinstances
	unset commfd($inst)
	set i [lsearch -exact $viewinstances($view) $inst]
	if {$i >= 0} {
	    set viewinstances($view) [lreplace $viewinstances($view) $i $i]
P
Paul Mackerras 已提交
1092
	}
1093
	# set it blocking so we wait for the process to terminate
1094
	fconfigure $fd -blocking 1
1095 1096 1097 1098
	if {[catch {close $fd} err]} {
	    set fv {}
	    if {$view != $curview} {
		set fv " for the \"$viewname($view)\" view"
1099
	    }
1100 1101
	    if {[string range $err 0 4] == "usage"} {
		set err "Gitk: error reading commits$fv:\
1102
			bad arguments to git log."
1103 1104
		if {$viewname($view) eq "Command line"} {
		    append err \
1105
			"  (Note: arguments to gitk are passed to git log\
1106 1107 1108 1109 1110 1111
			 to allow selection of commits to be displayed.)"
		}
	    } else {
		set err "Error reading commits$fv: $err"
	    }
	    error_popup $err
1112
	}
1113 1114 1115 1116 1117 1118 1119 1120 1121
	if {[incr viewactive($view) -1] <= 0} {
	    set viewcomplete($view) 1
	    # Check if we have seen any ids listed as parents that haven't
	    # appeared in the list
	    closevarcs $view
	    notbusy $view
	    set progresscoords {0 0}
	    adjustprogress
	}
1122
	if {$view == $curview} {
1123
	    run chewcommits
1124
	}
1125
	return 0
1126
    }
P
Paul Mackerras 已提交
1127
    set start 0
1128
    set gotsome 0
1129
    set scripts {}
P
Paul Mackerras 已提交
1130 1131 1132
    while 1 {
	set i [string first "\0" $stuff $start]
	if {$i < 0} {
1133
	    append leftover($inst) [string range $stuff $start end]
P
Paul Mackerras 已提交
1134
	    break
1135
	}
P
Paul Mackerras 已提交
1136
	if {$start == 0} {
1137
	    set cmit $leftover($inst)
1138
	    append cmit [string range $stuff 0 [expr {$i - 1}]]
1139
	    set leftover($inst) {}
1140 1141
	} else {
	    set cmit [string range $stuff $start [expr {$i - 1}]]
P
Paul Mackerras 已提交
1142 1143
	}
	set start [expr {$i + 1}]
1144 1145
	set j [string first "\n" $cmit]
	set ok 0
1146
	set listed 1
1147 1148
	if {$j >= 0 && [string match "commit *" $cmit]} {
	    set ids [string range $cmit 7 [expr {$j - 1}]]
1149
	    if {[string match {[-^<>]*} $ids]} {
1150 1151
		switch -- [string index $ids 0] {
		    "-" {set listed 0}
1152 1153 1154
		    "^" {set listed 2}
		    "<" {set listed 3}
		    ">" {set listed 4}
1155
		}
1156 1157
		set ids [string range $ids 1 end]
	    }
1158 1159
	    set ok 1
	    foreach id $ids {
1160
		if {[string length $id] != 40} {
1161 1162 1163 1164 1165 1166
		    set ok 0
		    break
		}
	    }
	}
	if {!$ok} {
1167 1168 1169 1170
	    set shortcmit $cmit
	    if {[string length $shortcmit] > 80} {
		set shortcmit "[string range $shortcmit 0 80]..."
	    }
1171
	    error_popup "[mc "Can't parse git log output:"] {$shortcmit}"
P
Paul Mackerras 已提交
1172 1173
	    exit 1
	}
1174
	set id [lindex $ids 0]
1175
	set vid $view,$id
1176 1177

	if {!$listed && $updating && ![info exists varcid($vid)] &&
1178
	    $vfilelimit($view) ne {}} {
1179 1180 1181 1182 1183 1184 1185
	    # git log doesn't rewrite parents for unlisted commits
	    # when doing path limiting, so work around that here
	    # by working out the rewritten parent with git rev-list
	    # and if we already know about it, using the rewritten
	    # parent as a substitute parent for $id's children.
	    if {![catch {
		set rwid [exec git rev-list --first-parent --max-count=1 \
1186
			      $id -- $vfilelimit($view)]
1187 1188 1189 1190 1191 1192 1193 1194 1195
	    }]} {
		if {$rwid ne {} && [info exists varcid($view,$rwid)]} {
		    # use $rwid in place of $id
		    rewrite_commit $view $id $rwid
		    continue
		}
	    }
	}

1196 1197 1198 1199 1200
	set a 0
	if {[info exists varcid($vid)]} {
	    if {$cmitlisted($vid) || !$listed} continue
	    set a $varcid($vid)
	}
1201 1202 1203 1204 1205
	if {$listed} {
	    set olds [lrange $ids 1 end]
	} else {
	    set olds {}
	}
1206
	set commitdata($id) [string range $cmit [expr {$j + 1}] end]
1207 1208 1209 1210
	set cmitlisted($vid) $listed
	set parents($vid) $olds
	if {![info exists children($vid)]} {
	    set children($vid) {}
1211
	} elseif {$a == 0 && [llength $children($vid)] == 1} {
1212 1213
	    set k [lindex $children($vid) 0]
	    if {[llength $parents($view,$k)] == 1 &&
1214
		(!$vdatemode($view) ||
1215 1216
		 $varcid($view,$k) == [llength $varctok($view)] - 1)} {
		set a $varcid($view,$k)
1217
	    }
1218
	}
1219 1220 1221 1222
	if {$a == 0} {
	    # new arc
	    set a [newvarc $view $id]
	}
1223 1224 1225
	if {[string compare [lindex $varctok($view) $a] $vtokmod($view)] < 0} {
	    modify_arc $view $a
	}
1226 1227 1228 1229 1230
	if {![info exists varcid($vid)]} {
	    set varcid($vid) $a
	    lappend varccommits($view,$a) $id
	    incr commitidx($view)
	}
1231

1232 1233 1234 1235 1236 1237 1238 1239
	set i 0
	foreach p $olds {
	    if {$i == 0 || [lsearch -exact $olds $p] >= $i} {
		set vp $view,$p
		if {[llength [lappend children($vp) $id]] > 1 &&
		    [vtokcmp $view [lindex $children($vp) end-1] $id] > 0} {
		    set children($vp) [lsort -command [list vtokcmp $view] \
					   $children($vp)]
1240
		    catch {unset ordertok}
1241
		}
1242 1243 1244
		if {[info exists varcid($view,$p)]} {
		    fix_reversal $p $a $view
		}
1245 1246 1247 1248
	    }
	    incr i
	}

1249 1250
	if {[info exists commitinterest($id)]} {
	    foreach script $commitinterest($id) {
1251
		lappend scripts [string map [list "%I" $id] $script]
1252 1253 1254
	    }
	    unset commitinterest($id)
	}
1255 1256 1257
	set gotsome 1
    }
    if {$gotsome} {
1258 1259 1260 1261 1262 1263 1264 1265 1266 1267
	global numcommits hlview

	if {$view == $curview} {
	    set numcommits $commitidx($view)
	    run chewcommits
	}
	if {[info exists hlview] && $view == $hlview} {
	    # we never actually get here...
	    run vhighlightmore
	}
1268 1269 1270
	foreach s $scripts {
	    eval $s
	}
1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297
	if {$view == $curview} {
	    # update progress bar
	    global progressdirn progresscoords proglastnc
	    set inc [expr {($commitidx($view) - $proglastnc) * 0.0002}]
	    set proglastnc $commitidx($view)
	    set l [lindex $progresscoords 0]
	    set r [lindex $progresscoords 1]
	    if {$progressdirn} {
		set r [expr {$r + $inc}]
		if {$r >= 1.0} {
		    set r 1.0
		    set progressdirn 0
		}
		if {$r > 0.2} {
		    set l [expr {$r - 0.2}]
		}
	    } else {
		set l [expr {$l - $inc}]
		if {$l <= 0.0} {
		    set l 0.0
		    set progressdirn 1
		}
		set r [expr {$l + 0.2}]
	    }
	    set progresscoords [list $l $r]
	    adjustprogress
	}
1298
    }
1299
    return 2
1300 1301
}

1302
proc chewcommits {} {
1303
    global curview hlview viewcomplete
1304
    global pending_select
1305

1306 1307 1308 1309
    layoutmore
    if {$viewcomplete($curview)} {
	global commitidx varctok
	global numcommits startmsecs
1310
	global mainheadid nullid
1311 1312 1313 1314

	if {[info exists pending_select]} {
	    set row [first_real_row]
	    selectline $row 1
1315
	}
1316 1317 1318 1319 1320 1321 1322 1323
	if {$commitidx($curview) > 0} {
	    #set ms [expr {[clock clicks -milliseconds] - $startmsecs}]
	    #puts "overall $ms ms for $numcommits commits"
	    #puts "[llength $varctok($view)] arcs, $commitidx($view) commits"
	} else {
	    show_status [mc "No commits selected"]
	}
	notbusy layout
1324
    }
1325
    return 0
1326 1327 1328
}

proc readcommit {id} {
1329
    if {[catch {set contents [exec git cat-file commit $id]}]} return
1330
    parsecommit $id $contents 0
P
Paul Mackerras 已提交
1331 1332
}

1333
proc parsecommit {id contents listed} {
1334 1335 1336 1337 1338 1339 1340 1341 1342
    global commitinfo cdate

    set inhdr 1
    set comment {}
    set headline {}
    set auname {}
    set audate {}
    set comname {}
    set comdate {}
P
Paul Mackerras 已提交
1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357
    set hdrend [string first "\n\n" $contents]
    if {$hdrend < 0} {
	# should never happen...
	set hdrend [string length $contents]
    }
    set header [string range $contents 0 [expr {$hdrend - 1}]]
    set comment [string range $contents [expr {$hdrend + 2}] end]
    foreach line [split $header "\n"] {
	set tag [lindex $line 0]
	if {$tag == "author"} {
	    set audate [lindex $line end-1]
	    set auname [lrange $line 1 end-2]
	} elseif {$tag == "committer"} {
	    set comdate [lindex $line end-1]
	    set comname [lrange $line 1 end-2]
1358 1359
	}
    }
P
Paul Mackerras 已提交
1360
    set headline {}
1361 1362 1363
    # take the first non-blank line of the comment as the headline
    set headline [string trimleft $comment]
    set i [string first "\n" $headline]
P
Paul Mackerras 已提交
1364
    if {$i >= 0} {
1365 1366 1367 1368 1369 1370
	set headline [string range $headline 0 $i]
    }
    set headline [string trimright $headline]
    set i [string first "\r" $headline]
    if {$i >= 0} {
	set headline [string trimright [string range $headline 0 $i]]
P
Paul Mackerras 已提交
1371 1372
    }
    if {!$listed} {
1373
	# git log indents the comment by 4 spaces;
1374
	# if we got this via git cat-file, add the indentation
P
Paul Mackerras 已提交
1375 1376 1377 1378
	set newcomment {}
	foreach line [split $comment "\n"] {
	    append newcomment "    "
	    append newcomment $line
1379
	    append newcomment "\n"
P
Paul Mackerras 已提交
1380 1381
	}
	set comment $newcomment
1382 1383
    }
    if {$comdate != {}} {
1384
	set cdate($id) $comdate
1385
    }
1386 1387
    set commitinfo($id) [list $headline $auname $audate \
			     $comname $comdate $comment]
1388 1389
}

1390
proc getcommit {id} {
1391
    global commitdata commitinfo
P
Paul Mackerras 已提交
1392

1393 1394
    if {[info exists commitdata($id)]} {
	parsecommit $id $commitdata($id) 1
P
Paul Mackerras 已提交
1395 1396 1397
    } else {
	readcommit $id
	if {![info exists commitinfo($id)]} {
1398
	    set commitinfo($id) [list [mc "No commit information available"]]
P
Paul Mackerras 已提交
1399 1400 1401 1402 1403
	}
    }
    return 1
}

1404
proc readrefs {} {
1405
    global tagids idtags headids idheads tagobjid
1406
    global otherrefids idotherrefs mainhead mainheadid
1407

1408 1409 1410
    foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
	catch {unset $v}
    }
1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421
    set refd [open [list | git show-ref -d] r]
    while {[gets $refd line] >= 0} {
	if {[string index $line 40] ne " "} continue
	set id [string range $line 0 39]
	set ref [string range $line 41 end]
	if {![string match "refs/*" $ref]} continue
	set name [string range $ref 5 end]
	if {[string match "remotes/*" $name]} {
	    if {![string match "*/HEAD" $name]} {
		set headids($name) $id
		lappend idheads($id) $name
1422
	    }
1423 1424
	} elseif {[string match "heads/*" $name]} {
	    set name [string range $name 6 end]
1425 1426
	    set headids($name) $id
	    lappend idheads($id) $name
1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437
	} elseif {[string match "tags/*" $name]} {
	    # this lets refs/tags/foo^{} overwrite refs/tags/foo,
	    # which is what we want since the former is the commit ID
	    set name [string range $name 5 end]
	    if {[string match "*^{}" $name]} {
		set name [string range $name 0 end-3]
	    } else {
		set tagobjid($name) $id
	    }
	    set tagids($name) $id
	    lappend idtags($id) $name
1438 1439 1440
	} else {
	    set otherrefids($name) $id
	    lappend idotherrefs($id) $name
1441 1442
	}
    }
1443
    catch {close $refd}
1444
    set mainhead {}
1445
    set mainheadid {}
1446 1447 1448 1449
    catch {
	set thehead [exec git symbolic-ref HEAD]
	if {[string match "refs/heads/*" $thehead]} {
	    set mainhead [string range $thehead 11 end]
1450 1451 1452
	    if {[info exists headids($mainhead)]} {
		set mainheadid $headids($mainhead)
	    }
1453 1454
	}
    }
1455 1456
}

1457 1458
# skip over fake commits
proc first_real_row {} {
1459
    global nullid nullid2 numcommits
1460 1461

    for {set row 0} {$row < $numcommits} {incr row} {
1462
	set id [commitonrow $row]
1463 1464 1465 1466 1467 1468 1469
	if {$id ne $nullid && $id ne $nullid2} {
	    break
	}
    }
    return $row
}

1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493
# update things for a head moved to a child of its previous location
proc movehead {id name} {
    global headids idheads

    removehead $headids($name) $name
    set headids($name) $id
    lappend idheads($id) $name
}

# update things when a head has been removed
proc removehead {id name} {
    global headids idheads

    if {$idheads($id) eq $name} {
	unset idheads($id)
    } else {
	set i [lsearch -exact $idheads($id) $name]
	if {$i >= 0} {
	    set idheads($id) [lreplace $idheads($id) $i $i]
	}
    }
    unset headids($name)
}

P
Paul Mackerras 已提交
1494
proc show_error {w top msg} {
1495 1496
    message $w.m -text $msg -justify center -aspect 400
    pack $w.m -side top -fill x -padx 20 -pady 20
1497
    button $w.ok -text [mc OK] -command "destroy $top"
1498
    pack $w.ok -side bottom -fill x
P
Paul Mackerras 已提交
1499 1500 1501
    bind $top <Visibility> "grab $top; focus $top"
    bind $top <Key-Return> "destroy $top"
    tkwait window $top
1502 1503
}

1504 1505 1506 1507
proc error_popup msg {
    set w .error
    toplevel $w
    wm transient $w .
P
Paul Mackerras 已提交
1508
    show_error $w $w $msg
1509 1510
}

1511 1512 1513 1514 1515 1516 1517 1518
proc confirm_popup msg {
    global confirm_ok
    set confirm_ok 0
    set w .confirm
    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
1519
    button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w"
1520
    pack $w.ok -side left -fill x
1521
    button $w.cancel -text [mc Cancel] -command "destroy $w"
1522 1523 1524 1525 1526 1527
    pack $w.cancel -side right -fill x
    bind $w <Visibility> "grab $w; focus $w"
    tkwait window $w
    return $confirm_ok
}

1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540
proc setoptions {} {
    option add *Panedwindow.showHandle 1 startupFile
    option add *Panedwindow.sashRelief raised startupFile
    option add *Button.font uifont startupFile
    option add *Checkbutton.font uifont startupFile
    option add *Radiobutton.font uifont startupFile
    option add *Menu.font uifont startupFile
    option add *Menubutton.font uifont startupFile
    option add *Label.font uifont startupFile
    option add *Message.font uifont startupFile
    option add *Entry.font uifont startupFile
}

1541
proc makewindow {} {
1542
    global canv canv2 canv3 linespc charspc ctext cflist cscroll
1543
    global tabstop
1544
    global findtype findtypemenu findloc findstring fstring geometry
1545
    global entries sha1entry sha1string sha1but
1546
    global diffcontextstring diffcontext
1547
    global ignorespace
1548
    global maincursor textcursor curtextcursor
1549
    global rowctxmenu fakerowmenu mergemax wrapcomment
1550
    global highlight_files gdttype
1551
    global searchstring sstring
1552
    global bgcolor fgcolor bglist fglist diffcolors selectbgcolor
1553 1554
    global headctxmenu progresscanv progressitem progresscoords statusw
    global fprogitem fprogcoord lastprogupdate progupdatepending
1555
    global rprogitem rprogcoord
1556
    global have_tk85
1557 1558

    menu .bar
1559
    .bar add cascade -label [mc "File"] -menu .bar.file
1560
    menu .bar.file
1561
    .bar.file add command -label [mc "Update"] -command updatecommits
P
Paul Mackerras 已提交
1562
    .bar.file add command -label [mc "Reload"] -command reloadcommits
1563 1564 1565
    .bar.file add command -label [mc "Reread references"] -command rereadrefs
    .bar.file add command -label [mc "List references"] -command showrefs
    .bar.file add command -label [mc "Quit"] -command doquit
1566
    menu .bar.edit
1567 1568
    .bar add cascade -label [mc "Edit"] -menu .bar.edit
    .bar.edit add command -label [mc "Preferences"] -command doprefs
1569

1570
    menu .bar.view
1571 1572 1573
    .bar add cascade -label [mc "View"] -menu .bar.view
    .bar.view add command -label [mc "New view..."] -command {newview 0}
    .bar.view add command -label [mc "Edit view..."] -command editview \
1574
	-state disabled
1575
    .bar.view add command -label [mc "Delete view"] -command delview -state disabled
P
Paul Mackerras 已提交
1576
    .bar.view add separator
1577
    .bar.view add radiobutton -label [mc "All files"] -command {showview 0} \
1578
	-variable selectedview -value 0
1579

1580
    menu .bar.help
1581 1582 1583
    .bar add cascade -label [mc "Help"] -menu .bar.help
    .bar.help add command -label [mc "About gitk"] -command about
    .bar.help add command -label [mc "Key bindings"] -command keys
1584
    .bar.help configure
1585 1586
    . configure -menu .bar

1587
    # the gui has upper and lower half, parts of a paned window.
P
Paul Mackerras 已提交
1588
    panedwindow .ctop -orient vertical
1589 1590

    # possibly use assumed geometry
1591
    if {![info exists geometry(pwsash0)]} {
1592 1593 1594 1595
        set geometry(topheight) [expr {15 * $linespc}]
        set geometry(topwidth) [expr {80 * $charspc}]
        set geometry(botheight) [expr {15 * $linespc}]
        set geometry(botwidth) [expr {50 * $charspc}]
1596 1597
        set geometry(pwsash0) "[expr {40 * $charspc}] 2"
        set geometry(pwsash1) "[expr {60 * $charspc}] 2"
1598 1599 1600 1601 1602 1603 1604 1605 1606 1607
    }

    # the upper half will have a paned window, a scroll bar to the right, and some stuff below
    frame .tf -height $geometry(topheight) -width $geometry(topwidth)
    frame .tf.histframe
    panedwindow .tf.histframe.pwclist -orient horizontal -sashpad 0 -handlesize 4

    # create three canvases
    set cscroll .tf.histframe.csb
    set canv .tf.histframe.pwclist.canv
1608
    canvas $canv \
1609
	-selectbackground $selectbgcolor \
1610
	-background $bgcolor -bd 0 \
P
Paul Mackerras 已提交
1611
	-yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
1612 1613
    .tf.histframe.pwclist add $canv
    set canv2 .tf.histframe.pwclist.canv2
1614
    canvas $canv2 \
1615
	-selectbackground $selectbgcolor \
1616
	-background $bgcolor -bd 0 -yscrollincr $linespc
1617 1618
    .tf.histframe.pwclist add $canv2
    set canv3 .tf.histframe.pwclist.canv3
1619
    canvas $canv3 \
1620
	-selectbackground $selectbgcolor \
1621
	-background $bgcolor -bd 0 -yscrollincr $linespc
1622
    .tf.histframe.pwclist add $canv3
1623 1624
    eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0)
    eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1)
1625 1626 1627 1628 1629

    # a scroll bar to rule them
    scrollbar $cscroll -command {allcanvs yview} -highlightthickness 0
    pack $cscroll -side right -fill y
    bind .tf.histframe.pwclist <Configure> {resizeclistpanes %W %w}
1630
    lappend bglist $canv $canv2 $canv3
1631
    pack .tf.histframe.pwclist -fill both -expand 1 -side left
1632

1633 1634 1635 1636 1637
    # we have two button bars at bottom of top frame. Bar 1
    frame .tf.bar
    frame .tf.lbar -height 15

    set sha1entry .tf.bar.sha1
1638
    set entries $sha1entry
1639
    set sha1but .tf.bar.sha1label
1640
    button $sha1but -text [mc "SHA1 ID: "] -state disabled -relief flat \
1641
	-command gotocommit -width 8
1642
    $sha1but conf -disabledforeground [$sha1but cget -foreground]
1643
    pack .tf.bar.sha1label -side left
1644
    entry $sha1entry -width 40 -font textfont -textvariable sha1string
1645
    trace add variable sha1string write sha1change
1646
    pack $sha1entry -side left -pady 2
1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663

    image create bitmap bm-left -data {
	#define left_width 16
	#define left_height 16
	static unsigned char left_bits[] = {
	0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
	0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00,
	0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01};
    }
    image create bitmap bm-right -data {
	#define right_width 16
	#define right_height 16
	static unsigned char right_bits[] = {
	0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c,
	0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c,
	0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01};
    }
1664
    button .tf.bar.leftbut -image bm-left -command goback \
1665
	-state disabled -width 26
1666 1667
    pack .tf.bar.leftbut -side left -fill y
    button .tf.bar.rightbut -image bm-right -command goforw \
1668
	-state disabled -width 26
1669
    pack .tf.bar.rightbut -side left -fill y
1670

1671 1672
    # Status label and progress bar
    set statusw .tf.bar.status
1673
    label $statusw -width 15 -relief sunken
1674
    pack $statusw -side left -padx 5
1675
    set h [expr {[font metrics uifont -linespace] + 2}]
1676 1677 1678 1679
    set progresscanv .tf.bar.progress
    canvas $progresscanv -relief sunken -height $h -borderwidth 2
    set progressitem [$progresscanv create rect -1 0 0 $h -fill green]
    set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow]
1680
    set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
1681 1682 1683
    pack $progresscanv -side right -expand 1 -fill x
    set progresscoords {0 0}
    set fprogcoord 0
1684
    set rprogcoord 0
1685 1686 1687 1688
    bind $progresscanv <Configure> adjustprogress
    set lastprogupdate [clock clicks -milliseconds]
    set progupdatepending 0

1689
    # build up the bottom bar of upper window
1690 1691 1692 1693
    label .tf.lbar.flabel -text "[mc "Find"] "
    button .tf.lbar.fnext -text [mc "next"] -command {dofind 1 1}
    button .tf.lbar.fprev -text [mc "prev"] -command {dofind -1 1}
    label .tf.lbar.flab2 -text " [mc "commit"] "
1694 1695
    pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \
	-side left -fill y
1696
    set gdttype [mc "containing:"]
1697
    set gm [tk_optionMenu .tf.lbar.gdttype gdttype \
1698 1699 1700
		[mc "containing:"] \
		[mc "touching paths:"] \
		[mc "adding/removing string:"]]
1701 1702 1703
    trace add variable gdttype write gdttype_change
    pack .tf.lbar.gdttype -side left -fill y

1704
    set findstring {}
1705
    set fstring .tf.lbar.findstring
1706
    lappend entries $fstring
1707
    entry $fstring -width 30 -font textfont -textvariable findstring
1708
    trace add variable findstring write find_change
1709
    set findtype [mc "Exact"]
1710
    set findtypemenu [tk_optionMenu .tf.lbar.findtype \
1711
		      findtype [mc "Exact"] [mc "IgnCase"] [mc "Regexp"]]
1712
    trace add variable findtype write findcom_change
1713 1714 1715
    set findloc [mc "All fields"]
    tk_optionMenu .tf.lbar.findloc findloc [mc "All fields"] [mc "Headline"] \
	[mc "Comments"] [mc "Author"] [mc "Committer"]
1716
    trace add variable findloc write find_change
1717 1718 1719
    pack .tf.lbar.findloc -side right
    pack .tf.lbar.findtype -side right
    pack $fstring -side left -expand 1 -fill x
1720 1721 1722 1723 1724 1725

    # Finish putting the upper half of the viewer together
    pack .tf.lbar -in .tf -side bottom -fill x
    pack .tf.bar -in .tf -side bottom -fill x
    pack .tf.histframe -fill both -side top -expand 1
    .ctop add .tf
1726 1727
    .ctop paneconfigure .tf -height $geometry(topheight)
    .ctop paneconfigure .tf -width $geometry(topwidth)
1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740

    # now build up the bottom
    panedwindow .pwbottom -orient horizontal

    # lower left, a text box over search bar, scroll bar to the right
    # if we know window height, then that will set the lower text height, otherwise
    # we set lower text height which will drive window height
    if {[info exists geometry(main)]} {
        frame .bleft -width $geometry(botwidth)
    } else {
        frame .bleft -width $geometry(botwidth) -height $geometry(botheight)
    }
    frame .bleft.top
1741
    frame .bleft.mid
1742
    frame .bleft.bottom
1743

1744
    button .bleft.top.search -text [mc "Search"] -command dosearch
1745 1746
    pack .bleft.top.search -side left -padx 5
    set sstring .bleft.top.sstring
1747
    entry $sstring -width 20 -font textfont -textvariable searchstring
1748 1749 1750
    lappend entries $sstring
    trace add variable searchstring write incrsearch
    pack $sstring -side left -expand 1 -fill x
1751
    radiobutton .bleft.mid.diff -text [mc "Diff"] \
1752
	-command changediffdisp -variable diffelide -value {0 0}
1753
    radiobutton .bleft.mid.old -text [mc "Old version"] \
1754
	-command changediffdisp -variable diffelide -value {0 1}
1755
    radiobutton .bleft.mid.new -text [mc "New version"] \
1756
	-command changediffdisp -variable diffelide -value {1 0}
1757
    label .bleft.mid.labeldiffcontext -text "      [mc "Lines of context"]: "
1758
    pack .bleft.mid.diff .bleft.mid.old .bleft.mid.new -side left
1759
    spinbox .bleft.mid.diffcontext -width 5 -font textfont \
1760 1761 1762 1763 1764 1765 1766
	-from 1 -increment 1 -to 10000000 \
	-validate all -validatecommand "diffcontextvalidate %P" \
	-textvariable diffcontextstring
    .bleft.mid.diffcontext set $diffcontext
    trace add variable diffcontextstring write diffcontextchange
    lappend entries .bleft.mid.diffcontext
    pack .bleft.mid.labeldiffcontext .bleft.mid.diffcontext -side left
1767 1768 1769
    checkbutton .bleft.mid.ignspace -text [mc "Ignore space change"] \
	-command changeignorespace -variable ignorespace
    pack .bleft.mid.ignspace -side left -padx 5
1770
    set ctext .bleft.bottom.ctext
1771
    text $ctext -background $bgcolor -foreground $fgcolor \
1772
	-state disabled -font textfont \
1773 1774
	-yscrollcommand scrolltext -wrap none \
	-xscrollcommand ".bleft.bottom.sbhorizontal set"
1775 1776 1777
    if {$have_tk85} {
	$ctext conf -tabstyle wordprocessor
    }
1778 1779 1780
    scrollbar .bleft.bottom.sb -command "$ctext yview"
    scrollbar .bleft.bottom.sbhorizontal -command "$ctext xview" -orient h \
	-width 10
1781
    pack .bleft.top -side top -fill x
1782
    pack .bleft.mid -side top -fill x
1783 1784 1785 1786 1787 1788
    grid $ctext .bleft.bottom.sb -sticky nsew
    grid .bleft.bottom.sbhorizontal -sticky ew
    grid columnconfigure .bleft.bottom 0 -weight 1
    grid rowconfigure .bleft.bottom 0 -weight 1
    grid rowconfigure .bleft.bottom 1 -weight 0
    pack .bleft.bottom -side top -fill both -expand 1
1789 1790
    lappend bglist $ctext
    lappend fglist $ctext
1791

1792
    $ctext tag conf comment -wrap $wrapcomment
1793
    $ctext tag conf filesep -font textfontbold -back "#aaaaaa"
1794 1795 1796
    $ctext tag conf hunksep -fore [lindex $diffcolors 2]
    $ctext tag conf d0 -fore [lindex $diffcolors 0]
    $ctext tag conf d1 -fore [lindex $diffcolors 1]
1797 1798 1799 1800 1801
    $ctext tag conf m0 -fore red
    $ctext tag conf m1 -fore blue
    $ctext tag conf m2 -fore green
    $ctext tag conf m3 -fore purple
    $ctext tag conf m4 -fore brown
1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812
    $ctext tag conf m5 -fore "#009090"
    $ctext tag conf m6 -fore magenta
    $ctext tag conf m7 -fore "#808000"
    $ctext tag conf m8 -fore "#009000"
    $ctext tag conf m9 -fore "#ff0080"
    $ctext tag conf m10 -fore cyan
    $ctext tag conf m11 -fore "#b07070"
    $ctext tag conf m12 -fore "#70b0f0"
    $ctext tag conf m13 -fore "#70f0b0"
    $ctext tag conf m14 -fore "#f0b070"
    $ctext tag conf m15 -fore "#ff70b0"
1813
    $ctext tag conf mmax -fore darkgrey
1814
    set mergemax 16
1815 1816
    $ctext tag conf mresult -font textfontbold
    $ctext tag conf msep -font textfontbold
1817
    $ctext tag conf found -back yellow
1818

1819
    .pwbottom add .bleft
1820
    .pwbottom paneconfigure .bleft -width $geometry(botwidth)
1821 1822 1823 1824

    # lower right
    frame .bright
    frame .bright.mode
1825
    radiobutton .bright.mode.patch -text [mc "Patch"] \
P
Paul Mackerras 已提交
1826
	-command reselectline -variable cmitmode -value "patch"
1827
    radiobutton .bright.mode.tree -text [mc "Tree"] \
P
Paul Mackerras 已提交
1828
	-command reselectline -variable cmitmode -value "tree"
1829 1830 1831
    grid .bright.mode.patch .bright.mode.tree -sticky ew
    pack .bright.mode -side top -fill x
    set cflist .bright.cfiles
1832
    set indent [font measure mainfont "nn"]
1833
    text $cflist \
1834
	-selectbackground $selectbgcolor \
1835
	-background $bgcolor -foreground $fgcolor \
1836
	-font mainfont \
1837
	-tabs [list $indent [expr {2 * $indent}]] \
1838
	-yscrollcommand ".bright.sb set" \
1839 1840
	-cursor [. cget -cursor] \
	-spacing1 1 -spacing3 1
1841 1842
    lappend bglist $cflist
    lappend fglist $cflist
1843 1844
    scrollbar .bright.sb -command "$cflist yview"
    pack .bright.sb -side right -fill y
1845
    pack $cflist -side left -fill both -expand 1
1846 1847
    $cflist tag configure highlight \
	-background [$cflist cget -selectbackground]
1848
    $cflist tag configure bold -font mainfontbold
1849

1850 1851
    .pwbottom add .bright
    .ctop add .pwbottom
1852

1853
    # restore window width & height if known
1854
    if {[info exists geometry(main)]} {
1855 1856 1857 1858 1859 1860 1861 1862 1863
	if {[scan $geometry(main) "%dx%d" w h] >= 2} {
	    if {$w > [winfo screenwidth .]} {
		set w [winfo screenwidth .]
	    }
	    if {$h > [winfo screenheight .]} {
		set h [winfo screenheight .]
	    }
	    wm geometry . "${w}x$h"
	}
1864 1865
    }

1866 1867 1868 1869 1870 1871
    if {[tk windowingsystem] eq {aqua}} {
        set M1B M1
    } else {
        set M1B Control
    }

1872 1873
    bind .pwbottom <Configure> {resizecdetpanes %W %w}
    pack .ctop -fill both -expand 1
1874 1875
    bindall <1> {selcanvline %W %x %y}
    #bindall <B1-Motion> {selcanvline %W %x %y}
1876 1877 1878 1879 1880 1881
    if {[tk windowingsystem] == "win32"} {
	bind . <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D }
	bind $ctext <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D ; break }
    } else {
	bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
	bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
1882 1883 1884 1885 1886 1887
        if {[tk windowingsystem] eq "aqua"} {
            bindall <MouseWheel> {
                set delta [expr {- (%D)}]
                allcanvs yview scroll $delta units
            }
        }
1888
    }
1889 1890
    bindall <2> "canvscan mark %W %x %y"
    bindall <B2-Motion> "canvscan dragto %W %x %y"
1891 1892
    bindkey <Home> selfirstline
    bindkey <End> sellastline
1893 1894
    bind . <Key-Up> "selnextline -1"
    bind . <Key-Down> "selnextline 1"
1895 1896
    bind . <Shift-Key-Up> "dofind -1 0"
    bind . <Shift-Key-Down> "dofind 1 0"
1897 1898 1899 1900
    bindkey <Key-Right> "goforw"
    bindkey <Key-Left> "goback"
    bind . <Key-Prior> "selnextpage -1"
    bind . <Key-Next> "selnextpage 1"
1901 1902 1903 1904 1905 1906
    bind . <$M1B-Home> "allcanvs yview moveto 0.0"
    bind . <$M1B-End> "allcanvs yview moveto 1.0"
    bind . <$M1B-Key-Up> "allcanvs yview scroll -1 units"
    bind . <$M1B-Key-Down> "allcanvs yview scroll 1 units"
    bind . <$M1B-Key-Prior> "allcanvs yview scroll -1 pages"
    bind . <$M1B-Key-Next> "allcanvs yview scroll 1 pages"
1907 1908 1909
    bindkey <Key-Delete> "$ctext yview scroll -1 pages"
    bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
    bindkey <Key-space> "$ctext yview scroll 1 pages"
1910 1911
    bindkey p "selnextline -1"
    bindkey n "selnextline 1"
R
Robert Suetterlin 已提交
1912 1913 1914 1915 1916 1917
    bindkey z "goback"
    bindkey x "goforw"
    bindkey i "selnextline -1"
    bindkey k "selnextline 1"
    bindkey j "goback"
    bindkey l "goforw"
1918 1919 1920
    bindkey b "$ctext yview scroll -1 pages"
    bindkey d "$ctext yview scroll 18 units"
    bindkey u "$ctext yview scroll -18 units"
1921 1922 1923
    bindkey / {dofind 1 1}
    bindkey <Key-Return> {dofind 1 1}
    bindkey ? {dofind -1 1}
1924
    bindkey f nextfile
1925
    bindkey <F5> updatecommits
1926
    bind . <$M1B-q> doquit
1927 1928
    bind . <$M1B-f> {dofind 1 1}
    bind . <$M1B-g> {dofind 1 0}
1929 1930 1931
    bind . <$M1B-r> dosearchback
    bind . <$M1B-s> dosearch
    bind . <$M1B-equal> {incrfont 1}
1932
    bind . <$M1B-plus> {incrfont 1}
1933 1934 1935
    bind . <$M1B-KP_Add> {incrfont 1}
    bind . <$M1B-minus> {incrfont -1}
    bind . <$M1B-KP_Subtract> {incrfont -1}
1936
    wm protocol . WM_DELETE_WINDOW doquit
1937
    bind . <Button-1> "click %W"
1938
    bind $fstring <Key-Return> {dofind 1 1}
1939
    bind $sha1entry <Key-Return> gotocommit
1940
    bind $sha1entry <<PasteSelection>> clearsha1
1941 1942
    bind $cflist <1> {sel_flist %W %x %y; break}
    bind $cflist <B1-Motion> {sel_flist %W %x %y; break}
P
Paul Mackerras 已提交
1943
    bind $cflist <ButtonRelease-1> {treeclick %W %x %y}
1944
    bind $cflist <Button-3> {pop_flist_menu %W %X %Y %x %y}
1945 1946 1947

    set maincursor [. cget -cursor]
    set textcursor [$ctext cget -cursor]
1948
    set curtextcursor $textcursor
1949

1950 1951
    set rowctxmenu .rowctxmenu
    menu $rowctxmenu -tearoff 0
1952
    $rowctxmenu add command -label [mc "Diff this -> selected"] \
1953
	-command {diffvssel 0}
1954
    $rowctxmenu add command -label [mc "Diff selected -> this"] \
1955
	-command {diffvssel 1}
1956 1957 1958 1959 1960
    $rowctxmenu add command -label [mc "Make patch"] -command mkpatch
    $rowctxmenu add command -label [mc "Create tag"] -command mktag
    $rowctxmenu add command -label [mc "Write commit to file"] -command writecommit
    $rowctxmenu add command -label [mc "Create new branch"] -command mkbranch
    $rowctxmenu add command -label [mc "Cherry-pick this commit"] \
1961
	-command cherrypick
1962
    $rowctxmenu add command -label [mc "Reset HEAD branch to here"] \
1963
	-command resethead
1964

1965 1966
    set fakerowmenu .fakerowmenu
    menu $fakerowmenu -tearoff 0
1967
    $fakerowmenu add command -label [mc "Diff this -> selected"] \
1968
	-command {diffvssel 0}
1969
    $fakerowmenu add command -label [mc "Diff selected -> this"] \
1970
	-command {diffvssel 1}
1971 1972 1973 1974
    $fakerowmenu add command -label [mc "Make patch"] -command mkpatch
#    $fakerowmenu add command -label [mc "Commit"] -command {mkcommit 0}
#    $fakerowmenu add command -label [mc "Commit all"] -command {mkcommit 1}
#    $fakerowmenu add command -label [mc "Revert local changes"] -command revertlocal
1975

1976 1977
    set headctxmenu .headctxmenu
    menu $headctxmenu -tearoff 0
1978
    $headctxmenu add command -label [mc "Check out this branch"] \
1979
	-command cobranch
1980
    $headctxmenu add command -label [mc "Remove this branch"] \
1981
	-command rmbranch
1982 1983 1984 1985

    global flist_menu
    set flist_menu .flistctxmenu
    menu $flist_menu -tearoff 0
1986
    $flist_menu add command -label [mc "Highlight this too"] \
1987
	-command {flist_hl 0}
1988
    $flist_menu add command -label [mc "Highlight this only"] \
1989
	-command {flist_hl 1}
1990 1991
}

1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
# Windows sends all mouse wheel events to the current focused window, not
# the one where the mouse hovers, so bind those events here and redirect
# to the correct window
proc windows_mousewheel_redirector {W X Y D} {
    global canv canv2 canv3
    set w [winfo containing -displayof $W $X $Y]
    if {$w ne ""} {
	set u [expr {$D < 0 ? 5 : -5}]
	if {$w == $canv || $w == $canv2 || $w == $canv3} {
	    allcanvs yview scroll $u units
	} else {
	    catch {
		$w yview scroll $u units
	    }
	}
    }
}

2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022
# mouse-2 makes all windows scan vertically, but only the one
# the cursor is in scans horizontally
proc canvscan {op w x y} {
    global canv canv2 canv3
    foreach c [list $canv $canv2 $canv3] {
	if {$c == $w} {
	    $c scan $op $x $y
	} else {
	    $c scan $op 0 $y
	}
    }
}

P
Paul Mackerras 已提交
2023 2024
proc scrollcanv {cscroll f0 f1} {
    $cscroll set $f0 $f1
2025
    drawvisible
2026
    flushhighlights
P
Paul Mackerras 已提交
2027 2028
}

2029 2030 2031 2032
# 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} {
2033
    global entries
2034 2035 2036 2037 2038
    bind . $ev $script
    set escript [bind Entry $ev]
    if {$escript == {}} {
	set escript [bind Entry <Key>]
    }
2039 2040 2041
    foreach e $entries {
	bind $e $ev "$escript; break"
    }
2042 2043 2044
}

# set the focus back to the toplevel for any click outside
2045
# the entry widgets
2046
proc click {w} {
2047 2048
    global ctext entries
    foreach e [concat $entries $ctext] {
2049
	if {$w == $e} return
2050
    }
2051
    focus .
2052 2053
}

2054 2055 2056 2057
# Adjust the progress bar for a change in requested extent or canvas size
proc adjustprogress {} {
    global progresscanv progressitem progresscoords
    global fprogitem fprogcoord lastprogupdate progupdatepending
2058
    global rprogitem rprogcoord
2059 2060 2061 2062 2063 2064 2065

    set w [expr {[winfo width $progresscanv] - 4}]
    set x0 [expr {$w * [lindex $progresscoords 0]}]
    set x1 [expr {$w * [lindex $progresscoords 1]}]
    set h [winfo height $progresscanv]
    $progresscanv coords $progressitem $x0 0 $x1 $h
    $progresscanv coords $fprogitem 0 0 [expr {$w * $fprogcoord}] $h
2066
    $progresscanv coords $rprogitem 0 0 [expr {$w * $rprogcoord}] $h
2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086
    set now [clock clicks -milliseconds]
    if {$now >= $lastprogupdate + 100} {
	set progupdatepending 0
	update
    } elseif {!$progupdatepending} {
	set progupdatepending 1
	after [expr {$lastprogupdate + 100 - $now}] doprogupdate
    }
}

proc doprogupdate {} {
    global lastprogupdate progupdatepending

    if {$progupdatepending} {
	set progupdatepending 0
	set lastprogupdate [clock clicks -milliseconds]
	update
    }
}

2087
proc savestuff {w} {
2088
    global canv canv2 canv3 mainfont textfont uifont tabstop
2089
    global stuffsaved findmergefiles maxgraphpct
2090
    global maxwidth showneartags showlocalchanges
2091
    global viewname viewfiles viewargs viewargscmd viewperm nextviewnum
2092
    global cmitmode wrapcomment datetimeformat limitdiffs
2093
    global colors bgcolor fgcolor diffcolors diffcontext selectbgcolor
2094
    global autoselect
2095

2096
    if {$stuffsaved} return
2097
    if {![winfo viewable .]} return
2098 2099
    catch {
	set f [open "~/.gitk-new" w]
2100 2101
	puts $f [list set mainfont $mainfont]
	puts $f [list set textfont $textfont]
2102
	puts $f [list set uifont $uifont]
2103
	puts $f [list set tabstop $tabstop]
2104
	puts $f [list set findmergefiles $findmergefiles]
2105
	puts $f [list set maxgraphpct $maxgraphpct]
2106
	puts $f [list set maxwidth $maxwidth]
P
Paul Mackerras 已提交
2107
	puts $f [list set cmitmode $cmitmode]
2108
	puts $f [list set wrapcomment $wrapcomment]
2109
	puts $f [list set autoselect $autoselect]
P
Paul Mackerras 已提交
2110
	puts $f [list set showneartags $showneartags]
2111
	puts $f [list set showlocalchanges $showlocalchanges]
2112
	puts $f [list set datetimeformat $datetimeformat]
2113
	puts $f [list set limitdiffs $limitdiffs]
2114 2115 2116 2117
	puts $f [list set bgcolor $bgcolor]
	puts $f [list set fgcolor $fgcolor]
	puts $f [list set colors $colors]
	puts $f [list set diffcolors $diffcolors]
2118
	puts $f [list set diffcontext $diffcontext]
2119
	puts $f [list set selectbgcolor $selectbgcolor]
2120

2121
	puts $f "set geometry(main) [wm geometry .]"
2122 2123
	puts $f "set geometry(topwidth) [winfo width .tf]"
	puts $f "set geometry(topheight) [winfo height .tf]"
2124 2125
        puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\""
        puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\""
2126 2127 2128
	puts $f "set geometry(botwidth) [winfo width .bleft]"
	puts $f "set geometry(botheight) [winfo height .bleft]"

2129 2130 2131
	puts -nonewline $f "set permviews {"
	for {set v 0} {$v < $nextviewnum} {incr v} {
	    if {$viewperm($v)} {
2132
		puts $f "{[list $viewname($v) $viewfiles($v) $viewargs($v) $viewargscmd($v)]}"
2133 2134 2135
	    }
	}
	puts $f "}"
2136 2137 2138 2139
	close $f
	file rename -force "~/.gitk-new" "~/.gitk"
    }
    set stuffsaved 1
2140 2141
}

2142 2143
proc resizeclistpanes {win w} {
    global oldwidth
2144
    if {[info exists oldwidth($win)]} {
2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157
	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} {
J
Jeff Hobbs 已提交
2158
		set sash1 [expr {$sash0 + 20}]
2159 2160
	    }
	    if {$sash1 > $w - 10} {
J
Jeff Hobbs 已提交
2161
		set sash1 [expr {$w - 10}]
2162
		if {$sash0 > $sash1 - 20} {
J
Jeff Hobbs 已提交
2163
		    set sash0 [expr {$sash1 - 20}]
2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174
		}
	    }
	}
	$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
2175
    if {[info exists oldwidth($win)]} {
2176 2177 2178 2179 2180 2181 2182 2183 2184 2185
	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} {
J
Jeff Hobbs 已提交
2186
		set sash0 [expr {$w - 15}]
2187 2188 2189 2190 2191 2192 2193
	    }
	}
	$win sash place 0 $sash0 [lindex $s0 1]
    }
    set oldwidth($win) $w
}

2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207
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
}

2208
proc about {} {
2209
    global uifont
2210 2211 2212 2213 2214 2215
    set w .about
    if {[winfo exists $w]} {
	raise $w
	return
    }
    toplevel $w
2216 2217
    wm title $w [mc "About gitk"]
    message $w.m -text [mc "
P
Paul Mackerras 已提交
2218
Gitk - a commit viewer for git
2219

2220
Copyright © 2005-2006 Paul Mackerras
2221

2222
Use and redistribute under the terms of the GNU General Public License"] \
2223 2224
	    -justify center -aspect 400 -border 2 -bg white -relief groove
    pack $w.m -side top -fill x -padx 2 -pady 2
2225
    button $w.ok -text [mc "Close"] -command "destroy $w" -default active
2226
    pack $w.ok -side bottom
2227 2228 2229
    bind $w <Visibility> "focus $w.ok"
    bind $w <Key-Escape> "destroy $w"
    bind $w <Key-Return> "destroy $w"
2230 2231
}

2232 2233 2234 2235 2236 2237
proc keys {} {
    set w .keys
    if {[winfo exists $w]} {
	raise $w
	return
    }
2238 2239 2240 2241 2242
    if {[tk windowingsystem] eq {aqua}} {
	set M1T Cmd
    } else {
	set M1T Ctrl
    }
2243
    toplevel $w
2244
    wm title $w [mc "Gitk key bindings"]
2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283
    message $w.m -text "
[mc "Gitk key bindings:"]

[mc "<%s-Q>		Quit" $M1T]
[mc "<Home>		Move to first commit"]
[mc "<End>		Move to last commit"]
[mc "<Up>, p, i	Move up one commit"]
[mc "<Down>, n, k	Move down one commit"]
[mc "<Left>, z, j	Go back in history list"]
[mc "<Right>, x, l	Go forward in history list"]
[mc "<PageUp>	Move up one page in commit list"]
[mc "<PageDown>	Move down one page in commit list"]
[mc "<%s-Home>	Scroll to top of commit list" $M1T]
[mc "<%s-End>	Scroll to bottom of commit list" $M1T]
[mc "<%s-Up>	Scroll commit list up one line" $M1T]
[mc "<%s-Down>	Scroll commit list down one line" $M1T]
[mc "<%s-PageUp>	Scroll commit list up one page" $M1T]
[mc "<%s-PageDown>	Scroll commit list down one page" $M1T]
[mc "<Shift-Up>	Find backwards (upwards, later commits)"]
[mc "<Shift-Down>	Find forwards (downwards, earlier commits)"]
[mc "<Delete>, b	Scroll diff view up one page"]
[mc "<Backspace>	Scroll diff view up one page"]
[mc "<Space>		Scroll diff view down one page"]
[mc "u		Scroll diff view up 18 lines"]
[mc "d		Scroll diff view down 18 lines"]
[mc "<%s-F>		Find" $M1T]
[mc "<%s-G>		Move to next find hit" $M1T]
[mc "<Return>	Move to next find hit"]
[mc "/		Move to next find hit, or redo find"]
[mc "?		Move to previous find hit"]
[mc "f		Scroll diff view to next file"]
[mc "<%s-S>		Search for next hit in diff view" $M1T]
[mc "<%s-R>		Search for previous hit in diff view" $M1T]
[mc "<%s-KP+>	Increase font size" $M1T]
[mc "<%s-plus>	Increase font size" $M1T]
[mc "<%s-KP->	Decrease font size" $M1T]
[mc "<%s-minus>	Decrease font size" $M1T]
[mc "<F5>		Update"]
" \
2284 2285
	    -justify left -bg white -border 2 -relief groove
    pack $w.m -side top -fill both -padx 2 -pady 2
2286
    button $w.ok -text [mc "Close"] -command "destroy $w" -default active
2287
    pack $w.ok -side bottom
2288 2289 2290
    bind $w <Visibility> "focus $w.ok"
    bind $w <Key-Escape> "destroy $w"
    bind $w <Key-Return> "destroy $w"
2291 2292
}

2293 2294
# Procedures for manipulating the file list window at the
# bottom right of the overall window.
P
Paul Mackerras 已提交
2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347

proc treeview {w l openlevs} {
    global treecontents treediropen treeheight treeparent treeindex

    set ix 0
    set treeindex() 0
    set lev 0
    set prefix {}
    set prefixend -1
    set prefendstack {}
    set htstack {}
    set ht 0
    set treecontents() {}
    $w conf -state normal
    foreach f $l {
	while {[string range $f 0 $prefixend] ne $prefix} {
	    if {$lev <= $openlevs} {
		$w mark set e:$treeindex($prefix) "end -1c"
		$w mark gravity e:$treeindex($prefix) left
	    }
	    set treeheight($prefix) $ht
	    incr ht [lindex $htstack end]
	    set htstack [lreplace $htstack end end]
	    set prefixend [lindex $prefendstack end]
	    set prefendstack [lreplace $prefendstack end end]
	    set prefix [string range $prefix 0 $prefixend]
	    incr lev -1
	}
	set tail [string range $f [expr {$prefixend+1}] end]
	while {[set slash [string first "/" $tail]] >= 0} {
	    lappend htstack $ht
	    set ht 0
	    lappend prefendstack $prefixend
	    incr prefixend [expr {$slash + 1}]
	    set d [string range $tail 0 $slash]
	    lappend treecontents($prefix) $d
	    set oldprefix $prefix
	    append prefix $d
	    set treecontents($prefix) {}
	    set treeindex($prefix) [incr ix]
	    set treeparent($prefix) $oldprefix
	    set tail [string range $tail [expr {$slash+1}] end]
	    if {$lev <= $openlevs} {
		set ht 1
		set treediropen($prefix) [expr {$lev < $openlevs}]
		set bm [expr {$lev == $openlevs? "tri-rt": "tri-dn"}]
		$w mark set d:$ix "end -1c"
		$w mark gravity d:$ix left
		set str "\n"
		for {set i 0} {$i < $lev} {incr i} {append str "\t"}
		$w insert end $str
		$w image create end -align center -image $bm -padx 1 \
		    -name a:$ix
2348
		$w insert end $d [highlight_tag $prefix]
P
Paul Mackerras 已提交
2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359
		$w mark set s:$ix "end -1c"
		$w mark gravity s:$ix left
	    }
	    incr lev
	}
	if {$tail ne {}} {
	    if {$lev <= $openlevs} {
		incr ht
		set str "\n"
		for {set i 0} {$i < $lev} {incr i} {append str "\t"}
		$w insert end $str
2360
		$w insert end $tail [highlight_tag $f]
P
Paul Mackerras 已提交
2361 2362 2363 2364 2365 2366 2367 2368
	    }
	    lappend treecontents($prefix) $tail
	}
    }
    while {$htstack ne {}} {
	set treeheight($prefix) $ht
	incr ht [lindex $htstack end]
	set htstack [lreplace $htstack end end]
2369 2370 2371
	set prefixend [lindex $prefendstack end]
	set prefendstack [lreplace $prefendstack end end]
	set prefix [string range $prefix 0 $prefixend]
P
Paul Mackerras 已提交
2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399
    }
    $w conf -state disabled
}

proc linetoelt {l} {
    global treeheight treecontents

    set y 2
    set prefix {}
    while {1} {
	foreach e $treecontents($prefix) {
	    if {$y == $l} {
		return "$prefix$e"
	    }
	    set n 1
	    if {[string index $e end] eq "/"} {
		set n $treeheight($prefix$e)
		if {$y + $n > $l} {
		    append prefix $e
		    incr y
		    break
		}
	    }
	    incr y $n
	}
    }
}

2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415
proc highlight_tree {y prefix} {
    global treeheight treecontents cflist

    foreach e $treecontents($prefix) {
	set path $prefix$e
	if {[highlight_tag $path] ne {}} {
	    $cflist tag add bold $y.0 "$y.0 lineend"
	}
	incr y
	if {[string index $e end] eq "/" && $treeheight($path) > 1} {
	    set y [highlight_tree $y $path]
	}
    }
    return $y
}

P
Paul Mackerras 已提交
2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448
proc treeclosedir {w dir} {
    global treediropen treeheight treeparent treeindex

    set ix $treeindex($dir)
    $w conf -state normal
    $w delete s:$ix e:$ix
    set treediropen($dir) 0
    $w image configure a:$ix -image tri-rt
    $w conf -state disabled
    set n [expr {1 - $treeheight($dir)}]
    while {$dir ne {}} {
	incr treeheight($dir) $n
	set dir $treeparent($dir)
    }
}

proc treeopendir {w dir} {
    global treediropen treeheight treeparent treecontents treeindex

    set ix $treeindex($dir)
    $w conf -state normal
    $w image configure a:$ix -image tri-dn
    $w mark set e:$ix s:$ix
    $w mark gravity e:$ix right
    set lev 0
    set str "\n"
    set n [llength $treecontents($dir)]
    for {set x $dir} {$x ne {}} {set x $treeparent($x)} {
	incr lev
	append str "\t"
	incr treeheight($x) $n
    }
    foreach e $treecontents($dir) {
2449
	set de $dir$e
P
Paul Mackerras 已提交
2450 2451 2452 2453 2454 2455 2456 2457
	if {[string index $e end] eq "/"} {
	    set iy $treeindex($de)
	    $w mark set d:$iy e:$ix
	    $w mark gravity d:$iy left
	    $w insert e:$ix $str
	    set treediropen($de) 0
	    $w image create e:$ix -align center -image tri-rt -padx 1 \
		-name a:$iy
2458
	    $w insert e:$ix $e [highlight_tag $de]
P
Paul Mackerras 已提交
2459 2460 2461 2462 2463
	    $w mark set s:$iy e:$ix
	    $w mark gravity s:$iy left
	    set treeheight($de) 1
	} else {
	    $w insert e:$ix $str
2464
	    $w insert e:$ix $e [highlight_tag $de]
P
Paul Mackerras 已提交
2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543
	}
    }
    $w mark gravity e:$ix left
    $w conf -state disabled
    set treediropen($dir) 1
    set top [lindex [split [$w index @0,0] .] 0]
    set ht [$w cget -height]
    set l [lindex [split [$w index s:$ix] .] 0]
    if {$l < $top} {
	$w yview $l.0
    } elseif {$l + $n + 1 > $top + $ht} {
	set top [expr {$l + $n + 2 - $ht}]
	if {$l < $top} {
	    set top $l
	}
	$w yview $top.0
    }
}

proc treeclick {w x y} {
    global treediropen cmitmode ctext cflist cflist_top

    if {$cmitmode ne "tree"} return
    if {![info exists cflist_top]} return
    set l [lindex [split [$w index "@$x,$y"] "."] 0]
    $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
    $cflist tag add highlight $l.0 "$l.0 lineend"
    set cflist_top $l
    if {$l == 1} {
	$ctext yview 1.0
	return
    }
    set e [linetoelt $l]
    if {[string index $e end] ne "/"} {
	showfile $e
    } elseif {$treediropen($e)} {
	treeclosedir $w $e
    } else {
	treeopendir $w $e
    }
}

proc setfilelist {id} {
    global treefilelist cflist

    treeview $cflist $treefilelist($id) 0
}

image create bitmap tri-rt -background black -foreground blue -data {
    #define tri-rt_width 13
    #define tri-rt_height 13
    static unsigned char tri-rt_bits[] = {
       0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x00, 0x70, 0x00, 0xf0, 0x00,
       0xf0, 0x01, 0xf0, 0x00, 0x70, 0x00, 0x30, 0x00, 0x10, 0x00, 0x00, 0x00,
       0x00, 0x00};
} -maskdata {
    #define tri-rt-mask_width 13
    #define tri-rt-mask_height 13
    static unsigned char tri-rt-mask_bits[] = {
       0x08, 0x00, 0x18, 0x00, 0x38, 0x00, 0x78, 0x00, 0xf8, 0x00, 0xf8, 0x01,
       0xf8, 0x03, 0xf8, 0x01, 0xf8, 0x00, 0x78, 0x00, 0x38, 0x00, 0x18, 0x00,
       0x08, 0x00};
}
image create bitmap tri-dn -background black -foreground blue -data {
    #define tri-dn_width 13
    #define tri-dn_height 13
    static unsigned char tri-dn_bits[] = {
       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x07, 0xf8, 0x03,
       0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
       0x00, 0x00};
} -maskdata {
    #define tri-dn-mask_width 13
    #define tri-dn-mask_height 13
    static unsigned char tri-dn-mask_bits[] = {
       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0xfe, 0x0f, 0xfc, 0x07,
       0xf8, 0x03, 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
       0x00, 0x00};
}

2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575
image create bitmap reficon-T -background black -foreground yellow -data {
    #define tagicon_width 13
    #define tagicon_height 9
    static unsigned char tagicon_bits[] = {
       0x00, 0x00, 0x00, 0x00, 0xf0, 0x07, 0xf8, 0x07,
       0xfc, 0x07, 0xf8, 0x07, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00};
} -maskdata {
    #define tagicon-mask_width 13
    #define tagicon-mask_height 9
    static unsigned char tagicon-mask_bits[] = {
       0x00, 0x00, 0xf0, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
       0xfe, 0x0f, 0xfc, 0x0f, 0xf8, 0x0f, 0xf0, 0x0f, 0x00, 0x00};
}
set rectdata {
    #define headicon_width 13
    #define headicon_height 9
    static unsigned char headicon_bits[] = {
       0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xf8, 0x07,
       0xf8, 0x07, 0xf8, 0x07, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00};
}
set rectmask {
    #define headicon-mask_width 13
    #define headicon-mask_height 9
    static unsigned char headicon-mask_bits[] = {
       0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
       0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00};
}
image create bitmap reficon-H -background black -foreground green \
    -data $rectdata -maskdata $rectmask
image create bitmap reficon-o -background black -foreground "#ddddff" \
    -data $rectdata -maskdata $rectmask

2576
proc init_flist {first} {
2577
    global cflist cflist_top difffilestart
2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591

    $cflist conf -state normal
    $cflist delete 0.0 end
    if {$first ne {}} {
	$cflist insert end $first
	set cflist_top 1
	$cflist tag add highlight 1.0 "1.0 lineend"
    } else {
	catch {unset cflist_top}
    }
    $cflist conf -state disabled
    set difffilestart {}
}

2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603
proc highlight_tag {f} {
    global highlight_paths

    foreach p $highlight_paths {
	if {[string match $p $f]} {
	    return "bold"
	}
    }
    return {}
}

proc highlight_filelist {} {
2604
    global cmitmode cflist
2605

2606 2607
    $cflist conf -state normal
    if {$cmitmode ne "tree"} {
2608 2609 2610 2611 2612 2613 2614
	set end [lindex [split [$cflist index end] .] 0]
	for {set l 2} {$l < $end} {incr l} {
	    set line [$cflist get $l.0 "$l.0 lineend"]
	    if {[highlight_tag $line] ne {}} {
		$cflist tag add bold $l.0 "$l.0 lineend"
	    }
	}
2615 2616
    } else {
	highlight_tree 2 {}
2617
    }
2618
    $cflist conf -state disabled
2619 2620 2621
}

proc unhighlight_filelist {} {
2622
    global cflist
2623

2624 2625 2626
    $cflist conf -state normal
    $cflist tag remove bold 1.0 end
    $cflist conf -state disabled
2627 2628
}

P
Paul Mackerras 已提交
2629
proc add_flist {fl} {
2630
    global cflist
2631

2632 2633 2634 2635
    $cflist conf -state normal
    foreach f $fl {
	$cflist insert end "\n"
	$cflist insert end $f [highlight_tag $f]
2636
    }
2637
    $cflist conf -state disabled
2638 2639 2640
}

proc sel_flist {w x y} {
2641
    global ctext difffilestart cflist cflist_top cmitmode
2642

P
Paul Mackerras 已提交
2643
    if {$cmitmode eq "tree"} return
2644 2645
    if {![info exists cflist_top]} return
    set l [lindex [split [$w index "@$x,$y"] "."] 0]
2646 2647 2648
    $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
    $cflist tag add highlight $l.0 "$l.0 lineend"
    set cflist_top $l
P
Paul Mackerras 已提交
2649 2650 2651 2652
    if {$l == 1} {
	$ctext yview 1.0
    } else {
	catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
2653 2654 2655
    }
}

2656 2657 2658 2659
proc pop_flist_menu {w X Y x y} {
    global ctext cflist cmitmode flist_menu flist_menu_file
    global treediffs diffids

2660
    stopfinding
2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673
    set l [lindex [split [$w index "@$x,$y"] "."] 0]
    if {$l <= 1} return
    if {$cmitmode eq "tree"} {
	set e [linetoelt $l]
	if {[string index $e end] eq "/"} return
    } else {
	set e [lindex $treediffs($diffids) [expr {$l-2}]]
    }
    set flist_menu_file $e
    tk_popup $flist_menu $X $Y
}

proc flist_hl {only} {
2674
    global flist_menu_file findstring gdttype
2675 2676

    set x [shellquote $flist_menu_file]
2677
    if {$only || $findstring eq {} || $gdttype ne [mc "touching paths:"]} {
2678
	set findstring $x
2679
    } else {
2680
	append findstring " " $x
2681
    }
2682
    set gdttype [mc "touching paths:"]
2683 2684
}

2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778
# Functions for adding and removing shell-type quoting

proc shellquote {str} {
    if {![string match "*\['\"\\ \t]*" $str]} {
	return $str
    }
    if {![string match "*\['\"\\]*" $str]} {
	return "\"$str\""
    }
    if {![string match "*'*" $str]} {
	return "'$str'"
    }
    return "\"[string map {\" \\\" \\ \\\\} $str]\""
}

proc shellarglist {l} {
    set str {}
    foreach a $l {
	if {$str ne {}} {
	    append str " "
	}
	append str [shellquote $a]
    }
    return $str
}

proc shelldequote {str} {
    set ret {}
    set used -1
    while {1} {
	incr used
	if {![regexp -start $used -indices "\['\"\\\\ \t]" $str first]} {
	    append ret [string range $str $used end]
	    set used [string length $str]
	    break
	}
	set first [lindex $first 0]
	set ch [string index $str $first]
	if {$first > $used} {
	    append ret [string range $str $used [expr {$first - 1}]]
	    set used $first
	}
	if {$ch eq " " || $ch eq "\t"} break
	incr used
	if {$ch eq "'"} {
	    set first [string first "'" $str $used]
	    if {$first < 0} {
		error "unmatched single-quote"
	    }
	    append ret [string range $str $used [expr {$first - 1}]]
	    set used $first
	    continue
	}
	if {$ch eq "\\"} {
	    if {$used >= [string length $str]} {
		error "trailing backslash"
	    }
	    append ret [string index $str $used]
	    continue
	}
	# here ch == "\""
	while {1} {
	    if {![regexp -start $used -indices "\[\"\\\\]" $str first]} {
		error "unmatched double-quote"
	    }
	    set first [lindex $first 0]
	    set ch [string index $str $first]
	    if {$first > $used} {
		append ret [string range $str $used [expr {$first - 1}]]
		set used $first
	    }
	    if {$ch eq "\""} break
	    incr used
	    append ret [string index $str $used]
	    incr used
	}
    }
    return [list $used $ret]
}

proc shellsplit {str} {
    set l {}
    while {1} {
	set str [string trimleft $str]
	if {$str eq {}} break
	set dq [shelldequote $str]
	set n [lindex $dq 0]
	set word [lindex $dq 1]
	set str [string range $str $n end]
	lappend l $word
    }
    return $l
}

2779 2780
# Code to implement multiple views

2781
proc newview {ishighlight} {
2782
    global nextviewnum newviewname newviewperm newishighlight
2783
    global newviewargs revtreeargs viewargscmd newviewargscmd curview
P
Paul Mackerras 已提交
2784

2785
    set newishighlight $ishighlight
P
Paul Mackerras 已提交
2786 2787 2788 2789 2790
    set top .gitkview
    if {[winfo exists $top]} {
	raise $top
	return
    }
2791
    set newviewname($nextviewnum) "[mc "View"] $nextviewnum"
2792
    set newviewperm($nextviewnum) 0
2793
    set newviewargs($nextviewnum) [shellarglist $revtreeargs]
2794
    set newviewargscmd($nextviewnum) $viewargscmd($curview)
2795
    vieweditor $top $nextviewnum [mc "Gitk view definition"]
2796 2797 2798 2799 2800
}

proc editview {} {
    global curview
    global viewname viewperm newviewname newviewperm
2801
    global viewargs newviewargs viewargscmd newviewargscmd
2802 2803 2804 2805 2806 2807 2808 2809

    set top .gitkvedit-$curview
    if {[winfo exists $top]} {
	raise $top
	return
    }
    set newviewname($curview) $viewname($curview)
    set newviewperm($curview) $viewperm($curview)
2810
    set newviewargs($curview) [shellarglist $viewargs($curview)]
2811
    set newviewargscmd($curview) $viewargscmd($curview)
2812 2813 2814 2815
    vieweditor $top $curview "Gitk: edit view $viewname($curview)"
}

proc vieweditor {top n title} {
2816
    global newviewname newviewperm viewfiles bgcolor
2817

P
Paul Mackerras 已提交
2818
    toplevel $top
2819
    wm title $top $title
2820 2821
    label $top.nl -text [mc "Name"]
    entry $top.name -width 20 -textvariable newviewname($n)
2822
    grid $top.nl $top.name -sticky w -pady 5
2823 2824
    checkbutton $top.perm -text [mc "Remember this view"] \
	-variable newviewperm($n)
2825
    grid $top.perm - -pady 5 -sticky w
2826
    message $top.al -aspect 1000 \
2827
	-text [mc "Commits to include (arguments to git log):"]
2828 2829
    grid $top.al - -sticky w -pady 5
    entry $top.args -width 50 -textvariable newviewargs($n) \
2830
	-background $bgcolor
2831
    grid $top.args - -sticky ew -padx 5
2832 2833 2834 2835 2836 2837 2838 2839

    message $top.ac -aspect 1000 \
	-text [mc "Command to generate more commits to include:"]
    grid $top.ac - -sticky w -pady 5
    entry $top.argscmd -width 50 -textvariable newviewargscmd($n) \
	-background white
    grid $top.argscmd - -sticky ew -padx 5

2840
    message $top.l -aspect 1000 \
2841
	-text [mc "Enter files and directories to include, one per line:"]
2842
    grid $top.l - -sticky w
2843
    text $top.t -width 40 -height 10 -background $bgcolor -font uifont
2844 2845 2846 2847 2848 2849 2850 2851
    if {[info exists viewfiles($n)]} {
	foreach f $viewfiles($n) {
	    $top.t insert end $f
	    $top.t insert end "\n"
	}
	$top.t delete {end - 1c} end
	$top.t mark set insert 0.0
    }
2852
    grid $top.t - -sticky ew -padx 5
P
Paul Mackerras 已提交
2853
    frame $top.buts
2854 2855
    button $top.buts.ok -text [mc "OK"] -command [list newviewok $top $n]
    button $top.buts.can -text [mc "Cancel"] -command [list destroy $top]
P
Paul Mackerras 已提交
2856 2857 2858 2859 2860 2861 2862
    grid $top.buts.ok $top.buts.can
    grid columnconfigure $top.buts 0 -weight 1 -uniform a
    grid columnconfigure $top.buts 1 -weight 1 -uniform a
    grid $top.buts - -pady 10 -sticky ew
    focus $top.t
}

2863
proc doviewmenu {m first cmd op argv} {
2864 2865 2866
    set nmenu [$m index end]
    for {set i $first} {$i <= $nmenu} {incr i} {
	if {[$m entrycget $i -command] eq $cmd} {
2867
	    eval $m $op $i $argv
2868
	    break
2869 2870
	}
    }
2871 2872 2873
}

proc allviewmenus {n op args} {
2874
    # global viewhlmenu
2875

2876
    doviewmenu .bar.view 5 [list showview $n] $op $args
2877
    # doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
2878 2879 2880
}

proc newviewok {top n} {
2881
    global nextviewnum newviewperm newviewname newishighlight
2882
    global viewname viewfiles viewperm selectedview curview
2883
    global viewargs newviewargs viewargscmd newviewargscmd viewhlmenu
P
Paul Mackerras 已提交
2884

2885 2886 2887
    if {[catch {
	set newargs [shellsplit $newviewargs($n)]
    } err]} {
2888
	error_popup "[mc "Error in commit selection arguments:"] $err"
2889 2890 2891 2892
	wm raise $top
	focus $top
	return
    }
P
Paul Mackerras 已提交
2893
    set files {}
2894
    foreach f [split [$top.t get 0.0 end] "\n"] {
P
Paul Mackerras 已提交
2895 2896 2897 2898 2899
	set ft [string trim $f]
	if {$ft ne {}} {
	    lappend files $ft
	}
    }
2900 2901 2902 2903 2904 2905
    if {![info exists viewfiles($n)]} {
	# creating a new view
	incr nextviewnum
	set viewname($n) $newviewname($n)
	set viewperm($n) $newviewperm($n)
	set viewfiles($n) $files
2906
	set viewargs($n) $newargs
2907
	set viewargscmd($n) $newviewargscmd($n)
2908 2909
	addviewmenu $n
	if {!$newishighlight} {
2910
	    run showview $n
2911
	} else {
2912
	    run addvhighlight $n
2913
	}
2914 2915 2916 2917 2918
    } else {
	# editing an existing view
	set viewperm($n) $newviewperm($n)
	if {$newviewname($n) ne $viewname($n)} {
	    set viewname($n) $newviewname($n)
2919
	    doviewmenu .bar.view 5 [list showview $n] \
2920
		entryconf [list -label $viewname($n)]
2921 2922
	    # doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
		# entryconf [list -label $viewname($n) -value $viewname($n)]
2923
	}
2924 2925
	if {$files ne $viewfiles($n) || $newargs ne $viewargs($n) || \
		$newviewargscmd($n) ne $viewargscmd($n)} {
2926
	    set viewfiles($n) $files
2927
	    set viewargs($n) $newargs
2928
	    set viewargscmd($n) $newviewargscmd($n)
2929
	    if {$curview == $n} {
2930
		run reloadcommits
2931 2932 2933 2934
	    }
	}
    }
    catch {destroy $top}
P
Paul Mackerras 已提交
2935 2936 2937
}

proc delview {} {
2938
    global curview viewperm hlview selectedhlview
P
Paul Mackerras 已提交
2939 2940

    if {$curview == 0} return
2941
    if {[info exists hlview] && $hlview == $curview} {
2942
	set selectedhlview [mc "None"]
2943 2944
	unset hlview
    }
2945
    allviewmenus $curview delete
2946
    set viewperm($curview) 0
P
Paul Mackerras 已提交
2947 2948 2949
    showview 0
}

2950
proc addviewmenu {n} {
2951
    global viewname viewhlmenu
2952 2953 2954

    .bar.view add radiobutton -label $viewname($n) \
	-command [list showview $n] -variable selectedview -value $n
2955 2956
    #$viewhlmenu add radiobutton -label $viewname($n) \
    #	-command [list addvhighlight $n] -variable selectedhlview
2957 2958
}

P
Paul Mackerras 已提交
2959
proc showview {n} {
2960
    global curview cached_commitrow ordertok
2961
    global displayorder parentlist rowidlist rowisopt rowfinal
2962 2963
    global colormap rowtextx nextcolor canvxmax
    global numcommits viewcomplete
P
Paul Mackerras 已提交
2964
    global selectedline currentid canv canvy0
2965
    global treediffs
2966
    global pending_select mainheadid
2967
    global commitidx
2968
    global selectedview
2969
    global hlview selectedhlview commitinterest
P
Paul Mackerras 已提交
2970 2971 2972

    if {$n == $curview} return
    set selid {}
2973 2974 2975 2976 2977
    set ymax [lindex [$canv cget -scrollregion] 3]
    set span [$canv yview]
    set ytop [expr {[lindex $span 0] * $ymax}]
    set ybot [expr {[lindex $span 1] * $ymax}]
    set yscreen [expr {($ybot - $ytop) / 2}]
P
Paul Mackerras 已提交
2978 2979 2980 2981 2982 2983
    if {[info exists selectedline]} {
	set selid $currentid
	set y [yc $selectedline]
	if {$ytop < $y && $y < $ybot} {
	    set yscreen [expr {$y - $ytop}]
	}
2984 2985 2986
    } elseif {[info exists pending_select]} {
	set selid $pending_select
	unset pending_select
P
Paul Mackerras 已提交
2987 2988
    }
    unselectline
2989
    normalline
P
Paul Mackerras 已提交
2990 2991
    catch {unset treediffs}
    clear_display
2992 2993
    if {[info exists hlview] && $hlview == $n} {
	unset hlview
2994
	set selectedhlview [mc "None"]
2995
    }
2996
    catch {unset commitinterest}
2997
    catch {unset cached_commitrow}
2998
    catch {unset ordertok}
P
Paul Mackerras 已提交
2999 3000

    set curview $n
3001
    set selectedview $n
3002 3003
    .bar.view entryconf [mc "Edit view..."] -state [expr {$n == 0? "disabled": "normal"}]
    .bar.view entryconf [mc "Delete view"] -state [expr {$n == 0? "disabled": "normal"}]
P
Paul Mackerras 已提交
3004

3005
    run refill_reflist
3006
    if {![info exists viewcomplete($n)]} {
3007 3008 3009
	if {$selid ne {}} {
	    set pending_select $selid
	}
3010
	getcommits
P
Paul Mackerras 已提交
3011 3012 3013
	return
    }

3014 3015 3016 3017 3018
    set displayorder {}
    set parentlist {}
    set rowidlist {}
    set rowisopt {}
    set rowfinal {}
3019
    set numcommits $commitidx($n)
3020

P
Paul Mackerras 已提交
3021 3022
    catch {unset colormap}
    catch {unset rowtextx}
3023 3024
    set nextcolor 0
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
3025 3026 3027 3028
    set curview $n
    set row 0
    setcanvscroll
    set yf 0
3029
    set row {}
3030 3031
    if {$selid ne {} && [commitinview $selid $n]} {
	set row [rowofcommit $selid]
P
Paul Mackerras 已提交
3032 3033 3034 3035 3036 3037 3038 3039 3040 3041
	# try to get the selected row in the same position on the screen
	set ymax [lindex [$canv cget -scrollregion] 3]
	set ytop [expr {[yc $row] - $yscreen}]
	if {$ytop < 0} {
	    set ytop 0
	}
	set yf [expr {$ytop * 1.0 / $ymax}]
    }
    allcanvs yview moveto $yf
    drawvisible
3042 3043
    if {$row ne {}} {
	selectline $row 0
3044 3045 3046 3047 3048 3049 3050 3051
    } elseif {$mainheadid ne {} && [commitinview $mainheadid $curview]} {
	selectline [rowofcommit $mainheadid] 1
    } elseif {!$viewcomplete($n)} {
	if {$selid ne {}} {
	    set pending_select $selid
	} else {
	    set pending_select $mainheadid
	}
3052
    } else {
3053
	set row [first_real_row]
3054 3055
	if {$row < $numcommits} {
	    selectline $row 0
3056 3057
	}
    }
3058 3059
    if {!$viewcomplete($n)} {
	if {$numcommits == 0} {
3060
	    show_status [mc "Reading commits..."]
3061
	}
3062
    } elseif {$numcommits == 0} {
3063
	show_status [mc "No commits selected"]
3064
    }
P
Paul Mackerras 已提交
3065 3066
}

3067 3068
# Stuff relating to the highlighting facility

3069
proc ishighlighted {id} {
3070
    global vhighlights fhighlights nhighlights rhighlights
3071

3072 3073
    if {[info exists nhighlights($id)] && $nhighlights($id) > 0} {
	return $nhighlights($id)
3074
    }
3075 3076
    if {[info exists vhighlights($id)] && $vhighlights($id) > 0} {
	return $vhighlights($id)
3077
    }
3078 3079
    if {[info exists fhighlights($id)] && $fhighlights($id) > 0} {
	return $fhighlights($id)
3080
    }
3081 3082
    if {[info exists rhighlights($id)] && $rhighlights($id) > 0} {
	return $rhighlights($id)
3083
    }
3084 3085 3086 3087
    return 0
}

proc bolden {row font} {
3088
    global canv linehtag selectedline boldrows
3089

3090
    lappend boldrows $row
3091
    $canv itemconf $linehtag($row) -font $font
3092
    if {[info exists selectedline] && $row == $selectedline} {
3093 3094 3095 3096 3097 3098 3099 3100 3101
	$canv delete secsel
	set t [eval $canv create rect [$canv bbox $linehtag($row)] \
		   -outline {{}} -tags secsel \
		   -fill [$canv cget -selectbackground]]
	$canv lower $t
    }
}

proc bolden_name {row font} {
3102
    global canv2 linentag selectedline boldnamerows
3103

3104
    lappend boldnamerows $row
3105
    $canv2 itemconf $linentag($row) -font $font
3106
    if {[info exists selectedline] && $row == $selectedline} {
3107 3108 3109 3110 3111 3112 3113 3114
	$canv2 delete secsel
	set t [eval $canv2 create rect [$canv2 bbox $linentag($row)] \
		   -outline {{}} -tags secsel \
		   -fill [$canv2 cget -selectbackground]]
	$canv2 lower $t
    }
}

3115
proc unbolden {} {
3116
    global boldrows
3117

3118 3119
    set stillbold {}
    foreach row $boldrows {
3120
	if {![ishighlighted [commitonrow $row]]} {
3121
	    bolden $row mainfont
3122 3123
	} else {
	    lappend stillbold $row
3124 3125
	}
    }
3126
    set boldrows $stillbold
3127 3128 3129
}

proc addvhighlight {n} {
3130
    global hlview viewcomplete curview vhl_done commitidx
3131 3132

    if {[info exists hlview]} {
3133
	delvhighlight
3134 3135
    }
    set hlview $n
3136
    if {$n != $curview && ![info exists viewcomplete($n)]} {
3137
	start_rev_list $n
3138 3139 3140 3141
    }
    set vhl_done $commitidx($hlview)
    if {$vhl_done > 0} {
	drawvisible
3142 3143 3144
    }
}

3145 3146
proc delvhighlight {} {
    global hlview vhighlights
3147 3148 3149

    if {![info exists hlview]} return
    unset hlview
3150 3151
    catch {unset vhighlights}
    unbolden
3152 3153
}

3154
proc vhighlightmore {} {
3155
    global hlview vhl_done commitidx vhighlights curview
3156 3157

    set max $commitidx($hlview)
3158 3159 3160 3161
    set vr [visiblerows]
    set r0 [lindex $vr 0]
    set r1 [lindex $vr 1]
    for {set i $vhl_done} {$i < $max} {incr i} {
3162 3163 3164
	set id [commitonrow $i $hlview]
	if {[commitinview $id $curview]} {
	    set row [rowofcommit $id]
3165 3166
	    if {$r0 <= $row && $row <= $r1} {
		if {![highlighted $row]} {
3167
		    bolden $row mainfontbold
3168
		}
3169
		set vhighlights($id) 1
3170 3171 3172
	    }
	}
    }
3173
    set vhl_done $max
3174
    return 0
3175 3176 3177
}

proc askvhighlight {row id} {
3178
    global hlview vhighlights iddrawn
3179

3180
    if {[commitinview $id $hlview]} {
3181
	if {[info exists iddrawn($id)] && ![ishighlighted $id]} {
3182
	    bolden $row mainfontbold
3183
	}
3184
	set vhighlights($id) 1
3185
    } else {
3186
	set vhighlights($id) 0
3187 3188 3189
    }
}

3190
proc hfiles_change {} {
3191
    global highlight_files filehighlight fhighlights fh_serial
3192
    global highlight_paths gdttype
3193 3194 3195 3196 3197

    if {[info exists filehighlight]} {
	# delete previous highlights
	catch {close $filehighlight}
	unset filehighlight
3198 3199
	catch {unset fhighlights}
	unbolden
3200
	unhighlight_filelist
3201
    }
3202
    set highlight_paths {}
3203 3204 3205 3206 3207 3208 3209
    after cancel do_file_hl $fh_serial
    incr fh_serial
    if {$highlight_files ne {}} {
	after 300 do_file_hl $fh_serial
    }
}

3210 3211 3212
proc gdttype_change {name ix op} {
    global gdttype highlight_files findstring findpattern

3213
    stopfinding
3214
    if {$findstring ne {}} {
3215
	if {$gdttype eq [mc "containing:"]} {
3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236
	    if {$highlight_files ne {}} {
		set highlight_files {}
		hfiles_change
	    }
	    findcom_change
	} else {
	    if {$findpattern ne {}} {
		set findpattern {}
		findcom_change
	    }
	    set highlight_files $findstring
	    hfiles_change
	}
	drawvisible
    }
    # enable/disable findtype/findloc menus too
}

proc find_change {name ix op} {
    global gdttype findstring highlight_files

3237
    stopfinding
3238
    if {$gdttype eq [mc "containing:"]} {
3239 3240 3241 3242 3243 3244 3245 3246 3247 3248
	findcom_change
    } else {
	if {$highlight_files ne $findstring} {
	    set highlight_files $findstring
	    hfiles_change
	}
    }
    drawvisible
}

3249
proc findcom_change args {
3250
    global nhighlights boldnamerows
3251 3252
    global findpattern findtype findstring gdttype

3253
    stopfinding
3254 3255
    # delete previous highlights, if any
    foreach row $boldnamerows {
3256
	bolden_name $row mainfont
3257 3258 3259 3260 3261
    }
    set boldnamerows {}
    catch {unset nhighlights}
    unbolden
    unmarkmatches
3262
    if {$gdttype ne [mc "containing:"] || $findstring eq {}} {
3263
	set findpattern {}
3264
    } elseif {$findtype eq [mc "Regexp"]} {
3265 3266 3267 3268 3269 3270 3271 3272
	set findpattern $findstring
    } else {
	set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
		   $findstring]
	set findpattern "*$e*"
    }
}

3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286
proc makepatterns {l} {
    set ret {}
    foreach e $l {
	set ee [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} $e]
	if {[string index $ee end] eq "/"} {
	    lappend ret "$ee*"
	} else {
	    lappend ret $ee
	    lappend ret "$ee/*"
	}
    }
    return $ret
}

3287
proc do_file_hl {serial} {
3288
    global highlight_files filehighlight highlight_paths gdttype fhl_list
3289

3290
    if {$gdttype eq [mc "touching paths:"]} {
3291 3292 3293 3294
	if {[catch {set paths [shellsplit $highlight_files]}]} return
	set highlight_paths [makepatterns $paths]
	highlight_filelist
	set gdtargs [concat -- $paths]
3295
    } elseif {$gdttype eq [mc "adding/removing string:"]} {
3296
	set gdtargs [list "-S$highlight_files"]
3297 3298 3299
    } else {
	# must be "containing:", i.e. we're searching commit info
	return
3300
    }
3301
    set cmd [concat | git diff-tree -r -s --stdin $gdtargs]
3302 3303
    set filehighlight [open $cmd r+]
    fconfigure $filehighlight -blocking 0
3304
    filerun $filehighlight readfhighlight
3305
    set fhl_list {}
3306 3307 3308 3309 3310
    drawvisible
    flushhighlights
}

proc flushhighlights {} {
3311
    global filehighlight fhl_list
3312 3313

    if {[info exists filehighlight]} {
3314
	lappend fhl_list {}
3315 3316 3317 3318 3319 3320
	puts $filehighlight ""
	flush $filehighlight
    }
}

proc askfilehighlight {row id} {
3321
    global filehighlight fhighlights fhl_list
3322

3323
    lappend fhl_list $id
3324
    set fhighlights($id) -1
3325 3326 3327 3328
    puts $filehighlight $id
}

proc readfhighlight {} {
3329
    global filehighlight fhighlights curview iddrawn
3330
    global fhl_list find_dirn
3331

3332 3333 3334 3335 3336
    if {![info exists filehighlight]} {
	return 0
    }
    set nr 0
    while {[incr nr] <= 100 && [gets $filehighlight line] >= 0} {
3337 3338 3339 3340 3341
	set line [string trim $line]
	set i [lsearch -exact $fhl_list $line]
	if {$i < 0} continue
	for {set j 0} {$j < $i} {incr j} {
	    set id [lindex $fhl_list $j]
3342
	    set fhighlights($id) 0
3343
	}
3344 3345
	set fhl_list [lrange $fhl_list [expr {$i+1}] end]
	if {$line eq {}} continue
3346 3347
	if {![commitinview $line $curview]} continue
	set row [rowofcommit $line]
3348
	if {[info exists iddrawn($line)] && ![ishighlighted $line]} {
3349
	    bolden $row mainfontbold
3350
	}
3351
	set fhighlights($line) 1
3352
    }
3353 3354
    if {[eof $filehighlight]} {
	# strange...
3355
	puts "oops, git diff-tree died"
3356 3357
	catch {close $filehighlight}
	unset filehighlight
3358
	return 0
3359
    }
3360
    if {[info exists find_dirn]} {
3361
	run findmore
3362
    }
3363
    return 1
3364 3365
}

3366
proc doesmatch {f} {
3367
    global findtype findpattern
3368

3369
    if {$findtype eq [mc "Regexp"]} {
3370
	return [regexp $findpattern $f]
3371
    } elseif {$findtype eq [mc "IgnCase"]} {
3372 3373 3374 3375 3376 3377
	return [string match -nocase $findpattern $f]
    } else {
	return [string match $findpattern $f]
    }
}

3378
proc askfindhighlight {row id} {
3379
    global nhighlights commitinfo iddrawn
3380 3381
    global findloc
    global markingmatches
3382 3383 3384 3385

    if {![info exists commitinfo($id)]} {
	getcommit $id
    }
3386
    set info $commitinfo($id)
3387
    set isbold 0
3388
    set fldtypes [list [mc Headline] [mc Author] [mc Date] [mc Committer] [mc CDate] [mc Comments]]
3389
    foreach f $info ty $fldtypes {
3390
	if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
3391
	    [doesmatch $f]} {
3392
	    if {$ty eq [mc "Author"]} {
3393
		set isbold 2
3394
		break
3395
	    }
3396
	    set isbold 1
3397 3398
	}
    }
3399
    if {$isbold && [info exists iddrawn($id)]} {
3400
	if {![ishighlighted $id]} {
3401
	    bolden $row mainfontbold
3402
	    if {$isbold > 1} {
3403
		bolden_name $row mainfontbold
3404
	    }
3405
	}
3406
	if {$markingmatches} {
3407
	    markrowmatches $row $id
3408 3409
	}
    }
3410
    set nhighlights($id) $isbold
3411 3412
}

3413 3414
proc markrowmatches {row id} {
    global canv canv2 linehtag linentag commitinfo findloc
3415

3416 3417
    set headline [lindex $commitinfo($id) 0]
    set author [lindex $commitinfo($id) 1]
3418 3419
    $canv delete match$row
    $canv2 delete match$row
3420
    if {$findloc eq [mc "All fields"] || $findloc eq [mc "Headline"]} {
3421 3422 3423 3424 3425
	set m [findmatches $headline]
	if {$m ne {}} {
	    markmatches $canv $row $headline $linehtag($row) $m \
		[$canv itemcget $linehtag($row) -font] $row
	}
3426
    }
3427
    if {$findloc eq [mc "All fields"] || $findloc eq [mc "Author"]} {
3428 3429 3430 3431 3432
	set m [findmatches $author]
	if {$m ne {}} {
	    markmatches $canv2 $row $author $linentag($row) $m \
		[$canv2 itemcget $linentag($row) -font] $row
	}
3433 3434 3435
    }
}

3436 3437 3438 3439
proc vrel_change {name ix op} {
    global highlight_related

    rhighlight_none
3440
    if {$highlight_related ne [mc "None"]} {
3441
	run drawvisible
3442 3443 3444 3445 3446 3447
    }
}

# prepare for testing whether commits are descendents or ancestors of a
proc rhighlight_sel {a} {
    global descendent desc_todo ancestor anc_todo
3448
    global highlight_related
3449 3450 3451 3452 3453

    catch {unset descendent}
    set desc_todo [list $a]
    catch {unset ancestor}
    set anc_todo [list $a]
3454
    if {$highlight_related ne [mc "None"]} {
3455
	rhighlight_none
3456
	run drawvisible
3457 3458 3459 3460 3461 3462
    }
}

proc rhighlight_none {} {
    global rhighlights

3463 3464
    catch {unset rhighlights}
    unbolden
3465 3466 3467
}

proc is_descendent {a} {
3468
    global curview children descendent desc_todo
3469 3470

    set v $curview
3471
    set la [rowofcommit $a]
3472 3473 3474 3475 3476
    set todo $desc_todo
    set leftover {}
    set done 0
    for {set i 0} {$i < [llength $todo]} {incr i} {
	set do [lindex $todo $i]
3477
	if {[rowofcommit $do] < $la} {
3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499
	    lappend leftover $do
	    continue
	}
	foreach nk $children($v,$do) {
	    if {![info exists descendent($nk)]} {
		set descendent($nk) 1
		lappend todo $nk
		if {$nk eq $a} {
		    set done 1
		}
	    }
	}
	if {$done} {
	    set desc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
	    return
	}
    }
    set descendent($a) 0
    set desc_todo $leftover
}

proc is_ancestor {a} {
3500
    global curview parents ancestor anc_todo
3501 3502

    set v $curview
3503
    set la [rowofcommit $a]
3504 3505 3506 3507 3508
    set todo $anc_todo
    set leftover {}
    set done 0
    for {set i 0} {$i < [llength $todo]} {incr i} {
	set do [lindex $todo $i]
3509
	if {![commitinview $do $v] || [rowofcommit $do] > $la} {
3510 3511 3512
	    lappend leftover $do
	    continue
	}
3513
	foreach np $parents($v,$do) {
3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531
	    if {![info exists ancestor($np)]} {
		set ancestor($np) 1
		lappend todo $np
		if {$np eq $a} {
		    set done 1
		}
	    }
	}
	if {$done} {
	    set anc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
	    return
	}
    }
    set ancestor($a) 0
    set anc_todo $leftover
}

proc askrelhighlight {row id} {
3532
    global descendent highlight_related iddrawn rhighlights
3533 3534 3535 3536
    global selectedline ancestor

    if {![info exists selectedline]} return
    set isbold 0
3537 3538
    if {$highlight_related eq [mc "Descendant"] ||
	$highlight_related eq [mc "Not descendant"]} {
3539 3540 3541
	if {![info exists descendent($id)]} {
	    is_descendent $id
	}
3542
	if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} {
3543 3544
	    set isbold 1
	}
3545 3546
    } elseif {$highlight_related eq [mc "Ancestor"] ||
	      $highlight_related eq [mc "Not ancestor"]} {
3547 3548 3549
	if {![info exists ancestor($id)]} {
	    is_ancestor $id
	}
3550
	if {$ancestor($id) == ($highlight_related eq [mc "Ancestor"])} {
3551 3552 3553 3554
	    set isbold 1
	}
    }
    if {[info exists iddrawn($id)]} {
3555
	if {$isbold && ![ishighlighted $id]} {
3556
	    bolden $row mainfontbold
3557 3558
	}
    }
3559
    set rhighlights($id) $isbold
3560 3561
}

3562 3563
# Graph layout functions

P
Paul Mackerras 已提交
3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579
proc shortids {ids} {
    set res {}
    foreach id $ids {
	if {[llength $id] > 1} {
	    lappend res [shortids $id]
	} elseif {[regexp {^[0-9a-f]{40}$} $id]} {
	    lappend res [string range $id 0 7]
	} else {
	    lappend res $id
	}
    }
    return $res
}

proc ntimes {n o} {
    set ret {}
3580 3581 3582 3583
    set o [list $o]
    for {set mask 1} {$mask <= $n} {incr mask $mask} {
	if {($n & $mask) != 0} {
	    set ret [concat $ret $o]
P
Paul Mackerras 已提交
3584
	}
3585
	set o [concat $o $o]
P
Paul Mackerras 已提交
3586
    }
3587
    return $ret
P
Paul Mackerras 已提交
3588 3589
}

3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609
proc ordertoken {id} {
    global ordertok curview varcid varcstart varctok curview parents children
    global nullid nullid2

    if {[info exists ordertok($id)]} {
	return $ordertok($id)
    }
    set origid $id
    set todo {}
    while {1} {
	if {[info exists varcid($curview,$id)]} {
	    set a $varcid($curview,$id)
	    set p [lindex $varcstart($curview) $a]
	} else {
	    set p [lindex $children($curview,$id) 0]
	}
	if {[info exists ordertok($p)]} {
	    set tok $ordertok($p)
	    break
	}
3610 3611
	set id [first_real_child $curview,$p]
	if {$id eq {}} {
3612
	    # it's a root
3613
	    set tok [lindex $varctok($curview) $varcid($curview,$p)]
3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634
	    break
	}
	if {[llength $parents($curview,$id)] == 1} {
	    lappend todo [list $p {}]
	} else {
	    set j [lsearch -exact $parents($curview,$id) $p]
	    if {$j < 0} {
		puts "oops didn't find [shortids $p] in parents of [shortids $id]"
	    }
	    lappend todo [list $p [strrep $j]]
	}
    }
    for {set i [llength $todo]} {[incr i -1] >= 0} {} {
	set p [lindex $todo $i 0]
	append tok [lindex $todo $i 1]
	set ordertok($p) $tok
    }
    set ordertok($origid) $tok
    return $tok
}

3635 3636 3637
# Work out where id should go in idlist so that order-token
# values increase from left to right
proc idcol {idlist id {i 0}} {
3638
    set t [ordertoken $id]
3639 3640 3641
    if {$i < 0} {
	set i 0
    }
3642
    if {$i >= [llength $idlist] || $t < [ordertoken [lindex $idlist $i]]} {
3643 3644
	if {$i > [llength $idlist]} {
	    set i [llength $idlist]
P
Paul Mackerras 已提交
3645
	}
3646
	while {[incr i -1] >= 0 && $t < [ordertoken [lindex $idlist $i]]} {}
3647 3648
	incr i
    } else {
3649
	if {$t > [ordertoken [lindex $idlist $i]]} {
3650
	    while {[incr i] < [llength $idlist] &&
3651
		   $t >= [ordertoken [lindex $idlist $i]]} {}
P
Paul Mackerras 已提交
3652 3653
	}
    }
3654
    return $i
P
Paul Mackerras 已提交
3655 3656 3657
}

proc initlayout {} {
3658
    global rowidlist rowisopt rowfinal displayorder parentlist
3659
    global numcommits canvxmax canv
3660
    global nextcolor
3661
    global colormap rowtextx
P
Paul Mackerras 已提交
3662

3663 3664
    set numcommits 0
    set displayorder {}
3665
    set parentlist {}
3666
    set nextcolor 0
3667 3668
    set rowidlist {}
    set rowisopt {}
3669
    set rowfinal {}
3670
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
3671 3672
    catch {unset colormap}
    catch {unset rowtextx}
3673
    setcanvscroll
3674 3675 3676 3677
}

proc setcanvscroll {} {
    global canv canv2 canv3 numcommits linespc canvxmax canvy0
3678
    global lastscrollset lastscrollrows
3679 3680 3681 3682 3683

    set ymax [expr {$canvy0 + ($numcommits - 0.5) * $linespc + 2}]
    $canv conf -scrollregion [list 0 0 $canvxmax $ymax]
    $canv2 conf -scrollregion [list 0 0 0 $ymax]
    $canv3 conf -scrollregion [list 0 0 0 $ymax]
3684 3685
    set lastscrollset [clock clicks -milliseconds]
    set lastscrollrows $numcommits
P
Paul Mackerras 已提交
3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706
}

proc visiblerows {} {
    global canv numcommits linespc

    set ymax [lindex [$canv cget -scrollregion] 3]
    if {$ymax eq {} || $ymax == 0} return
    set f [$canv yview]
    set y0 [expr {int([lindex $f 0] * $ymax)}]
    set r0 [expr {int(($y0 - 3) / $linespc) - 1}]
    if {$r0 < 0} {
	set r0 0
    }
    set y1 [expr {int([lindex $f 1] * $ymax)}]
    set r1 [expr {int(($y1 - 3) / $linespc) + 1}]
    if {$r1 >= $numcommits} {
	set r1 [expr {$numcommits - 1}]
    }
    return [list $r0 $r1]
}

3707
proc layoutmore {} {
3708
    global commitidx viewcomplete curview
3709
    global numcommits pending_select selectedline curview
3710 3711 3712 3713
    global lastscrollset lastscrollrows commitinterest

    if {$lastscrollrows < 100 || $viewcomplete($curview) ||
	[clock clicks -milliseconds] - $lastscrollset > 500} {
3714 3715
	setcanvscroll
    }
3716
    if {[info exists pending_select] &&
3717 3718
	[commitinview $pending_select $curview]} {
	selectline [rowofcommit $pending_select] 1
3719
    }
3720
    drawvisible
3721 3722 3723
}

proc doshowlocalchanges {} {
3724
    global curview mainheadid
3725

3726
    if {[commitinview $mainheadid $curview]} {
3727
	dodiffindex
3728 3729
    } else {
	lappend commitinterest($mainheadid) {dodiffindex}
3730 3731 3732 3733
    }
}

proc dohidelocalchanges {} {
3734
    global nullid nullid2 lserial curview
3735

3736
    if {[commitinview $nullid $curview]} {
3737
	removefakerow $nullid
3738
    }
3739
    if {[commitinview $nullid2 $curview]} {
3740
	removefakerow $nullid2
3741 3742 3743 3744
    }
    incr lserial
}

3745
# spawn off a process to do git diff-index --cached HEAD
3746
proc dodiffindex {} {
3747
    global lserial showlocalchanges
3748
    global isworktree
3749

3750
    if {!$showlocalchanges || !$isworktree} return
3751
    incr lserial
3752
    set fd [open "|git diff-index --cached HEAD" r]
3753 3754 3755 3756 3757
    fconfigure $fd -blocking 0
    filerun $fd [list readdiffindex $fd $lserial]
}

proc readdiffindex {fd serial} {
3758
    global mainheadid nullid nullid2 curview commitinfo commitdata lserial
3759

3760
    set isdiff 1
3761
    if {[gets $fd line] < 0} {
3762 3763
	if {![eof $fd]} {
	    return 1
3764
	}
3765
	set isdiff 0
3766 3767 3768 3769
    }
    # we only need to see one line and we don't really care what it says...
    close $fd

P
Paul Mackerras 已提交
3770 3771
    if {$serial != $lserial} {
	return 0
3772 3773
    }

P
Paul Mackerras 已提交
3774 3775 3776 3777 3778 3779
    # now see if there are any local changes not checked in to the index
    set fd [open "|git diff-files" r]
    fconfigure $fd -blocking 0
    filerun $fd [list readdifffiles $fd $serial]

    if {$isdiff && ![commitinview $nullid2 $curview]} {
3780
	# add the line for the changes in the index to the graph
3781
	set hl [mc "Local changes checked in to index but not committed"]
3782 3783
	set commitinfo($nullid2) [list  $hl {} {} {} {} "    $hl\n"]
	set commitdata($nullid2) "\n    $hl\n"
3784
	if {[commitinview $nullid $curview]} {
3785
	    removefakerow $nullid
3786
	}
3787
	insertfakerow $nullid2 $mainheadid
P
Paul Mackerras 已提交
3788
    } elseif {!$isdiff && [commitinview $nullid2 $curview]} {
3789
	removefakerow $nullid2
3790 3791 3792 3793 3794
    }
    return 0
}

proc readdifffiles {fd serial} {
3795
    global mainheadid nullid nullid2 curview
3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807
    global commitinfo commitdata lserial

    set isdiff 1
    if {[gets $fd line] < 0} {
	if {![eof $fd]} {
	    return 1
	}
	set isdiff 0
    }
    # we only need to see one line and we don't really care what it says...
    close $fd

P
Paul Mackerras 已提交
3808 3809 3810 3811 3812
    if {$serial != $lserial} {
	return 0
    }

    if {$isdiff && ![commitinview $nullid $curview]} {
3813
	# add the line for the local diff to the graph
3814
	set hl [mc "Local uncommitted changes, not checked in to index"]
3815 3816
	set commitinfo($nullid) [list  $hl {} {} {} {} "    $hl\n"]
	set commitdata($nullid) "\n    $hl\n"
3817 3818 3819 3820 3821
	if {[commitinview $nullid2 $curview]} {
	    set p $nullid2
	} else {
	    set p $mainheadid
	}
3822
	insertfakerow $nullid $p
P
Paul Mackerras 已提交
3823
    } elseif {!$isdiff && [commitinview $nullid $curview]} {
3824
	removefakerow $nullid
3825 3826
    }
    return 0
P
Paul Mackerras 已提交
3827 3828
}

3829
proc nextuse {id row} {
3830
    global curview children
P
Paul Mackerras 已提交
3831

3832 3833
    if {[info exists children($curview,$id)]} {
	foreach kid $children($curview,$id) {
3834
	    if {![commitinview $kid $curview]} {
3835 3836
		return -1
	    }
3837 3838
	    if {[rowofcommit $kid] > $row} {
		return [rowofcommit $kid]
P
Paul Mackerras 已提交
3839 3840
	    }
	}
3841
    }
3842 3843
    if {[commitinview $id $curview]} {
	return [rowofcommit $id]
3844 3845 3846 3847
    }
    return -1
}

3848
proc prevuse {id row} {
3849
    global curview children
3850 3851 3852 3853

    set ret -1
    if {[info exists children($curview,$id)]} {
	foreach kid $children($curview,$id) {
3854 3855 3856
	    if {![commitinview $kid $curview]} break
	    if {[rowofcommit $kid] < $row} {
		set ret [rowofcommit $kid]
3857 3858
	    }
	}
3859 3860 3861 3862
    }
    return $ret
}

3863 3864
proc make_idlist {row} {
    global displayorder parentlist uparrowlen downarrowlen mingaplen
3865
    global commitidx curview children
P
Paul Mackerras 已提交
3866

3867 3868 3869
    set r [expr {$row - $mingaplen - $downarrowlen - 1}]
    if {$r < 0} {
	set r 0
3870
    }
3871 3872 3873 3874 3875 3876 3877 3878
    set ra [expr {$row - $downarrowlen}]
    if {$ra < 0} {
	set ra 0
    }
    set rb [expr {$row + $uparrowlen}]
    if {$rb > $commitidx($curview)} {
	set rb $commitidx($curview)
    }
3879
    make_disporder $r [expr {$rb + 1}]
3880 3881 3882 3883 3884 3885 3886 3887
    set ids {}
    for {} {$r < $ra} {incr r} {
	set nextid [lindex $displayorder [expr {$r + 1}]]
	foreach p [lindex $parentlist $r] {
	    if {$p eq $nextid} continue
	    set rn [nextuse $p $r]
	    if {$rn >= $row &&
		$rn <= $r + $downarrowlen + $mingaplen + $uparrowlen} {
3888
		lappend ids [list [ordertoken $p] $p]
P
Paul Mackerras 已提交
3889 3890
	    }
	}
3891 3892 3893 3894 3895 3896 3897
    }
    for {} {$r < $row} {incr r} {
	set nextid [lindex $displayorder [expr {$r + 1}]]
	foreach p [lindex $parentlist $r] {
	    if {$p eq $nextid} continue
	    set rn [nextuse $p $r]
	    if {$rn < 0 || $rn >= $row} {
3898
		lappend ids [list [ordertoken $p] $p]
P
Paul Mackerras 已提交
3899 3900
	    }
	}
3901 3902
    }
    set id [lindex $displayorder $row]
3903
    lappend ids [list [ordertoken $id] $id]
3904 3905 3906
    while {$r < $rb} {
	foreach p [lindex $parentlist $r] {
	    set firstkid [lindex $children($curview,$p) 0]
3907
	    if {[rowofcommit $firstkid] < $row} {
3908
		lappend ids [list [ordertoken $p] $p]
P
Paul Mackerras 已提交
3909 3910
	    }
	}
3911 3912 3913 3914
	incr r
	set id [lindex $displayorder $r]
	if {$id ne {}} {
	    set firstkid [lindex $children($curview,$id) 0]
3915
	    if {$firstkid ne {} && [rowofcommit $firstkid] < $row} {
3916
		lappend ids [list [ordertoken $id] $id]
3917
	    }
P
Paul Mackerras 已提交
3918 3919
	}
    }
3920 3921 3922 3923 3924
    set idlist {}
    foreach idx [lsort -unique $ids] {
	lappend idlist [lindex $idx 1]
    }
    return $idlist
P
Paul Mackerras 已提交
3925 3926
}

3927 3928 3929 3930 3931 3932 3933 3934
proc rowsequal {a b} {
    while {[set i [lsearch -exact $a {}]] >= 0} {
	set a [lreplace $a $i $i]
    }
    while {[set i [lsearch -exact $b {}]] >= 0} {
	set b [lreplace $b $i $i]
    }
    return [expr {$a eq $b}]
P
Paul Mackerras 已提交
3935 3936
}

3937 3938
proc makeupline {id row rend col} {
    global rowidlist uparrowlen downarrowlen mingaplen
P
Paul Mackerras 已提交
3939

3940 3941 3942 3943 3944 3945 3946
    for {set r $rend} {1} {set r $rstart} {
	set rstart [prevuse $id $r]
	if {$rstart < 0} return
	if {$rstart < $row} break
    }
    if {$rstart + $uparrowlen + $mingaplen + $downarrowlen < $rend} {
	set rstart [expr {$rend - $uparrowlen - 1}]
3947
    }
3948 3949 3950 3951 3952 3953 3954
    for {set r $rstart} {[incr r] <= $row} {} {
	set idlist [lindex $rowidlist $r]
	if {$idlist ne {} && [lsearch -exact $idlist $id] < 0} {
	    set col [idcol $idlist $id $col]
	    lset rowidlist $r [linsert $idlist $col $id]
	    changedrow $r
	}
P
Paul Mackerras 已提交
3955 3956 3957
    }
}

3958
proc layoutrows {row endrow} {
3959
    global rowidlist rowisopt rowfinal displayorder
3960 3961
    global uparrowlen downarrowlen maxwidth mingaplen
    global children parentlist
3962
    global commitidx viewcomplete curview
P
Paul Mackerras 已提交
3963

3964
    make_disporder [expr {$row - 1}] [expr {$endrow + $uparrowlen}]
3965 3966
    set idlist {}
    if {$row > 0} {
3967 3968
	set rm1 [expr {$row - 1}]
	foreach id [lindex $rowidlist $rm1] {
3969 3970 3971 3972
	    if {$id ne {}} {
		lappend idlist $id
	    }
	}
3973
	set final [lindex $rowfinal $rm1]
3974
    }
3975 3976
    for {} {$row < $endrow} {incr row} {
	set rm1 [expr {$row - 1}]
3977
	if {$rm1 < 0 || $idlist eq {}} {
3978
	    set idlist [make_idlist $row]
3979
	    set final 1
3980 3981 3982 3983 3984 3985 3986 3987
	} else {
	    set id [lindex $displayorder $rm1]
	    set col [lsearch -exact $idlist $id]
	    set idlist [lreplace $idlist $col $col]
	    foreach p [lindex $parentlist $rm1] {
		if {[lsearch -exact $idlist $p] < 0} {
		    set col [idcol $idlist $p $col]
		    set idlist [linsert $idlist $col $p]
3988 3989 3990 3991
		    # if not the first child, we have to insert a line going up
		    if {$id ne [lindex $children($curview,$p) 0]} {
			makeupline $p $rm1 $row $col
		    }
3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009
		}
	    }
	    set id [lindex $displayorder $row]
	    if {$row > $downarrowlen} {
		set termrow [expr {$row - $downarrowlen - 1}]
		foreach p [lindex $parentlist $termrow] {
		    set i [lsearch -exact $idlist $p]
		    if {$i < 0} continue
		    set nr [nextuse $p $termrow]
		    if {$nr < 0 || $nr >= $row + $mingaplen + $uparrowlen} {
			set idlist [lreplace $idlist $i $i]
		    }
		}
	    }
	    set col [lsearch -exact $idlist $id]
	    if {$col < 0} {
		set col [idcol $idlist $id]
		set idlist [linsert $idlist $col $id]
4010 4011 4012
		if {$children($curview,$id) ne {}} {
		    makeupline $id $rm1 $row $col
		}
4013 4014 4015 4016 4017 4018 4019
	    }
	    set r [expr {$row + $uparrowlen - 1}]
	    if {$r < $commitidx($curview)} {
		set x $col
		foreach p [lindex $parentlist $r] {
		    if {[lsearch -exact $idlist $p] >= 0} continue
		    set fk [lindex $children($curview,$p) 0]
4020
		    if {[rowofcommit $fk] < $row} {
4021 4022 4023 4024 4025 4026 4027 4028
			set x [idcol $idlist $p $x]
			set idlist [linsert $idlist $x $p]
		    }
		}
		if {[incr r] < $commitidx($curview)} {
		    set p [lindex $displayorder $r]
		    if {[lsearch -exact $idlist $p] < 0} {
			set fk [lindex $children($curview,$p) 0]
4029
			if {$fk ne {} && [rowofcommit $fk] < $row} {
4030 4031 4032 4033 4034 4035 4036
			    set x [idcol $idlist $p $x]
			    set idlist [linsert $idlist $x $p]
			}
		    }
		}
	    }
	}
4037 4038 4039 4040 4041
	if {$final && !$viewcomplete($curview) &&
	    $row + $uparrowlen + $mingaplen + $downarrowlen
		>= $commitidx($curview)} {
	    set final 0
	}
4042 4043 4044 4045
	set l [llength $rowidlist]
	if {$row == $l} {
	    lappend rowidlist $idlist
	    lappend rowisopt 0
4046
	    lappend rowfinal $final
4047
	} elseif {$row < $l} {
4048
	    if {![rowsequal $idlist [lindex $rowidlist $row]]} {
4049 4050 4051
		lset rowidlist $row $idlist
		changedrow $row
	    }
4052
	    lset rowfinal $row $final
4053
	} else {
4054 4055
	    set pad [ntimes [expr {$row - $l}] {}]
	    set rowidlist [concat $rowidlist $pad]
4056
	    lappend rowidlist $idlist
4057 4058
	    set rowfinal [concat $rowfinal $pad]
	    lappend rowfinal $final
4059 4060
	    set rowisopt [concat $rowisopt [ntimes [expr {$row - $l + 1}] 0]]
	}
P
Paul Mackerras 已提交
4061
    }
4062
    return $row
P
Paul Mackerras 已提交
4063 4064
}

4065 4066
proc changedrow {row} {
    global displayorder iddrawn rowisopt need_redisplay
P
Paul Mackerras 已提交
4067

4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080
    set l [llength $rowisopt]
    if {$row < $l} {
	lset rowisopt $row 0
	if {$row + 1 < $l} {
	    lset rowisopt [expr {$row + 1}] 0
	    if {$row + 2 < $l} {
		lset rowisopt [expr {$row + 2}] 0
	    }
	}
    }
    set id [lindex $displayorder $row]
    if {[info exists iddrawn($id)]} {
	set need_redisplay 1
P
Paul Mackerras 已提交
4081 4082 4083 4084
    }
}

proc insert_pad {row col npad} {
4085
    global rowidlist
P
Paul Mackerras 已提交
4086 4087

    set pad [ntimes $npad {}]
P
Paul Mackerras 已提交
4088 4089 4090 4091 4092 4093 4094 4095
    set idlist [lindex $rowidlist $row]
    set bef [lrange $idlist 0 [expr {$col - 1}]]
    set aft [lrange $idlist $col end]
    set i [lsearch -exact $aft {}]
    if {$i > 0} {
	set aft [lreplace $aft $i $i]
    }
    lset rowidlist $row [concat $bef $pad $aft]
4096
    changedrow $row
P
Paul Mackerras 已提交
4097 4098 4099
}

proc optimize_rows {row col endrow} {
4100
    global rowidlist rowisopt displayorder curview children
P
Paul Mackerras 已提交
4101

4102 4103 4104
    if {$row < 1} {
	set row 1
    }
4105 4106
    for {} {$row < $endrow} {incr row; set col 0} {
	if {[lindex $rowisopt $row]} continue
P
Paul Mackerras 已提交
4107
	set haspad 0
4108 4109
	set y0 [expr {$row - 1}]
	set ym [expr {$row - 2}]
4110 4111 4112 4113 4114 4115 4116 4117 4118
	set idlist [lindex $rowidlist $row]
	set previdlist [lindex $rowidlist $y0]
	if {$idlist eq {} || $previdlist eq {}} continue
	if {$ym >= 0} {
	    set pprevidlist [lindex $rowidlist $ym]
	    if {$pprevidlist eq {}} continue
	} else {
	    set pprevidlist {}
	}
4119 4120 4121 4122 4123 4124
	set x0 -1
	set xm -1
	for {} {$col < [llength $idlist]} {incr col} {
	    set id [lindex $idlist $col]
	    if {[lindex $previdlist $col] eq $id} continue
	    if {$id eq {}} {
P
Paul Mackerras 已提交
4125 4126 4127
		set haspad 1
		continue
	    }
4128 4129 4130
	    set x0 [lsearch -exact $previdlist $id]
	    if {$x0 < 0} continue
	    set z [expr {$x0 - $col}]
P
Paul Mackerras 已提交
4131
	    set isarrow 0
4132 4133 4134 4135 4136 4137 4138
	    set z0 {}
	    if {$ym >= 0} {
		set xm [lsearch -exact $pprevidlist $id]
		if {$xm >= 0} {
		    set z0 [expr {$xm - $x0}]
		}
	    }
P
Paul Mackerras 已提交
4139
	    if {$z0 eq {}} {
4140 4141 4142
		# if row y0 is the first child of $id then it's not an arrow
		if {[lindex $children($curview,$id) 0] ne
		    [lindex $displayorder $y0]} {
P
Paul Mackerras 已提交
4143 4144 4145
		    set isarrow 1
		}
	    }
P
Paul Mackerras 已提交
4146 4147 4148 4149
	    if {!$isarrow && $id ne [lindex $displayorder $row] &&
		[lsearch -exact [lindex $rowidlist [expr {$row+1}]] $id] < 0} {
		set isarrow 1
	    }
4150 4151 4152 4153
	    # Looking at lines from this row to the previous row,
	    # make them go straight up if they end in an arrow on
	    # the previous row; otherwise make them go straight up
	    # or at 45 degrees.
P
Paul Mackerras 已提交
4154
	    if {$z < -1 || ($z < 0 && $isarrow)} {
4155 4156
		# Line currently goes left too much;
		# insert pads in the previous row, then optimize it
P
Paul Mackerras 已提交
4157 4158 4159 4160 4161
		set npad [expr {-1 - $z + $isarrow}]
		insert_pad $y0 $x0 $npad
		if {$y0 > 0} {
		    optimize_rows $y0 $x0 $row
		}
4162 4163 4164 4165 4166 4167 4168 4169
		set previdlist [lindex $rowidlist $y0]
		set x0 [lsearch -exact $previdlist $id]
		set z [expr {$x0 - $col}]
		if {$z0 ne {}} {
		    set pprevidlist [lindex $rowidlist $ym]
		    set xm [lsearch -exact $pprevidlist $id]
		    set z0 [expr {$xm - $x0}]
		}
P
Paul Mackerras 已提交
4170
	    } elseif {$z > 1 || ($z > 0 && $isarrow)} {
4171
		# Line currently goes right too much;
4172
		# insert pads in this line
P
Paul Mackerras 已提交
4173
		set npad [expr {$z - 1 + $isarrow}]
P
Paul Mackerras 已提交
4174 4175
		insert_pad $row $col $npad
		set idlist [lindex $rowidlist $row]
P
Paul Mackerras 已提交
4176
		incr col $npad
4177
		set z [expr {$x0 - $col}]
P
Paul Mackerras 已提交
4178 4179
		set haspad 1
	    }
4180
	    if {$z0 eq {} && !$isarrow && $ym >= 0} {
4181
		# this line links to its first child on row $row-2
4182 4183
		set id [lindex $displayorder $ym]
		set xc [lsearch -exact $pprevidlist $id]
4184 4185 4186 4187
		if {$xc >= 0} {
		    set z0 [expr {$xc - $x0}]
		}
	    }
4188
	    # avoid lines jigging left then immediately right
P
Paul Mackerras 已提交
4189 4190
	    if {$z0 ne {} && $z < 0 && $z0 > 0} {
		insert_pad $y0 $x0 1
4191 4192 4193
		incr x0
		optimize_rows $y0 $x0 $row
		set previdlist [lindex $rowidlist $y0]
P
Paul Mackerras 已提交
4194 4195 4196
	    }
	}
	if {!$haspad} {
4197
	    # Find the first column that doesn't have a line going right
P
Paul Mackerras 已提交
4198
	    for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
4199 4200 4201 4202
		set id [lindex $idlist $col]
		if {$id eq {}} break
		set x0 [lsearch -exact $previdlist $id]
		if {$x0 < 0} {
4203
		    # check if this is the link to the first child
4204 4205
		    set kid [lindex $displayorder $y0]
		    if {[lindex $children($curview,$id) 0] eq $kid} {
4206
			# it is, work out offset to child
4207
			set x0 [lsearch -exact $previdlist $kid]
4208 4209
		    }
		}
4210
		if {$x0 <= $col} break
P
Paul Mackerras 已提交
4211
	    }
4212
	    # Insert a pad at that column as long as it has a line and
4213 4214
	    # isn't the last column
	    if {$x0 >= 0 && [incr col] < [llength $idlist]} {
P
Paul Mackerras 已提交
4215
		set idlist [linsert $idlist $col {}]
4216 4217
		lset rowidlist $row $idlist
		changedrow $row
P
Paul Mackerras 已提交
4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232
	    }
	}
    }
}

proc xc {row col} {
    global canvx0 linespc
    return [expr {$canvx0 + $col * $linespc}]
}

proc yc {row} {
    global canvy0 linespc
    return [expr {$canvy0 + $row * $linespc}]
}

4233 4234 4235 4236 4237 4238 4239 4240 4241 4242
proc linewidth {id} {
    global thickerline lthickness

    set wid $lthickness
    if {[info exists thickerline] && $id eq $thickerline} {
	set wid [expr {2 * $lthickness}]
    }
    return $wid
}

P
Paul Mackerras 已提交
4243
proc rowranges {id} {
4244
    global curview children uparrowlen downarrowlen
4245
    global rowidlist
P
Paul Mackerras 已提交
4246

4247 4248 4249
    set kids $children($curview,$id)
    if {$kids eq {}} {
	return {}
4250
    }
4251 4252 4253
    set ret {}
    lappend kids $id
    foreach child $kids {
4254 4255
	if {![commitinview $child $curview]} break
	set row [rowofcommit $child]
4256 4257
	if {![info exists prev]} {
	    lappend ret [expr {$row + 1}]
4258
	} else {
4259
	    if {$row <= $prevrow} {
4260
		puts "oops children of [shortids $id] out of order [shortids $child] $row <= [shortids $prev] $prevrow"
4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291
	    }
	    # see if the line extends the whole way from prevrow to row
	    if {$row > $prevrow + $uparrowlen + $downarrowlen &&
		[lsearch -exact [lindex $rowidlist \
			    [expr {int(($row + $prevrow) / 2)}]] $id] < 0} {
		# it doesn't, see where it ends
		set r [expr {$prevrow + $downarrowlen}]
		if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {
		    while {[incr r -1] > $prevrow &&
			   [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}
		} else {
		    while {[incr r] <= $row &&
			   [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}
		    incr r -1
		}
		lappend ret $r
		# see where it starts up again
		set r [expr {$row - $uparrowlen}]
		if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {
		    while {[incr r] < $row &&
			   [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}
		} else {
		    while {[incr r -1] >= $prevrow &&
			   [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}
		    incr r
		}
		lappend ret $r
	    }
	}
	if {$child eq $id} {
	    lappend ret $row
4292
	}
4293
	set prev $child
4294
	set prevrow $row
P
Paul Mackerras 已提交
4295
    }
4296
    return $ret
4297 4298 4299 4300
}

proc drawlineseg {id row endrow arrowlow} {
    global rowidlist displayorder iddrawn linesegs
P
Paul Mackerras 已提交
4301
    global canv colormap linespc curview maxlinelen parentlist
4302 4303 4304 4305

    set cols [list [lsearch -exact [lindex $rowidlist $row] $id]]
    set le [expr {$row + 1}]
    set arrowhigh 1
P
Paul Mackerras 已提交
4306
    while {1} {
4307 4308 4309 4310 4311 4312 4313 4314 4315 4316
	set c [lsearch -exact [lindex $rowidlist $le] $id]
	if {$c < 0} {
	    incr le -1
	    break
	}
	lappend cols $c
	set x [lindex $displayorder $le]
	if {$x eq $id} {
	    set arrowhigh 0
	    break
P
Paul Mackerras 已提交
4317
	}
4318 4319 4320 4321 4322 4323 4324 4325 4326
	if {[info exists iddrawn($x)] || $le == $endrow} {
	    set c [lsearch -exact [lindex $rowidlist [expr {$le+1}]] $id]
	    if {$c >= 0} {
		lappend cols $c
		set arrowhigh 0
	    }
	    break
	}
	incr le
P
Paul Mackerras 已提交
4327
    }
4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375
    if {$le <= $row} {
	return $row
    }

    set lines {}
    set i 0
    set joinhigh 0
    if {[info exists linesegs($id)]} {
	set lines $linesegs($id)
	foreach li $lines {
	    set r0 [lindex $li 0]
	    if {$r0 > $row} {
		if {$r0 == $le && [lindex $li 1] - $row <= $maxlinelen} {
		    set joinhigh 1
		}
		break
	    }
	    incr i
	}
    }
    set joinlow 0
    if {$i > 0} {
	set li [lindex $lines [expr {$i-1}]]
	set r1 [lindex $li 1]
	if {$r1 == $row && $le - [lindex $li 0] <= $maxlinelen} {
	    set joinlow 1
	}
    }

    set x [lindex $cols [expr {$le - $row}]]
    set xp [lindex $cols [expr {$le - 1 - $row}]]
    set dir [expr {$xp - $x}]
    if {$joinhigh} {
	set ith [lindex $lines $i 2]
	set coords [$canv coords $ith]
	set ah [$canv itemcget $ith -arrow]
	set arrowhigh [expr {$ah eq "first" || $ah eq "both"}]
	set x2 [lindex $cols [expr {$le + 1 - $row}]]
	if {$x2 ne {} && $x - $x2 == $dir} {
	    set coords [lrange $coords 0 end-2]
	}
    } else {
	set coords [list [xc $le $x] [yc $le]]
    }
    if {$joinlow} {
	set itl [lindex $lines [expr {$i-1}] 2]
	set al [$canv itemcget $itl -arrow]
	set arrowlow [expr {$al eq "last" || $al eq "both"}]
P
Paul Mackerras 已提交
4376 4377 4378 4379 4380
    } elseif {$arrowlow} {
	if {[lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0 ||
	    [lsearch -exact [lindex $parentlist [expr {$row-1}]] $id] >= 0} {
	    set arrowlow 0
	}
4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398
    }
    set arrow [lindex {none first last both} [expr {$arrowhigh + 2*$arrowlow}]]
    for {set y $le} {[incr y -1] > $row} {} {
	set x $xp
	set xp [lindex $cols [expr {$y - 1 - $row}]]
	set ndir [expr {$xp - $x}]
	if {$dir != $ndir || $xp < 0} {
	    lappend coords [xc $y $x] [yc $y]
	}
	set dir $ndir
    }
    if {!$joinlow} {
	if {$xp < 0} {
	    # join parent line to first child
	    set ch [lindex $displayorder $row]
	    set xc [lsearch -exact [lindex $rowidlist $row] $ch]
	    if {$xc < 0} {
		puts "oops: drawlineseg: child $ch not on row $row"
P
Paul Mackerras 已提交
4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411
	    } elseif {$xc != $x} {
		if {($arrowhigh && $le == $row + 1) || $dir == 0} {
		    set d [expr {int(0.5 * $linespc)}]
		    set x1 [xc $row $x]
		    if {$xc < $x} {
			set x2 [expr {$x1 - $d}]
		    } else {
			set x2 [expr {$x1 + $d}]
		    }
		    set y2 [yc $row]
		    set y1 [expr {$y2 + $d}]
		    lappend coords $x1 $y1 $x2 $y2
		} elseif {$xc < $x - 1} {
4412 4413 4414 4415 4416
		    lappend coords [xc $row [expr {$x-1}]] [yc $row]
		} elseif {$xc > $x + 1} {
		    lappend coords [xc $row [expr {$x+1}]] [yc $row]
		}
		set x $xc
4417
	    }
4418 4419 4420 4421
	    lappend coords [xc $row $x] [yc $row]
	} else {
	    set xn [xc $row $xp]
	    set yn [yc $row]
P
Paul Mackerras 已提交
4422
	    lappend coords $xn $yn
4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457
	}
	if {!$joinhigh} {
	    assigncolor $id
	    set t [$canv create line $coords -width [linewidth $id] \
		       -fill $colormap($id) -tags lines.$id -arrow $arrow]
	    $canv lower $t
	    bindline $t $id
	    set lines [linsert $lines $i [list $row $le $t]]
	} else {
	    $canv coords $ith $coords
	    if {$arrow ne $ah} {
		$canv itemconf $ith -arrow $arrow
	    }
	    lset lines $i 0 $row
	}
    } else {
	set xo [lsearch -exact [lindex $rowidlist [expr {$row - 1}]] $id]
	set ndir [expr {$xo - $xp}]
	set clow [$canv coords $itl]
	if {$dir == $ndir} {
	    set clow [lrange $clow 2 end]
	}
	set coords [concat $coords $clow]
	if {!$joinhigh} {
	    lset lines [expr {$i-1}] 1 $le
	} else {
	    # coalesce two pieces
	    $canv delete $ith
	    set b [lindex $lines [expr {$i-1}] 0]
	    set e [lindex $lines $i 1]
	    set lines [lreplace $lines [expr {$i-1}] $i [list $b $e $itl]]
	}
	$canv coords $itl $coords
	if {$arrow ne $al} {
	    $canv itemconf $itl -arrow $arrow
4458 4459
	}
    }
4460 4461 4462

    set linesegs($id) $lines
    return $le
P
Paul Mackerras 已提交
4463 4464
}

4465 4466
proc drawparentlinks {id row} {
    global rowidlist canv colormap curview parentlist
4467
    global idpos linespc
P
Paul Mackerras 已提交
4468

4469 4470 4471 4472
    set rowids [lindex $rowidlist $row]
    set col [lsearch -exact $rowids $id]
    if {$col < 0} return
    set olds [lindex $parentlist $row]
P
Paul Mackerras 已提交
4473 4474 4475 4476
    set row2 [expr {$row + 1}]
    set x [xc $row $col]
    set y [yc $row]
    set y2 [yc $row2]
P
Paul Mackerras 已提交
4477
    set d [expr {int(0.5 * $linespc)}]
4478
    set ymid [expr {$y + $d}]
4479
    set ids [lindex $rowidlist $row2]
P
Paul Mackerras 已提交
4480 4481 4482
    # rmx = right-most X coord used
    set rmx 0
    foreach p $olds {
4483 4484 4485 4486 4487 4488 4489 4490 4491
	set i [lsearch -exact $ids $p]
	if {$i < 0} {
	    puts "oops, parent $p of $id not in list"
	    continue
	}
	set x2 [xc $row2 $i]
	if {$x2 > $rmx} {
	    set rmx $x2
	}
4492 4493
	set j [lsearch -exact $rowids $p]
	if {$j < 0} {
4494 4495 4496
	    # drawlineseg will do this one for us
	    continue
	}
P
Paul Mackerras 已提交
4497 4498 4499
	assigncolor $p
	# should handle duplicated parents here...
	set coords [list $x $y]
4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521
	if {$i != $col} {
	    # if attaching to a vertical segment, draw a smaller
	    # slant for visual distinctness
	    if {$i == $j} {
		if {$i < $col} {
		    lappend coords [expr {$x2 + $d}] $y $x2 $ymid
		} else {
		    lappend coords [expr {$x2 - $d}] $y $x2 $ymid
		}
	    } elseif {$i < $col && $i < $j} {
		# segment slants towards us already
		lappend coords [xc $row $j] $y
	    } else {
		if {$i < $col - 1} {
		    lappend coords [expr {$x2 + $linespc}] $y
		} elseif {$i > $col + 1} {
		    lappend coords [expr {$x2 - $linespc}] $y
		}
		lappend coords $x2 $y2
	    }
	} else {
	    lappend coords $x2 $y2
P
Paul Mackerras 已提交
4522
	}
4523
	set t [$canv create line $coords -width [linewidth $p] \
P
Paul Mackerras 已提交
4524 4525 4526 4527
		   -fill $colormap($p) -tags lines.$p]
	$canv lower $t
	bindline $t $p
    }
4528 4529 4530 4531
    if {$rmx > [lindex $idpos($id) 1]} {
	lset idpos($id) 1 $rmx
	redrawtags $id
    }
P
Paul Mackerras 已提交
4532 4533
}

4534
proc drawlines {id} {
4535
    global canv
P
Paul Mackerras 已提交
4536

4537
    $canv itemconf lines.$id -width [linewidth $id]
P
Paul Mackerras 已提交
4538 4539
}

4540
proc drawcmittext {id row col} {
4541 4542
    global linespc canv canv2 canv3 fgcolor curview
    global cmitlisted commitinfo rowidlist parentlist
P
Paul Mackerras 已提交
4543
    global rowtextx idpos idtags idheads idotherrefs
4544
    global linehtag linentag linedtag selectedline
4545
    global canvxmax boldrows boldnamerows fgcolor nullid nullid2
P
Paul Mackerras 已提交
4546

4547
    # listed is 0 for boundary, 1 for normal, 2 for negative, 3 for left, 4 for right
4548
    set listed $cmitlisted($curview,$id)
4549 4550
    if {$id eq $nullid} {
	set ofill red
4551
    } elseif {$id eq $nullid2} {
4552
	set ofill green
4553
    } else {
4554
	set ofill [expr {$listed != 0 ? $listed == 2 ? "gray" : "blue" : "white"}]
4555
    }
P
Paul Mackerras 已提交
4556 4557 4558
    set x [xc $row $col]
    set y [yc $row]
    set orad [expr {$linespc / 3}]
4559
    if {$listed <= 2} {
4560 4561 4562
	set t [$canv create oval [expr {$x - $orad}] [expr {$y - $orad}] \
		   [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
		   -fill $ofill -outline $fgcolor -width 1 -tags circle]
4563
    } elseif {$listed == 3} {
4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577
	# triangle pointing left for left-side commits
	set t [$canv create polygon \
		   [expr {$x - $orad}] $y \
		   [expr {$x + $orad - 1}] [expr {$y - $orad}] \
		   [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
		   -fill $ofill -outline $fgcolor -width 1 -tags circle]
    } else {
	# triangle pointing right for right-side commits
	set t [$canv create polygon \
		   [expr {$x + $orad - 1}] $y \
		   [expr {$x - $orad}] [expr {$y - $orad}] \
		   [expr {$x - $orad}] [expr {$y + $orad - 1}] \
		   -fill $ofill -outline $fgcolor -width 1 -tags circle]
    }
P
Paul Mackerras 已提交
4578 4579
    $canv raise $t
    $canv bind $t <1> {selcanvline {} %x %y}
4580 4581 4582 4583 4584 4585 4586 4587 4588 4589
    set rmx [llength [lindex $rowidlist $row]]
    set olds [lindex $parentlist $row]
    if {$olds ne {}} {
	set nextids [lindex $rowidlist [expr {$row + 1}]]
	foreach p $olds {
	    set i [lsearch -exact $nextids $p]
	    if {$i > $rmx} {
		set rmx $i
	    }
	}
P
Paul Mackerras 已提交
4590
    }
4591
    set xt [xc $row $rmx]
P
Paul Mackerras 已提交
4592 4593 4594 4595 4596 4597 4598 4599 4600 4601
    set rowtextx($row) $xt
    set idpos($id) [list $x $xt $y]
    if {[info exists idtags($id)] || [info exists idheads($id)]
	|| [info exists idotherrefs($id)]} {
	set xt [drawtags $id $x $xt $y]
    }
    set headline [lindex $commitinfo($id) 0]
    set name [lindex $commitinfo($id) 1]
    set date [lindex $commitinfo($id) 2]
    set date [formatdate $date]
4602 4603
    set font mainfont
    set nfont mainfont
4604
    set isbold [ishighlighted $id]
4605
    if {$isbold > 0} {
4606
	lappend boldrows $row
4607
	set font mainfontbold
4608
	if {$isbold > 1} {
4609
	    lappend boldnamerows $row
4610
	    set nfont mainfontbold
4611
	}
4612
    }
4613 4614
    set linehtag($row) [$canv create text $xt $y -anchor w -fill $fgcolor \
			    -text $headline -font $font -tags text]
P
Paul Mackerras 已提交
4615
    $canv bind $linehtag($row) <Button-3> "rowmenu %X %Y $id"
4616 4617 4618
    set linentag($row) [$canv2 create text 3 $y -anchor w -fill $fgcolor \
			    -text $name -font $nfont -tags text]
    set linedtag($row) [$canv3 create text 3 $y -anchor w -fill $fgcolor \
4619
			    -text $date -font mainfont -tags text]
4620 4621 4622
    if {[info exists selectedline] && $selectedline == $row} {
	make_secsel $row
    }
4623
    set xr [expr {$xt + [font measure $font $headline]}]
4624 4625 4626 4627
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
P
Paul Mackerras 已提交
4628 4629 4630
}

proc drawcmitrow {row} {
4631
    global displayorder rowidlist nrows_drawn
4632
    global iddrawn markingmatches
4633
    global commitinfo numcommits
4634
    global filehighlight fhighlights findpattern nhighlights
4635
    global hlview vhighlights
4636
    global highlight_related rhighlights
P
Paul Mackerras 已提交
4637

4638
    if {$row >= $numcommits} return
P
Paul Mackerras 已提交
4639 4640

    set id [lindex $displayorder $row]
4641
    if {[info exists hlview] && ![info exists vhighlights($id)]} {
4642 4643
	askvhighlight $row $id
    }
4644
    if {[info exists filehighlight] && ![info exists fhighlights($id)]} {
4645 4646
	askfilehighlight $row $id
    }
4647
    if {$findpattern ne {} && ![info exists nhighlights($id)]} {
4648
	askfindhighlight $row $id
4649
    }
4650
    if {$highlight_related ne [mc "None"] && ![info exists rhighlights($id)]} {
4651 4652
	askrelhighlight $row $id
    }
4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664
    if {![info exists iddrawn($id)]} {
	set col [lsearch -exact [lindex $rowidlist $row] $id]
	if {$col < 0} {
	    puts "oops, row $row id $id not in list"
	    return
	}
	if {![info exists commitinfo($id)]} {
	    getcommit $id
	}
	assigncolor $id
	drawcmittext $id $row $col
	set iddrawn($id) 1
4665
	incr nrows_drawn
P
Paul Mackerras 已提交
4666
    }
4667 4668
    if {$markingmatches} {
	markrowmatches $row $id
P
Paul Mackerras 已提交
4669 4670 4671
    }
}

4672
proc drawcommits {row {endrow {}}} {
4673
    global numcommits iddrawn displayorder curview need_redisplay
4674
    global parentlist rowidlist rowfinal uparrowlen downarrowlen nrows_drawn
P
Paul Mackerras 已提交
4675 4676 4677 4678

    if {$row < 0} {
	set row 0
    }
4679 4680 4681
    if {$endrow eq {}} {
	set endrow $row
    }
P
Paul Mackerras 已提交
4682 4683 4684
    if {$endrow >= $numcommits} {
	set endrow [expr {$numcommits - 1}]
    }
4685

4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698
    set rl1 [expr {$row - $downarrowlen - 3}]
    if {$rl1 < 0} {
	set rl1 0
    }
    set ro1 [expr {$row - 3}]
    if {$ro1 < 0} {
	set ro1 0
    }
    set r2 [expr {$endrow + $uparrowlen + 3}]
    if {$r2 > $numcommits} {
	set r2 $numcommits
    }
    for {set r $rl1} {$r < $r2} {incr r} {
4699
	if {[lindex $rowidlist $r] ne {} && [lindex $rowfinal $r]} {
4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714
	    if {$rl1 < $r} {
		layoutrows $rl1 $r
	    }
	    set rl1 [expr {$r + 1}]
	}
    }
    if {$rl1 < $r} {
	layoutrows $rl1 $r
    }
    optimize_rows $ro1 0 $r2
    if {$need_redisplay || $nrows_drawn > 2000} {
	clear_display
	drawvisible
    }

4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727
    # make the lines join to already-drawn rows either side
    set r [expr {$row - 1}]
    if {$r < 0 || ![info exists iddrawn([lindex $displayorder $r])]} {
	set r $row
    }
    set er [expr {$endrow + 1}]
    if {$er >= $numcommits ||
	![info exists iddrawn([lindex $displayorder $er])]} {
	set er $endrow
    }
    for {} {$r <= $er} {incr r} {
	set id [lindex $displayorder $r]
	set wasdrawn [info exists iddrawn($id)]
4728
	drawcmitrow $r
4729 4730
	if {$r == $er} break
	set nextid [lindex $displayorder [expr {$r + 1}]]
4731
	if {$wasdrawn && [info exists iddrawn($nextid)]} continue
4732 4733 4734 4735 4736
	drawparentlinks $id $r

	set rowids [lindex $rowidlist $r]
	foreach lid $rowids {
	    if {$lid eq {}} continue
4737
	    if {[info exists lineend($lid)] && $lineend($lid) > $r} continue
4738 4739 4740 4741 4742
	    if {$lid eq $id} {
		# see if this is the first child of any of its parents
		foreach p [lindex $parentlist $r] {
		    if {[lsearch -exact $rowids $p] < 0} {
			# make this line extend up to the child
4743
			set lineend($p) [drawlineseg $p $r $er 0]
4744 4745
		    }
		}
4746 4747
	    } else {
		set lineend($lid) [drawlineseg $lid $r $er 1]
4748 4749
	    }
	}
P
Paul Mackerras 已提交
4750 4751 4752
    }
}

4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770
proc undolayout {row} {
    global uparrowlen mingaplen downarrowlen
    global rowidlist rowisopt rowfinal need_redisplay

    set r [expr {$row - ($uparrowlen + $mingaplen + $downarrowlen)}]
    if {$r < 0} {
	set r 0
    }
    if {[llength $rowidlist] > $r} {
	incr r -1
	set rowidlist [lrange $rowidlist 0 $r]
	set rowfinal [lrange $rowfinal 0 $r]
	set rowisopt [lrange $rowisopt 0 $r]
	set need_redisplay 1
	run drawvisible
    }
}

4771 4772
proc drawvisible {} {
    global canv linespc curview vrowmod selectedline targetrow targetid
4773
    global need_redisplay cscroll numcommits
4774

4775
    set fs [$canv yview]
4776
    set ymax [lindex [$canv cget -scrollregion] 3]
4777
    if {$ymax eq {} || $ymax == 0 || $numcommits == 0} return
4778 4779
    set f0 [lindex $fs 0]
    set f1 [lindex $fs 1]
4780 4781
    set y0 [expr {int($f0 * $ymax)}]
    set y1 [expr {int($f1 * $ymax)}]
4782 4783

    if {[info exists targetid]} {
4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802
	if {[commitinview $targetid $curview]} {
	    set r [rowofcommit $targetid]
	    if {$r != $targetrow} {
		# Fix up the scrollregion and change the scrolling position
		# now that our target row has moved.
		set diff [expr {($r - $targetrow) * $linespc}]
		set targetrow $r
		setcanvscroll
		set ymax [lindex [$canv cget -scrollregion] 3]
		incr y0 $diff
		incr y1 $diff
		set f0 [expr {$y0 / $ymax}]
		set f1 [expr {$y1 / $ymax}]
		allcanvs yview moveto $f0
		$cscroll set $f0 $f1
		set need_redisplay 1
	    }
	} else {
	    unset targetid
4803 4804 4805 4806
	}
    }

    set row [expr {int(($y0 - 3) / $linespc) - 1}]
4807
    set endrow [expr {int(($y1 - 3) / $linespc) + 1}]
4808 4809 4810 4811 4812 4813
    if {$endrow >= $vrowmod($curview)} {
	update_arcrows $curview
    }
    if {[info exists selectedline] &&
	$row <= $selectedline && $selectedline <= $endrow} {
	set targetrow $selectedline
4814
    } elseif {[info exists targetid]} {
4815 4816
	set targetrow [expr {int(($row + $endrow) / 2)}]
    }
4817 4818 4819 4820 4821
    if {[info exists targetrow]} {
	if {$targetrow >= $numcommits} {
	    set targetrow [expr {$numcommits - 1}]
	}
	set targetid [commitonrow $targetrow]
4822
    }
4823 4824 4825
    drawcommits $row $endrow
}

P
Paul Mackerras 已提交
4826
proc clear_display {} {
4827
    global iddrawn linesegs need_redisplay nrows_drawn
4828
    global vhighlights fhighlights nhighlights rhighlights
P
Paul Mackerras 已提交
4829 4830 4831

    allcanvs delete all
    catch {unset iddrawn}
4832
    catch {unset linesegs}
4833 4834 4835
    catch {unset vhighlights}
    catch {unset fhighlights}
    catch {unset nhighlights}
4836
    catch {unset rhighlights}
4837 4838
    set need_redisplay 0
    set nrows_drawn 0
P
Paul Mackerras 已提交
4839 4840
}

P
Paul Mackerras 已提交
4841
proc findcrossings {id} {
4842
    global rowidlist parentlist numcommits displayorder
P
Paul Mackerras 已提交
4843 4844 4845 4846 4847 4848 4849

    set cross {}
    set ccross {}
    foreach {s e} [rowranges $id] {
	if {$e >= $numcommits} {
	    set e [expr {$numcommits - 1}]
	}
4850
	if {$e <= $s} continue
P
Paul Mackerras 已提交
4851
	for {set row $e} {[incr row -1] >= $s} {} {
4852 4853
	    set x [lsearch -exact [lindex $rowidlist $row] $id]
	    if {$x < 0} break
P
Paul Mackerras 已提交
4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866 4867 4868 4869 4870 4871 4872 4873 4874 4875
	    set olds [lindex $parentlist $row]
	    set kid [lindex $displayorder $row]
	    set kidx [lsearch -exact [lindex $rowidlist $row] $kid]
	    if {$kidx < 0} continue
	    set nextrow [lindex $rowidlist [expr {$row + 1}]]
	    foreach p $olds {
		set px [lsearch -exact $nextrow $p]
		if {$px < 0} continue
		if {($kidx < $x && $x < $px) || ($px < $x && $x < $kidx)} {
		    if {[lsearch -exact $ccross $p] >= 0} continue
		    if {$x == $px + ($kidx < $px? -1: 1)} {
			lappend ccross $p
		    } elseif {[lsearch -exact $cross $p] < 0} {
			lappend cross $p
		    }
		}
	    }
	}
    }
    return [concat $ccross {{}} $cross]
}

4876
proc assigncolor {id} {
P
Paul Mackerras 已提交
4877
    global colormap colors nextcolor
4878
    global parents children children curview
4879

4880
    if {[info exists colormap($id)]} return
4881
    set ncolors [llength $colors]
4882 4883
    if {[info exists children($curview,$id)]} {
	set kids $children($curview,$id)
4884 4885 4886 4887 4888
    } else {
	set kids {}
    }
    if {[llength $kids] == 1} {
	set child [lindex $kids 0]
4889
	if {[info exists colormap($child)]
4890
	    && [llength $parents($curview,$child)] == 1} {
4891 4892
	    set colormap($id) $colormap($child)
	    return
4893
	}
4894 4895
    }
    set badcolors {}
P
Paul Mackerras 已提交
4896 4897 4898 4899 4900 4901
    set origbad {}
    foreach x [findcrossings $id] {
	if {$x eq {}} {
	    # delimiter between corner crossings and other crossings
	    if {[llength $badcolors] >= $ncolors - 1} break
	    set origbad $badcolors
4902
	}
P
Paul Mackerras 已提交
4903 4904 4905
	if {[info exists colormap($x)]
	    && [lsearch -exact $badcolors $colormap($x)] < 0} {
	    lappend badcolors $colormap($x)
4906 4907
	}
    }
P
Paul Mackerras 已提交
4908 4909
    if {[llength $badcolors] >= $ncolors} {
	set badcolors $origbad
4910
    }
P
Paul Mackerras 已提交
4911
    set origbad $badcolors
4912
    if {[llength $badcolors] < $ncolors - 1} {
4913
	foreach child $kids {
4914 4915 4916 4917
	    if {[info exists colormap($child)]
		&& [lsearch -exact $badcolors $colormap($child)] < 0} {
		lappend badcolors $colormap($child)
	    }
4918
	    foreach p $parents($curview,$child) {
4919 4920 4921
		if {[info exists colormap($p)]
		    && [lsearch -exact $badcolors $colormap($p)] < 0} {
		    lappend badcolors $colormap($p)
4922 4923 4924 4925 4926 4927
		}
	    }
	}
	if {[llength $badcolors] >= $ncolors} {
	    set badcolors $origbad
	}
4928 4929 4930 4931 4932
    }
    for {set i 0} {$i <= $ncolors} {incr i} {
	set c [lindex $colors $nextcolor]
	if {[incr nextcolor] >= $ncolors} {
	    set nextcolor 0
4933
	}
4934
	if {[lsearch -exact $badcolors $c]} break
4935
    }
4936
    set colormap($id) $c
4937 4938
}

4939 4940 4941 4942 4943 4944
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"
4945
    $canv bind $t <Button-1> "lineclick %x %y $id 1"
4946 4947
}

4948
proc drawtags {id x xt y1} {
4949
    global idtags idheads idotherrefs mainhead
4950
    global linespc lthickness
4951
    global canv rowtextx curview fgcolor bgcolor
4952 4953 4954

    set marks {}
    set ntags 0
4955
    set nheads 0
4956 4957 4958 4959 4960 4961
    if {[info exists idtags($id)]} {
	set marks $idtags($id)
	set ntags [llength $marks]
    }
    if {[info exists idheads($id)]} {
	set marks [concat $marks $idheads($id)]
4962 4963 4964 4965
	set nheads [llength $idheads($id)]
    }
    if {[info exists idotherrefs($id)]} {
	set marks [concat $marks $idotherrefs($id)]
4966 4967 4968 4969 4970 4971
    }
    if {$marks eq {}} {
	return $xt
    }

    set delta [expr {int(0.5 * ($linespc - $lthickness))}]
J
Jeff Hobbs 已提交
4972 4973
    set yt [expr {$y1 - 0.5 * $linespc}]
    set yb [expr {$yt + $linespc - 1}]
4974 4975
    set xvals {}
    set wvals {}
4976
    set i -1
4977
    foreach tag $marks {
4978 4979
	incr i
	if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} {
4980
	    set wid [font measure mainfontbold $tag]
4981
	} else {
4982
	    set wid [font measure mainfont $tag]
4983
	}
4984 4985 4986 4987 4988 4989 4990 4991
	lappend xvals $xt
	lappend wvals $wid
	set xt [expr {$xt + $delta + $wid + $lthickness + $linespc}]
    }
    set t [$canv create line $x $y1 [lindex $xvals end] $y1 \
	       -width $lthickness -fill black -tags tag.$id]
    $canv lower $t
    foreach tag $marks x $xvals wid $wvals {
J
Jeff Hobbs 已提交
4992 4993
	set xl [expr {$x + $delta}]
	set xr [expr {$x + $delta + $wid + $lthickness}]
4994
	set font mainfont
4995 4996
	if {[incr ntags -1] >= 0} {
	    # draw a tag
J
Jeff Hobbs 已提交
4997 4998
	    set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
		       $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
4999 5000
		       -width 1 -outline black -fill yellow -tags tag.$id]
	    $canv bind $t <1> [list showtag $tag 1]
5001
	    set rowtextx([rowofcommit $id]) [expr {$xr + $linespc}]
5002
	} else {
5003 5004 5005
	    # draw a head or other ref
	    if {[incr nheads -1] >= 0} {
		set col green
5006
		if {$tag eq $mainhead} {
5007
		    set font mainfontbold
5008
		}
5009 5010 5011
	    } else {
		set col "#ddddff"
	    }
J
Jeff Hobbs 已提交
5012
	    set xl [expr {$xl - $delta/2}]
5013
	    $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
5014
		-width 1 -outline black -fill $col -tags tag.$id
5015
	    if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
5016
	        set rwid [font measure mainfont $remoteprefix]
5017 5018 5019 5020 5021 5022
		set xi [expr {$x + 1}]
		set yti [expr {$yt + 1}]
		set xri [expr {$x + $rwid}]
		$canv create polygon $xi $yti $xri $yti $xri $yb $xi $yb \
			-width 0 -fill "#ffddaa" -tags tag.$id
	    }
5023
	}
5024
	set t [$canv create text $xl $y1 -anchor w -text $tag -fill $fgcolor \
5025
		   -font $font -tags [list tag.$id text]]
5026 5027
	if {$ntags >= 0} {
	    $canv bind $t <1> [list showtag $tag 1]
5028 5029
	} elseif {$nheads >= 0} {
	    $canv bind $t <Button-3> [list headmenu %X %Y $id $tag]
5030
	}
5031 5032 5033 5034
    }
    return $xt
}

5035 5036 5037 5038 5039 5040 5041 5042 5043 5044 5045
proc xcoord {i level ln} {
    global canvx0 xspc1 xspc2

    set x [expr {$canvx0 + $i * $xspc1($ln)}]
    if {$i > 0 && $i == $level} {
	set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}]
    } elseif {$i > $level} {
	set x [expr {$x + $xspc2 - $xspc1($ln)}]
    }
    return $x
}
5046

5047
proc show_status {msg} {
5048
    global canv fgcolor
5049 5050

    clear_display
5051
    $canv create text 3 3 -anchor nw -text $msg -font mainfont \
5052
	-tags text -fill $fgcolor
5053 5054
}

5055 5056 5057 5058 5059 5060 5061 5062 5063
# Don't change the text pane cursor if it is currently the hand cursor,
# showing that we are over a sha1 ID link.
proc settextcursor {c} {
    global ctext curtextcursor

    if {[$ctext cget -cursor] == $curtextcursor} {
	$ctext config -cursor $c
    }
    set curtextcursor $c
5064 5065
}

5066 5067
proc nowbusy {what {name {}}} {
    global isbusy busyname statusw
5068 5069 5070 5071 5072 5073

    if {[array names isbusy] eq {}} {
	. config -cursor watch
	settextcursor watch
    }
    set isbusy($what) 1
5074 5075 5076 5077
    set busyname($what) $name
    if {$name ne {}} {
	$statusw conf -text $name
    }
5078 5079 5080
}

proc notbusy {what} {
5081
    global isbusy maincursor textcursor busyname statusw
5082

5083 5084 5085 5086 5087 5088 5089
    catch {
	unset isbusy($what)
	if {$busyname($what) ne {} &&
	    [$statusw cget -text] eq $busyname($what)} {
	    $statusw conf -text {}
	}
    }
5090 5091 5092 5093 5094 5095
    if {[array names isbusy] eq {}} {
	. config -cursor $maincursor
	settextcursor $textcursor
    }
}

5096
proc findmatches {f} {
5097
    global findtype findstring
5098
    if {$findtype == [mc "Regexp"]} {
5099
	set matches [regexp -indices -all -inline $findstring $f]
5100
    } else {
5101
	set fs $findstring
5102
	if {$findtype == [mc "IgnCase"]} {
5103 5104
	    set f [string tolower $f]
	    set fs [string tolower $fs]
5105 5106 5107
	}
	set matches {}
	set i 0
5108 5109 5110 5111
	set l [string length $fs]
	while {[set j [string first $fs $f $i]] >= 0} {
	    lappend matches [list $j [expr {$j+$l-1}]]
	    set i [expr {$j + $l}]
5112 5113 5114 5115 5116
	}
    }
    return $matches
}

5117
proc dofind {{dirn 1} {wrap 1}} {
5118
    global findstring findstartline findcurline selectedline numcommits
5119
    global gdttype filehighlight fh_serial find_dirn findallowwrap
5120

5121 5122 5123 5124
    if {[info exists find_dirn]} {
	if {$find_dirn == $dirn} return
	stopfinding
    }
5125
    focus .
5126 5127
    if {$findstring eq {} || $numcommits == 0} return
    if {![info exists selectedline]} {
5128
	set findstartline [lindex [visiblerows] [expr {$dirn < 0}]]
5129
    } else {
5130
	set findstartline $selectedline
5131
    }
5132
    set findcurline $findstartline
5133 5134
    nowbusy finding [mc "Searching"]
    if {$gdttype ne [mc "containing:"] && ![info exists filehighlight]} {
5135 5136
	after cancel do_file_hl $fh_serial
	do_file_hl $fh_serial
5137
    }
5138 5139 5140
    set find_dirn $dirn
    set findallowwrap $wrap
    run findmore
5141 5142
}

5143 5144
proc stopfinding {} {
    global find_dirn findcurline fprogcoord
5145

5146 5147 5148 5149 5150 5151
    if {[info exists find_dirn]} {
	unset find_dirn
	unset findcurline
	notbusy finding
	set fprogcoord 0
	adjustprogress
5152 5153 5154 5155
    }
}

proc findmore {} {
5156
    global commitdata commitinfo numcommits findpattern findloc
5157
    global findstartline findcurline findallowwrap
5158
    global find_dirn gdttype fhighlights fprogcoord
5159
    global curview varcorder vrownum varccommits vrowmod
5160

5161
    if {![info exists find_dirn]} {
5162 5163
	return 0
    }
5164
    set fldtypes [list [mc "Headline"] [mc "Author"] [mc "Date"] [mc "Committer"] [mc "CDate"] [mc "Comments"]]
5165
    set l $findcurline
5166 5167 5168 5169 5170 5171 5172 5173 5174 5175 5176
    set moretodo 0
    if {$find_dirn > 0} {
	incr l
	if {$l >= $numcommits} {
	    set l 0
	}
	if {$l <= $findstartline} {
	    set lim [expr {$findstartline + 1}]
	} else {
	    set lim $numcommits
	    set moretodo $findallowwrap
P
Paul Mackerras 已提交
5177
	}
5178
    } else {
5179 5180
	if {$l == 0} {
	    set l $numcommits
5181
	}
5182 5183 5184
	incr l -1
	if {$l >= $findstartline} {
	    set lim [expr {$findstartline - 1}]
5185
	} else {
5186 5187
	    set lim -1
	    set moretodo $findallowwrap
5188
	}
5189
    }
5190 5191 5192 5193
    set n [expr {($lim - $l) * $find_dirn}]
    if {$n > 500} {
	set n 500
	set moretodo 1
5194
    }
5195 5196 5197
    if {$l + ($find_dirn > 0? $n: 1) > $vrowmod($curview)} {
	update_arcrows $curview
    }
5198 5199
    set found 0
    set domore 1
5200 5201 5202 5203 5204
    set ai [bsearch $vrownum($curview) $l]
    set a [lindex $varcorder($curview) $ai]
    set arow [lindex $vrownum($curview) $ai]
    set ids [lindex $varccommits($curview,$a)]
    set arowend [expr {$arow + [llength $ids]}]
5205
    if {$gdttype eq [mc "containing:"]} {
5206
	for {} {$n > 0} {incr n -1; incr l $find_dirn} {
5207 5208 5209 5210 5211 5212 5213 5214
	    if {$l < $arow || $l >= $arowend} {
		incr ai $find_dirn
		set a [lindex $varcorder($curview) $ai]
		set arow [lindex $vrownum($curview) $ai]
		set ids [lindex $varccommits($curview,$a)]
		set arowend [expr {$arow + [llength $ids]}]
	    }
	    set id [lindex $ids [expr {$l - $arow}]]
5215
	    # shouldn't happen unless git log doesn't give all the commits...
5216 5217 5218 5219
	    if {![info exists commitdata($id)] ||
		![doesmatch $commitdata($id)]} {
		continue
	    }
5220 5221 5222 5223 5224
	    if {![info exists commitinfo($id)]} {
		getcommit $id
	    }
	    set info $commitinfo($id)
	    foreach f $info ty $fldtypes {
5225
		if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
5226 5227 5228 5229 5230 5231
		    [doesmatch $f]} {
		    set found 1
		    break
		}
	    }
	    if {$found} break
5232
	}
5233
    } else {
5234
	for {} {$n > 0} {incr n -1; incr l $find_dirn} {
5235 5236 5237 5238 5239 5240 5241 5242
	    if {$l < $arow || $l >= $arowend} {
		incr ai $find_dirn
		set a [lindex $varcorder($curview) $ai]
		set arow [lindex $vrownum($curview) $ai]
		set ids [lindex $varccommits($curview,$a)]
		set arowend [expr {$arow + [llength $ids]}]
	    }
	    set id [lindex $ids [expr {$l - $arow}]]
5243 5244
	    if {![info exists fhighlights($id)]} {
		# this sets fhighlights($id) to -1
5245
		askfilehighlight $l $id
5246
	    }
5247
	    if {$fhighlights($id) > 0} {
5248 5249 5250
		set found $domore
		break
	    }
5251
	    if {$fhighlights($id) < 0} {
5252 5253
		if {$domore} {
		    set domore 0
5254
		    set findcurline [expr {$l - $find_dirn}]
5255
		}
5256 5257 5258
	    }
	}
    }
5259
    if {$found || ($domore && !$moretodo)} {
5260
	unset findcurline
5261
	unset find_dirn
5262
	notbusy finding
5263 5264 5265 5266 5267 5268 5269
	set fprogcoord 0
	adjustprogress
	if {$found} {
	    findselectline $l
	} else {
	    bell
	}
5270
	return 0
5271
    }
5272 5273
    if {!$domore} {
	flushhighlights
5274
    } else {
5275
	set findcurline [expr {$l - $find_dirn}]
5276
    }
5277
    set n [expr {($findcurline - $findstartline) * $find_dirn - 1}]
5278 5279
    if {$n < 0} {
	incr n $numcommits
5280
    }
5281 5282 5283
    set fprogcoord [expr {$n * 1.0 / $numcommits}]
    adjustprogress
    return $domore
5284 5285 5286
}

proc findselectline {l} {
5287
    global findloc commentend ctext findcurline markingmatches gdttype
5288 5289 5290

    set markingmatches 1
    set findcurline $l
5291
    selectline $l 1
5292
    if {$findloc == [mc "All fields"] || $findloc == [mc "Comments"]} {
5293 5294 5295 5296 5297
	# 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]
J
Jeff Hobbs 已提交
5298
	    set end [expr {[lindex $match 1] + 1}]
5299 5300
	    $ctext tag add found "1.0 + $start c" "1.0 + $end c"
	}
5301
    }
5302
    drawvisible
5303 5304
}

5305
# mark the bits of a headline or author that match a find string
5306 5307 5308
proc markmatches {canv l str tag matches font row} {
    global selectedline

5309 5310 5311 5312 5313 5314 5315 5316
    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
J
Jeff Hobbs 已提交
5317 5318 5319 5320
	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 \
5321
		   -outline {} -tags [list match$l matches] -fill yellow]
5322
	$canv lower $t
5323 5324 5325
	if {[info exists selectedline] && $row == $selectedline} {
	    $canv raise $t secsel
	}
5326 5327 5328 5329
    }
}

proc unmarkmatches {} {
5330
    global markingmatches
5331

5332
    allcanvs delete matches
5333
    set markingmatches 0
5334
    stopfinding
5335 5336
}

5337
proc selcanvline {w x y} {
5338
    global canv canvy0 ctext linespc
P
Paul Mackerras 已提交
5339
    global rowtextx
5340
    set ymax [lindex [$canv cget -scrollregion] 3]
5341
    if {$ymax == {}} return
5342 5343 5344 5345 5346 5347
    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
    }
5348
    if {$w eq $canv} {
5349 5350 5351
	set xmax [lindex [$canv cget -scrollregion] 2]
	set xleft [expr {[lindex [$canv xview] 0] * $xmax}]
	if {![info exists rowtextx($l)] || $xleft + $x < $rowtextx($l)} return
5352
    }
5353
    unmarkmatches
5354
    selectline $l 1
5355 5356
}

5357 5358
proc commit_descriptor {p} {
    global commitinfo
5359 5360 5361
    if {![info exists commitinfo($p)]} {
	getcommit $p
    }
5362
    set l "..."
5363
    if {[llength $commitinfo($p)] > 1} {
5364 5365
	set l [lindex $commitinfo($p) 0]
    }
P
Paul Mackerras 已提交
5366
    return "$p ($l)\n"
5367 5368
}

5369 5370
# append some text to the ctext widget, and make any SHA1 ID
# that we know about be a clickable link.
5371
proc appendwithlinks {text tags} {
5372
    global ctext linknum curview pendinglinks
5373 5374

    set start [$ctext index "end - 1c"]
5375
    $ctext insert end $text $tags
5376 5377 5378 5379 5380 5381
    set links [regexp -indices -all -inline {[0-9a-f]{40}} $text]
    foreach l $links {
	set s [lindex $l 0]
	set e [lindex $l 1]
	set linkid [string range $text $s $e]
	incr e
P
Paul Mackerras 已提交
5382
	$ctext tag delete link$linknum
5383
	$ctext tag add link$linknum "$start + $s c" "$start + $e c"
5384
	setlink $linkid link$linknum
5385 5386
	incr linknum
    }
5387 5388 5389
}

proc setlink {id lk} {
5390
    global curview ctext pendinglinks commitinterest
5391

5392
    if {[commitinview $id $curview]} {
5393
	$ctext tag conf $lk -foreground blue -underline 1
5394
	$ctext tag bind $lk <1> [list selectline [rowofcommit $id] 1]
5395 5396 5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423
	$ctext tag bind $lk <Enter> {linkcursor %W 1}
	$ctext tag bind $lk <Leave> {linkcursor %W -1}
    } else {
	lappend pendinglinks($id) $lk
	lappend commitinterest($id) {makelink %I}
    }
}

proc makelink {id} {
    global pendinglinks

    if {![info exists pendinglinks($id)]} return
    foreach lk $pendinglinks($id) {
	setlink $id $lk
    }
    unset pendinglinks($id)
}

proc linkcursor {w inc} {
    global linkentercount curtextcursor

    if {[incr linkentercount $inc] > 0} {
	$w configure -cursor hand2
    } else {
	$w configure -cursor $curtextcursor
	if {$linkentercount < 0} {
	    set linkentercount 0
	}
    }
5424 5425
}

5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 5441
proc viewnextline {dir} {
    global canv linespc

    $canv delete hover
    set ymax [lindex [$canv cget -scrollregion] 3]
    set wnow [$canv yview]
    set wtop [expr {[lindex $wnow 0] * $ymax}]
    set newtop [expr {$wtop + $dir * $linespc}]
    if {$newtop < 0} {
	set newtop 0
    } elseif {$newtop > $ymax} {
	set newtop $ymax
    }
    allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
}

5442 5443
# add a list of tag or branch names at position pos
# returns the number of names inserted
5444
proc appendrefs {pos ids var} {
5445
    global ctext linknum curview $var maxrefs
P
Paul Mackerras 已提交
5446

5447 5448 5449
    if {[catch {$ctext index $pos}]} {
	return 0
    }
5450 5451 5452 5453 5454 5455 5456 5457
    $ctext conf -state normal
    $ctext delete $pos "$pos lineend"
    set tags {}
    foreach id $ids {
	foreach tag [set $var\($id\)] {
	    lappend tags [list $tag $id]
	}
    }
5458 5459 5460 5461 5462 5463 5464 5465 5466 5467 5468 5469
    if {[llength $tags] > $maxrefs} {
	$ctext insert $pos "many ([llength $tags])"
    } else {
	set tags [lsort -index 0 -decreasing $tags]
	set sep {}
	foreach ti $tags {
	    set id [lindex $ti 1]
	    set lk link$linknum
	    incr linknum
	    $ctext tag delete $lk
	    $ctext insert $pos $sep
	    $ctext insert $pos [lindex $ti 0] $lk
5470
	    setlink $id $lk
5471
	    set sep ", "
P
Paul Mackerras 已提交
5472 5473
	}
    }
5474
    $ctext conf -state disabled
5475
    return [llength $tags]
P
Paul Mackerras 已提交
5476 5477
}

5478 5479 5480
# called when we have finished computing the nearby tags
proc dispneartags {delay} {
    global selectedline currentid showneartags tagphase
5481

5482 5483 5484 5485 5486 5487 5488 5489
    if {![info exists selectedline] || !$showneartags} return
    after cancel dispnexttag
    if {$delay} {
	after 200 dispnexttag
	set tagphase -1
    } else {
	after idle dispnexttag
	set tagphase 0
5490 5491 5492
    }
}

5493 5494
proc dispnexttag {} {
    global selectedline currentid showneartags tagphase ctext
P
Paul Mackerras 已提交
5495 5496

    if {![info exists selectedline] || !$showneartags} return
5497 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507 5508 5509 5510 5511 5512 5513 5514 5515 5516 5517 5518 5519 5520
    switch -- $tagphase {
	0 {
	    set dtags [desctags $currentid]
	    if {$dtags ne {}} {
		appendrefs precedes $dtags idtags
	    }
	}
	1 {
	    set atags [anctags $currentid]
	    if {$atags ne {}} {
		appendrefs follows $atags idtags
	    }
	}
	2 {
	    set dheads [descheads $currentid]
	    if {$dheads ne {}} {
		if {[appendrefs branch $dheads idheads] > 1
		    && [$ctext get "branch -3c"] eq "h"} {
		    # turn "Branch" into "Branches"
		    $ctext conf -state normal
		    $ctext insert "branch -2c" "es"
		    $ctext conf -state disabled
		}
	    }
5521 5522
	}
    }
5523 5524
    if {[incr tagphase] <= 2} {
	after idle dispnexttag
P
Paul Mackerras 已提交
5525 5526 5527
    }
}

5528 5529 5530 5531 5532 5533 5534 5535 5536 5537 5538 5539 5540 5541 5542 5543 5544 5545
proc make_secsel {l} {
    global linehtag linentag linedtag canv canv2 canv3

    if {![info exists linehtag($l)]} return
    $canv delete secsel
    set t [eval $canv create rect [$canv bbox $linehtag($l)] -outline {{}} \
	       -tags secsel -fill [$canv cget -selectbackground]]
    $canv lower $t
    $canv2 delete secsel
    set t [eval $canv2 create rect [$canv2 bbox $linentag($l)] -outline {{}} \
	       -tags secsel -fill [$canv2 cget -selectbackground]]
    $canv2 lower $t
    $canv3 delete secsel
    set t [eval $canv3 create rect [$canv3 bbox $linedtag($l)] -outline {{}} \
	       -tags secsel -fill [$canv3 cget -selectbackground]]
    $canv3 lower $t
}

5546
proc selectline {l isnew} {
5547
    global canv ctext commitinfo selectedline
5548
    global canvy0 linespc parents children curview
5549
    global currentid sha1entry
P
Paul Mackerras 已提交
5550
    global commentend idtags linknum
5551
    global mergemax numcommits pending_select
5552
    global cmitmode showneartags allcommits
5553
    global targetrow targetid lastscrollrows
5554
    global autoselect
5555

5556
    catch {unset pending_select}
5557
    $canv delete hover
5558
    normalline
5559
    unsel_reflist
5560
    stopfinding
5561
    if {$l < 0 || $l >= $numcommits} return
5562 5563 5564
    set id [commitonrow $l]
    set targetid $id
    set targetrow $l
5565 5566 5567 5568 5569
    set selectedline $l
    set currentid $id
    if {$lastscrollrows < $numcommits} {
	setcanvscroll
    }
5570

5571
    set y [expr {$canvy0 + $l * $linespc}]
5572
    set ymax [lindex [$canv cget -scrollregion] 3]
5573 5574
    set ytop [expr {$y - $linespc - 1}]
    set ybot [expr {$y + $linespc + 1}]
5575
    set wnow [$canv yview]
J
Jeff Hobbs 已提交
5576 5577
    set wtop [expr {[lindex $wnow 0] * $ymax}]
    set wbot [expr {[lindex $wnow 1] * $ymax}]
5578 5579
    set wh [expr {$wbot - $wtop}]
    set newtop $wtop
5580
    if {$ytop < $wtop} {
5581 5582 5583 5584 5585 5586 5587
	if {$ybot < $wtop} {
	    set newtop [expr {$y - $wh / 2.0}]
	} else {
	    set newtop $ytop
	    if {$newtop > $wtop - $linespc} {
		set newtop [expr {$wtop - $linespc}]
	    }
5588
	}
5589 5590 5591 5592 5593 5594 5595 5596
    } 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}]
	    }
5597
	}
5598 5599 5600 5601 5602
    }
    if {$newtop != $wtop} {
	if {$newtop < 0} {
	    set newtop 0
	}
J
Jeff Hobbs 已提交
5603
	allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
P
Paul Mackerras 已提交
5604
	drawvisible
5605
    }
5606

5607
    make_secsel $l
P
Paul Mackerras 已提交
5608

5609
    if {$isnew} {
5610
	addtohistory [list selbyid $id]
5611 5612
    }

5613 5614
    $sha1entry delete 0 end
    $sha1entry insert 0 $id
5615 5616 5617 5618
    if {$autoselect} {
	$sha1entry selection from 0
	$sha1entry selection to end
    }
5619
    rhighlight_sel $id
5620

5621
    $ctext conf -state normal
5622
    clear_ctext
5623
    set linknum 0
5624 5625 5626
    if {![info exists commitinfo($id)]} {
	getcommit $id
    }
5627
    set info $commitinfo($id)
P
Paul Mackerras 已提交
5628
    set date [formatdate [lindex $info 2]]
5629
    $ctext insert end "[mc "Author"]: [lindex $info 1]  $date\n"
P
Paul Mackerras 已提交
5630
    set date [formatdate [lindex $info 4]]
5631
    $ctext insert end "[mc "Committer"]: [lindex $info 3]  $date\n"
5632
    if {[info exists idtags($id)]} {
5633
	$ctext insert end [mc "Tags:"]
5634 5635 5636 5637 5638
	foreach tag $idtags($id) {
	    $ctext insert end " $tag"
	}
	$ctext insert end "\n"
    }
5639

5640
    set headers {}
5641
    set olds $parents($curview,$id)
5642
    if {[llength $olds] > 1} {
5643
	set np 0
5644
	foreach p $olds {
5645 5646 5647 5648 5649
	    if {$np >= $mergemax} {
		set tag mmax
	    } else {
		set tag m$np
	    }
5650
	    $ctext insert end "[mc "Parent"]: " $tag
5651
	    appendwithlinks [commit_descriptor $p] {}
5652 5653 5654
	    incr np
	}
    } else {
5655
	foreach p $olds {
5656
	    append headers "[mc "Parent"]: [commit_descriptor $p]"
5657 5658
	}
    }
5659

5660
    foreach c $children($curview,$id) {
5661
	append headers "[mc "Child"]:  [commit_descriptor $c]"
5662
    }
5663 5664

    # make anything that looks like a SHA1 ID be a clickable link
5665
    appendwithlinks $headers {}
P
Paul Mackerras 已提交
5666 5667 5668 5669
    if {$showneartags} {
	if {![info exists allcommits]} {
	    getallcommits
	}
5670
	$ctext insert end "[mc "Branch"]: "
5671 5672
	$ctext mark set branch "end -1c"
	$ctext mark gravity branch left
5673
	$ctext insert end "\n[mc "Follows"]: "
P
Paul Mackerras 已提交
5674 5675
	$ctext mark set follows "end -1c"
	$ctext mark gravity follows left
5676
	$ctext insert end "\n[mc "Precedes"]: "
P
Paul Mackerras 已提交
5677 5678 5679
	$ctext mark set precedes "end -1c"
	$ctext mark gravity precedes left
	$ctext insert end "\n"
5680
	dispneartags 1
P
Paul Mackerras 已提交
5681 5682
    }
    $ctext insert end "\n"
5683 5684 5685 5686 5687
    set comment [lindex $info 5]
    if {[string first "\r" $comment] >= 0} {
	set comment [string map {"\r" "\n    "} $comment]
    }
    appendwithlinks $comment {comment}
5688

5689
    $ctext tag remove found 1.0 end
5690
    $ctext conf -state disabled
5691
    set commentend [$ctext index "end - 1c"]
5692

5693
    init_flist [mc "Comments"]
P
Paul Mackerras 已提交
5694 5695 5696
    if {$cmitmode eq "tree"} {
	gettree $id
    } elseif {[llength $olds] <= 1} {
5697
	startdiff $id
5698
    } else {
5699
	mergediff $id
5700 5701 5702
    }
}

5703 5704 5705 5706 5707 5708 5709 5710 5711 5712 5713 5714
proc selfirstline {} {
    unmarkmatches
    selectline 0 1
}

proc sellastline {} {
    global numcommits
    unmarkmatches
    set l [expr {$numcommits - 1}]
    selectline $l 1
}

5715 5716
proc selnextline {dir} {
    global selectedline
5717
    focus .
5718
    if {![info exists selectedline]} return
J
Jeff Hobbs 已提交
5719
    set l [expr {$selectedline + $dir}]
5720
    unmarkmatches
5721 5722 5723
    selectline $l 1
}

5724 5725 5726 5727 5728 5729 5730 5731
proc selnextpage {dir} {
    global canv linespc selectedline numcommits

    set lpp [expr {([winfo height $canv] - 2) / $linespc}]
    if {$lpp < 1} {
	set lpp 1
    }
    allcanvs yview scroll [expr {$dir * $lpp}] units
5732
    drawvisible
5733 5734 5735 5736 5737 5738 5739 5740
    if {![info exists selectedline]} return
    set l [expr {$selectedline + $dir * $lpp}]
    if {$l < 0} {
	set l 0
    } elseif {$l >= $numcommits} {
        set l [expr $numcommits - 1]
    }
    unmarkmatches
5741
    selectline $l 1
5742 5743
}

5744
proc unselectline {} {
P
Paul Mackerras 已提交
5745
    global selectedline currentid
5746 5747

    catch {unset selectedline}
P
Paul Mackerras 已提交
5748
    catch {unset currentid}
5749
    allcanvs delete secsel
5750
    rhighlight_none
5751 5752
}

P
Paul Mackerras 已提交
5753 5754 5755 5756 5757 5758 5759 5760
proc reselectline {} {
    global selectedline

    if {[info exists selectedline]} {
	selectline $selectedline 0
    }
}

5761
proc addtohistory {cmd} {
5762
    global history historyindex curview
5763

5764
    set elt [list $curview $cmd]
5765
    if {$historyindex > 0
5766
	&& [lindex $history [expr {$historyindex - 1}]] == $elt} {
5767 5768 5769 5770
	return
    }

    if {$historyindex < [llength $history]} {
5771
	set history [lreplace $history $historyindex end $elt]
5772
    } else {
5773
	lappend history $elt
5774 5775 5776
    }
    incr historyindex
    if {$historyindex > 1} {
5777
	.tf.bar.leftbut conf -state normal
5778
    } else {
5779
	.tf.bar.leftbut conf -state disabled
5780
    }
5781
    .tf.bar.rightbut conf -state disabled
5782 5783
}

5784 5785 5786 5787 5788 5789 5790 5791 5792 5793 5794
proc godo {elt} {
    global curview

    set view [lindex $elt 0]
    set cmd [lindex $elt 1]
    if {$curview != $view} {
	showview $view
    }
    eval $cmd
}

5795 5796
proc goback {} {
    global history historyindex
5797
    focus .
5798 5799 5800

    if {$historyindex > 1} {
	incr historyindex -1
5801
	godo [lindex $history [expr {$historyindex - 1}]]
5802
	.tf.bar.rightbut conf -state normal
5803 5804
    }
    if {$historyindex <= 1} {
5805
	.tf.bar.leftbut conf -state disabled
5806 5807 5808 5809 5810
    }
}

proc goforw {} {
    global history historyindex
5811
    focus .
5812 5813

    if {$historyindex < [llength $history]} {
5814
	set cmd [lindex $history $historyindex]
5815
	incr historyindex
5816
	godo $cmd
5817
	.tf.bar.leftbut conf -state normal
5818 5819
    }
    if {$historyindex >= [llength $history]} {
5820
	.tf.bar.rightbut conf -state disabled
5821
    }
5822 5823
}

P
Paul Mackerras 已提交
5824
proc gettree {id} {
5825 5826
    global treefilelist treeidlist diffids diffmergeid treepending
    global nullid nullid2
P
Paul Mackerras 已提交
5827 5828 5829 5830 5831

    set diffids $id
    catch {unset diffmergeid}
    if {![info exists treefilelist($id)]} {
	if {![info exists treepending]} {
5832 5833 5834 5835
	    if {$id eq $nullid} {
		set cmd [list | git ls-files]
	    } elseif {$id eq $nullid2} {
		set cmd [list | git ls-files --stage -t]
5836
	    } else {
5837
		set cmd [list | git ls-tree -r $id]
5838 5839
	    }
	    if {[catch {set gtf [open $cmd r]}]} {
P
Paul Mackerras 已提交
5840 5841 5842 5843 5844 5845
		return
	    }
	    set treepending $id
	    set treefilelist($id) {}
	    set treeidlist($id) {}
	    fconfigure $gtf -blocking 0
5846
	    filerun $gtf [list gettreeline $gtf $id]
P
Paul Mackerras 已提交
5847 5848 5849 5850 5851 5852 5853
	}
    } else {
	setfilelist $id
    }
}

proc gettreeline {gtf id} {
5854
    global treefilelist treeidlist treepending cmitmode diffids nullid nullid2
P
Paul Mackerras 已提交
5855

5856 5857
    set nl 0
    while {[incr nl] <= 1000 && [gets $gtf line] >= 0} {
5858 5859 5860 5861
	if {$diffids eq $nullid} {
	    set fname $line
	} else {
	    if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue
5862 5863 5864 5865
	    set i [string first "\t" $line]
	    if {$i < 0} continue
	    set sha1 [lindex $line 2]
	    set fname [string range $line [expr {$i+1}] end]
5866 5867 5868 5869 5870
	    if {[string index $fname 0] eq "\""} {
		set fname [lindex $fname 0]
	    }
	    lappend treeidlist($id) $sha1
	}
5871 5872 5873 5874
	lappend treefilelist($id) $fname
    }
    if {![eof $gtf]} {
	return [expr {$nl >= 1000? 2: 1}]
P
Paul Mackerras 已提交
5875 5876 5877 5878 5879 5880 5881 5882 5883 5884 5885 5886
    }
    close $gtf
    unset treepending
    if {$cmitmode ne "tree"} {
	if {![info exists diffmergeid]} {
	    gettreediffs $diffids
	}
    } elseif {$id ne $diffids} {
	gettree $diffids
    } else {
	setfilelist $id
    }
5887
    return 0
P
Paul Mackerras 已提交
5888 5889 5890
}

proc showfile {f} {
5891
    global treefilelist treeidlist diffids nullid nullid2
P
Paul Mackerras 已提交
5892 5893 5894 5895 5896 5897 5898
    global ctext commentend

    set i [lsearch -exact $treefilelist($diffids) $f]
    if {$i < 0} {
	puts "oops, $f not in list for id $diffids"
	return
    }
5899 5900 5901
    if {$diffids eq $nullid} {
	if {[catch {set bf [open $f r]} err]} {
	    puts "oops, can't read $f: $err"
5902 5903 5904
	    return
	}
    } else {
5905 5906 5907
	set blob [lindex $treeidlist($diffids) $i]
	if {[catch {set bf [open [concat | git cat-file blob $blob] r]} err]} {
	    puts "oops, error reading blob $blob: $err"
5908 5909
	    return
	}
P
Paul Mackerras 已提交
5910 5911
    }
    fconfigure $bf -blocking 0
5912
    filerun $bf [list getblobline $bf $diffids]
P
Paul Mackerras 已提交
5913
    $ctext config -state normal
5914
    clear_ctext $commentend
P
Paul Mackerras 已提交
5915 5916 5917 5918
    $ctext insert end "\n"
    $ctext insert end "$f\n" filesep
    $ctext config -state disabled
    $ctext yview $commentend
5919
    settabs 0
P
Paul Mackerras 已提交
5920 5921 5922 5923 5924 5925 5926
}

proc getblobline {bf id} {
    global diffids cmitmode ctext

    if {$id ne $diffids || $cmitmode ne "tree"} {
	catch {close $bf}
5927
	return 0
P
Paul Mackerras 已提交
5928 5929
    }
    $ctext config -state normal
5930 5931
    set nl 0
    while {[incr nl] <= 1000 && [gets $bf line] >= 0} {
P
Paul Mackerras 已提交
5932 5933 5934 5935 5936 5937
	$ctext insert end "$line\n"
    }
    if {[eof $bf]} {
	# delete last newline
	$ctext delete "end - 2c" "end - 1c"
	close $bf
5938
	return 0
P
Paul Mackerras 已提交
5939 5940
    }
    $ctext config -state disabled
5941
    return [expr {$nl >= 1000? 2: 1}]
P
Paul Mackerras 已提交
5942 5943
}

5944
proc mergediff {id} {
5945
    global diffmergeid mdifffd
5946
    global diffids
5947
    global parents
5948
    global diffcontext
5949
    global limitdiffs vfilelimit curview
5950

5951
    set diffmergeid $id
5952
    set diffids $id
5953
    # this doesn't seem to actually affect anything...
5954
    set cmd [concat | git diff-tree --no-commit-id --cc -U$diffcontext $id]
5955 5956
    if {$limitdiffs && $vfilelimit($curview) ne {}} {
	set cmd [concat $cmd -- $vfilelimit($curview)]
5957
    }
5958
    if {[catch {set mdf [open $cmd r]} err]} {
5959
	error_popup "[mc "Error getting merge diffs:"] $err"
5960
	return
5961
    }
5962 5963
    fconfigure $mdf -blocking 0
    set mdifffd($id) $mdf
5964
    set np [llength $parents($curview,$id)]
5965
    settabs $np
5966
    filerun $mdf [list getmergediffline $mdf $id $np]
5967 5968
}

5969
proc getmergediffline {mdf id np} {
5970
    global diffmergeid ctext cflist mergemax
5971
    global difffilestart mdifffd
5972

5973 5974 5975 5976 5977
    $ctext conf -state normal
    set nr 0
    while {[incr nr] <= 1000 && [gets $mdf line] >= 0} {
	if {![info exists diffmergeid] || $id != $diffmergeid
	    || $mdf != $mdifffd($id)} {
5978
	    close $mdf
5979
	    return 0
5980
	}
5981 5982 5983 5984 5985 5986 5987 5988 5989 5990 5991 5992 5993 5994 5995 5996 5997 5998 5999 6000 6001 6002 6003 6004 6005 6006 6007 6008 6009 6010 6011
	if {[regexp {^diff --cc (.*)} $line match fname]} {
	    # start of a new file
	    $ctext insert end "\n"
	    set here [$ctext index "end - 1c"]
	    lappend difffilestart $here
	    add_flist [list $fname]
	    set l [expr {(78 - [string length $fname]) / 2}]
	    set pad [string range "----------------------------------------" 1 $l]
	    $ctext insert end "$pad $fname $pad\n" filesep
	} elseif {[regexp {^@@} $line]} {
	    $ctext insert end "$line\n" hunksep
	} elseif {[regexp {^[0-9a-f]{40}$} $line] || [regexp {^index} $line]} {
	    # do nothing
	} else {
	    # parse the prefix - one ' ', '-' or '+' for each parent
	    set spaces {}
	    set minuses {}
	    set pluses {}
	    set isbad 0
	    for {set j 0} {$j < $np} {incr j} {
		set c [string range $line $j $j]
		if {$c == " "} {
		    lappend spaces $j
		} elseif {$c == "-"} {
		    lappend minuses $j
		} elseif {$c == "+"} {
		    lappend pluses $j
		} else {
		    set isbad 1
		    break
		}
6012
	    }
6013 6014 6015 6016 6017 6018 6019 6020 6021
	    set tags {}
	    set num {}
	    if {!$isbad && $minuses ne {} && $pluses eq {}} {
		# line doesn't appear in result, parents in $minuses have the line
		set num [lindex $minuses 0]
	    } elseif {!$isbad && $pluses ne {} && $minuses eq {}} {
		# line appears in result, parents in $pluses don't have the line
		lappend tags mresult
		set num [lindex $spaces 0]
6022
	    }
6023 6024 6025 6026 6027 6028 6029
	    if {$num ne {}} {
		if {$num >= $mergemax} {
		    set num "max"
		}
		lappend tags m$num
	    }
	    $ctext insert end "$line\n" $tags
6030
	}
6031 6032
    }
    $ctext conf -state disabled
6033 6034 6035
    if {[eof $mdf]} {
	close $mdf
	return 0
6036
    }
6037
    return [expr {$nr >= 1000? 2: 1}]
6038 6039
}

6040
proc startdiff {ids} {
6041
    global treediffs diffids treepending diffmergeid nullid nullid2
6042

6043
    settabs 1
6044
    set diffids $ids
6045
    catch {unset diffmergeid}
6046 6047 6048
    if {![info exists treediffs($ids)] ||
	[lsearch -exact $ids $nullid] >= 0 ||
	[lsearch -exact $ids $nullid2] >= 0} {
6049
	if {![info exists treepending]} {
6050
	    gettreediffs $ids
6051 6052
	}
    } else {
6053
	addtocflist $ids
6054 6055 6056
    }
}

6057 6058 6059
proc path_filter {filter name} {
    foreach p $filter {
	set l [string length $p]
6060 6061 6062 6063 6064 6065 6066 6067 6068 6069
	if {[string index $p end] eq "/"} {
	    if {[string compare -length $l $p $name] == 0} {
		return 1
	    }
	} else {
	    if {[string compare -length $l $p $name] == 0 &&
		([string length $name] == $l ||
		 [string index $name $l] eq "/")} {
		return 1
	    }
6070 6071 6072 6073 6074
	}
    }
    return 0
}

6075
proc addtocflist {ids} {
6076
    global treediffs
6077

6078
    add_flist $treediffs($ids)
6079
    getblobdiffs $ids
6080 6081
}

6082
proc diffcmd {ids flags} {
6083
    global nullid nullid2
6084 6085

    set i [lsearch -exact $ids $nullid]
6086
    set j [lsearch -exact $ids $nullid2]
6087
    if {$i >= 0} {
6088 6089 6090 6091 6092 6093 6094 6095 6096 6097 6098 6099 6100 6101 6102 6103 6104
	if {[llength $ids] > 1 && $j < 0} {
	    # comparing working directory with some specific revision
	    set cmd [concat | git diff-index $flags]
	    if {$i == 0} {
		lappend cmd -R [lindex $ids 1]
	    } else {
		lappend cmd [lindex $ids 0]
	    }
	} else {
	    # comparing working directory with index
	    set cmd [concat | git diff-files $flags]
	    if {$j == 1} {
		lappend cmd -R
	    }
	}
    } elseif {$j >= 0} {
	set cmd [concat | git diff-index --cached $flags]
6105
	if {[llength $ids] > 1} {
6106
	    # comparing index with specific revision
6107 6108 6109 6110 6111 6112
	    if {$i == 0} {
		lappend cmd -R [lindex $ids 1]
	    } else {
		lappend cmd [lindex $ids 0]
	    }
	} else {
6113
	    # comparing index with HEAD
6114 6115 6116
	    lappend cmd HEAD
	}
    } else {
6117
	set cmd [concat | git diff-tree -r $flags $ids]
6118 6119 6120 6121
    }
    return $cmd
}

6122
proc gettreediffs {ids} {
6123
    global treediff treepending
6124

6125
    set treepending $ids
6126
    set treediff {}
6127
    if {[catch {set gdtf [open [diffcmd $ids {--no-commit-id}] r]}]} return
6128
    fconfigure $gdtf -blocking 0
6129
    filerun $gdtf [list gettreediffline $gdtf $ids]
6130 6131
}

6132
proc gettreediffline {gdtf ids} {
6133
    global treediff treediffs treepending diffids diffmergeid
6134
    global cmitmode vfilelimit curview limitdiffs
6135

6136 6137
    set nr 0
    while {[incr nr] <= 1000 && [gets $gdtf line] >= 0} {
6138 6139 6140 6141 6142 6143 6144 6145
	set i [string first "\t" $line]
	if {$i >= 0} {
	    set file [string range $line [expr {$i+1}] end]
	    if {[string index $file 0] eq "\""} {
		set file [lindex $file 0]
	    }
	    lappend treediff $file
	}
6146 6147 6148 6149 6150
    }
    if {![eof $gdtf]} {
	return [expr {$nr >= 1000? 2: 1}]
    }
    close $gdtf
6151
    if {$limitdiffs && $vfilelimit($curview) ne {}} {
6152 6153
	set flist {}
	foreach f $treediff {
6154
	    if {[path_filter $vfilelimit($curview) $f]} {
6155 6156 6157 6158 6159 6160 6161
		lappend flist $f
	    }
	}
	set treediffs($ids) $flist
    } else {
	set treediffs($ids) $treediff
    }
6162 6163 6164 6165 6166 6167
    unset treepending
    if {$cmitmode eq "tree"} {
	gettree $diffids
    } elseif {$ids != $diffids} {
	if {![info exists diffmergeid]} {
	    gettreediffs $diffids
6168
	}
6169 6170
    } else {
	addtocflist $ids
6171
    }
6172
    return 0
6173 6174
}

6175 6176 6177 6178 6179 6180 6181 6182 6183 6184 6185 6186 6187 6188 6189 6190
# empty string or positive integer
proc diffcontextvalidate {v} {
    return [regexp {^(|[1-9][0-9]*)$} $v]
}

proc diffcontextchange {n1 n2 op} {
    global diffcontextstring diffcontext

    if {[string is integer -strict $diffcontextstring]} {
	if {$diffcontextstring > 0} {
	    set diffcontext $diffcontextstring
	    reselectline
	}
    }
}

6191 6192 6193 6194
proc changeignorespace {} {
    reselectline
}

6195
proc getblobdiffs {ids} {
6196
    global blobdifffd diffids env
6197
    global diffinhdr treediffs
6198
    global diffcontext
6199
    global ignorespace
6200
    global limitdiffs vfilelimit curview
6201

6202
    set cmd [diffcmd $ids "-p -C --no-commit-id -U$diffcontext"]
6203 6204 6205
    if {$ignorespace} {
	append cmd " -w"
    }
6206 6207
    if {$limitdiffs && $vfilelimit($curview) ne {}} {
	set cmd [concat $cmd -- $vfilelimit($curview)]
6208 6209
    }
    if {[catch {set bdf [open $cmd r]} err]} {
6210 6211 6212
	puts "error getting diffs: $err"
	return
    }
6213
    set diffinhdr 0
6214
    fconfigure $bdf -blocking 0
6215
    set blobdifffd($ids) $bdf
6216
    filerun $bdf [list getblobdiffline $bdf $diffids]
6217 6218
}

6219 6220 6221 6222 6223 6224 6225 6226 6227 6228 6229 6230 6231
proc setinlist {var i val} {
    global $var

    while {[llength [set $var]] < $i} {
	lappend $var {}
    }
    if {[llength [set $var]] == $i} {
	lappend $var $val
    } else {
	lset $var $i $val
    }
}

6232 6233 6234 6235 6236 6237 6238 6239 6240 6241 6242 6243
proc makediffhdr {fname ids} {
    global ctext curdiffstart treediffs

    set i [lsearch -exact $treediffs($ids) $fname]
    if {$i >= 0} {
	setinlist difffilestart $i $curdiffstart
    }
    set l [expr {(78 - [string length $fname]) / 2}]
    set pad [string range "----------------------------------------" 1 $l]
    $ctext insert $curdiffstart "$pad $fname $pad" filesep
}

6244
proc getblobdiffline {bdf ids} {
6245
    global diffids blobdifffd ctext curdiffstart
6246
    global diffnexthead diffnextnote difffilestart
6247
    global diffinhdr treediffs
6248

6249
    set nr 0
6250
    $ctext conf -state normal
6251 6252 6253 6254
    while {[incr nr] <= 1000 && [gets $bdf line] >= 0} {
	if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
	    close $bdf
	    return 0
6255
	}
6256 6257 6258 6259
	if {![string compare -length 11 "diff --git " $line]} {
	    # trim off "diff --git "
	    set line [string range $line 11 end]
	    set diffinhdr 1
6260 6261
	    # start of a new file
	    $ctext insert end "\n"
6262 6263 6264 6265 6266 6267
	    set curdiffstart [$ctext index "end - 1c"]
	    $ctext insert end "\n" filesep
	    # If the name hasn't changed the length will be odd,
	    # the middle char will be a space, and the two bits either
	    # side will be a/name and b/name, or "a/name" and "b/name".
	    # If the name has changed we'll get "rename from" and
6268 6269
	    # "rename to" or "copy from" and "copy to" lines following this,
	    # and we'll use them to get the filenames.
6270 6271 6272 6273 6274 6275 6276 6277
	    # This complexity is necessary because spaces in the filename(s)
	    # don't get escaped.
	    set l [string length $line]
	    set i [expr {$l / 2}]
	    if {!(($l & 1) && [string index $line $i] eq " " &&
		  [string range $line 2 [expr {$i - 1}]] eq \
		      [string range $line [expr {$i + 3}] end])} {
		continue
6278
	    }
6279 6280 6281 6282 6283
	    # unescape if quoted and chop off the a/ from the front
	    if {[string index $line 0] eq "\""} {
		set fname [string range [lindex $line 0] 2 end]
	    } else {
		set fname [string range $line 2 [expr {$i - 1}]]
6284
	    }
6285 6286 6287
	    makediffhdr $fname $ids

	} elseif {[regexp {^@@ -([0-9]+)(,[0-9]+)? \+([0-9]+)(,[0-9]+)? @@(.*)} \
6288 6289 6290
		       $line match f1l f1c f2l f2c rest]} {
	    $ctext insert end "$line\n" hunksep
	    set diffinhdr 0
6291 6292

	} elseif {$diffinhdr} {
6293
	    if {![string compare -length 12 "rename from " $line]} {
6294
		set fname [string range $line [expr 6 + [string first " from " $line] ] end]
6295 6296 6297 6298 6299 6300 6301
		if {[string index $fname 0] eq "\""} {
		    set fname [lindex $fname 0]
		}
		set i [lsearch -exact $treediffs($ids) $fname]
		if {$i >= 0} {
		    setinlist difffilestart $i $curdiffstart
		}
6302 6303 6304
	    } elseif {![string compare -length 10 $line "rename to "] ||
		      ![string compare -length 8 $line "copy to "]} {
		set fname [string range $line [expr 4 + [string first " to " $line] ] end]
6305 6306 6307 6308 6309 6310 6311 6312 6313 6314 6315 6316 6317
		if {[string index $fname 0] eq "\""} {
		    set fname [lindex $fname 0]
		}
		makediffhdr $fname $ids
	    } elseif {[string compare -length 3 $line "---"] == 0} {
		# do nothing
		continue
	    } elseif {[string compare -length 3 $line "+++"] == 0} {
		set diffinhdr 0
		continue
	    }
	    $ctext insert end "$line\n" filesep

6318
	} else {
6319 6320 6321 6322 6323 6324 6325
	    set x [string range $line 0 0]
	    if {$x == "-" || $x == "+"} {
		set tag [expr {$x == "+"}]
		$ctext insert end "$line\n" d$tag
	    } elseif {$x == " "} {
		$ctext insert end "$line\n"
	    } else {
6326 6327 6328
		# "\ No newline at end of file",
		# or something else we don't recognize
		$ctext insert end "$line\n" hunksep
6329 6330 6331 6332
	    }
	}
    }
    $ctext conf -state disabled
6333 6334 6335
    if {[eof $bdf]} {
	close $bdf
	return 0
6336
    }
6337
    return [expr {$nr >= 1000? 2: 1}]
6338 6339
}

6340 6341 6342 6343 6344 6345 6346
proc changediffdisp {} {
    global ctext diffelide

    $ctext tag conf d0 -elide [lindex $diffelide 0]
    $ctext tag conf d1 -elide [lindex $diffelide 1]
}

6347 6348 6349 6350 6351 6352 6353 6354 6355 6356 6357 6358 6359 6360
proc prevfile {} {
    global difffilestart ctext
    set prev [lindex $difffilestart 0]
    set here [$ctext index @0,0]
    foreach loc $difffilestart {
	if {[$ctext compare $loc >= $here]} {
	    $ctext yview $prev
	    return
	}
	set prev $loc
    }
    $ctext yview $prev
}

6361 6362 6363
proc nextfile {} {
    global difffilestart ctext
    set here [$ctext index @0,0]
6364 6365 6366
    foreach loc $difffilestart {
	if {[$ctext compare $loc > $here]} {
	    $ctext yview $loc
6367
	    return
6368 6369
	}
    }
6370 6371
}

6372 6373
proc clear_ctext {{first 1.0}} {
    global ctext smarktop smarkbot
6374
    global pendinglinks
6375

6376 6377 6378
    set l [lindex [split $first .] 0]
    if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} {
	set smarktop $l
6379
    }
6380 6381
    if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} {
	set smarkbot $l
6382 6383
    }
    $ctext delete $first end
6384 6385 6386
    if {$first eq "1.0"} {
	catch {unset pendinglinks}
    }
6387 6388
}

6389
proc settabs {{firstab {}}} {
6390
    global firsttabstop tabstop ctext have_tk85
6391 6392 6393 6394

    if {$firstab ne {} && $have_tk85} {
	set firsttabstop $firstab
    }
6395
    set w [font measure textfont "0"]
6396
    if {$firsttabstop != 0} {
6397 6398
	$ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \
			       [expr {($firsttabstop + 2 * $tabstop) * $w}]]
6399 6400 6401 6402 6403
    } elseif {$have_tk85 || $tabstop != 8} {
	$ctext conf -tabs [expr {$tabstop * $w}]
    } else {
	$ctext conf -tabs {}
    }
6404 6405 6406
}

proc incrsearch {name ix op} {
6407
    global ctext searchstring searchdirn
6408 6409

    $ctext tag remove found 1.0 end
6410 6411 6412 6413 6414 6415 6416 6417 6418 6419 6420
    if {[catch {$ctext index anchor}]} {
	# no anchor set, use start of selection, or of visible area
	set sel [$ctext tag ranges sel]
	if {$sel ne {}} {
	    $ctext mark set anchor [lindex $sel 0]
	} elseif {$searchdirn eq "-forwards"} {
	    $ctext mark set anchor @0,0
	} else {
	    $ctext mark set anchor @0,[winfo height $ctext]
	}
    }
6421
    if {$searchstring ne {}} {
6422 6423 6424 6425
	set here [$ctext search $searchdirn -- $searchstring anchor]
	if {$here ne {}} {
	    $ctext see $here
	}
6426 6427 6428 6429 6430
	searchmarkvisible 1
    }
}

proc dosearch {} {
6431
    global sstring ctext searchstring searchdirn
6432 6433 6434

    focus $sstring
    $sstring icursor end
6435 6436 6437 6438 6439 6440 6441 6442 6443 6444 6445 6446 6447 6448 6449 6450 6451 6452 6453 6454 6455 6456 6457 6458 6459 6460 6461 6462 6463 6464 6465 6466 6467 6468 6469 6470 6471 6472 6473 6474 6475 6476 6477 6478
    set searchdirn -forwards
    if {$searchstring ne {}} {
	set sel [$ctext tag ranges sel]
	if {$sel ne {}} {
	    set start "[lindex $sel 0] + 1c"
	} elseif {[catch {set start [$ctext index anchor]}]} {
	    set start "@0,0"
	}
	set match [$ctext search -count mlen -- $searchstring $start]
	$ctext tag remove sel 1.0 end
	if {$match eq {}} {
	    bell
	    return
	}
	$ctext see $match
	set mend "$match + $mlen c"
	$ctext tag add sel $match $mend
	$ctext mark unset anchor
    }
}

proc dosearchback {} {
    global sstring ctext searchstring searchdirn

    focus $sstring
    $sstring icursor end
    set searchdirn -backwards
    if {$searchstring ne {}} {
	set sel [$ctext tag ranges sel]
	if {$sel ne {}} {
	    set start [lindex $sel 0]
	} elseif {[catch {set start [$ctext index anchor]}]} {
	    set start @0,[winfo height $ctext]
	}
	set match [$ctext search -backwards -count ml -- $searchstring $start]
	$ctext tag remove sel 1.0 end
	if {$match eq {}} {
	    bell
	    return
	}
	$ctext see $match
	set mend "$match + $ml c"
	$ctext tag add sel $match $mend
	$ctext mark unset anchor
6479 6480 6481 6482 6483 6484 6485 6486 6487 6488 6489 6490 6491 6492 6493 6494 6495 6496 6497 6498 6499 6500 6501 6502 6503 6504 6505 6506 6507 6508 6509 6510 6511 6512 6513 6514 6515 6516
    }
}

proc searchmark {first last} {
    global ctext searchstring

    set mend $first.0
    while {1} {
	set match [$ctext search -count mlen -- $searchstring $mend $last.end]
	if {$match eq {}} break
	set mend "$match + $mlen c"
	$ctext tag add found $match $mend
    }
}

proc searchmarkvisible {doall} {
    global ctext smarktop smarkbot

    set topline [lindex [split [$ctext index @0,0] .] 0]
    set botline [lindex [split [$ctext index @0,[winfo height $ctext]] .] 0]
    if {$doall || $botline < $smarktop || $topline > $smarkbot} {
	# no overlap with previous
	searchmark $topline $botline
	set smarktop $topline
	set smarkbot $botline
    } else {
	if {$topline < $smarktop} {
	    searchmark $topline [expr {$smarktop-1}]
	    set smarktop $topline
	}
	if {$botline > $smarkbot} {
	    searchmark [expr {$smarkbot+1}] $botline
	    set smarkbot $botline
	}
    }
}

proc scrolltext {f0 f1} {
6517
    global searchstring
6518

6519
    .bleft.bottom.sb set $f0 $f1
6520 6521 6522 6523 6524
    if {$searchstring ne {}} {
	searchmarkvisible 0
    }
}

6525
proc setcoords {} {
6526
    global linespc charspc canvx0 canvy0
6527
    global xspc1 xspc2 lthickness
6528

6529 6530
    set linespc [font metrics mainfont -linespace]
    set charspc [font measure mainfont "m"]
P
Paul Mackerras 已提交
6531 6532
    set canvy0 [expr {int(3 + 0.5 * $linespc)}]
    set canvx0 [expr {int(3 + 0.5 * $linespc)}]
6533
    set lthickness [expr {int($linespc / 9) + 1}]
6534 6535
    set xspc1(0) $linespc
    set xspc2 $linespc
6536
}
6537

6538
proc redisplay {} {
6539
    global canv
P
Paul Mackerras 已提交
6540 6541 6542 6543 6544 6545
    global selectedline

    set ymax [lindex [$canv cget -scrollregion] 3]
    if {$ymax eq {} || $ymax == 0} return
    set span [$canv yview]
    clear_display
6546
    setcanvscroll
P
Paul Mackerras 已提交
6547 6548 6549 6550
    allcanvs yview moveto [lindex $span 0]
    drawvisible
    if {[info exists selectedline]} {
	selectline $selectedline 0
6551
	allcanvs yview moveto [lindex $span 0]
6552 6553 6554
    }
}

6555 6556 6557 6558 6559 6560 6561 6562 6563
proc parsefont {f n} {
    global fontattr

    set fontattr($f,family) [lindex $n 0]
    set s [lindex $n 1]
    if {$s eq {} || $s == 0} {
	set s 10
    } elseif {$s < 0} {
	set s [expr {int(-$s / [winfo fpixels . 1p] + 0.5)}]
6564
    }
6565 6566 6567 6568 6569 6570 6571 6572 6573 6574
    set fontattr($f,size) $s
    set fontattr($f,weight) normal
    set fontattr($f,slant) roman
    foreach style [lrange $n 2 end] {
	switch -- $style {
	    "normal" -
	    "bold"   {set fontattr($f,weight) $style}
	    "roman" -
	    "italic" {set fontattr($f,slant) $style}
	}
6575
    }
6576 6577 6578 6579 6580 6581 6582 6583 6584 6585 6586 6587 6588 6589 6590 6591
}

proc fontflags {f {isbold 0}} {
    global fontattr

    return [list -family $fontattr($f,family) -size $fontattr($f,size) \
		-weight [expr {$isbold? "bold": $fontattr($f,weight)}] \
		-slant $fontattr($f,slant)]
}

proc fontname {f} {
    global fontattr

    set n [list $fontattr($f,family) $fontattr($f,size)]
    if {$fontattr($f,weight) eq "bold"} {
	lappend n "bold"
6592
    }
6593 6594
    if {$fontattr($f,slant) eq "italic"} {
	lappend n "italic"
6595
    }
6596
    return $n
6597 6598
}

6599
proc incrfont {inc} {
6600
    global mainfont textfont ctext canv cflist showrefstop
6601 6602
    global stopped entries fontattr

6603
    unmarkmatches
6604
    set s $fontattr(mainfont,size)
6605 6606 6607 6608
    incr s $inc
    if {$s < 1} {
	set s 1
    }
6609
    set fontattr(mainfont,size) $s
6610 6611
    font config mainfont -size $s
    font config mainfontbold -size $s
6612 6613
    set mainfont [fontname mainfont]
    set s $fontattr(textfont,size)
6614 6615 6616 6617
    incr s $inc
    if {$s < 1} {
	set s 1
    }
6618
    set fontattr(textfont,size) $s
6619 6620
    font config textfont -size $s
    font config textfontbold -size $s
6621
    set textfont [fontname textfont]
6622
    setcoords
6623
    settabs
6624 6625
    redisplay
}
6626

6627 6628 6629 6630 6631 6632 6633
proc clearsha1 {} {
    global sha1entry sha1string
    if {[string length $sha1string] == 40} {
	$sha1entry delete 0 end
    }
}

6634 6635 6636 6637 6638 6639 6640 6641 6642 6643
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"} {
6644
	$sha1but conf -state normal -relief raised -text "[mc "Goto:"] "
6645
    } else {
6646
	$sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] "
6647 6648 6649 6650
    }
}

proc gotocommit {} {
6651
    global sha1string tagids headids curview varcid
6652

6653 6654 6655 6656
    if {$sha1string == {}
	|| ([info exists currentid] && $sha1string == $currentid)} return
    if {[info exists tagids($sha1string)]} {
	set id $tagids($sha1string)
6657 6658
    } elseif {[info exists headids($sha1string)]} {
	set id $headids($sha1string)
6659 6660
    } else {
	set id [string tolower $sha1string]
6661
	if {[regexp {^[0-9a-f]{4,39}$} $id]} {
6662
	    set matches [array names varcid "$curview,$id*"]
6663 6664
	    if {$matches ne {}} {
		if {[llength $matches] > 1} {
6665
		    error_popup [mc "Short SHA1 id %s is ambiguous" $id]
6666 6667
		    return
		}
6668
		set id [lindex [split [lindex $matches 0] ","] 1]
6669 6670
	    }
	}
6671
    }
6672 6673
    if {[commitinview $id $curview]} {
	selectline [rowofcommit $id] 1
6674 6675
	return
    }
6676
    if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
6677
	set msg [mc "SHA1 id %s is not known" $sha1string]
6678
    } else {
6679
	set msg [mc "Tag/Head %s is not known" $sha1string]
6680
    }
6681
    error_popup $msg
6682 6683
}

6684 6685 6686 6687
proc lineenter {x y id} {
    global hoverx hovery hoverid hovertimer
    global commitinfo canv

P
Paul Mackerras 已提交
6688
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
6689 6690 6691 6692 6693 6694 6695 6696 6697 6698 6699 6700 6701 6702 6703 6704 6705 6706 6707 6708 6709 6710 6711 6712 6713 6714 6715 6716 6717 6718 6719 6720 6721 6722 6723 6724 6725 6726 6727
    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
6728
    global commitinfo
6729 6730 6731 6732 6733 6734 6735 6736 6737

    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}]
6738
    set x1 [expr {$x + [font measure mainfont $text] + 2 * $lthickness}]
6739 6740 6741 6742
    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
6743
    set t [$canv create text $x $y -anchor nw -text $text -tags hover \
6744
	       -font mainfont]
6745 6746 6747
    $canv raise $t
}

6748
proc clickisonarrow {id y} {
P
Paul Mackerras 已提交
6749
    global lthickness
6750

P
Paul Mackerras 已提交
6751
    set ranges [rowranges $id]
6752
    set thresh [expr {2 * $lthickness + 6}]
P
Paul Mackerras 已提交
6753
    set n [expr {[llength $ranges] - 1}]
6754
    for {set i 1} {$i < $n} {incr i} {
P
Paul Mackerras 已提交
6755
	set row [lindex $ranges $i]
6756 6757
	if {abs([yc $row] - $y) < $thresh} {
	    return $i
6758 6759 6760 6761 6762
	}
    }
    return {}
}

6763
proc arrowjump {id n y} {
P
Paul Mackerras 已提交
6764
    global canv
6765

6766 6767
    # 1 <-> 2, 3 <-> 4, etc...
    set n [expr {(($n - 1) ^ 1) + 1}]
P
Paul Mackerras 已提交
6768
    set row [lindex [rowranges $id] $n]
6769
    set yt [yc $row]
6770 6771 6772 6773 6774 6775 6776 6777
    set ymax [lindex [$canv cget -scrollregion] 3]
    if {$ymax eq {} || $ymax <= 0} return
    set view [$canv yview]
    set yspan [expr {[lindex $view 1] - [lindex $view 0]}]
    set yfrac [expr {$yt / $ymax - $yspan / 2}]
    if {$yfrac < 0} {
	set yfrac 0
    }
6778
    allcanvs yview moveto $yfrac
6779 6780
}

6781
proc lineclick {x y id isnew} {
6782
    global ctext commitinfo children canv thickerline curview
6783

P
Paul Mackerras 已提交
6784
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
6785
    unmarkmatches
6786
    unselectline
6787 6788 6789 6790
    normalline
    $canv delete hover
    # draw this line thicker than normal
    set thickerline $id
6791
    drawlines $id
6792
    if {$isnew} {
6793 6794 6795 6796 6797 6798 6799 6800 6801 6802 6803 6804 6805
	set ymax [lindex [$canv cget -scrollregion] 3]
	if {$ymax eq {}} return
	set yfrac [lindex [$canv yview] 0]
	set y [expr {$y + $yfrac * $ymax}]
    }
    set dirn [clickisonarrow $id $y]
    if {$dirn ne {}} {
	arrowjump $id $dirn $y
	return
    }

    if {$isnew} {
	addtohistory [list lineclick $x $y $id 0]
6806
    }
6807 6808
    # fill the details pane with info about this line
    $ctext conf -state normal
6809
    clear_ctext
6810
    settabs 0
6811
    $ctext insert end "[mc "Parent"]:\t"
6812 6813
    $ctext insert end $id link0
    setlink $id link0
6814
    set info $commitinfo($id)
6815
    $ctext insert end "\n\t[lindex $info 0]\n"
6816
    $ctext insert end "\t[mc "Author"]:\t[lindex $info 1]\n"
P
Paul Mackerras 已提交
6817
    set date [formatdate [lindex $info 2]]
6818
    $ctext insert end "\t[mc "Date"]:\t$date\n"
6819
    set kids $children($curview,$id)
6820
    if {$kids ne {}} {
6821
	$ctext insert end "\n[mc "Children"]:"
6822
	set i 0
6823
	foreach child $kids {
6824
	    incr i
P
Paul Mackerras 已提交
6825
	    if {![info exists commitinfo($child)] && ![getcommit $child]} continue
6826
	    set info $commitinfo($child)
6827
	    $ctext insert end "\n\t"
6828 6829
	    $ctext insert end $child link$i
	    setlink $child link$i
6830
	    $ctext insert end "\n\t[lindex $info 0]"
6831
	    $ctext insert end "\n\t[mc "Author"]:\t[lindex $info 1]"
P
Paul Mackerras 已提交
6832
	    set date [formatdate [lindex $info 2]]
6833
	    $ctext insert end "\n\t[mc "Date"]:\t$date\n"
6834 6835 6836
	}
    }
    $ctext conf -state disabled
6837
    init_flist {}
6838 6839
}

6840 6841 6842
proc normalline {} {
    global thickerline
    if {[info exists thickerline]} {
6843
	set id $thickerline
6844
	unset thickerline
6845
	drawlines $id
6846 6847 6848
    }
}

6849
proc selbyid {id} {
6850 6851 6852
    global curview
    if {[commitinview $id $curview]} {
	selectline [rowofcommit $id] 1
6853 6854 6855 6856 6857 6858 6859 6860 6861 6862 6863 6864
    }
}

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} {
6865
    global rowctxmenu selectedline rowmenuid curview
6866
    global nullid nullid2 fakerowmenu mainhead
6867

6868
    stopfinding
6869
    set rowmenuid $id
6870
    if {![info exists selectedline]
6871
	|| [rowofcommit $id] eq $selectedline} {
6872 6873 6874 6875
	set state disabled
    } else {
	set state normal
    }
6876
    if {$id ne $nullid && $id ne $nullid2} {
6877
	set menu $rowctxmenu
6878
	$menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead]
6879 6880 6881
    } else {
	set menu $fakerowmenu
    }
6882 6883 6884
    $menu entryconfigure [mc "Diff this -> selected"] -state $state
    $menu entryconfigure [mc "Diff selected -> this"] -state $state
    $menu entryconfigure [mc "Make patch"] -state $state
6885
    tk_popup $menu $x $y
6886 6887 6888
}

proc diffvssel {dirn} {
6889
    global rowmenuid selectedline
6890 6891 6892

    if {![info exists selectedline]} return
    if {$dirn} {
6893
	set oldid [commitonrow $selectedline]
6894 6895 6896
	set newid $rowmenuid
    } else {
	set oldid $rowmenuid
6897
	set newid [commitonrow $selectedline]
6898
    }
6899 6900 6901 6902 6903
    addtohistory [list doseldiff $oldid $newid]
    doseldiff $oldid $newid
}

proc doseldiff {oldid newid} {
6904
    global ctext
6905 6906
    global commitinfo

6907
    $ctext conf -state normal
6908
    clear_ctext
6909 6910
    init_flist [mc "Top"]
    $ctext insert end "[mc "From"] "
6911 6912
    $ctext insert end $oldid link0
    setlink $oldid link0
6913
    $ctext insert end "\n     "
6914
    $ctext insert end [lindex $commitinfo($oldid) 0]
6915
    $ctext insert end "\n\n[mc "To"]   "
6916 6917
    $ctext insert end $newid link1
    setlink $newid link1
6918
    $ctext insert end "\n     "
6919 6920 6921 6922
    $ctext insert end [lindex $commitinfo($newid) 0]
    $ctext insert end "\n"
    $ctext conf -state disabled
    $ctext tag remove found 1.0 end
6923
    startdiff [list $oldid $newid]
6924 6925
}

6926 6927 6928 6929 6930 6931 6932 6933 6934 6935 6936 6937
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
6938
    label $top.title -text [mc "Generate patch"]
6939
    grid $top.title - -pady 10
6940
    label $top.from -text [mc "From:"]
6941
    entry $top.fromsha1 -width 40 -relief flat
6942 6943 6944
    $top.fromsha1 insert 0 $oldid
    $top.fromsha1 conf -state readonly
    grid $top.from $top.fromsha1 -sticky w
6945
    entry $top.fromhead -width 60 -relief flat
6946 6947 6948
    $top.fromhead insert 0 $oldhead
    $top.fromhead conf -state readonly
    grid x $top.fromhead -sticky w
6949
    label $top.to -text [mc "To:"]
6950
    entry $top.tosha1 -width 40 -relief flat
6951 6952 6953
    $top.tosha1 insert 0 $newid
    $top.tosha1 conf -state readonly
    grid $top.to $top.tosha1 -sticky w
6954
    entry $top.tohead -width 60 -relief flat
6955 6956 6957
    $top.tohead insert 0 $newhead
    $top.tohead conf -state readonly
    grid x $top.tohead -sticky w
6958
    button $top.rev -text [mc "Reverse"] -command mkpatchrev -padx 5
6959
    grid $top.rev x -pady 10
6960
    label $top.flab -text [mc "Output file:"]
6961 6962 6963
    entry $top.fname -width 60
    $top.fname insert 0 [file normalize "patch$patchnum.patch"]
    incr patchnum
6964
    grid $top.flab $top.fname -sticky w
6965
    frame $top.buts
6966 6967
    button $top.buts.gen -text [mc "Generate"] -command mkpatchgo
    button $top.buts.can -text [mc "Cancel"] -command mkpatchcan
6968 6969 6970 6971
    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
6972
    focus $top.fname
6973 6974 6975 6976 6977 6978 6979 6980 6981 6982 6983 6984 6985 6986 6987 6988 6989 6990 6991
}

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 {} {
6992
    global patchtop nullid nullid2
6993 6994 6995 6996

    set oldid [$patchtop.fromsha1 get]
    set newid [$patchtop.tosha1 get]
    set fname [$patchtop.fname get]
6997
    set cmd [diffcmd [list $oldid $newid] -p]
6998 6999
    # trim off the initial "|"
    set cmd [lrange $cmd 1 end]
7000 7001
    lappend cmd >$fname &
    if {[catch {eval exec $cmd} err]} {
7002
	error_popup "[mc "Error creating patch:"] $err"
7003 7004 7005 7006 7007 7008 7009 7010 7011 7012 7013 7014
    }
    catch {destroy $patchtop}
    unset patchtop
}

proc mkpatchcan {} {
    global patchtop

    catch {destroy $patchtop}
    unset patchtop
}

7015 7016 7017 7018 7019 7020 7021
proc mktag {} {
    global rowmenuid mktagtop commitinfo

    set top .maketag
    set mktagtop $top
    catch {destroy $top}
    toplevel $top
7022
    label $top.title -text [mc "Create tag"]
7023
    grid $top.title - -pady 10
7024
    label $top.id -text [mc "ID:"]
7025
    entry $top.sha1 -width 40 -relief flat
7026 7027 7028
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
7029
    entry $top.head -width 60 -relief flat
7030 7031 7032
    $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
    $top.head conf -state readonly
    grid x $top.head -sticky w
7033
    label $top.tlab -text [mc "Tag name:"]
7034
    entry $top.tag -width 60
7035 7036
    grid $top.tlab $top.tag -sticky w
    frame $top.buts
7037 7038
    button $top.buts.gen -text [mc "Create"] -command mktaggo
    button $top.buts.can -text [mc "Cancel"] -command mktagcan
7039 7040 7041 7042 7043 7044 7045 7046 7047 7048 7049 7050 7051
    grid $top.buts.gen $top.buts.can
    grid columnconfigure $top.buts 0 -weight 1 -uniform a
    grid columnconfigure $top.buts 1 -weight 1 -uniform a
    grid $top.buts - -pady 10 -sticky ew
    focus $top.tag
}

proc domktag {} {
    global mktagtop env tagids idtags

    set id [$mktagtop.sha1 get]
    set tag [$mktagtop.tag get]
    if {$tag == {}} {
7052
	error_popup [mc "No tag name specified"]
7053 7054 7055
	return
    }
    if {[info exists tagids($tag)]} {
7056
	error_popup [mc "Tag \"%s\" already exists" $tag]
7057 7058 7059
	return
    }
    if {[catch {
7060
	exec git tag $tag $id
7061
    } err]} {
7062
	error_popup "[mc "Error creating tag:"] $err"
7063 7064 7065 7066 7067
	return
    }

    set tagids($tag) $id
    lappend idtags($id) $tag
7068
    redrawtags $id
7069
    addedtag $id
7070 7071
    dispneartags 0
    run refill_reflist
7072 7073 7074
}

proc redrawtags {id} {
7075
    global canv linehtag idpos currentid curview
7076
    global canvxmax iddrawn
7077

7078
    if {![commitinview $id $curview]} return
7079
    if {![info exists iddrawn($id)]} return
7080
    set row [rowofcommit $id]
7081 7082
    $canv delete tag.$id
    set xt [eval drawtags $id $idpos($id)]
7083 7084 7085 7086
    $canv coords $linehtag($row) $xt [lindex $idpos($id) 2]
    set text [$canv itemcget $linehtag($row) -text]
    set font [$canv itemcget $linehtag($row) -font]
    set xr [expr {$xt + [font measure $font $text]}]
P
Paul Mackerras 已提交
7087 7088 7089 7090
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
7091 7092
    if {[info exists currentid] && $currentid == $id} {
	make_secsel $row
7093 7094 7095 7096 7097 7098 7099 7100 7101 7102 7103 7104 7105 7106 7107
    }
}

proc mktagcan {} {
    global mktagtop

    catch {destroy $mktagtop}
    unset mktagtop
}

proc mktaggo {} {
    domktag
    mktagcan
}

7108 7109 7110 7111 7112 7113 7114
proc writecommit {} {
    global rowmenuid wrcomtop commitinfo wrcomcmd

    set top .writecommit
    set wrcomtop $top
    catch {destroy $top}
    toplevel $top
7115
    label $top.title -text [mc "Write commit to file"]
7116
    grid $top.title - -pady 10
7117
    label $top.id -text [mc "ID:"]
7118 7119 7120 7121 7122 7123 7124 7125
    entry $top.sha1 -width 40 -relief flat
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
    entry $top.head -width 60 -relief flat
    $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
    $top.head conf -state readonly
    grid x $top.head -sticky w
7126
    label $top.clab -text [mc "Command:"]
7127 7128
    entry $top.cmd -width 60 -textvariable wrcomcmd
    grid $top.clab $top.cmd -sticky w -pady 10
7129
    label $top.flab -text [mc "Output file:"]
7130 7131 7132 7133
    entry $top.fname -width 60
    $top.fname insert 0 [file normalize "commit-[string range $rowmenuid 0 6]"]
    grid $top.flab $top.fname -sticky w
    frame $top.buts
7134 7135
    button $top.buts.gen -text [mc "Write"] -command wrcomgo
    button $top.buts.can -text [mc "Cancel"] -command wrcomcan
7136 7137 7138 7139 7140 7141 7142 7143 7144 7145 7146 7147 7148 7149
    grid $top.buts.gen $top.buts.can
    grid columnconfigure $top.buts 0 -weight 1 -uniform a
    grid columnconfigure $top.buts 1 -weight 1 -uniform a
    grid $top.buts - -pady 10 -sticky ew
    focus $top.fname
}

proc wrcomgo {} {
    global wrcomtop

    set id [$wrcomtop.sha1 get]
    set cmd "echo $id | [$wrcomtop.cmd get]"
    set fname [$wrcomtop.fname get]
    if {[catch {exec sh -c $cmd >$fname &} err]} {
7150
	error_popup "[mc "Error writing commit:"] $err"
7151 7152 7153 7154 7155 7156 7157 7158 7159 7160 7161 7162
    }
    catch {destroy $wrcomtop}
    unset wrcomtop
}

proc wrcomcan {} {
    global wrcomtop

    catch {destroy $wrcomtop}
    unset wrcomtop
}

7163 7164 7165 7166 7167 7168
proc mkbranch {} {
    global rowmenuid mkbrtop

    set top .makebranch
    catch {destroy $top}
    toplevel $top
7169
    label $top.title -text [mc "Create new branch"]
7170
    grid $top.title - -pady 10
7171
    label $top.id -text [mc "ID:"]
7172 7173 7174 7175
    entry $top.sha1 -width 40 -relief flat
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
7176
    label $top.nlab -text [mc "Name:"]
7177 7178 7179
    entry $top.name -width 40
    grid $top.nlab $top.name -sticky w
    frame $top.buts
7180 7181
    button $top.buts.go -text [mc "Create"] -command [list mkbrgo $top]
    button $top.buts.can -text [mc "Cancel"] -command "catch {destroy $top}"
7182 7183 7184 7185 7186 7187 7188 7189 7190 7191 7192 7193 7194
    grid $top.buts.go $top.buts.can
    grid columnconfigure $top.buts 0 -weight 1 -uniform a
    grid columnconfigure $top.buts 1 -weight 1 -uniform a
    grid $top.buts - -pady 10 -sticky ew
    focus $top.name
}

proc mkbrgo {top} {
    global headids idheads

    set name [$top.name get]
    set id [$top.sha1 get]
    if {$name eq {}} {
7195
	error_popup [mc "Please specify a name for the new branch"]
7196 7197 7198 7199 7200 7201 7202 7203 7204 7205 7206
	return
    }
    catch {destroy $top}
    nowbusy newbranch
    update
    if {[catch {
	exec git branch $name $id
    } err]} {
	notbusy newbranch
	error_popup $err
    } else {
7207 7208
	set headids($name) $id
	lappend idheads($id) $name
7209
	addedhead $id $name
7210 7211
	notbusy newbranch
	redrawtags $id
7212
	dispneartags 0
7213
	run refill_reflist
7214 7215 7216
    }
}

7217
proc cherrypick {} {
7218
    global rowmenuid curview
7219
    global mainhead mainheadid
7220

7221 7222 7223
    set oldhead [exec git rev-parse HEAD]
    set dheads [descheads $rowmenuid]
    if {$dheads ne {} && [lsearch -exact $dheads $oldhead] >= 0} {
7224 7225 7226
	set ok [confirm_popup [mc "Commit %s is already\
		included in branch %s -- really re-apply it?" \
				   [string range $rowmenuid 0 7] $mainhead]]
7227 7228
	if {!$ok} return
    }
7229
    nowbusy cherrypick [mc "Cherry-picking"]
7230 7231 7232 7233 7234 7235 7236 7237 7238 7239 7240
    update
    # Unfortunately git-cherry-pick writes stuff to stderr even when
    # no error occurs, and exec takes that as an indication of error...
    if {[catch {exec sh -c "git cherry-pick -r $rowmenuid 2>&1"} err]} {
	notbusy cherrypick
	error_popup $err
	return
    }
    set newhead [exec git rev-parse HEAD]
    if {$newhead eq $oldhead} {
	notbusy cherrypick
7241
	error_popup [mc "No changes committed"]
7242 7243
	return
    }
7244
    addnewchild $newhead $oldhead
7245 7246
    if {[commitinview $oldhead $curview]} {
	insertrow $newhead $oldhead $curview
7247
	if {$mainhead ne {}} {
7248
	    movehead $newhead $mainhead
7249
	    movedhead $newhead $mainhead
7250
	    set mainheadid $newhead
7251 7252 7253
	}
	redrawtags $oldhead
	redrawtags $newhead
7254
	selbyid $newhead
7255 7256 7257 7258
    }
    notbusy cherrypick
}

7259
proc resethead {} {
7260
    global mainhead rowmenuid confirm_ok resettype
7261 7262 7263 7264 7265

    set confirm_ok 0
    set w ".confirmreset"
    toplevel $w
    wm transient $w .
7266
    wm title $w [mc "Confirm reset"]
7267
    message $w.m -text \
7268
	[mc "Reset branch %s to %s?" $mainhead [string range $rowmenuid 0 7]] \
7269 7270 7271
	-justify center -aspect 1000
    pack $w.m -side top -fill x -padx 20 -pady 20
    frame $w.f -relief sunken -border 2
7272
    message $w.f.rt -text [mc "Reset type:"] -aspect 1000
7273 7274 7275
    grid $w.f.rt -sticky w
    set resettype mixed
    radiobutton $w.f.soft -value soft -variable resettype -justify left \
7276
	-text [mc "Soft: Leave working tree and index untouched"]
7277 7278
    grid $w.f.soft -sticky w
    radiobutton $w.f.mixed -value mixed -variable resettype -justify left \
7279
	-text [mc "Mixed: Leave working tree untouched, reset index"]
7280 7281
    grid $w.f.mixed -sticky w
    radiobutton $w.f.hard -value hard -variable resettype -justify left \
7282
	-text [mc "Hard: Reset working tree and index\n(discard ALL local changes)"]
7283 7284
    grid $w.f.hard -sticky w
    pack $w.f -side top -fill x
7285
    button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w"
7286
    pack $w.ok -side left -fill x -padx 20 -pady 20
7287
    button $w.cancel -text [mc Cancel] -command "destroy $w"
7288 7289 7290 7291
    pack $w.cancel -side right -fill x -padx 20 -pady 20
    bind $w <Visibility> "grab $w; focus $w"
    tkwait window $w
    if {!$confirm_ok} return
7292 7293
    if {[catch {set fd [open \
	    [list | sh -c "git reset --$resettype $rowmenuid 2>&1"] r]} err]} {
7294 7295
	error_popup $err
    } else {
7296
	dohidelocalchanges
7297
	filerun $fd [list readresetstat $fd]
7298
	nowbusy reset [mc "Resetting"]
7299
	selbyid $rowmenuid
7300 7301 7302
    }
}

7303 7304
proc readresetstat {fd} {
    global mainhead mainheadid showlocalchanges rprogcoord
7305 7306 7307

    if {[gets $fd line] >= 0} {
	if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
7308 7309
	    set rprogcoord [expr {1.0 * $m / $n}]
	    adjustprogress
7310 7311 7312
	}
	return 1
    }
7313 7314
    set rprogcoord 0
    adjustprogress
7315 7316 7317 7318 7319 7320 7321 7322 7323 7324
    notbusy reset
    if {[catch {close $fd} err]} {
	error_popup $err
    }
    set oldhead $mainheadid
    set newhead [exec git rev-parse HEAD]
    if {$newhead ne $oldhead} {
	movehead $newhead $mainhead
	movedhead $newhead $mainhead
	set mainheadid $newhead
7325
	redrawtags $oldhead
7326
	redrawtags $newhead
7327 7328 7329 7330
    }
    if {$showlocalchanges} {
	doshowlocalchanges
    }
7331
    return 0
7332 7333
}

7334 7335
# context menu for a head
proc headmenu {x y id head} {
7336
    global headmenuid headmenuhead headctxmenu mainhead
7337

7338
    stopfinding
7339 7340
    set headmenuid $id
    set headmenuhead $head
7341 7342 7343 7344 7345 7346
    set state normal
    if {$head eq $mainhead} {
	set state disabled
    }
    $headctxmenu entryconfigure 0 -state $state
    $headctxmenu entryconfigure 1 -state $state
7347 7348 7349 7350 7351
    tk_popup $headctxmenu $x $y
}

proc cobranch {} {
    global headmenuid headmenuhead mainhead headids
7352
    global showlocalchanges mainheadid
7353 7354 7355

    # check the tree is clean first??
    set oldmainhead $mainhead
7356
    nowbusy checkout [mc "Checking out"]
7357
    update
7358
    dohidelocalchanges
7359
    if {[catch {
7360
	exec git checkout -q $headmenuhead
7361 7362 7363 7364 7365
    } err]} {
	notbusy checkout
	error_popup $err
    } else {
	notbusy checkout
7366
	set mainhead $headmenuhead
7367
	set mainheadid $headmenuid
7368 7369 7370 7371
	if {[info exists headids($oldmainhead)]} {
	    redrawtags $headids($oldmainhead)
	}
	redrawtags $headmenuid
7372
	selbyid $headmenuid
7373 7374 7375
    }
    if {$showlocalchanges} {
	dodiffindex
7376 7377 7378 7379
    }
}

proc rmbranch {} {
7380
    global headmenuid headmenuhead mainhead
7381
    global idheads
7382 7383 7384

    set head $headmenuhead
    set id $headmenuid
7385
    # this check shouldn't be needed any more...
7386
    if {$head eq $mainhead} {
7387
	error_popup [mc "Cannot delete the currently checked-out branch"]
7388 7389
	return
    }
7390
    set dheads [descheads $id]
7391
    if {[llength $dheads] == 1 && $idheads($dheads) eq $head} {
7392
	# the stuff on this branch isn't on any other branch
7393 7394
	if {![confirm_popup [mc "The commits on branch %s aren't on any other\
			branch.\nReally delete branch %s?" $head $head]]} return
7395 7396 7397 7398 7399 7400 7401 7402
    }
    nowbusy rmbranch
    update
    if {[catch {exec git branch -D $head} err]} {
	notbusy rmbranch
	error_popup $err
	return
    }
7403
    removehead $id $head
7404
    removedhead $id $head
7405 7406
    redrawtags $id
    notbusy rmbranch
7407
    dispneartags 0
7408 7409 7410 7411 7412
    run refill_reflist
}

# Display a list of tags and heads
proc showrefs {} {
7413 7414
    global showrefstop bgcolor fgcolor selectbgcolor
    global bglist fglist reflistfilter reflist maincursor
7415 7416 7417 7418 7419 7420 7421 7422 7423

    set top .showrefs
    set showrefstop $top
    if {[winfo exists $top]} {
	raise $top
	refill_reflist
	return
    }
    toplevel $top
7424
    wm title $top [mc "Tags and heads: %s" [file tail [pwd]]]
7425
    text $top.list -background $bgcolor -foreground $fgcolor \
7426
	-selectbackground $selectbgcolor -font mainfont \
7427 7428 7429 7430 7431 7432 7433 7434 7435 7436 7437
	-xscrollcommand "$top.xsb set" -yscrollcommand "$top.ysb set" \
	-width 30 -height 20 -cursor $maincursor \
	-spacing1 1 -spacing3 1 -state disabled
    $top.list tag configure highlight -background $selectbgcolor
    lappend bglist $top.list
    lappend fglist $top.list
    scrollbar $top.ysb -command "$top.list yview" -orient vertical
    scrollbar $top.xsb -command "$top.list xview" -orient horizontal
    grid $top.list $top.ysb -sticky nsew
    grid $top.xsb x -sticky ew
    frame $top.f
7438 7439
    label $top.f.l -text "[mc "Filter"]: "
    entry $top.f.e -width 20 -textvariable reflistfilter
7440 7441 7442 7443 7444
    set reflistfilter "*"
    trace add variable reflistfilter write reflistfilter_change
    pack $top.f.e -side right -fill x -expand 1
    pack $top.f.l -side left
    grid $top.f - -sticky ew -pady 2
7445
    button $top.close -command [list destroy $top] -text [mc "Close"]
7446 7447 7448 7449 7450 7451 7452 7453 7454 7455 7456 7457 7458 7459 7460 7461 7462 7463 7464 7465 7466 7467 7468 7469 7470 7471 7472 7473 7474 7475 7476 7477 7478 7479 7480 7481 7482 7483 7484 7485 7486
    grid $top.close -
    grid columnconfigure $top 0 -weight 1
    grid rowconfigure $top 0 -weight 1
    bind $top.list <1> {break}
    bind $top.list <B1-Motion> {break}
    bind $top.list <ButtonRelease-1> {sel_reflist %W %x %y; break}
    set reflist {}
    refill_reflist
}

proc sel_reflist {w x y} {
    global showrefstop reflist headids tagids otherrefids

    if {![winfo exists $showrefstop]} return
    set l [lindex [split [$w index "@$x,$y"] "."] 0]
    set ref [lindex $reflist [expr {$l-1}]]
    set n [lindex $ref 0]
    switch -- [lindex $ref 1] {
	"H" {selbyid $headids($n)}
	"T" {selbyid $tagids($n)}
	"o" {selbyid $otherrefids($n)}
    }
    $showrefstop.list tag add highlight $l.0 "$l.0 lineend"
}

proc unsel_reflist {} {
    global showrefstop

    if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
    $showrefstop.list tag remove highlight 0.0 end
}

proc reflistfilter_change {n1 n2 op} {
    global reflistfilter

    after cancel refill_reflist
    after 200 refill_reflist
}

proc refill_reflist {} {
    global reflist reflistfilter showrefstop headids tagids otherrefids
7487
    global curview commitinterest
7488 7489 7490 7491 7492

    if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
    set refs {}
    foreach n [array names headids] {
	if {[string match $reflistfilter $n]} {
7493
	    if {[commitinview $headids($n) $curview]} {
7494 7495 7496 7497 7498 7499 7500 7501
		lappend refs [list $n H]
	    } else {
		set commitinterest($headids($n)) {run refill_reflist}
	    }
	}
    }
    foreach n [array names tagids] {
	if {[string match $reflistfilter $n]} {
7502
	    if {[commitinview $tagids($n) $curview]} {
7503 7504 7505 7506 7507 7508 7509 7510
		lappend refs [list $n T]
	    } else {
		set commitinterest($tagids($n)) {run refill_reflist}
	    }
	}
    }
    foreach n [array names otherrefids] {
	if {[string match $reflistfilter $n]} {
7511
	    if {[commitinview $otherrefids($n) $curview]} {
7512 7513 7514 7515 7516 7517 7518 7519 7520 7521 7522 7523 7524 7525 7526 7527 7528 7529 7530 7531 7532 7533 7534 7535 7536 7537 7538 7539 7540 7541 7542 7543 7544 7545 7546 7547 7548 7549 7550 7551 7552 7553 7554 7555 7556 7557 7558 7559 7560 7561 7562 7563
		lappend refs [list $n o]
	    } else {
		set commitinterest($otherrefids($n)) {run refill_reflist}
	    }
	}
    }
    set refs [lsort -index 0 $refs]
    if {$refs eq $reflist} return

    # Update the contents of $showrefstop.list according to the
    # differences between $reflist (old) and $refs (new)
    $showrefstop.list conf -state normal
    $showrefstop.list insert end "\n"
    set i 0
    set j 0
    while {$i < [llength $reflist] || $j < [llength $refs]} {
	if {$i < [llength $reflist]} {
	    if {$j < [llength $refs]} {
		set cmp [string compare [lindex $reflist $i 0] \
			     [lindex $refs $j 0]]
		if {$cmp == 0} {
		    set cmp [string compare [lindex $reflist $i 1] \
				 [lindex $refs $j 1]]
		}
	    } else {
		set cmp -1
	    }
	} else {
	    set cmp 1
	}
	switch -- $cmp {
	    -1 {
		$showrefstop.list delete "[expr {$j+1}].0" "[expr {$j+2}].0"
		incr i
	    }
	    0 {
		incr i
		incr j
	    }
	    1 {
		set l [expr {$j + 1}]
		$showrefstop.list image create $l.0 -align baseline \
		    -image reficon-[lindex $refs $j 1] -padx 2
		$showrefstop.list insert $l.1 "[lindex $refs $j 0]\n"
		incr j
	    }
	}
    }
    set reflist $refs
    # delete last newline
    $showrefstop.list delete end-2c end-1c
    $showrefstop.list conf -state disabled
7564 7565
}

P
Paul Mackerras 已提交
7566 7567
# Stuff for finding nearby tags
proc getallcommits {} {
7568 7569
    global allcommits nextarc seeds allccache allcwait cachedarcs allcupdate
    global idheads idtags idotherrefs allparents tagobjid
7570

7571 7572 7573 7574
    if {![info exists allcommits]} {
	set nextarc 0
	set allcommits 0
	set seeds {}
7575 7576 7577 7578 7579 7580 7581 7582
	set allcwait 0
	set cachedarcs 0
	set allccache [file join [gitdir] "gitk.cache"]
	if {![catch {
	    set f [open $allccache r]
	    set allcwait 1
	    getcache $f
	}]} return
7583
    }
7584

7585 7586 7587 7588 7589 7590 7591 7592 7593 7594 7595 7596 7597 7598 7599 7600 7601 7602 7603 7604 7605 7606 7607 7608 7609 7610 7611 7612 7613 7614 7615 7616 7617 7618 7619
    if {$allcwait} {
	return
    }
    set cmd [list | git rev-list --parents]
    set allcupdate [expr {$seeds ne {}}]
    if {!$allcupdate} {
	set ids "--all"
    } else {
	set refs [concat [array names idheads] [array names idtags] \
		      [array names idotherrefs]]
	set ids {}
	set tagobjs {}
	foreach name [array names tagobjid] {
	    lappend tagobjs $tagobjid($name)
	}
	foreach id [lsort -unique $refs] {
	    if {![info exists allparents($id)] &&
		[lsearch -exact $tagobjs $id] < 0} {
		lappend ids $id
	    }
	}
	if {$ids ne {}} {
	    foreach id $seeds {
		lappend ids "^$id"
	    }
	}
    }
    if {$ids ne {}} {
	set fd [open [concat $cmd $ids] r]
	fconfigure $fd -blocking 0
	incr allcommits
	nowbusy allcommits
	filerun $fd [list getallclines $fd]
    } else {
	dispneartags 0
7620
    }
7621 7622 7623 7624 7625 7626 7627 7628 7629 7630 7631 7632 7633 7634 7635 7636 7637 7638
}

# Since most commits have 1 parent and 1 child, we group strings of
# such commits into "arcs" joining branch/merge points (BMPs), which
# are commits that either don't have 1 parent or don't have 1 child.
#
# arcnos(id) - incoming arcs for BMP, arc we're on for other nodes
# arcout(id) - outgoing arcs for BMP
# arcids(a) - list of IDs on arc including end but not start
# arcstart(a) - BMP ID at start of arc
# arcend(a) - BMP ID at end of arc
# growing(a) - arc a is still growing
# arctags(a) - IDs out of arcids (excluding end) that have tags
# archeads(a) - IDs out of arcids (excluding end) that have heads
# The start of an arc is at the descendent end, so "incoming" means
# coming from descendents, and "outgoing" means going towards ancestors.

proc getallclines {fd} {
7639
    global allparents allchildren idtags idheads nextarc
7640
    global arcnos arcids arctags arcout arcend arcstart archeads growing
7641 7642
    global seeds allcommits cachedarcs allcupdate
    
7643
    set nid 0
7644
    while {[incr nid] <= 1000 && [gets $fd line] >= 0} {
7645 7646 7647 7648 7649
	set id [lindex $line 0]
	if {[info exists allparents($id)]} {
	    # seen it already
	    continue
	}
7650
	set cachedarcs 0
7651 7652 7653 7654 7655 7656 7657 7658 7659 7660 7661 7662
	set olds [lrange $line 1 end]
	set allparents($id) $olds
	if {![info exists allchildren($id)]} {
	    set allchildren($id) {}
	    set arcnos($id) {}
	    lappend seeds $id
	} else {
	    set a $arcnos($id)
	    if {[llength $olds] == 1 && [llength $a] == 1} {
		lappend arcids($a) $id
		if {[info exists idtags($id)]} {
		    lappend arctags($a) $id
P
Paul Mackerras 已提交
7663
		}
7664 7665 7666 7667 7668 7669 7670 7671 7672 7673 7674 7675 7676 7677 7678 7679 7680 7681 7682 7683 7684 7685 7686 7687 7688 7689 7690 7691 7692 7693 7694 7695 7696 7697 7698 7699 7700 7701 7702 7703 7704 7705 7706 7707 7708 7709
		if {[info exists idheads($id)]} {
		    lappend archeads($a) $id
		}
		if {[info exists allparents($olds)]} {
		    # seen parent already
		    if {![info exists arcout($olds)]} {
			splitarc $olds
		    }
		    lappend arcids($a) $olds
		    set arcend($a) $olds
		    unset growing($a)
		}
		lappend allchildren($olds) $id
		lappend arcnos($olds) $a
		continue
	    }
	}
	foreach a $arcnos($id) {
	    lappend arcids($a) $id
	    set arcend($a) $id
	    unset growing($a)
	}

	set ao {}
	foreach p $olds {
	    lappend allchildren($p) $id
	    set a [incr nextarc]
	    set arcstart($a) $id
	    set archeads($a) {}
	    set arctags($a) {}
	    set archeads($a) {}
	    set arcids($a) {}
	    lappend ao $a
	    set growing($a) 1
	    if {[info exists allparents($p)]} {
		# seen it already, may need to make a new branch
		if {![info exists arcout($p)]} {
		    splitarc $p
		}
		lappend arcids($a) $p
		set arcend($a) $p
		unset growing($a)
	    }
	    lappend arcnos($p) $a
	}
	set arcout($id) $ao
7710
    }
7711 7712 7713 7714 7715 7716
    if {$nid > 0} {
	global cached_dheads cached_dtags cached_atags
	catch {unset cached_dheads}
	catch {unset cached_dtags}
	catch {unset cached_atags}
    }
7717 7718 7719
    if {![eof $fd]} {
	return [expr {$nid >= 1000? 2: 1}]
    }
7720 7721 7722 7723 7724 7725 7726 7727 7728 7729 7730 7731
    set cacheok 1
    if {[catch {
	fconfigure $fd -blocking 1
	close $fd
    } err]} {
	# got an error reading the list of commits
	# if we were updating, try rereading the whole thing again
	if {$allcupdate} {
	    incr allcommits -1
	    dropcache $err
	    return
	}
7732
	error_popup "[mc "Error reading commit topology information;\
7733
		branch and preceding/following tag information\
7734
	        will be incomplete."]\n($err)"
7735 7736
	set cacheok 0
    }
7737 7738
    if {[incr allcommits -1] == 0} {
	notbusy allcommits
7739 7740 7741
	if {$cacheok} {
	    run savecache
	}
7742 7743
    }
    dispneartags 0
7744
    return 0
P
Paul Mackerras 已提交
7745 7746
}

7747 7748
proc recalcarc {a} {
    global arctags archeads arcids idtags idheads
P
Paul Mackerras 已提交
7749

7750 7751 7752 7753 7754 7755 7756 7757
    set at {}
    set ah {}
    foreach id [lrange $arcids($a) 0 end-1] {
	if {[info exists idtags($id)]} {
	    lappend at $id
	}
	if {[info exists idheads($id)]} {
	    lappend ah $id
P
Paul Mackerras 已提交
7758
	}
7759
    }
7760 7761
    set arctags($a) $at
    set archeads($a) $ah
P
Paul Mackerras 已提交
7762 7763
}

7764
proc splitarc {p} {
7765
    global arcnos arcids nextarc arctags archeads idtags idheads
7766
    global arcstart arcend arcout allparents growing
7767

7768 7769 7770 7771 7772 7773 7774 7775 7776 7777 7778 7779 7780 7781 7782 7783 7784 7785 7786 7787 7788 7789 7790 7791 7792 7793 7794 7795 7796 7797 7798 7799 7800
    set a $arcnos($p)
    if {[llength $a] != 1} {
	puts "oops splitarc called but [llength $a] arcs already"
	return
    }
    set a [lindex $a 0]
    set i [lsearch -exact $arcids($a) $p]
    if {$i < 0} {
	puts "oops splitarc $p not in arc $a"
	return
    }
    set na [incr nextarc]
    if {[info exists arcend($a)]} {
	set arcend($na) $arcend($a)
    } else {
	set l [lindex $allparents([lindex $arcids($a) end]) 0]
	set j [lsearch -exact $arcnos($l) $a]
	set arcnos($l) [lreplace $arcnos($l) $j $j $na]
    }
    set tail [lrange $arcids($a) [expr {$i+1}] end]
    set arcids($a) [lrange $arcids($a) 0 $i]
    set arcend($a) $p
    set arcstart($na) $p
    set arcout($p) $na
    set arcids($na) $tail
    if {[info exists growing($a)]} {
	set growing($na) 1
	unset growing($a)
    }

    foreach id $tail {
	if {[llength $arcnos($id)] == 1} {
	    set arcnos($id) $na
7801
	} else {
7802 7803
	    set j [lsearch -exact $arcnos($id) $a]
	    set arcnos($id) [lreplace $arcnos($id) $j $j $na]
7804
	}
7805 7806 7807 7808 7809 7810 7811 7812 7813 7814 7815 7816 7817 7818 7819
    }

    # reconstruct tags and heads lists
    if {$arctags($a) ne {} || $archeads($a) ne {}} {
	recalcarc $a
	recalcarc $na
    } else {
	set arctags($na) {}
	set archeads($na) {}
    }
}

# Update things for a new commit added that is a child of one
# existing commit.  Used when cherry-picking.
proc addnewchild {id p} {
7820
    global allparents allchildren idtags nextarc
7821
    global arcnos arcids arctags arcout arcend arcstart archeads growing
7822
    global seeds allcommits
7823

7824
    if {![info exists allcommits] || ![info exists arcnos($p)]} return
7825 7826 7827 7828 7829 7830 7831 7832 7833 7834 7835 7836 7837 7838 7839 7840 7841 7842
    set allparents($id) [list $p]
    set allchildren($id) {}
    set arcnos($id) {}
    lappend seeds $id
    lappend allchildren($p) $id
    set a [incr nextarc]
    set arcstart($a) $id
    set archeads($a) {}
    set arctags($a) {}
    set arcids($a) [list $p]
    set arcend($a) $p
    if {![info exists arcout($p)]} {
	splitarc $p
    }
    lappend arcnos($p) $a
    set arcout($id) [list $a]
}

7843 7844 7845 7846 7847 7848 7849 7850 7851 7852 7853 7854 7855 7856 7857 7858 7859 7860 7861 7862 7863 7864 7865 7866 7867 7868 7869 7870 7871 7872 7873 7874 7875 7876 7877 7878 7879 7880 7881 7882 7883 7884 7885 7886 7887 7888 7889 7890 7891 7892 7893 7894 7895 7896 7897 7898 7899 7900 7901 7902 7903 7904 7905 7906 7907 7908 7909 7910 7911 7912 7913 7914 7915 7916 7917 7918 7919 7920 7921 7922 7923 7924 7925 7926 7927 7928 7929 7930 7931 7932 7933 7934 7935 7936 7937 7938 7939 7940 7941 7942 7943 7944 7945 7946 7947 7948 7949 7950 7951 7952 7953 7954 7955 7956 7957 7958 7959 7960 7961 7962 7963 7964 7965 7966 7967 7968 7969 7970 7971 7972 7973 7974 7975 7976 7977 7978 7979 7980 7981 7982 7983 7984 7985 7986 7987 7988 7989 7990 7991 7992 7993 7994 7995 7996 7997 7998 7999 8000 8001 8002 8003 8004 8005 8006 8007 8008
# This implements a cache for the topology information.
# The cache saves, for each arc, the start and end of the arc,
# the ids on the arc, and the outgoing arcs from the end.
proc readcache {f} {
    global arcnos arcids arcout arcstart arcend arctags archeads nextarc
    global idtags idheads allparents cachedarcs possible_seeds seeds growing
    global allcwait

    set a $nextarc
    set lim $cachedarcs
    if {$lim - $a > 500} {
	set lim [expr {$a + 500}]
    }
    if {[catch {
	if {$a == $lim} {
	    # finish reading the cache and setting up arctags, etc.
	    set line [gets $f]
	    if {$line ne "1"} {error "bad final version"}
	    close $f
	    foreach id [array names idtags] {
		if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 &&
		    [llength $allparents($id)] == 1} {
		    set a [lindex $arcnos($id) 0]
		    if {$arctags($a) eq {}} {
			recalcarc $a
		    }
		}
	    }
	    foreach id [array names idheads] {
		if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 &&
		    [llength $allparents($id)] == 1} {
		    set a [lindex $arcnos($id) 0]
		    if {$archeads($a) eq {}} {
			recalcarc $a
		    }
		}
	    }
	    foreach id [lsort -unique $possible_seeds] {
		if {$arcnos($id) eq {}} {
		    lappend seeds $id
		}
	    }
	    set allcwait 0
	} else {
	    while {[incr a] <= $lim} {
		set line [gets $f]
		if {[llength $line] != 3} {error "bad line"}
		set s [lindex $line 0]
		set arcstart($a) $s
		lappend arcout($s) $a
		if {![info exists arcnos($s)]} {
		    lappend possible_seeds $s
		    set arcnos($s) {}
		}
		set e [lindex $line 1]
		if {$e eq {}} {
		    set growing($a) 1
		} else {
		    set arcend($a) $e
		    if {![info exists arcout($e)]} {
			set arcout($e) {}
		    }
		}
		set arcids($a) [lindex $line 2]
		foreach id $arcids($a) {
		    lappend allparents($s) $id
		    set s $id
		    lappend arcnos($id) $a
		}
		if {![info exists allparents($s)]} {
		    set allparents($s) {}
		}
		set arctags($a) {}
		set archeads($a) {}
	    }
	    set nextarc [expr {$a - 1}]
	}
    } err]} {
	dropcache $err
	return 0
    }
    if {!$allcwait} {
	getallcommits
    }
    return $allcwait
}

proc getcache {f} {
    global nextarc cachedarcs possible_seeds

    if {[catch {
	set line [gets $f]
	if {[llength $line] != 2 || [lindex $line 0] ne "1"} {error "bad version"}
	# make sure it's an integer
	set cachedarcs [expr {int([lindex $line 1])}]
	if {$cachedarcs < 0} {error "bad number of arcs"}
	set nextarc 0
	set possible_seeds {}
	run readcache $f
    } err]} {
	dropcache $err
    }
    return 0
}

proc dropcache {err} {
    global allcwait nextarc cachedarcs seeds

    #puts "dropping cache ($err)"
    foreach v {arcnos arcout arcids arcstart arcend growing \
		   arctags archeads allparents allchildren} {
	global $v
	catch {unset $v}
    }
    set allcwait 0
    set nextarc 0
    set cachedarcs 0
    set seeds {}
    getallcommits
}

proc writecache {f} {
    global cachearc cachedarcs allccache
    global arcstart arcend arcnos arcids arcout

    set a $cachearc
    set lim $cachedarcs
    if {$lim - $a > 1000} {
	set lim [expr {$a + 1000}]
    }
    if {[catch {
	while {[incr a] <= $lim} {
	    if {[info exists arcend($a)]} {
		puts $f [list $arcstart($a) $arcend($a) $arcids($a)]
	    } else {
		puts $f [list $arcstart($a) {} $arcids($a)]
	    }
	}
    } err]} {
	catch {close $f}
	catch {file delete $allccache}
	#puts "writing cache failed ($err)"
	return 0
    }
    set cachearc [expr {$a - 1}]
    if {$a > $cachedarcs} {
	puts $f "1"
	close $f
	return 0
    }
    return 1
}

proc savecache {} {
    global nextarc cachedarcs cachearc allccache

    if {$nextarc == $cachedarcs} return
    set cachearc 0
    set cachedarcs $nextarc
    catch {
	set f [open $allccache w]
	puts $f [list 1 $cachedarcs]
	run writecache $f
    }
}

8009 8010 8011 8012 8013 8014 8015 8016 8017
# Returns 1 if a is an ancestor of b, -1 if b is an ancestor of a,
# or 0 if neither is true.
proc anc_or_desc {a b} {
    global arcout arcstart arcend arcnos cached_isanc

    if {$arcnos($a) eq $arcnos($b)} {
	# Both are on the same arc(s); either both are the same BMP,
	# or if one is not a BMP, the other is also not a BMP or is
	# the BMP at end of the arc (and it only has 1 incoming arc).
8018 8019
	# Or both can be BMPs with no incoming arcs.
	if {$a eq $b || $arcnos($a) eq {}} {
8020
	    return 0
8021
	}
8022 8023 8024 8025 8026 8027 8028 8029
	# assert {[llength $arcnos($a)] == 1}
	set arc [lindex $arcnos($a) 0]
	set i [lsearch -exact $arcids($arc) $a]
	set j [lsearch -exact $arcids($arc) $b]
	if {$i < 0 || $i > $j} {
	    return 1
	} else {
	    return -1
8030 8031
	}
    }
8032 8033 8034 8035 8036 8037 8038

    if {![info exists arcout($a)]} {
	set arc [lindex $arcnos($a) 0]
	if {[info exists arcend($arc)]} {
	    set aend $arcend($arc)
	} else {
	    set aend {}
8039
	}
8040 8041 8042 8043 8044 8045 8046 8047 8048 8049
	set a $arcstart($arc)
    } else {
	set aend $a
    }
    if {![info exists arcout($b)]} {
	set arc [lindex $arcnos($b) 0]
	if {[info exists arcend($arc)]} {
	    set bend $arcend($arc)
	} else {
	    set bend {}
8050
	}
8051 8052 8053
	set b $arcstart($arc)
    } else {
	set bend $b
8054
    }
8055 8056 8057 8058 8059 8060 8061 8062 8063 8064 8065 8066 8067 8068 8069 8070 8071 8072
    if {$a eq $bend} {
	return 1
    }
    if {$b eq $aend} {
	return -1
    }
    if {[info exists cached_isanc($a,$bend)]} {
	if {$cached_isanc($a,$bend)} {
	    return 1
	}
    }
    if {[info exists cached_isanc($b,$aend)]} {
	if {$cached_isanc($b,$aend)} {
	    return -1
	}
	if {[info exists cached_isanc($a,$bend)]} {
	    return 0
	}
8073 8074
    }

8075 8076 8077 8078 8079 8080 8081 8082 8083 8084 8085 8086 8087 8088 8089 8090 8091 8092 8093 8094 8095 8096 8097 8098 8099 8100 8101 8102 8103 8104 8105
    set todo [list $a $b]
    set anc($a) a
    set anc($b) b
    for {set i 0} {$i < [llength $todo]} {incr i} {
	set x [lindex $todo $i]
	if {$anc($x) eq {}} {
	    continue
	}
	foreach arc $arcnos($x) {
	    set xd $arcstart($arc)
	    if {$xd eq $bend} {
		set cached_isanc($a,$bend) 1
		set cached_isanc($b,$aend) 0
		return 1
	    } elseif {$xd eq $aend} {
		set cached_isanc($b,$aend) 1
		set cached_isanc($a,$bend) 0
		return -1
	    }
	    if {![info exists anc($xd)]} {
		set anc($xd) $anc($x)
		lappend todo $xd
	    } elseif {$anc($xd) ne $anc($x)} {
		set anc($xd) {}
	    }
	}
    }
    set cached_isanc($a,$bend) 0
    set cached_isanc($b,$aend) 0
    return 0
}
P
Paul Mackerras 已提交
8106

8107 8108 8109 8110 8111 8112 8113 8114 8115 8116 8117 8118 8119 8120 8121 8122 8123 8124 8125
# This identifies whether $desc has an ancestor that is
# a growing tip of the graph and which is not an ancestor of $anc
# and returns 0 if so and 1 if not.
# If we subsequently discover a tag on such a growing tip, and that
# turns out to be a descendent of $anc (which it could, since we
# don't necessarily see children before parents), then $desc
# isn't a good choice to display as a descendent tag of
# $anc (since it is the descendent of another tag which is
# a descendent of $anc).  Similarly, $anc isn't a good choice to
# display as a ancestor tag of $desc.
#
proc is_certain {desc anc} {
    global arcnos arcout arcstart arcend growing problems

    set certain {}
    if {[llength $arcnos($anc)] == 1} {
	# tags on the same arc are certain
	if {$arcnos($desc) eq $arcnos($anc)} {
	    return 1
P
Paul Mackerras 已提交
8126
	}
8127 8128 8129 8130
	if {![info exists arcout($anc)]} {
	    # if $anc is partway along an arc, use the start of the arc instead
	    set a [lindex $arcnos($anc) 0]
	    set anc $arcstart($a)
P
Paul Mackerras 已提交
8131
	}
8132 8133 8134 8135 8136 8137 8138 8139 8140 8141 8142 8143 8144 8145 8146 8147 8148 8149 8150 8151 8152 8153 8154 8155 8156 8157 8158 8159 8160 8161 8162 8163 8164 8165 8166 8167 8168 8169 8170 8171 8172 8173 8174 8175 8176 8177 8178 8179 8180 8181 8182 8183 8184 8185 8186 8187 8188 8189 8190 8191 8192 8193 8194 8195 8196 8197 8198 8199
    }
    if {[llength $arcnos($desc)] > 1 || [info exists arcout($desc)]} {
	set x $desc
    } else {
	set a [lindex $arcnos($desc) 0]
	set x $arcend($a)
    }
    if {$x == $anc} {
	return 1
    }
    set anclist [list $x]
    set dl($x) 1
    set nnh 1
    set ngrowanc 0
    for {set i 0} {$i < [llength $anclist] && ($nnh > 0 || $ngrowanc > 0)} {incr i} {
	set x [lindex $anclist $i]
	if {$dl($x)} {
	    incr nnh -1
	}
	set done($x) 1
	foreach a $arcout($x) {
	    if {[info exists growing($a)]} {
		if {![info exists growanc($x)] && $dl($x)} {
		    set growanc($x) 1
		    incr ngrowanc
		}
	    } else {
		set y $arcend($a)
		if {[info exists dl($y)]} {
		    if {$dl($y)} {
			if {!$dl($x)} {
			    set dl($y) 0
			    if {![info exists done($y)]} {
				incr nnh -1
			    }
			    if {[info exists growanc($x)]} {
				incr ngrowanc -1
			    }
			    set xl [list $y]
			    for {set k 0} {$k < [llength $xl]} {incr k} {
				set z [lindex $xl $k]
				foreach c $arcout($z) {
				    if {[info exists arcend($c)]} {
					set v $arcend($c)
					if {[info exists dl($v)] && $dl($v)} {
					    set dl($v) 0
					    if {![info exists done($v)]} {
						incr nnh -1
					    }
					    if {[info exists growanc($v)]} {
						incr ngrowanc -1
					    }
					    lappend xl $v
					}
				    }
				}
			    }
			}
		    }
		} elseif {$y eq $anc || !$dl($x)} {
		    set dl($y) 0
		    lappend anclist $y
		} else {
		    set dl($y) 1
		    lappend anclist $y
		    incr nnh
		}
	    }
P
Paul Mackerras 已提交
8200 8201
	}
    }
8202 8203 8204
    foreach x [array names growanc] {
	if {$dl($x)} {
	    return 0
P
Paul Mackerras 已提交
8205
	}
8206
	return 0
P
Paul Mackerras 已提交
8207
    }
8208
    return 1
P
Paul Mackerras 已提交
8209 8210
}

8211 8212
proc validate_arctags {a} {
    global arctags idtags
P
Paul Mackerras 已提交
8213

8214 8215 8216 8217 8218 8219 8220 8221 8222 8223 8224 8225 8226 8227 8228 8229 8230 8231 8232 8233 8234 8235 8236 8237 8238 8239 8240 8241 8242 8243 8244 8245 8246 8247 8248 8249 8250 8251 8252 8253 8254 8255 8256 8257 8258 8259 8260 8261 8262
    set i -1
    set na $arctags($a)
    foreach id $arctags($a) {
	incr i
	if {![info exists idtags($id)]} {
	    set na [lreplace $na $i $i]
	    incr i -1
	}
    }
    set arctags($a) $na
}

proc validate_archeads {a} {
    global archeads idheads

    set i -1
    set na $archeads($a)
    foreach id $archeads($a) {
	incr i
	if {![info exists idheads($id)]} {
	    set na [lreplace $na $i $i]
	    incr i -1
	}
    }
    set archeads($a) $na
}

# Return the list of IDs that have tags that are descendents of id,
# ignoring IDs that are descendents of IDs already reported.
proc desctags {id} {
    global arcnos arcstart arcids arctags idtags allparents
    global growing cached_dtags

    if {![info exists allparents($id)]} {
	return {}
    }
    set t1 [clock clicks -milliseconds]
    set argid $id
    if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
	# part-way along an arc; check that arc first
	set a [lindex $arcnos($id) 0]
	if {$arctags($a) ne {}} {
	    validate_arctags $a
	    set i [lsearch -exact $arcids($a) $id]
	    set tid {}
	    foreach t $arctags($a) {
		set j [lsearch -exact $arcids($a) $t]
		if {$j >= $i} break
		set tid $t
P
Paul Mackerras 已提交
8263
	    }
8264 8265
	    if {$tid ne {}} {
		return $tid
P
Paul Mackerras 已提交
8266 8267
	    }
	}
8268 8269 8270 8271 8272 8273 8274 8275 8276 8277 8278 8279 8280 8281 8282 8283 8284 8285 8286 8287 8288 8289 8290 8291 8292 8293 8294 8295 8296 8297 8298 8299 8300 8301 8302 8303 8304 8305 8306 8307 8308 8309 8310 8311 8312 8313 8314 8315 8316 8317 8318 8319 8320 8321 8322 8323 8324 8325 8326 8327 8328 8329 8330 8331
	set id $arcstart($a)
	if {[info exists idtags($id)]} {
	    return $id
	}
    }
    if {[info exists cached_dtags($id)]} {
	return $cached_dtags($id)
    }

    set origid $id
    set todo [list $id]
    set queued($id) 1
    set nc 1
    for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} {
	set id [lindex $todo $i]
	set done($id) 1
	set ta [info exists hastaggedancestor($id)]
	if {!$ta} {
	    incr nc -1
	}
	# ignore tags on starting node
	if {!$ta && $i > 0} {
	    if {[info exists idtags($id)]} {
		set tagloc($id) $id
		set ta 1
	    } elseif {[info exists cached_dtags($id)]} {
		set tagloc($id) $cached_dtags($id)
		set ta 1
	    }
	}
	foreach a $arcnos($id) {
	    set d $arcstart($a)
	    if {!$ta && $arctags($a) ne {}} {
		validate_arctags $a
		if {$arctags($a) ne {}} {
		    lappend tagloc($id) [lindex $arctags($a) end]
		}
	    }
	    if {$ta || $arctags($a) ne {}} {
		set tomark [list $d]
		for {set j 0} {$j < [llength $tomark]} {incr j} {
		    set dd [lindex $tomark $j]
		    if {![info exists hastaggedancestor($dd)]} {
			if {[info exists done($dd)]} {
			    foreach b $arcnos($dd) {
				lappend tomark $arcstart($b)
			    }
			    if {[info exists tagloc($dd)]} {
				unset tagloc($dd)
			    }
			} elseif {[info exists queued($dd)]} {
			    incr nc -1
			}
			set hastaggedancestor($dd) 1
		    }
		}
	    }
	    if {![info exists queued($d)]} {
		lappend todo $d
		set queued($d) 1
		if {![info exists hastaggedancestor($d)]} {
		    incr nc
		}
	    }
P
Paul Mackerras 已提交
8332
	}
8333
    }
8334 8335 8336 8337 8338 8339 8340 8341 8342 8343 8344 8345
    set tags {}
    foreach id [array names tagloc] {
	if {![info exists hastaggedancestor($id)]} {
	    foreach t $tagloc($id) {
		if {[lsearch -exact $tags $t] < 0} {
		    lappend tags $t
		}
	    }
	}
    }
    set t2 [clock clicks -milliseconds]
    set loopix $i
8346

8347 8348 8349 8350 8351 8352 8353 8354 8355 8356 8357 8358 8359 8360
    # remove tags that are descendents of other tags
    for {set i 0} {$i < [llength $tags]} {incr i} {
	set a [lindex $tags $i]
	for {set j 0} {$j < $i} {incr j} {
	    set b [lindex $tags $j]
	    set r [anc_or_desc $a $b]
	    if {$r == 1} {
		set tags [lreplace $tags $j $j]
		incr j -1
		incr i -1
	    } elseif {$r == -1} {
		set tags [lreplace $tags $i $i]
		incr i -1
		break
8361 8362 8363 8364
	    }
	}
    }

8365 8366 8367 8368 8369 8370 8371 8372 8373
    if {[array names growing] ne {}} {
	# graph isn't finished, need to check if any tag could get
	# eclipsed by another tag coming later.  Simply ignore any
	# tags that could later get eclipsed.
	set ctags {}
	foreach t $tags {
	    if {[is_certain $t $origid]} {
		lappend ctags $t
	    }
8374
	}
8375 8376 8377 8378
	if {$tags eq $ctags} {
	    set cached_dtags($origid) $tags
	} else {
	    set tags $ctags
8379
	}
8380 8381 8382 8383 8384 8385 8386
    } else {
	set cached_dtags($origid) $tags
    }
    set t3 [clock clicks -milliseconds]
    if {0 && $t3 - $t1 >= 100} {
	puts "iterating descendents ($loopix/[llength $todo] nodes) took\
    	    [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left"
8387
    }
8388 8389
    return $tags
}
8390

8391 8392 8393 8394 8395 8396 8397 8398 8399 8400 8401 8402 8403 8404 8405 8406 8407 8408 8409 8410 8411
proc anctags {id} {
    global arcnos arcids arcout arcend arctags idtags allparents
    global growing cached_atags

    if {![info exists allparents($id)]} {
	return {}
    }
    set t1 [clock clicks -milliseconds]
    set argid $id
    if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
	# part-way along an arc; check that arc first
	set a [lindex $arcnos($id) 0]
	if {$arctags($a) ne {}} {
	    validate_arctags $a
	    set i [lsearch -exact $arcids($a) $id]
	    foreach t $arctags($a) {
		set j [lsearch -exact $arcids($a) $t]
		if {$j > $i} {
		    return $t
		}
	    }
8412
	}
8413 8414 8415 8416 8417 8418 8419 8420 8421 8422 8423 8424 8425 8426 8427 8428 8429 8430 8431 8432 8433 8434 8435 8436 8437 8438 8439 8440 8441 8442 8443 8444 8445 8446 8447 8448 8449 8450 8451 8452 8453 8454 8455 8456 8457 8458 8459 8460 8461 8462 8463 8464 8465 8466 8467 8468 8469 8470 8471 8472 8473 8474 8475 8476 8477 8478 8479 8480 8481 8482 8483 8484 8485 8486 8487 8488 8489 8490 8491 8492 8493 8494 8495
	if {![info exists arcend($a)]} {
	    return {}
	}
	set id $arcend($a)
	if {[info exists idtags($id)]} {
	    return $id
	}
    }
    if {[info exists cached_atags($id)]} {
	return $cached_atags($id)
    }

    set origid $id
    set todo [list $id]
    set queued($id) 1
    set taglist {}
    set nc 1
    for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} {
	set id [lindex $todo $i]
	set done($id) 1
	set td [info exists hastaggeddescendent($id)]
	if {!$td} {
	    incr nc -1
	}
	# ignore tags on starting node
	if {!$td && $i > 0} {
	    if {[info exists idtags($id)]} {
		set tagloc($id) $id
		set td 1
	    } elseif {[info exists cached_atags($id)]} {
		set tagloc($id) $cached_atags($id)
		set td 1
	    }
	}
	foreach a $arcout($id) {
	    if {!$td && $arctags($a) ne {}} {
		validate_arctags $a
		if {$arctags($a) ne {}} {
		    lappend tagloc($id) [lindex $arctags($a) 0]
		}
	    }
	    if {![info exists arcend($a)]} continue
	    set d $arcend($a)
	    if {$td || $arctags($a) ne {}} {
		set tomark [list $d]
		for {set j 0} {$j < [llength $tomark]} {incr j} {
		    set dd [lindex $tomark $j]
		    if {![info exists hastaggeddescendent($dd)]} {
			if {[info exists done($dd)]} {
			    foreach b $arcout($dd) {
				if {[info exists arcend($b)]} {
				    lappend tomark $arcend($b)
				}
			    }
			    if {[info exists tagloc($dd)]} {
				unset tagloc($dd)
			    }
			} elseif {[info exists queued($dd)]} {
			    incr nc -1
			}
			set hastaggeddescendent($dd) 1
		    }
		}
	    }
	    if {![info exists queued($d)]} {
		lappend todo $d
		set queued($d) 1
		if {![info exists hastaggeddescendent($d)]} {
		    incr nc
		}
	    }
	}
    }
    set t2 [clock clicks -milliseconds]
    set loopix $i
    set tags {}
    foreach id [array names tagloc] {
	if {![info exists hastaggeddescendent($id)]} {
	    foreach t $tagloc($id) {
		if {[lsearch -exact $tags $t] < 0} {
		    lappend tags $t
		}
	    }
8496 8497 8498
	}
    }

8499 8500 8501 8502 8503 8504 8505 8506 8507 8508 8509 8510 8511 8512 8513 8514 8515 8516 8517 8518 8519 8520 8521 8522 8523 8524 8525 8526 8527 8528 8529 8530
    # remove tags that are ancestors of other tags
    for {set i 0} {$i < [llength $tags]} {incr i} {
	set a [lindex $tags $i]
	for {set j 0} {$j < $i} {incr j} {
	    set b [lindex $tags $j]
	    set r [anc_or_desc $a $b]
	    if {$r == -1} {
		set tags [lreplace $tags $j $j]
		incr j -1
		incr i -1
	    } elseif {$r == 1} {
		set tags [lreplace $tags $i $i]
		incr i -1
		break
	    }
	}
    }

    if {[array names growing] ne {}} {
	# graph isn't finished, need to check if any tag could get
	# eclipsed by another tag coming later.  Simply ignore any
	# tags that could later get eclipsed.
	set ctags {}
	foreach t $tags {
	    if {[is_certain $origid $t]} {
		lappend ctags $t
	    }
	}
	if {$tags eq $ctags} {
	    set cached_atags($origid) $tags
	} else {
	    set tags $ctags
8531
	}
8532 8533 8534 8535 8536 8537 8538
    } else {
	set cached_atags($origid) $tags
    }
    set t3 [clock clicks -milliseconds]
    if {0 && $t3 - $t1 >= 100} {
	puts "iterating ancestors ($loopix/[llength $todo] nodes) took\
    	    [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left"
8539
    }
8540
    return $tags
8541 8542
}

8543 8544 8545 8546 8547
# Return the list of IDs that have heads that are descendents of id,
# including id itself if it has a head.
proc descheads {id} {
    global arcnos arcstart arcids archeads idheads cached_dheads
    global allparents
8548

8549 8550 8551
    if {![info exists allparents($id)]} {
	return {}
    }
8552
    set aret {}
8553 8554 8555 8556 8557 8558 8559 8560 8561
    if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
	# part-way along an arc; check it first
	set a [lindex $arcnos($id) 0]
	if {$archeads($a) ne {}} {
	    validate_archeads $a
	    set i [lsearch -exact $arcids($a) $id]
	    foreach t $archeads($a) {
		set j [lsearch -exact $arcids($a) $t]
		if {$j > $i} break
8562
		lappend aret $t
8563
	    }
8564
	}
8565
	set id $arcstart($a)
8566
    }
8567 8568 8569
    set origid $id
    set todo [list $id]
    set seen($id) 1
8570
    set ret {}
8571 8572 8573 8574 8575 8576 8577 8578 8579 8580
    for {set i 0} {$i < [llength $todo]} {incr i} {
	set id [lindex $todo $i]
	if {[info exists cached_dheads($id)]} {
	    set ret [concat $ret $cached_dheads($id)]
	} else {
	    if {[info exists idheads($id)]} {
		lappend ret $id
	    }
	    foreach a $arcnos($id) {
		if {$archeads($a) ne {}} {
8581 8582 8583 8584
		    validate_archeads $a
		    if {$archeads($a) ne {}} {
			set ret [concat $ret $archeads($a)]
		    }
8585 8586 8587 8588 8589 8590 8591
		}
		set d $arcstart($a)
		if {![info exists seen($d)]} {
		    lappend todo $d
		    set seen($d) 1
		}
	    }
8592 8593
	}
    }
8594 8595
    set ret [lsort -unique $ret]
    set cached_dheads($origid) $ret
8596
    return [concat $ret $aret]
8597 8598
}

8599 8600
proc addedtag {id} {
    global arcnos arcout cached_dtags cached_atags
8601

8602 8603 8604
    if {![info exists arcnos($id)]} return
    if {![info exists arcout($id)]} {
	recalcarc [lindex $arcnos($id) 0]
8605
    }
8606 8607
    catch {unset cached_dtags}
    catch {unset cached_atags}
8608 8609
}

8610 8611 8612 8613 8614 8615 8616 8617 8618 8619 8620 8621 8622 8623 8624 8625 8626 8627
proc addedhead {hid head} {
    global arcnos arcout cached_dheads

    if {![info exists arcnos($hid)]} return
    if {![info exists arcout($hid)]} {
	recalcarc [lindex $arcnos($hid) 0]
    }
    catch {unset cached_dheads}
}

proc removedhead {hid head} {
    global cached_dheads

    catch {unset cached_dheads}
}

proc movedhead {hid head} {
    global arcnos arcout cached_dheads
8628

8629 8630 8631
    if {![info exists arcnos($hid)]} return
    if {![info exists arcout($hid)]} {
	recalcarc [lindex $arcnos($hid) 0]
8632
    }
8633 8634 8635 8636 8637 8638 8639 8640 8641 8642 8643 8644 8645 8646
    catch {unset cached_dheads}
}

proc changedrefs {} {
    global cached_dheads cached_dtags cached_atags
    global arctags archeads arcnos arcout idheads idtags

    foreach id [concat [array names idheads] [array names idtags]] {
	if {[info exists arcnos($id)] && ![info exists arcout($id)]} {
	    set a [lindex $arcnos($id) 0]
	    if {![info exists donearc($a)]} {
		recalcarc $a
		set donearc($a) 1
	    }
8647 8648
	}
    }
8649 8650 8651
    catch {unset cached_dtags}
    catch {unset cached_atags}
    catch {unset cached_dheads}
8652 8653
}

8654
proc rereadrefs {} {
8655
    global idtags idheads idotherrefs mainheadid
8656 8657 8658 8659 8660 8661 8662 8663

    set refids [concat [array names idtags] \
		    [array names idheads] [array names idotherrefs]]
    foreach id $refids {
	if {![info exists ref($id)]} {
	    set ref($id) [listrefs $id]
	}
    }
8664
    set oldmainhead $mainheadid
8665
    readrefs
8666
    changedrefs
8667 8668 8669 8670
    set refids [lsort -unique [concat $refids [array names idtags] \
			[array names idheads] [array names idotherrefs]]]
    foreach id $refids {
	set v [listrefs $id]
8671
	if {![info exists ref($id)] || $ref($id) != $v ||
8672 8673
	    ($id eq $oldmainhead && $id ne $mainheadid) ||
	    ($id eq $mainheadid && $id ne $oldmainhead)} {
8674 8675 8676
	    redrawtags $id
	}
    }
8677
    run refill_reflist
8678 8679
}

8680 8681 8682 8683 8684 8685 8686 8687 8688 8689 8690 8691 8692 8693 8694 8695 8696 8697
proc listrefs {id} {
    global idtags idheads idotherrefs

    set x {}
    if {[info exists idtags($id)]} {
	set x $idtags($id)
    }
    set y {}
    if {[info exists idheads($id)]} {
	set y $idheads($id)
    }
    set z {}
    if {[info exists idotherrefs($id)]} {
	set z $idotherrefs($id)
    }
    return [list $x $y $z]
}

8698
proc showtag {tag isnew} {
8699
    global ctext tagcontents tagids linknum tagobjid
8700 8701 8702 8703 8704

    if {$isnew} {
	addtohistory [list showtag $tag 0]
    }
    $ctext conf -state normal
8705
    clear_ctext
8706
    settabs 0
8707
    set linknum 0
8708 8709 8710 8711 8712
    if {![info exists tagcontents($tag)]} {
	catch {
	    set tagcontents($tag) [exec git cat-file tag $tagobjid($tag)]
	}
    }
8713 8714 8715
    if {[info exists tagcontents($tag)]} {
	set text $tagcontents($tag)
    } else {
8716
	set text "[mc "Tag"]: $tag\n[mc "Id"]:  $tagids($tag)"
8717
    }
8718
    appendwithlinks $text {}
8719
    $ctext conf -state disabled
8720
    init_flist {}
8721 8722
}

8723 8724 8725
proc doquit {} {
    global stopped
    set stopped 100
8726
    savestuff .
8727 8728
    destroy .
}
8729

P
Paul Mackerras 已提交
8730 8731 8732 8733 8734 8735 8736 8737 8738 8739 8740 8741 8742 8743 8744 8745 8746 8747 8748 8749 8750 8751 8752 8753 8754 8755
proc mkfontdisp {font top which} {
    global fontattr fontpref $font

    set fontpref($font) [set $font]
    button $top.${font}but -text $which -font optionfont \
	-command [list choosefont $font $which]
    label $top.$font -relief flat -font $font \
	-text $fontattr($font,family) -justify left
    grid x $top.${font}but $top.$font -sticky w
}

proc choosefont {font which} {
    global fontparam fontlist fonttop fontattr

    set fontparam(which) $which
    set fontparam(font) $font
    set fontparam(family) [font actual $font -family]
    set fontparam(size) $fontattr($font,size)
    set fontparam(weight) $fontattr($font,weight)
    set fontparam(slant) $fontattr($font,slant)
    set top .gitkfont
    set fonttop $top
    if {![winfo exists $top]} {
	font create sample
	eval font config sample [font actual $font]
	toplevel $top
8756
	wm title $top [mc "Gitk font chooser"]
8757
	label $top.l -textvariable fontparam(which)
P
Paul Mackerras 已提交
8758 8759 8760 8761 8762 8763 8764 8765 8766 8767 8768 8769 8770 8771 8772
	pack $top.l -side top
	set fontlist [lsort [font families]]
	frame $top.f
	listbox $top.f.fam -listvariable fontlist \
	    -yscrollcommand [list $top.f.sb set]
	bind $top.f.fam <<ListboxSelect>> selfontfam
	scrollbar $top.f.sb -command [list $top.f.fam yview]
	pack $top.f.sb -side right -fill y
	pack $top.f.fam -side left -fill both -expand 1
	pack $top.f -side top -fill both -expand 1
	frame $top.g
	spinbox $top.g.size -from 4 -to 40 -width 4 \
	    -textvariable fontparam(size) \
	    -validatecommand {string is integer -strict %s}
	checkbutton $top.g.bold -padx 5 \
8773
	    -font {{Times New Roman} 12 bold} -text [mc "B"] -indicatoron 0 \
P
Paul Mackerras 已提交
8774 8775
	    -variable fontparam(weight) -onvalue bold -offvalue normal
	checkbutton $top.g.ital -padx 5 \
8776
	    -font {{Times New Roman} 12 italic} -text [mc "I"] -indicatoron 0  \
P
Paul Mackerras 已提交
8777 8778 8779 8780 8781 8782 8783 8784 8785 8786
	    -variable fontparam(slant) -onvalue italic -offvalue roman
	pack $top.g.size $top.g.bold $top.g.ital -side left
	pack $top.g -side top
	canvas $top.c -width 150 -height 50 -border 2 -relief sunk \
	    -background white
	$top.c create text 100 25 -anchor center -text $which -font sample \
	    -fill black -tags text
	bind $top.c <Configure> [list centertext $top.c]
	pack $top.c -side top -fill x
	frame $top.buts
8787 8788
	button $top.buts.ok -text [mc "OK"] -command fontok -default active
	button $top.buts.can -text [mc "Cancel"] -command fontcan -default normal
P
Paul Mackerras 已提交
8789 8790 8791 8792 8793 8794 8795 8796 8797 8798 8799 8800 8801 8802 8803 8804 8805 8806 8807 8808 8809 8810 8811 8812 8813 8814 8815 8816 8817 8818 8819 8820 8821 8822 8823 8824 8825 8826 8827 8828 8829 8830 8831 8832 8833 8834 8835 8836 8837 8838 8839 8840 8841 8842 8843 8844 8845 8846 8847 8848 8849 8850 8851
	grid $top.buts.ok $top.buts.can
	grid columnconfigure $top.buts 0 -weight 1 -uniform a
	grid columnconfigure $top.buts 1 -weight 1 -uniform a
	pack $top.buts -side bottom -fill x
	trace add variable fontparam write chg_fontparam
    } else {
	raise $top
	$top.c itemconf text -text $which
    }
    set i [lsearch -exact $fontlist $fontparam(family)]
    if {$i >= 0} {
	$top.f.fam selection set $i
	$top.f.fam see $i
    }
}

proc centertext {w} {
    $w coords text [expr {[winfo width $w] / 2}] [expr {[winfo height $w] / 2}]
}

proc fontok {} {
    global fontparam fontpref prefstop

    set f $fontparam(font)
    set fontpref($f) [list $fontparam(family) $fontparam(size)]
    if {$fontparam(weight) eq "bold"} {
	lappend fontpref($f) "bold"
    }
    if {$fontparam(slant) eq "italic"} {
	lappend fontpref($f) "italic"
    }
    set w $prefstop.$f
    $w conf -text $fontparam(family) -font $fontpref($f)
	
    fontcan
}

proc fontcan {} {
    global fonttop fontparam

    if {[info exists fonttop]} {
	catch {destroy $fonttop}
	catch {font delete sample}
	unset fonttop
	unset fontparam
    }
}

proc selfontfam {} {
    global fonttop fontparam

    set i [$fonttop.f.fam curselection]
    if {$i ne {}} {
	set fontparam(family) [$fonttop.f.fam get $i]
    }
}

proc chg_fontparam {v sub op} {
    global fontparam

    font config sample -$sub $fontparam($sub)
}

8852
proc doprefs {} {
8853
    global maxwidth maxgraphpct
8854
    global oldprefs prefstop showneartags showlocalchanges
8855
    global bgcolor fgcolor ctext diffcolors selectbgcolor
8856
    global tabstop limitdiffs autoselect
P
Paul Mackerras 已提交
8857

8858 8859 8860 8861 8862
    set top .gitkprefs
    set prefstop $top
    if {[winfo exists $top]} {
	raise $top
	return
8863
    }
P
Paul Mackerras 已提交
8864
    foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
8865
		   limitdiffs tabstop} {
8866
	set oldprefs($v) [set $v]
P
Paul Mackerras 已提交
8867
    }
8868
    toplevel $top
8869 8870
    wm title $top [mc "Gitk preferences"]
    label $top.ldisp -text [mc "Commit list display options"]
8871 8872
    grid $top.ldisp - -sticky w -pady 10
    label $top.spacer -text " "
8873
    label $top.maxwidthl -text [mc "Maximum graph width (lines)"] \
8874 8875 8876
	-font optionfont
    spinbox $top.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
    grid $top.spacer $top.maxwidthl $top.maxwidth -sticky w
8877
    label $top.maxpctl -text [mc "Maximum graph width (% of pane)"] \
8878 8879 8880
	-font optionfont
    spinbox $top.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
    grid x $top.maxpctl $top.maxpct -sticky w
8881
    frame $top.showlocal
8882
    label $top.showlocal.l -text [mc "Show local changes"] -font optionfont
8883 8884 8885
    checkbutton $top.showlocal.b -variable showlocalchanges
    pack $top.showlocal.b $top.showlocal.l -side left
    grid x $top.showlocal -sticky w
8886 8887 8888 8889 8890
    frame $top.autoselect
    label $top.autoselect.l -text [mc "Auto-select SHA1"] -font optionfont
    checkbutton $top.autoselect.b -variable autoselect
    pack $top.autoselect.b $top.autoselect.l -side left
    grid x $top.autoselect -sticky w
8891

8892
    label $top.ddisp -text [mc "Diff display options"]
8893
    grid $top.ddisp - -sticky w -pady 10
8894
    label $top.tabstopl -text [mc "Tab spacing"] -font optionfont
8895 8896
    spinbox $top.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
    grid x $top.tabstopl $top.tabstop -sticky w
P
Paul Mackerras 已提交
8897
    frame $top.ntag
8898
    label $top.ntag.l -text [mc "Display nearby tags"] -font optionfont
P
Paul Mackerras 已提交
8899 8900 8901
    checkbutton $top.ntag.b -variable showneartags
    pack $top.ntag.b $top.ntag.l -side left
    grid x $top.ntag -sticky w
8902
    frame $top.ldiff
8903
    label $top.ldiff.l -text [mc "Limit diffs to listed paths"] -font optionfont
8904 8905 8906
    checkbutton $top.ldiff.b -variable limitdiffs
    pack $top.ldiff.b $top.ldiff.l -side left
    grid x $top.ldiff -sticky w
8907

8908
    label $top.cdisp -text [mc "Colors: press to choose"]
8909 8910
    grid $top.cdisp - -sticky w -pady 10
    label $top.bg -padx 40 -relief sunk -background $bgcolor
8911
    button $top.bgbut -text [mc "Background"] -font optionfont \
8912 8913 8914
	-command [list choosecolor bgcolor 0 $top.bg background setbg]
    grid x $top.bgbut $top.bg -sticky w
    label $top.fg -padx 40 -relief sunk -background $fgcolor
8915
    button $top.fgbut -text [mc "Foreground"] -font optionfont \
8916 8917 8918
	-command [list choosecolor fgcolor 0 $top.fg foreground setfg]
    grid x $top.fgbut $top.fg -sticky w
    label $top.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]
8919
    button $top.diffoldbut -text [mc "Diff: old lines"] -font optionfont \
8920 8921 8922 8923
	-command [list choosecolor diffcolors 0 $top.diffold "diff old lines" \
		      [list $ctext tag conf d0 -foreground]]
    grid x $top.diffoldbut $top.diffold -sticky w
    label $top.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1]
8924
    button $top.diffnewbut -text [mc "Diff: new lines"] -font optionfont \
8925 8926 8927 8928
	-command [list choosecolor diffcolors 1 $top.diffnew "diff new lines" \
		      [list $ctext tag conf d1 -foreground]]
    grid x $top.diffnewbut $top.diffnew -sticky w
    label $top.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2]
8929
    button $top.hunksepbut -text [mc "Diff: hunk header"] -font optionfont \
8930 8931 8932 8933
	-command [list choosecolor diffcolors 2 $top.hunksep \
		      "diff hunk header" \
		      [list $ctext tag conf hunksep -foreground]]
    grid x $top.hunksepbut $top.hunksep -sticky w
8934
    label $top.selbgsep -padx 40 -relief sunk -background $selectbgcolor
8935
    button $top.selbgbut -text [mc "Select bg"] -font optionfont \
8936
	-command [list choosecolor selectbgcolor 0 $top.selbgsep background setselbg]
8937
    grid x $top.selbgbut $top.selbgsep -sticky w
8938

8939
    label $top.cfont -text [mc "Fonts: press to choose"]
P
Paul Mackerras 已提交
8940
    grid $top.cfont - -sticky w -pady 10
8941 8942 8943
    mkfontdisp mainfont $top [mc "Main font"]
    mkfontdisp textfont $top [mc "Diff display font"]
    mkfontdisp uifont $top [mc "User interface font"]
P
Paul Mackerras 已提交
8944

8945
    frame $top.buts
8946 8947
    button $top.buts.ok -text [mc "OK"] -command prefsok -default active
    button $top.buts.can -text [mc "Cancel"] -command prefscan -default normal
8948 8949 8950 8951
    grid $top.buts.ok $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
8952
    bind $top <Visibility> "focus $top.buts.ok"
8953 8954
}

8955 8956 8957 8958
proc choosecolor {v vi w x cmd} {
    global $v

    set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \
8959
	       -title [mc "Gitk: choose color for %s" $x]]
8960 8961 8962 8963 8964 8965
    if {$c eq {}} return
    $w conf -background $c
    lset $v $vi $c
    eval $cmd $c
}

8966 8967 8968 8969 8970 8971 8972 8973 8974 8975
proc setselbg {c} {
    global bglist cflist
    foreach w $bglist {
	$w configure -selectbackground $c
    }
    $cflist tag configure highlight \
	-background [$cflist cget -selectbackground]
    allcanvs itemconf secsel -fill $c
}

8976 8977 8978 8979 8980 8981 8982 8983 8984 8985 8986 8987 8988 8989 8990 8991 8992 8993
proc setbg {c} {
    global bglist

    foreach w $bglist {
	$w conf -background $c
    }
}

proc setfg {c} {
    global fglist canv

    foreach w $fglist {
	$w conf -foreground $c
    }
    allcanvs itemconf text -fill $c
    $canv itemconf circle -outline $c
}

8994
proc prefscan {} {
8995
    global oldprefs prefstop
8996

P
Paul Mackerras 已提交
8997
    foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
8998 8999
		   limitdiffs tabstop} {
	global $v
9000 9001 9002 9003
	set $v $oldprefs($v)
    }
    catch {destroy $prefstop}
    unset prefstop
P
Paul Mackerras 已提交
9004
    fontcan
9005 9006 9007 9008
}

proc prefsok {} {
    global maxwidth maxgraphpct
9009
    global oldprefs prefstop showneartags showlocalchanges
P
Paul Mackerras 已提交
9010
    global fontpref mainfont textfont uifont
P
Paul Mackerras 已提交
9011
    global limitdiffs treediffs
9012 9013 9014

    catch {destroy $prefstop}
    unset prefstop
P
Paul Mackerras 已提交
9015 9016 9017 9018 9019 9020 9021 9022 9023 9024 9025 9026 9027 9028 9029 9030 9031 9032 9033 9034 9035
    fontcan
    set fontchanged 0
    if {$mainfont ne $fontpref(mainfont)} {
	set mainfont $fontpref(mainfont)
	parsefont mainfont $mainfont
	eval font configure mainfont [fontflags mainfont]
	eval font configure mainfontbold [fontflags mainfont 1]
	setcoords
	set fontchanged 1
    }
    if {$textfont ne $fontpref(textfont)} {
	set textfont $fontpref(textfont)
	parsefont textfont $textfont
	eval font configure textfont [fontflags textfont]
	eval font configure textfontbold [fontflags textfont 1]
    }
    if {$uifont ne $fontpref(uifont)} {
	set uifont $fontpref(uifont)
	parsefont uifont $uifont
	eval font configure uifont [fontflags uifont]
    }
9036
    settabs
9037 9038 9039 9040 9041 9042 9043
    if {$showlocalchanges != $oldprefs(showlocalchanges)} {
	if {$showlocalchanges} {
	    doshowlocalchanges
	} else {
	    dohidelocalchanges
	}
    }
9044 9045 9046 9047
    if {$limitdiffs != $oldprefs(limitdiffs)} {
	# treediffs elements are limited by path
	catch {unset treediffs}
    }
P
Paul Mackerras 已提交
9048
    if {$fontchanged || $maxwidth != $oldprefs(maxwidth)
9049 9050
	|| $maxgraphpct != $oldprefs(maxgraphpct)} {
	redisplay
9051 9052
    } elseif {$showneartags != $oldprefs(showneartags) ||
	  $limitdiffs != $oldprefs(limitdiffs)} {
P
Paul Mackerras 已提交
9053
	reselectline
9054 9055 9056 9057
    }
}

proc formatdate {d} {
9058
    global datetimeformat
9059
    if {$d ne {}} {
9060
	set d [clock format $d -format $datetimeformat]
9061 9062
    }
    return $d
P
Paul Mackerras 已提交
9063 9064
}

9065 9066 9067 9068 9069 9070 9071 9072 9073 9074 9075 9076 9077 9078 9079 9080 9081 9082 9083 9084 9085 9086 9087 9088 9089 9090 9091 9092 9093 9094 9095 9096 9097 9098 9099 9100 9101 9102 9103 9104 9105 9106 9107 9108 9109 9110 9111 9112 9113 9114 9115 9116 9117 9118 9119 9120 9121 9122 9123 9124 9125 9126 9127 9128 9129 9130 9131 9132 9133 9134 9135 9136 9137 9138 9139 9140 9141 9142 9143 9144 9145 9146 9147 9148 9149 9150 9151 9152 9153 9154 9155 9156 9157 9158 9159 9160 9161 9162 9163 9164 9165 9166 9167 9168 9169 9170 9171 9172 9173 9174 9175 9176 9177 9178 9179 9180 9181 9182 9183 9184 9185 9186 9187 9188 9189 9190 9191 9192 9193 9194 9195 9196 9197 9198 9199 9200 9201 9202 9203 9204 9205 9206 9207 9208 9209 9210 9211 9212 9213 9214 9215 9216 9217 9218 9219 9220 9221 9222 9223 9224 9225 9226 9227 9228 9229 9230 9231 9232 9233 9234 9235 9236 9237 9238 9239 9240 9241 9242 9243 9244 9245 9246 9247 9248 9249 9250 9251 9252 9253 9254 9255 9256 9257 9258 9259 9260 9261 9262 9263 9264 9265 9266 9267 9268 9269 9270 9271 9272 9273 9274 9275 9276 9277 9278 9279 9280 9281 9282 9283 9284 9285 9286 9287 9288 9289 9290 9291 9292 9293 9294 9295 9296 9297 9298 9299 9300 9301 9302 9303 9304 9305 9306 9307 9308 9309 9310 9311 9312 9313 9314 9315 9316 9317 9318 9319 9320 9321 9322 9323 9324 9325 9326 9327 9328 9329 9330 9331 9332 9333 9334 9335 9336 9337
# This list of encoding names and aliases is distilled from
# http://www.iana.org/assignments/character-sets.
# Not all of them are supported by Tcl.
set encoding_aliases {
    { ANSI_X3.4-1968 iso-ir-6 ANSI_X3.4-1986 ISO_646.irv:1991 ASCII
      ISO646-US US-ASCII us IBM367 cp367 csASCII }
    { ISO-10646-UTF-1 csISO10646UTF1 }
    { ISO_646.basic:1983 ref csISO646basic1983 }
    { INVARIANT csINVARIANT }
    { ISO_646.irv:1983 iso-ir-2 irv csISO2IntlRefVersion }
    { BS_4730 iso-ir-4 ISO646-GB gb uk csISO4UnitedKingdom }
    { NATS-SEFI iso-ir-8-1 csNATSSEFI }
    { NATS-SEFI-ADD iso-ir-8-2 csNATSSEFIADD }
    { NATS-DANO iso-ir-9-1 csNATSDANO }
    { NATS-DANO-ADD iso-ir-9-2 csNATSDANOADD }
    { SEN_850200_B iso-ir-10 FI ISO646-FI ISO646-SE se csISO10Swedish }
    { SEN_850200_C iso-ir-11 ISO646-SE2 se2 csISO11SwedishForNames }
    { KS_C_5601-1987 iso-ir-149 KS_C_5601-1989 KSC_5601 korean csKSC56011987 }
    { ISO-2022-KR csISO2022KR }
    { EUC-KR csEUCKR }
    { ISO-2022-JP csISO2022JP }
    { ISO-2022-JP-2 csISO2022JP2 }
    { JIS_C6220-1969-jp JIS_C6220-1969 iso-ir-13 katakana x0201-7
      csISO13JISC6220jp }
    { JIS_C6220-1969-ro iso-ir-14 jp ISO646-JP csISO14JISC6220ro }
    { IT iso-ir-15 ISO646-IT csISO15Italian }
    { PT iso-ir-16 ISO646-PT csISO16Portuguese }
    { ES iso-ir-17 ISO646-ES csISO17Spanish }
    { greek7-old iso-ir-18 csISO18Greek7Old }
    { latin-greek iso-ir-19 csISO19LatinGreek }
    { DIN_66003 iso-ir-21 de ISO646-DE csISO21German }
    { NF_Z_62-010_(1973) iso-ir-25 ISO646-FR1 csISO25French }
    { Latin-greek-1 iso-ir-27 csISO27LatinGreek1 }
    { ISO_5427 iso-ir-37 csISO5427Cyrillic }
    { JIS_C6226-1978 iso-ir-42 csISO42JISC62261978 }
    { BS_viewdata iso-ir-47 csISO47BSViewdata }
    { INIS iso-ir-49 csISO49INIS }
    { INIS-8 iso-ir-50 csISO50INIS8 }
    { INIS-cyrillic iso-ir-51 csISO51INISCyrillic }
    { ISO_5427:1981 iso-ir-54 ISO5427Cyrillic1981 }
    { ISO_5428:1980 iso-ir-55 csISO5428Greek }
    { GB_1988-80 iso-ir-57 cn ISO646-CN csISO57GB1988 }
    { GB_2312-80 iso-ir-58 chinese csISO58GB231280 }
    { NS_4551-1 iso-ir-60 ISO646-NO no csISO60DanishNorwegian
      csISO60Norwegian1 }
    { NS_4551-2 ISO646-NO2 iso-ir-61 no2 csISO61Norwegian2 }
    { NF_Z_62-010 iso-ir-69 ISO646-FR fr csISO69French }
    { videotex-suppl iso-ir-70 csISO70VideotexSupp1 }
    { PT2 iso-ir-84 ISO646-PT2 csISO84Portuguese2 }
    { ES2 iso-ir-85 ISO646-ES2 csISO85Spanish2 }
    { MSZ_7795.3 iso-ir-86 ISO646-HU hu csISO86Hungarian }
    { JIS_C6226-1983 iso-ir-87 x0208 JIS_X0208-1983 csISO87JISX0208 }
    { greek7 iso-ir-88 csISO88Greek7 }
    { ASMO_449 ISO_9036 arabic7 iso-ir-89 csISO89ASMO449 }
    { iso-ir-90 csISO90 }
    { JIS_C6229-1984-a iso-ir-91 jp-ocr-a csISO91JISC62291984a }
    { JIS_C6229-1984-b iso-ir-92 ISO646-JP-OCR-B jp-ocr-b
      csISO92JISC62991984b }
    { JIS_C6229-1984-b-add iso-ir-93 jp-ocr-b-add csISO93JIS62291984badd }
    { JIS_C6229-1984-hand iso-ir-94 jp-ocr-hand csISO94JIS62291984hand }
    { JIS_C6229-1984-hand-add iso-ir-95 jp-ocr-hand-add
      csISO95JIS62291984handadd }
    { JIS_C6229-1984-kana iso-ir-96 csISO96JISC62291984kana }
    { ISO_2033-1983 iso-ir-98 e13b csISO2033 }
    { ANSI_X3.110-1983 iso-ir-99 CSA_T500-1983 NAPLPS csISO99NAPLPS }
    { ISO_8859-1:1987 iso-ir-100 ISO_8859-1 ISO-8859-1 latin1 l1 IBM819
      CP819 csISOLatin1 }
    { ISO_8859-2:1987 iso-ir-101 ISO_8859-2 ISO-8859-2 latin2 l2 csISOLatin2 }
    { T.61-7bit iso-ir-102 csISO102T617bit }
    { T.61-8bit T.61 iso-ir-103 csISO103T618bit }
    { ISO_8859-3:1988 iso-ir-109 ISO_8859-3 ISO-8859-3 latin3 l3 csISOLatin3 }
    { ISO_8859-4:1988 iso-ir-110 ISO_8859-4 ISO-8859-4 latin4 l4 csISOLatin4 }
    { ECMA-cyrillic iso-ir-111 KOI8-E csISO111ECMACyrillic }
    { CSA_Z243.4-1985-1 iso-ir-121 ISO646-CA csa7-1 ca csISO121Canadian1 }
    { CSA_Z243.4-1985-2 iso-ir-122 ISO646-CA2 csa7-2 csISO122Canadian2 }
    { CSA_Z243.4-1985-gr iso-ir-123 csISO123CSAZ24341985gr }
    { ISO_8859-6:1987 iso-ir-127 ISO_8859-6 ISO-8859-6 ECMA-114 ASMO-708
      arabic csISOLatinArabic }
    { ISO_8859-6-E csISO88596E ISO-8859-6-E }
    { ISO_8859-6-I csISO88596I ISO-8859-6-I }
    { ISO_8859-7:1987 iso-ir-126 ISO_8859-7 ISO-8859-7 ELOT_928 ECMA-118
      greek greek8 csISOLatinGreek }
    { T.101-G2 iso-ir-128 csISO128T101G2 }
    { ISO_8859-8:1988 iso-ir-138 ISO_8859-8 ISO-8859-8 hebrew
      csISOLatinHebrew }
    { ISO_8859-8-E csISO88598E ISO-8859-8-E }
    { ISO_8859-8-I csISO88598I ISO-8859-8-I }
    { CSN_369103 iso-ir-139 csISO139CSN369103 }
    { JUS_I.B1.002 iso-ir-141 ISO646-YU js yu csISO141JUSIB1002 }
    { ISO_6937-2-add iso-ir-142 csISOTextComm }
    { IEC_P27-1 iso-ir-143 csISO143IECP271 }
    { ISO_8859-5:1988 iso-ir-144 ISO_8859-5 ISO-8859-5 cyrillic
      csISOLatinCyrillic }
    { JUS_I.B1.003-serb iso-ir-146 serbian csISO146Serbian }
    { JUS_I.B1.003-mac macedonian iso-ir-147 csISO147Macedonian }
    { ISO_8859-9:1989 iso-ir-148 ISO_8859-9 ISO-8859-9 latin5 l5 csISOLatin5 }
    { greek-ccitt iso-ir-150 csISO150 csISO150GreekCCITT }
    { NC_NC00-10:81 cuba iso-ir-151 ISO646-CU csISO151Cuba }
    { ISO_6937-2-25 iso-ir-152 csISO6937Add }
    { GOST_19768-74 ST_SEV_358-88 iso-ir-153 csISO153GOST1976874 }
    { ISO_8859-supp iso-ir-154 latin1-2-5 csISO8859Supp }
    { ISO_10367-box iso-ir-155 csISO10367Box }
    { ISO-8859-10 iso-ir-157 l6 ISO_8859-10:1992 csISOLatin6 latin6 }
    { latin-lap lap iso-ir-158 csISO158Lap }
    { JIS_X0212-1990 x0212 iso-ir-159 csISO159JISX02121990 }
    { DS_2089 DS2089 ISO646-DK dk csISO646Danish }
    { us-dk csUSDK }
    { dk-us csDKUS }
    { JIS_X0201 X0201 csHalfWidthKatakana }
    { KSC5636 ISO646-KR csKSC5636 }
    { ISO-10646-UCS-2 csUnicode }
    { ISO-10646-UCS-4 csUCS4 }
    { DEC-MCS dec csDECMCS }
    { hp-roman8 roman8 r8 csHPRoman8 }
    { macintosh mac csMacintosh }
    { IBM037 cp037 ebcdic-cp-us ebcdic-cp-ca ebcdic-cp-wt ebcdic-cp-nl
      csIBM037 }
    { IBM038 EBCDIC-INT cp038 csIBM038 }
    { IBM273 CP273 csIBM273 }
    { IBM274 EBCDIC-BE CP274 csIBM274 }
    { IBM275 EBCDIC-BR cp275 csIBM275 }
    { IBM277 EBCDIC-CP-DK EBCDIC-CP-NO csIBM277 }
    { IBM278 CP278 ebcdic-cp-fi ebcdic-cp-se csIBM278 }
    { IBM280 CP280 ebcdic-cp-it csIBM280 }
    { IBM281 EBCDIC-JP-E cp281 csIBM281 }
    { IBM284 CP284 ebcdic-cp-es csIBM284 }
    { IBM285 CP285 ebcdic-cp-gb csIBM285 }
    { IBM290 cp290 EBCDIC-JP-kana csIBM290 }
    { IBM297 cp297 ebcdic-cp-fr csIBM297 }
    { IBM420 cp420 ebcdic-cp-ar1 csIBM420 }
    { IBM423 cp423 ebcdic-cp-gr csIBM423 }
    { IBM424 cp424 ebcdic-cp-he csIBM424 }
    { IBM437 cp437 437 csPC8CodePage437 }
    { IBM500 CP500 ebcdic-cp-be ebcdic-cp-ch csIBM500 }
    { IBM775 cp775 csPC775Baltic }
    { IBM850 cp850 850 csPC850Multilingual }
    { IBM851 cp851 851 csIBM851 }
    { IBM852 cp852 852 csPCp852 }
    { IBM855 cp855 855 csIBM855 }
    { IBM857 cp857 857 csIBM857 }
    { IBM860 cp860 860 csIBM860 }
    { IBM861 cp861 861 cp-is csIBM861 }
    { IBM862 cp862 862 csPC862LatinHebrew }
    { IBM863 cp863 863 csIBM863 }
    { IBM864 cp864 csIBM864 }
    { IBM865 cp865 865 csIBM865 }
    { IBM866 cp866 866 csIBM866 }
    { IBM868 CP868 cp-ar csIBM868 }
    { IBM869 cp869 869 cp-gr csIBM869 }
    { IBM870 CP870 ebcdic-cp-roece ebcdic-cp-yu csIBM870 }
    { IBM871 CP871 ebcdic-cp-is csIBM871 }
    { IBM880 cp880 EBCDIC-Cyrillic csIBM880 }
    { IBM891 cp891 csIBM891 }
    { IBM903 cp903 csIBM903 }
    { IBM904 cp904 904 csIBBM904 }
    { IBM905 CP905 ebcdic-cp-tr csIBM905 }
    { IBM918 CP918 ebcdic-cp-ar2 csIBM918 }
    { IBM1026 CP1026 csIBM1026 }
    { EBCDIC-AT-DE csIBMEBCDICATDE }
    { EBCDIC-AT-DE-A csEBCDICATDEA }
    { EBCDIC-CA-FR csEBCDICCAFR }
    { EBCDIC-DK-NO csEBCDICDKNO }
    { EBCDIC-DK-NO-A csEBCDICDKNOA }
    { EBCDIC-FI-SE csEBCDICFISE }
    { EBCDIC-FI-SE-A csEBCDICFISEA }
    { EBCDIC-FR csEBCDICFR }
    { EBCDIC-IT csEBCDICIT }
    { EBCDIC-PT csEBCDICPT }
    { EBCDIC-ES csEBCDICES }
    { EBCDIC-ES-A csEBCDICESA }
    { EBCDIC-ES-S csEBCDICESS }
    { EBCDIC-UK csEBCDICUK }
    { EBCDIC-US csEBCDICUS }
    { UNKNOWN-8BIT csUnknown8BiT }
    { MNEMONIC csMnemonic }
    { MNEM csMnem }
    { VISCII csVISCII }
    { VIQR csVIQR }
    { KOI8-R csKOI8R }
    { IBM00858 CCSID00858 CP00858 PC-Multilingual-850+euro }
    { IBM00924 CCSID00924 CP00924 ebcdic-Latin9--euro }
    { IBM01140 CCSID01140 CP01140 ebcdic-us-37+euro }
    { IBM01141 CCSID01141 CP01141 ebcdic-de-273+euro }
    { IBM01142 CCSID01142 CP01142 ebcdic-dk-277+euro ebcdic-no-277+euro }
    { IBM01143 CCSID01143 CP01143 ebcdic-fi-278+euro ebcdic-se-278+euro }
    { IBM01144 CCSID01144 CP01144 ebcdic-it-280+euro }
    { IBM01145 CCSID01145 CP01145 ebcdic-es-284+euro }
    { IBM01146 CCSID01146 CP01146 ebcdic-gb-285+euro }
    { IBM01147 CCSID01147 CP01147 ebcdic-fr-297+euro }
    { IBM01148 CCSID01148 CP01148 ebcdic-international-500+euro }
    { IBM01149 CCSID01149 CP01149 ebcdic-is-871+euro }
    { IBM1047 IBM-1047 }
    { PTCP154 csPTCP154 PT154 CP154 Cyrillic-Asian }
    { Amiga-1251 Ami1251 Amiga1251 Ami-1251 }
    { UNICODE-1-1 csUnicode11 }
    { CESU-8 csCESU-8 }
    { BOCU-1 csBOCU-1 }
    { UNICODE-1-1-UTF-7 csUnicode11UTF7 }
    { ISO-8859-14 iso-ir-199 ISO_8859-14:1998 ISO_8859-14 latin8 iso-celtic
      l8 }
    { ISO-8859-15 ISO_8859-15 Latin-9 }
    { ISO-8859-16 iso-ir-226 ISO_8859-16:2001 ISO_8859-16 latin10 l10 }
    { GBK CP936 MS936 windows-936 }
    { JIS_Encoding csJISEncoding }
    { Shift_JIS MS_Kanji csShiftJIS }
    { Extended_UNIX_Code_Packed_Format_for_Japanese csEUCPkdFmtJapanese
      EUC-JP }
    { Extended_UNIX_Code_Fixed_Width_for_Japanese csEUCFixWidJapanese }
    { ISO-10646-UCS-Basic csUnicodeASCII }
    { ISO-10646-Unicode-Latin1 csUnicodeLatin1 ISO-10646 }
    { ISO-Unicode-IBM-1261 csUnicodeIBM1261 }
    { ISO-Unicode-IBM-1268 csUnicodeIBM1268 }
    { ISO-Unicode-IBM-1276 csUnicodeIBM1276 }
    { ISO-Unicode-IBM-1264 csUnicodeIBM1264 }
    { ISO-Unicode-IBM-1265 csUnicodeIBM1265 }
    { ISO-8859-1-Windows-3.0-Latin-1 csWindows30Latin1 }
    { ISO-8859-1-Windows-3.1-Latin-1 csWindows31Latin1 }
    { ISO-8859-2-Windows-Latin-2 csWindows31Latin2 }
    { ISO-8859-9-Windows-Latin-5 csWindows31Latin5 }
    { Adobe-Standard-Encoding csAdobeStandardEncoding }
    { Ventura-US csVenturaUS }
    { Ventura-International csVenturaInternational }
    { PC8-Danish-Norwegian csPC8DanishNorwegian }
    { PC8-Turkish csPC8Turkish }
    { IBM-Symbols csIBMSymbols }
    { IBM-Thai csIBMThai }
    { HP-Legal csHPLegal }
    { HP-Pi-font csHPPiFont }
    { HP-Math8 csHPMath8 }
    { Adobe-Symbol-Encoding csHPPSMath }
    { HP-DeskTop csHPDesktop }
    { Ventura-Math csVenturaMath }
    { Microsoft-Publishing csMicrosoftPublishing }
    { Windows-31J csWindows31J }
    { GB2312 csGB2312 }
    { Big5 csBig5 }
}

proc tcl_encoding {enc} {
    global encoding_aliases
    set names [encoding names]
    set lcnames [string tolower $names]
    set enc [string tolower $enc]
    set i [lsearch -exact $lcnames $enc]
    if {$i < 0} {
	# look for "isonnn" instead of "iso-nnn" or "iso_nnn"
	if {[regsub {^iso[-_]} $enc iso encx]} {
	    set i [lsearch -exact $lcnames $encx]
	}
    }
    if {$i < 0} {
	foreach l $encoding_aliases {
	    set ll [string tolower $l]
	    if {[lsearch -exact $ll $enc] < 0} continue
	    # look through the aliases for one that tcl knows about
	    foreach e $ll {
		set i [lsearch -exact $lcnames $e]
		if {$i < 0} {
		    if {[regsub {^iso[-_]} $e iso ex]} {
			set i [lsearch -exact $lcnames $ex]
		    }
		}
		if {$i >= 0} break
	    }
	    break
	}
    }
    if {$i >= 0} {
	return [lindex $names $i]
    }
    return {}
}

9338 9339
# First check that Tcl/Tk is recent enough
if {[catch {package require Tk 8.4} err]} {
9340 9341
    show_error {} . [mc "Sorry, gitk cannot run with this version of Tcl/Tk.\n\
		     Gitk requires at least Tcl/Tk 8.4."]
9342 9343 9344
    exit 1
}

9345
# defaults...
9346
set wrcomcmd "git diff-tree --stdin -p --pretty"
9347

9348
set gitencoding {}
9349
catch {
9350
    set gitencoding [exec git config --get i18n.commitencoding]
9351 9352
}
if {$gitencoding == ""} {
9353 9354 9355 9356 9357
    set gitencoding "utf-8"
}
set tclencoding [tcl_encoding $gitencoding]
if {$tclencoding == {}} {
    puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
9358
}
9359

9360 9361
set mainfont {Helvetica 9}
set textfont {Courier 9}
9362
set uifont {Helvetica 9 bold}
9363
set tabstop 8
9364
set findmergefiles 0
9365
set maxgraphpct 50
9366
set maxwidth 16
P
Paul Mackerras 已提交
9367
set revlistorder 0
9368
set fastdate 0
9369 9370 9371
set uparrowlen 5
set downarrowlen 5
set mingaplen 100
P
Paul Mackerras 已提交
9372
set cmitmode "patch"
9373
set wrapcomment "none"
P
Paul Mackerras 已提交
9374
set showneartags 1
9375
set maxrefs 20
9376
set maxlinelen 200
9377
set showlocalchanges 1
9378
set limitdiffs 1
9379
set datetimeformat "%Y-%m-%d %H:%M:%S"
9380
set autoselect 1
9381 9382

set colors {green red blue magenta darkgrey brown orange}
9383 9384 9385
set bgcolor white
set fgcolor black
set diffcolors {red "#00a000" blue}
9386
set diffcontext 3
9387
set ignorespace 0
9388
set selectbgcolor gray85
9389

9390 9391 9392 9393 9394 9395 9396 9397 9398 9399 9400 9401 9402 9403 9404 9405 9406 9407 9408
## For msgcat loading, first locate the installation location.
if { [info exists ::env(GITK_MSGSDIR)] } {
    ## Msgsdir was manually set in the environment.
    set gitk_msgsdir $::env(GITK_MSGSDIR)
} else {
    ## Let's guess the prefix from argv0.
    set gitk_prefix [file dirname [file dirname [file normalize $argv0]]]
    set gitk_libdir [file join $gitk_prefix share gitk lib]
    set gitk_msgsdir [file join $gitk_libdir msgs]
    unset gitk_prefix
}

## Internationalization (i18n) through msgcat and gettext. See
## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
package require msgcat
namespace import ::msgcat::mc
## And eventually load the actual message catalog
::msgcat::mcload $gitk_msgsdir

9409 9410
catch {source ~/.gitk}

9411
font create optionfont -family sans-serif -size -12
9412

9413 9414 9415 9416 9417 9418 9419 9420 9421 9422
parsefont mainfont $mainfont
eval font create mainfont [fontflags mainfont]
eval font create mainfontbold [fontflags mainfont 1]

parsefont textfont $textfont
eval font create textfont [fontflags textfont]
eval font create textfontbold [fontflags textfont 1]

parsefont uifont $uifont
eval font create uifont [fontflags uifont]
9423

9424 9425
setoptions

9426
# check that we can find a .git directory somewhere...
9427
if {[catch {set gitdir [gitdir]}]} {
9428
    show_error {} . [mc "Cannot find a git repository here."]
9429 9430
    exit 1
}
9431
if {![file isdirectory $gitdir]} {
9432
    show_error {} . [mc "Cannot find the git directory \"%s\"." $gitdir]
9433 9434 9435
    exit 1
}

9436
set revtreeargs {}
9437 9438
set cmdline_files {}
set i 0
9439
set revtreeargscmd {}
9440
foreach arg $argv {
9441
    switch -glob -- $arg {
9442
	"" { }
9443 9444 9445 9446
	"--" {
	    set cmdline_files [lrange $argv [expr {$i + 1}] end]
	    break
	}
9447 9448 9449
	"--argscmd=*" {
	    set revtreeargscmd [string range $arg 10 end]
	}
9450 9451 9452 9453
	default {
	    lappend revtreeargs $arg
	}
    }
9454
    incr i
9455
}
9456

9457
if {$i >= [llength $argv] && $revtreeargs ne {}} {
9458
    # no -- on command line, but some arguments (other than --argscmd)
9459
    if {[catch {
9460
	set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs]
9461 9462 9463
	set cmdline_files [split $f "\n"]
	set n [llength $cmdline_files]
	set revtreeargs [lrange $revtreeargs 0 end-$n]
9464 9465 9466 9467 9468
	# Unfortunately git rev-parse doesn't produce an error when
	# something is both a revision and a filename.  To be consistent
	# with git log and git rev-list, check revtreeargs for filenames.
	foreach arg $revtreeargs {
	    if {[file exists $arg]} {
9469 9470
		show_error {} . [mc "Ambiguous argument '%s': both revision\
				 and filename" $arg]
9471 9472 9473
		exit 1
	    }
	}
9474 9475 9476 9477 9478
    } err]} {
	# unfortunately we get both stdout and stderr in $err,
	# so look for "fatal:".
	set i [string first "fatal:" $err]
	if {$i > 0} {
J
Junio C Hamano 已提交
9479
	    set err [string range $err [expr {$i + 6}] end]
9480
	}
9481
	show_error {} . "[mc "Bad arguments to gitk:"]\n$err"
9482 9483 9484 9485
	exit 1
    }
}

9486
set nullid "0000000000000000000000000000000000000000"
9487 9488
set nullid2 "0000000000000000000000000000000000000001"

9489
set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
9490

9491
set runq {}
9492 9493
set history {}
set historyindex 0
9494 9495
set fh_serial 0
set nhl_names {}
9496
set highlight_paths {}
9497
set findpattern {}
9498
set searchdirn -forwards
9499 9500
set boldrows {}
set boldnamerows {}
9501
set diffelide {0 0}
9502
set markingmatches 0
9503
set linkentercount 0
9504 9505
set need_redisplay 0
set nrows_drawn 0
9506
set firsttabstop 0
P
Paul Mackerras 已提交
9507

P
Paul Mackerras 已提交
9508 9509
set nextviewnum 1
set curview 0
9510
set selectedview 0
9511 9512
set selectedhlview [mc "None"]
set highlight_related [mc "None"]
9513
set highlight_files {}
P
Paul Mackerras 已提交
9514
set viewfiles(0) {}
9515
set viewperm(0) 0
9516
set viewargs(0) {}
9517
set viewargscmd(0) {}
P
Paul Mackerras 已提交
9518

9519
set loginstance 0
9520
set cmdlineok 0
9521
set stopped 0
9522
set stuffsaved 0
9523
set patchnum 0
9524
set lserial 0
9525
set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}]
9526
setcoords
9527
makewindow
9528 9529
# wait for the window to become visible
tkwait visibility .
9530
wm title . "[file tail $argv0]: [file tail [pwd]]"
9531
readrefs
9532

9533
if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} {
P
Paul Mackerras 已提交
9534 9535
    # create a view for the files/dirs specified on the command line
    set curview 1
9536
    set selectedview 1
P
Paul Mackerras 已提交
9537
    set nextviewnum 2
9538
    set viewname(1) [mc "Command line"]
P
Paul Mackerras 已提交
9539
    set viewfiles(1) $cmdline_files
9540
    set viewargs(1) $revtreeargs
9541
    set viewargscmd(1) $revtreeargscmd
9542
    set viewperm(1) 0
9543
    set vdatemode(1) 0
9544
    addviewmenu 1
9545 9546
    .bar.view entryconf [mc "Edit view..."] -state normal
    .bar.view entryconf [mc "Delete view"] -state normal
P
Paul Mackerras 已提交
9547
}
9548 9549 9550 9551 9552 9553 9554

if {[info exists permviews]} {
    foreach v $permviews {
	set n $nextviewnum
	incr nextviewnum
	set viewname($n) [lindex $v 0]
	set viewfiles($n) [lindex $v 1]
9555
	set viewargs($n) [lindex $v 2]
9556
	set viewargscmd($n) [lindex $v 3]
9557
	set viewperm($n) 1
9558
	addviewmenu $n
9559 9560
    }
}
9561
getcommits