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

P
Paul Mackerras 已提交
5
# Copyright © 2005-2008 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
# 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 {
25
    global isonrunq runq currunq
26 27 28

    set script $args
    if {[info exists isonrunq($script)]} return
29
    if {$runq eq {} && ![info exists currunq]} {
30 31 32 33 34 35 36 37 38 39 40
	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} {
41
    global runq currunq
42 43

    fileevent $fd readable {}
44
    if {$runq eq {} && ![info exists currunq]} {
45 46 47 48 49
	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
proc dorunq {} {
63
    global isonrunq runq currunq
64 65 66

    set tstart [clock clicks -milliseconds]
    set t0 $tstart
67
    while {[llength $runq] > 0} {
68 69
	set fd [lindex $runq 0 0]
	set script [lindex $runq 0 1]
70 71
	set currunq [lindex $runq 0]
	set runq [lrange $runq 1 end]
72
	set repeat [eval $script]
73
	unset currunq
74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
	set t1 [clock clicks -milliseconds]
	set t [expr {$t1 - $t0}]
	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
    }
}

95 96 97 98 99 100 101 102 103
proc reg_instance {fd} {
    global commfd leftover loginstance

    set i [incr loginstance]
    set commfd($i) $fd
    set leftover($i) {}
    return $i
}

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
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} {
P
Paul Mackerras 已提交
131
    global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs
132 133 134

    set vdatemode($n) 0
    set vmergeonly($n) 0
P
Paul Mackerras 已提交
135 136 137 138 139 140 141 142 143 144 145 146 147 148 149
    set glflags {}
    set diffargs {}
    set nextisval 0
    set revargs {}
    set origargs $arglist
    set allknown 1
    set filtered 0
    set i -1
    foreach arg $arglist {
	incr i
	if {$nextisval} {
	    lappend glflags $arg
	    set nextisval 0
	    continue
	}
150 151 152 153
	switch -glob -- $arg {
	    "-d" -
	    "--date-order" {
		set vdatemode($n) 1
P
Paul Mackerras 已提交
154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207
		# remove from origargs in case we hit an unknown option
		set origargs [lreplace $origargs $i $i]
		incr i -1
	    }
	    # These request or affect diff output, which we don't want.
	    # Some could be used to set our defaults for diff display.
	    "-[puabwcrRBMC]" -
	    "--no-renames" - "--full-index" - "--binary" - "--abbrev=*" -
	    "--find-copies-harder" - "-l*" - "--ext-diff" - "--no-ext-diff" -
	    "--src-prefix=*" - "--dst-prefix=*" - "--no-prefix" -
	    "-O*" - "--text" - "--full-diff" - "--ignore-space-at-eol" -
	    "--ignore-space-change" - "-U*" - "--unified=*" {
		lappend diffargs $arg
	    }
	    # These cause our parsing of git log's output to fail, or else
	    # they're options we want to set ourselves, so ignore them.
	    "--raw" - "--patch-with-raw" - "--patch-with-stat" -
	    "--name-only" - "--name-status" - "--color" - "--color-words" -
	    "--log-size" - "--pretty=*" - "--decorate" - "--abbrev-commit" -
	    "--cc" - "-z" - "--header" - "--parents" - "--boundary" -
	    "--no-color" - "-g" - "--walk-reflogs" - "--no-walk" -
	    "--timestamp" - "relative-date" - "--date=*" - "--stdin" -
	    "--objects" - "--objects-edge" - "--reverse" {
	    }
	    # These are harmless, and some are even useful
	    "--stat=*" - "--numstat" - "--shortstat" - "--summary" -
	    "--check" - "--exit-code" - "--quiet" - "--topo-order" -
	    "--full-history" - "--dense" - "--sparse" -
	    "--follow" - "--left-right" - "--encoding=*" {
		lappend glflags $arg
	    }
	    # These mean that we get a subset of the commits
	    "--diff-filter=*" - "--no-merges" - "--unpacked" -
	    "--max-count=*" - "--skip=*" - "--since=*" - "--after=*" -
	    "--until=*" - "--before=*" - "--max-age=*" - "--min-age=*" -
	    "--author=*" - "--committer=*" - "--grep=*" - "-[iE]" -
	    "--remove-empty" - "--first-parent" - "--cherry-pick" -
	    "-S*" - "--pickaxe-all" - "--pickaxe-regex" - {
		set filtered 1
		lappend glflags $arg
	    }
	    # This appears to be the only one that has a value as a
	    # separate word following it
	    "-n" {
		set filtered 1
		set nextisval 1
		lappend glflags $arg
	    }
	    "--not" {
		set notflag [expr {!$notflag}]
		lappend revargs $arg
	    }
	    "--all" {
		lappend revargs $arg
208 209 210
	    }
	    "--merge" {
		set vmergeonly($n) 1
P
Paul Mackerras 已提交
211 212 213 214 215 216 217 218 219 220 221 222 223
		# git rev-parse doesn't understand --merge
		lappend revargs --gitk-symmetric-diff-marker MERGE_HEAD...HEAD
	    }
	    # Other flag arguments including -<n>
	    "-*" {
		if {[string is digit -strict [string range $arg 1 end]]} {
		    set filtered 1
		} else {
		    # a flag argument that we don't recognize;
		    # that means we can't optimize
		    set allknown 0
		}
		lappend glflags $arg
224
	    }
P
Paul Mackerras 已提交
225
	    # Non-flag arguments specify commits or ranges of commits
226
	    default {
P
Paul Mackerras 已提交
227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271
		if {[string match "*...*" $arg]} {
		    lappend revargs --gitk-symmetric-diff-marker
		}
		lappend revargs $arg
	    }
	}
    }
    set vdflags($n) $diffargs
    set vflags($n) $glflags
    set vrevs($n) $revargs
    set vfiltered($n) $filtered
    set vorigargs($n) $origargs
    return $allknown
}

proc parseviewrevs {view revs} {
    global vposids vnegids

    if {$revs eq {}} {
	set revs HEAD
    }
    if {[catch {set ids [eval exec git rev-parse $revs]} err]} {
	# we get stdout followed by stderr in $err
	# for an unknown rev, git rev-parse echoes it and then errors out
	set errlines [split $err "\n"]
	set badrev {}
	for {set l 0} {$l < [llength $errlines]} {incr l} {
	    set line [lindex $errlines $l]
	    if {!([string length $line] == 40 && [string is xdigit $line])} {
		if {[string match "fatal:*" $line]} {
		    if {[string match "fatal: ambiguous argument*" $line]
			&& $badrev ne {}} {
			if {[llength $badrev] == 1} {
			    set err "unknown revision $badrev"
			} else {
			    set err "unknown revisions: [join $badrev ", "]"
			}
		    } else {
			set err [join [lrange $errlines $l end] "\n"]
		    }
		    break
		}
		lappend badrev $line
	    }
	}		    
272
	error_popup "[mc "Error parsing revisions:"] $err"
P
Paul Mackerras 已提交
273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294
	return {}
    }
    set ret {}
    set pos {}
    set neg {}
    set sdm 0
    foreach id [split $ids "\n"] {
	if {$id eq "--gitk-symmetric-diff-marker"} {
	    set sdm 4
	} elseif {[string match "^*" $id]} {
	    if {$sdm != 1} {
		lappend ret $id
		if {$sdm == 3} {
		    set sdm 0
		}
	    }
	    lappend neg [string range $id 1 end]
	} else {
	    if {$sdm != 2} {
		lappend ret $id
	    } else {
		lset ret end [lindex $ret end]...$id
295
	    }
P
Paul Mackerras 已提交
296
	    lappend pos $id
297
	}
P
Paul Mackerras 已提交
298
	incr sdm -1
299
    }
P
Paul Mackerras 已提交
300 301 302
    set vposids($view) $pos
    set vnegids($view) $neg
    return $ret
303 304
}

305
# Start off a git log process and arrange to read its output
306
proc start_rev_list {view} {
307
    global startmsecs commitidx viewcomplete curview
308
    global tclencoding
P
Paul Mackerras 已提交
309
    global viewargs viewargscmd viewfiles vfilelimit
310
    global showlocalchanges
311
    global viewactive viewinstances vmergeonly
312
    global mainheadid
P
Paul Mackerras 已提交
313
    global vcanopt vflags vrevs vorigargs
314 315

    set startmsecs [clock clicks -milliseconds]
316
    set commitidx($view) 0
317 318 319
    # these are set this way for the error exits
    set viewcomplete($view) 1
    set viewactive($view) 0
320 321
    varcinit $view

322 323 324 325 326
    set args $viewargs($view)
    if {$viewargscmd($view) ne {}} {
	if {[catch {
	    set str [exec sh -c $viewargscmd($view)]
	} err]} {
327
	    error_popup "[mc "Error executing --argscmd command:"] $err"
328
	    return 0
329 330 331
	}
	set args [concat $args [split $str "\n"]]
    }
P
Paul Mackerras 已提交
332
    set vcanopt($view) [parseviewargs $view $args]
333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350

    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

P
Paul Mackerras 已提交
351 352 353 354 355 356 357 358 359 360
    if {$vcanopt($view)} {
	set revs [parseviewrevs $view $vrevs($view)]
	if {$revs eq {}} {
	    return 0
	}
	set args [concat $vflags($view) $revs]
    } else {
	set args $vorigargs($view)
    }

361
    if {[catch {
362
	set fd [open [concat | git log --no-color -z --pretty=raw --parents \
363
			 --boundary $args "--" $files] r]
364
    } err]} {
P
Paul Mackerras 已提交
365
	error_popup "[mc "Error executing git log:"] $err"
366
	return 0
367
    }
368
    set i [reg_instance $fd]
369
    set viewinstances($view) [list $i]
370
    if {$showlocalchanges && $mainheadid ne {}} {
371
	interestedin $mainheadid dodiffindex
372
    }
373
    fconfigure $fd -blocking 0 -translation lf -eofchar {}
374
    if {$tclencoding != {}} {
375
	fconfigure $fd -encoding $tclencoding
376
    }
377
    filerun $fd [list getcommitlines $fd $i $view 0]
378
    nowbusy $view [mc "Reading"]
379 380 381
    set viewcomplete($view) 0
    set viewactive($view) 1
    return 1
382 383
}

384 385 386 387 388 389
proc stop_instance {inst} {
    global commfd leftover

    set fd $commfd($inst)
    catch {
	set pid [pid $fd]
390 391 392 393 394 395

	if {$::tcl_platform(platform) eq {windows}} {
	    exec kill -f $pid
	} else {
	    exec kill $pid
	}
396 397 398 399 400 401 402 403 404 405 406 407 408 409 410
    }
    catch {close $fd}
    nukefile $fd
    unset commfd($inst)
    unset leftover($inst)
}

proc stop_backends {} {
    global commfd

    foreach inst [array names commfd] {
	stop_instance $inst
    }
}

411
proc stop_rev_list {view} {
412
    global viewinstances
413

414
    foreach inst $viewinstances($view) {
415
	stop_instance $inst
416
    }
417
    set viewinstances($view) {}
418 419
}

420
proc reset_pending_select {selid} {
421
    global pending_select mainheadid selectheadid
422 423 424

    if {$selid ne {}} {
	set pending_select $selid
425 426
    } elseif {$selectheadid ne {}} {
	set pending_select $selectheadid
427 428 429 430 431 432
    } else {
	set pending_select $mainheadid
    }
}

proc getcommits {selid} {
433
    global canv curview need_redisplay viewactive
434

435
    initlayout
436
    if {[start_rev_list $curview]} {
437
	reset_pending_select $selid
438 439 440 441 442
	show_status [mc "Reading commits..."]
	set need_redisplay 1
    } else {
	show_status [mc "No commits selected"]
    }
443 444
}

445
proc updatecommits {} {
P
Paul Mackerras 已提交
446
    global curview vcanopt vorigargs vfilelimit viewinstances
447 448
    global viewactive viewcomplete tclencoding
    global startmsecs showneartags showlocalchanges
449
    global mainheadid pending_select
P
Paul Mackerras 已提交
450
    global isworktree
P
Paul Mackerras 已提交
451
    global varcid vposids vnegids vflags vrevs
452

P
Paul Mackerras 已提交
453
    set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}]
454
    set oldmainid $mainheadid
455
    rereadrefs
456 457 458 459 460 461 462 463
    if {$showlocalchanges} {
	if {$mainheadid ne $oldmainid} {
	    dohidelocalchanges
	}
	if {[commitinview $mainheadid $curview]} {
	    dodiffindex
	}
    }
464
    set view $curview
P
Paul Mackerras 已提交
465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498
    if {$vcanopt($view)} {
	set oldpos $vposids($view)
	set oldneg $vnegids($view)
	set revs [parseviewrevs $view $vrevs($view)]
	if {$revs eq {}} {
	    return
	}
	# note: getting the delta when negative refs change is hard,
	# and could require multiple git log invocations, so in that
	# case we ask git log for all the commits (not just the delta)
	if {$oldneg eq $vnegids($view)} {
	    set newrevs {}
	    set npos 0
	    # take out positive refs that we asked for before or
	    # that we have already seen
	    foreach rev $revs {
		if {[string length $rev] == 40} {
		    if {[lsearch -exact $oldpos $rev] < 0
			&& ![info exists varcid($view,$rev)]} {
			lappend newrevs $rev
			incr npos
		    }
		} else {
		    lappend $newrevs $rev
		}
	    }
	    if {$npos == 0} return
	    set revs $newrevs
	    set vposids($view) [lsort -unique [concat $oldpos $vposids($view)]]
	}
	set args [concat $vflags($view) $revs --not $oldpos]
    } else {
	set args $vorigargs($view)
    }
499 500
    if {[catch {
	set fd [open [concat | git log --no-color -z --pretty=raw --parents \
P
Paul Mackerras 已提交
501
			  --boundary $args "--" $vfilelimit($view)] r]
502
    } err]} {
503
	error_popup "[mc "Error executing git log:"] $err"
P
Paul Mackerras 已提交
504
	return
505 506 507 508
    }
    if {$viewactive($view) == 0} {
	set startmsecs [clock clicks -milliseconds]
    }
509
    set i [reg_instance $fd]
510 511 512 513 514
    lappend viewinstances($view) $i
    fconfigure $fd -blocking 0 -translation lf -eofchar {}
    if {$tclencoding != {}} {
	fconfigure $fd -encoding $tclencoding
    }
515
    filerun $fd [list getcommitlines $fd $i $view 1]
516 517
    incr viewactive($view)
    set viewcomplete($view) 0
518
    reset_pending_select {}
519 520 521 522 523 524 525 526 527
    nowbusy $view "Reading"
    if {$showneartags} {
	getallcommits
    }
}

proc reloadcommits {} {
    global curview viewcomplete selectedline currentid thickerline
    global showneartags treediffs commitinterest cached_commitrow
528
    global targetid
529

530 531 532 533 534
    set selid {}
    if {$selectedline ne {}} {
	set selid $currentid
    }

535 536 537 538
    if {!$viewcomplete($curview)} {
	stop_rev_list $curview
    }
    resetvarcs $curview
539
    set selectedline {}
540 541 542 543 544 545 546 547 548 549 550
    catch {unset currentid}
    catch {unset thickerline}
    catch {unset treediffs}
    readrefs
    changedrefs
    if {$showneartags} {
	getallcommits
    }
    clear_display
    catch {unset commitinterest}
    catch {unset cached_commitrow}
551
    catch {unset targetid}
552
    setcanvscroll
553
    getcommits $selid
554
    return 0
555 556
}

557 558 559 560 561 562 563 564 565 566 567 568 569
# 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]
}

570 571 572 573
# Procedures used in reordering commits from git log (without
# --topo-order) into the order for display.

proc varcinit {view} {
574 575
    global varcstart vupptr vdownptr vleftptr vbackptr varctok varcrow
    global vtokmod varcmod vrowmod varcix vlastins
576 577 578 579 580

    set varcstart($view) {{}}
    set vupptr($view) {0}
    set vdownptr($view) {0}
    set vleftptr($view) {0}
581
    set vbackptr($view) {0}
582 583 584 585
    set varctok($view) {{}}
    set varcrow($view) {{}}
    set vtokmod($view) {}
    set varcmod($view) 0
586
    set vrowmod($view) 0
587
    set varcix($view) {{}}
588
    set vlastins($view) {0}
589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608
}

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)
    }
609
    catch {unset ordertok}
610 611
}

612 613 614 615 616 617 618 619 620 621 622 623 624
# 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
}

625
proc newvarc {view id} {
626
    global varcid varctok parents children vdatemode
627 628
    global vupptr vdownptr vleftptr vbackptr varcrow varcix varcstart
    global commitdata commitinfo vseedcount varccommits vlastins
629 630 631

    set a [llength $varctok($view)]
    set vid $view,$id
632
    if {[llength $children($vid)] == 0 || $vdatemode($view)} {
633 634 635 636 637 638 639 640 641 642 643 644 645 646 647
	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 {}
648 649 650 651 652 653 654 655 656
    }
    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]
657
	}
658 659
    }
    if {$ka != 0} {
660 661 662 663
	set i [lsearch -exact $parents($view,$ki) $id]
	set j [expr {[llength $parents($view,$ki)] - 1 - $i}]
	append tok [strrep $j]
    }
664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687
    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
    }
688 689 690 691 692
    lappend varctok($view) $tok
    lappend varcstart($view) $id
    lappend vdownptr($view) 0
    lappend varcrow($view) {}
    lappend varcix($view) {}
693
    set varccommits($view,$a) {}
694
    lappend vlastins($view) 0
695 696 697 698 699
    return $a
}

proc splitvarc {p v} {
    global varcid varcstart varccommits varctok
700
    global vupptr vdownptr vleftptr vbackptr varcix varcrow vlastins
701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718

    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]
719
    lappend vlastins($v) [lindex $vlastins($v) $oa]
720
    lset vdownptr($v) $oa $na
721
    lset vlastins($v) $oa 0
722 723
    lappend vupptr($v) $oa
    lappend vleftptr($v) 0
724
    lappend vbackptr($v) 0
725 726 727 728 729 730 731
    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
732
    global vupptr vdownptr vleftptr vbackptr vlastins varcid vtokmod vdatemode
733 734 735 736

    set t1 [clock clicks -milliseconds]
    set todo {}
    set isrelated($a) 1
737
    set kidchanged($a) 1
738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760
    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 {
761
	if {![info exists kidchanged($a)]} continue
762
	set id [lindex $varcstart($v) $a]
763 764 765 766 767
	if {[llength $children($v,$id)] > 1} {
	    set children($v,$id) [lsort -command [list vtokcmp $v] \
				      $children($v,$id)]
	}
	set oldtok [lindex $varctok($v) $a]
768
	if {!$vdatemode($v)} {
769 770 771 772 773
	    set tok {}
	} else {
	    set tok $oldtok
	}
	set ka 0
774 775
	set kid [last_real_child $v,$id]
	if {$kid ne {}} {
776 777 778 779 780
	    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]
781 782
	    }
	}
783
	if {$ka != 0} {
784 785 786 787
	    set i [lsearch -exact $parents($v,$ki) $id]
	    set j [expr {[llength $parents($v,$ki)] - 1 - $i}]
	    append tok [strrep $j]
	}
788 789 790 791 792 793 794 795 796 797 798 799
	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
800 801
	set b [lindex $vupptr($v) $a]
	if {$b != $ka} {
802 803
	    if {[string compare [lindex $varctok($v) $ka] $vtokmod($v)] < 0} {
		modify_arc $v $ka
804
	    }
805 806
	    if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} {
		modify_arc $v $b
807
	    }
808 809 810 811
	    set c [lindex $vbackptr($v) $a]
	    set d [lindex $vleftptr($v) $a]
	    if {$c == 0} {
		lset vdownptr($v) $b $d
812
	    } else {
813 814 815 816
		lset vleftptr($v) $c $d
	    }
	    if {$d != 0} {
		lset vbackptr($v) $d $c
817
	    }
818 819 820
	    if {[lindex $vlastins($v) $b] == $a} {
		lset vlastins($v) $b $c
	    }
821
	    lset vupptr($v) $a $ka
822 823 824 825 826 827 828 829 830 831 832 833
	    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]
834
	    }
835 836 837 838 839 840
	    if {$c == $ka} {
 		lset vdownptr($v) $ka $a
		lset vbackptr($v) $a 0
	    } else {
		lset vleftptr($v) $c $a
		lset vbackptr($v) $a $c
841
	    }
842 843 844 845 846 847 848 849 850 851 852
	    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)]
853 854 855 856 857 858
	}
    }
    set t2 [clock clicks -milliseconds]
    #puts "renumbervarc did [llength $todo] of $ntot arcs in [expr {$t2-$t1}]ms"
}

859 860 861
# 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.
862
proc fix_reversal {p a v} {
P
Paul Mackerras 已提交
863
    global varcid varcstart varctok vupptr
864 865 866 867 868 869

    set pa $varcid($v,$p)
    if {$p ne [lindex $varcstart($v) $pa]} {
	splitvarc $p $v
	set pa $varcid($v,$p)
    }
P
Paul Mackerras 已提交
870 871 872 873
    # seeds always need to be renumbered
    if {[lindex $vupptr($v) $pa] == 0 ||
	[string compare [lindex $varctok($v) $a] \
	     [lindex $varctok($v) $pa]] > 0} {
874 875 876 877 878
	renumbervarc $pa $v
    }
}

proc insertrow {id p v} {
879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912
    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} {
913
    global varcid varccommits parents children cmitlisted
914
    global commitidx varctok vtokmod targetid targetrow curview numcommits
915

916
    set v $curview
917 918 919
    set a $varcid($v,$p)
    set i [lsearch -exact $varccommits($v,$a) $p]
    if {$i < 0} {
920
	puts "oops: insertfakerow can't find [shortids $p] on arc $a"
921 922 923 924 925
	return
    }
    set children($v,$id) {}
    set parents($v,$id) [list $p]
    set varcid($v,$id) $a
926
    lappend children($v,$p) $id
927
    set cmitlisted($v,$id) 1
928
    set numcommits [incr commitidx($v)]
929 930
    # note we deliberately don't update varcstart($v) even if $i == 0
    set varccommits($v,$a) [linsert $varccommits($v,$a) $i $id]
931
    modify_arc $v $a $i
932 933 934 935 936
    if {[info exists targetid]} {
	if {![comes_before $targetid $p]} {
	    incr targetrow
	}
    }
937
    setcanvscroll
938
    drawvisible
939 940
}

941
proc removefakerow {id} {
942
    global varcid varccommits parents children commitidx
943
    global varctok vtokmod cmitlisted currentid selectedline
944
    global targetid curview numcommits
945

946
    set v $curview
947
    if {[llength $parents($v,$id)] != 1} {
948
	puts "oops: removefakerow [shortids $id] has [llength $parents($v,$id)] parents"
949 950 951 952 953 954
	return
    }
    set p [lindex $parents($v,$id) 0]
    set a $varcid($v,$id)
    set i [lsearch -exact $varccommits($v,$a) $id]
    if {$i < 0} {
955
	puts "oops: removefakerow can't find [shortids $id] on arc $a"
956 957 958 959 960 961 962
	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)
963
    set numcommits [incr commitidx($v) -1]
964 965 966 967
    set j [lsearch -exact $children($v,$p) $id]
    if {$j >= 0} {
	set children($v,$p) [lreplace $children($v,$p) $j $j]
    }
968
    modify_arc $v $a $i
969 970
    if {[info exist currentid] && $id eq $currentid} {
	unset currentid
971
	set selectedline {}
972
    }
973 974 975
    if {[info exists targetid] && $targetid eq $id} {
	set targetid $p
    }
976
    setcanvscroll
977
    drawvisible
978 979
}

980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003
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 {}
}

1004 1005 1006 1007 1008 1009 1010
proc vtokcmp {v a b} {
    global varctok varcid

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

1011 1012
# This assumes that if lim is not given, the caller has checked that
# arc a's token is less than $vtokmod($v)
1013 1014
proc modify_arc {v a {lim {}}} {
    global varctok vtokmod varcmod varcrow vupptr curview vrowmod varccommits
1015

1016 1017 1018 1019 1020 1021 1022 1023
    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
	}
    }
1024 1025 1026 1027 1028
    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]
1029
	    set lim {}
1030
	}
1031 1032 1033 1034 1035 1036 1037 1038
	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 已提交
1039
	undolayout $r
1040 1041 1042
    }
}

1043
proc update_arcrows {v} {
1044
    global vtokmod varcmod vrowmod varcrow commitidx currentid selectedline
P
Paul Mackerras 已提交
1045
    global varcid vrownum varcorder varcix varccommits
1046
    global vupptr vdownptr vleftptr varctok
P
Paul Mackerras 已提交
1047
    global displayorder parentlist curview cached_commitrow
1048

1049 1050 1051 1052 1053 1054 1055 1056
    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}
    }
1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101
    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
    }
1102 1103 1104
    set vtokmod($v) [lindex $varctok($v) $p]
    set varcmod($v) $p
    set vrowmod($v) $row
1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119
    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
1120
    global varctok vtokmod
1121 1122 1123 1124 1125 1126 1127

    set v $curview
    if {![info exists varcid($v,$id)]} {
	puts "oops rowofcommit no arc for [shortids $id]"
	return {}
    }
    set a $varcid($v,$id)
1128
    if {[string compare [lindex $varctok($v) $a] $vtokmod($v)] >= 0} {
1129 1130
	update_arcrows $v
    }
1131 1132 1133
    if {[info exists cached_commitrow($id)]} {
	return $cached_commitrow($id)
    }
1134 1135 1136 1137 1138 1139 1140 1141 1142 1143
    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
}

1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159
# 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]}]
}

1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182
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
1183
    global varccommits varcorder parents vrowmod varcrow
1184 1185
    global d_valid_start d_valid_end

1186
    if {$end > $vrowmod($curview)} {
1187 1188
	update_arcrows $curview
    }
1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208
    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)
	    }
1209
	} elseif {[lindex $displayorder [expr {$r + $al - 1}]] eq {}} {
1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233
	    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
1234
    global cmitlisted commitidx vtokmod
1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253

    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
1254 1255
	    if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} {
		modify_arc $v $b
1256
	    }
1257
	    lappend varccommits($v,$b) $p
1258
	    incr commitidx($v)
1259
	    set scripts [check_interest $p $scripts]
1260 1261 1262 1263 1264 1265 1266 1267 1268
	}
    }
    if {$missing_parents > 0} {
	foreach s $scripts {
	    eval $s
	}
    }
}

1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288
# 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
1289 1290 1291
	# 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}]
1292 1293 1294
    }
}

1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327
# Mechanism for registering a command to be executed when we come
# across a particular commit.  To handle the case when only the
# prefix of the commit is known, the commitinterest array is now
# indexed by the first 4 characters of the ID.  Each element is a
# list of id, cmd pairs.
proc interestedin {id cmd} {
    global commitinterest

    lappend commitinterest([string range $id 0 3]) $id $cmd
}

proc check_interest {id scripts} {
    global commitinterest

    set prefix [string range $id 0 3]
    if {[info exists commitinterest($prefix)]} {
	set newlist {}
	foreach {i script} $commitinterest($prefix) {
	    if {[string match "$i*" $id]} {
		lappend scripts [string map [list "%I" $id "%P" $i] $script]
	    } else {
		lappend newlist $i $script
	    }
	}
	if {$newlist ne {}} {
	    set commitinterest($prefix) $newlist
	} else {
	    unset commitinterest($prefix)
	}
    }
    return $scripts
}

1328
proc getcommitlines {fd inst view updating}  {
1329
    global cmitlisted leftover
1330
    global commitidx commitdata vdatemode
1331
    global parents children curview hlview
1332
    global idpending ordertok
1333
    global varccommits varcid varctok vtokmod vfilelimit
1334

1335
    set stuff [read $fd 500000]
1336
    # git log doesn't terminate the last commit with a null...
1337
    if {$stuff == {} && $leftover($inst) ne {} && [eof $fd]} {
1338 1339
	set stuff "\0"
    }
P
Paul Mackerras 已提交
1340
    if {$stuff == {}} {
1341 1342 1343
	if {![eof $fd]} {
	    return 1
	}
1344
	global commfd viewcomplete viewactive viewname
1345 1346 1347 1348 1349
	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 已提交
1350
	}
1351
	# set it blocking so we wait for the process to terminate
1352
	fconfigure $fd -blocking 1
1353 1354 1355 1356
	if {[catch {close $fd} err]} {
	    set fv {}
	    if {$view != $curview} {
		set fv " for the \"$viewname($view)\" view"
1357
	    }
1358 1359
	    if {[string range $err 0 4] == "usage"} {
		set err "Gitk: error reading commits$fv:\
1360
			bad arguments to git log."
1361 1362
		if {$viewname($view) eq "Command line"} {
		    append err \
1363
			"  (Note: arguments to gitk are passed to git log\
1364 1365 1366 1367 1368 1369
			 to allow selection of commits to be displayed.)"
		}
	    } else {
		set err "Error reading commits$fv: $err"
	    }
	    error_popup $err
1370
	}
1371 1372 1373 1374 1375 1376 1377
	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
	}
1378
	if {$view == $curview} {
1379
	    run chewcommits
1380
	}
1381
	return 0
1382
    }
P
Paul Mackerras 已提交
1383
    set start 0
1384
    set gotsome 0
1385
    set scripts {}
P
Paul Mackerras 已提交
1386 1387 1388
    while 1 {
	set i [string first "\0" $stuff $start]
	if {$i < 0} {
1389
	    append leftover($inst) [string range $stuff $start end]
P
Paul Mackerras 已提交
1390
	    break
1391
	}
P
Paul Mackerras 已提交
1392
	if {$start == 0} {
1393
	    set cmit $leftover($inst)
1394
	    append cmit [string range $stuff 0 [expr {$i - 1}]]
1395
	    set leftover($inst) {}
1396 1397
	} else {
	    set cmit [string range $stuff $start [expr {$i - 1}]]
P
Paul Mackerras 已提交
1398 1399
	}
	set start [expr {$i + 1}]
1400 1401
	set j [string first "\n" $cmit]
	set ok 0
1402
	set listed 1
1403 1404
	if {$j >= 0 && [string match "commit *" $cmit]} {
	    set ids [string range $cmit 7 [expr {$j - 1}]]
1405
	    if {[string match {[-^<>]*} $ids]} {
1406 1407
		switch -- [string index $ids 0] {
		    "-" {set listed 0}
1408 1409 1410
		    "^" {set listed 2}
		    "<" {set listed 3}
		    ">" {set listed 4}
1411
		}
1412 1413
		set ids [string range $ids 1 end]
	    }
1414 1415
	    set ok 1
	    foreach id $ids {
1416
		if {[string length $id] != 40} {
1417 1418 1419 1420 1421 1422
		    set ok 0
		    break
		}
	    }
	}
	if {!$ok} {
1423 1424 1425 1426
	    set shortcmit $cmit
	    if {[string length $shortcmit] > 80} {
		set shortcmit "[string range $shortcmit 0 80]..."
	    }
1427
	    error_popup "[mc "Can't parse git log output:"] {$shortcmit}"
P
Paul Mackerras 已提交
1428 1429
	    exit 1
	}
1430
	set id [lindex $ids 0]
1431
	set vid $view,$id
1432 1433

	if {!$listed && $updating && ![info exists varcid($vid)] &&
1434
	    $vfilelimit($view) ne {}} {
1435 1436 1437 1438 1439 1440 1441
	    # 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 \
1442
			      $id -- $vfilelimit($view)]
1443 1444 1445 1446 1447 1448 1449 1450 1451
	    }]} {
		if {$rwid ne {} && [info exists varcid($view,$rwid)]} {
		    # use $rwid in place of $id
		    rewrite_commit $view $id $rwid
		    continue
		}
	    }
	}

1452 1453 1454 1455 1456
	set a 0
	if {[info exists varcid($vid)]} {
	    if {$cmitlisted($vid) || !$listed} continue
	    set a $varcid($vid)
	}
1457 1458 1459 1460 1461
	if {$listed} {
	    set olds [lrange $ids 1 end]
	} else {
	    set olds {}
	}
1462
	set commitdata($id) [string range $cmit [expr {$j + 1}] end]
1463 1464 1465 1466
	set cmitlisted($vid) $listed
	set parents($vid) $olds
	if {![info exists children($vid)]} {
	    set children($vid) {}
1467
	} elseif {$a == 0 && [llength $children($vid)] == 1} {
1468 1469
	    set k [lindex $children($vid) 0]
	    if {[llength $parents($view,$k)] == 1 &&
1470
		(!$vdatemode($view) ||
1471 1472
		 $varcid($view,$k) == [llength $varctok($view)] - 1)} {
		set a $varcid($view,$k)
1473
	    }
1474
	}
1475 1476 1477 1478
	if {$a == 0} {
	    # new arc
	    set a [newvarc $view $id]
	}
1479 1480 1481
	if {[string compare [lindex $varctok($view) $a] $vtokmod($view)] < 0} {
	    modify_arc $view $a
	}
1482 1483 1484 1485 1486
	if {![info exists varcid($vid)]} {
	    set varcid($vid) $a
	    lappend varccommits($view,$a) $id
	    incr commitidx($view)
	}
1487

1488 1489 1490 1491 1492 1493 1494 1495
	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)]
1496
		    catch {unset ordertok}
1497
		}
1498 1499 1500
		if {[info exists varcid($view,$p)]} {
		    fix_reversal $p $a $view
		}
1501 1502 1503 1504
	    }
	    incr i
	}

1505
	set scripts [check_interest $id $scripts]
1506 1507 1508
	set gotsome 1
    }
    if {$gotsome} {
1509 1510 1511 1512 1513 1514 1515 1516 1517 1518
	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
	}
1519 1520 1521
	foreach s $scripts {
	    eval $s
	}
1522
    }
1523
    return 2
1524 1525
}

1526
proc chewcommits {} {
1527
    global curview hlview viewcomplete
1528
    global pending_select
1529

1530 1531 1532 1533 1534 1535
    layoutmore
    if {$viewcomplete($curview)} {
	global commitidx varctok
	global numcommits startmsecs

	if {[info exists pending_select]} {
1536 1537 1538 1539 1540 1541 1542 1543 1544
	    update
	    reset_pending_select {}

	    if {[commitinview $pending_select $curview]} {
		selectline [rowofcommit $pending_select] 1
	    } else {
		set row [first_real_row]
		selectline $row 1
	    }
1545
	}
1546 1547 1548 1549 1550 1551 1552 1553
	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
1554
    }
1555
    return 0
1556 1557 1558
}

proc readcommit {id} {
1559
    if {[catch {set contents [exec git cat-file commit $id]}]} return
1560
    parsecommit $id $contents 0
P
Paul Mackerras 已提交
1561 1562
}

1563
proc parsecommit {id contents listed} {
1564 1565 1566 1567 1568 1569 1570 1571 1572
    global commitinfo cdate

    set inhdr 1
    set comment {}
    set headline {}
    set auname {}
    set audate {}
    set comname {}
    set comdate {}
P
Paul Mackerras 已提交
1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587
    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]
1588 1589
	}
    }
P
Paul Mackerras 已提交
1590
    set headline {}
1591 1592 1593
    # 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 已提交
1594
    if {$i >= 0} {
1595 1596 1597 1598 1599 1600
	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 已提交
1601 1602
    }
    if {!$listed} {
1603
	# git log indents the comment by 4 spaces;
1604
	# if we got this via git cat-file, add the indentation
P
Paul Mackerras 已提交
1605 1606 1607 1608
	set newcomment {}
	foreach line [split $comment "\n"] {
	    append newcomment "    "
	    append newcomment $line
1609
	    append newcomment "\n"
P
Paul Mackerras 已提交
1610 1611
	}
	set comment $newcomment
1612 1613
    }
    if {$comdate != {}} {
1614
	set cdate($id) $comdate
1615
    }
1616 1617
    set commitinfo($id) [list $headline $auname $audate \
			     $comname $comdate $comment]
1618 1619
}

1620
proc getcommit {id} {
1621
    global commitdata commitinfo
P
Paul Mackerras 已提交
1622

1623 1624
    if {[info exists commitdata($id)]} {
	parsecommit $id $commitdata($id) 1
P
Paul Mackerras 已提交
1625 1626 1627
    } else {
	readcommit $id
	if {![info exists commitinfo($id)]} {
1628
	    set commitinfo($id) [list [mc "No commit information available"]]
P
Paul Mackerras 已提交
1629 1630 1631 1632 1633
	}
    }
    return 1
}

1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646
# Expand an abbreviated commit ID to a list of full 40-char IDs that match
# and are present in the current view.
# This is fairly slow...
proc longid {prefix} {
    global varcid curview

    set ids {}
    foreach match [array names varcid "$curview,$prefix*"] {
	lappend ids [lindex [split $match ","] 1]
    }
    return $ids
}

1647
proc readrefs {} {
1648
    global tagids idtags headids idheads tagobjid
1649
    global otherrefids idotherrefs mainhead mainheadid
1650
    global selecthead selectheadid
1651

1652 1653 1654
    foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
	catch {unset $v}
    }
1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665
    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
1666
	    }
1667 1668
	} elseif {[string match "heads/*" $name]} {
	    set name [string range $name 6 end]
1669 1670
	    set headids($name) $id
	    lappend idheads($id) $name
1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681
	} 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
1682 1683 1684
	} else {
	    set otherrefids($name) $id
	    lappend idotherrefs($id) $name
1685 1686
	}
    }
1687
    catch {close $refd}
1688
    set mainhead {}
1689
    set mainheadid {}
1690
    catch {
1691
	set mainheadid [exec git rev-parse HEAD]
1692 1693 1694 1695 1696
	set thehead [exec git symbolic-ref HEAD]
	if {[string match "refs/heads/*" $thehead]} {
	    set mainhead [string range $thehead 11 end]
	}
    }
1697 1698 1699 1700 1701 1702
    set selectheadid {}
    if {$selecthead ne {}} {
	catch {
	    set selectheadid [exec git rev-parse --verify $selecthead]
	}
    }
1703 1704
}

1705 1706
# skip over fake commits
proc first_real_row {} {
1707
    global nullid nullid2 numcommits
1708 1709

    for {set row 0} {$row < $numcommits} {incr row} {
1710
	set id [commitonrow $row]
1711 1712 1713 1714 1715 1716 1717
	if {$id ne $nullid && $id ne $nullid2} {
	    break
	}
    }
    return $row
}

1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741
# 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 已提交
1742
proc show_error {w top msg} {
1743 1744
    message $w.m -text $msg -justify center -aspect 400
    pack $w.m -side top -fill x -padx 20 -pady 20
1745
    button $w.ok -text [mc OK] -command "destroy $top"
1746
    pack $w.ok -side bottom -fill x
P
Paul Mackerras 已提交
1747 1748 1749
    bind $top <Visibility> "grab $top; focus $top"
    bind $top <Key-Return> "destroy $top"
    tkwait window $top
1750 1751
}

1752 1753 1754 1755
proc error_popup msg {
    set w .error
    toplevel $w
    wm transient $w .
P
Paul Mackerras 已提交
1756
    show_error $w $w $msg
1757 1758
}

1759 1760 1761 1762 1763 1764 1765 1766
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
1767
    button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w"
1768
    pack $w.ok -side left -fill x
1769
    button $w.cancel -text [mc Cancel] -command "destroy $w"
1770 1771 1772 1773 1774 1775
    pack $w.cancel -side right -fill x
    bind $w <Visibility> "grab $w; focus $w"
    tkwait window $w
    return $confirm_ok
}

1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788
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
}

P
Paul Mackerras 已提交
1789 1790 1791 1792 1793 1794 1795 1796
# Make a menu and submenus.
# m is the window name for the menu, items is the list of menu items to add.
# Each item is a list {mc label type description options...}
# mc is ignored; it's so we can put mc there to alert xgettext
# label is the string that appears in the menu
# type is cascade, command or radiobutton (should add checkbutton)
# description depends on type; it's the sublist for cascade, the
# command to invoke for command, or {variable value} for radiobutton
1797 1798 1799
proc makemenu {m items} {
    menu $m
    foreach i $items {
P
Paul Mackerras 已提交
1800 1801 1802
	set name [mc [lindex $i 1]]
	set type [lindex $i 2]
	set thing [lindex $i 3]
1803 1804 1805 1806 1807 1808 1809 1810 1811 1812
	set params [list $type]
	if {$name ne {}} {
	    set u [string first "&" [string map {&& x} $name]]
	    lappend params -label [string map {&& & & {}} $name]
	    if {$u >= 0} {
		lappend params -underline $u
	    }
	}
	switch -- $type {
	    "cascade" {
P
Paul Mackerras 已提交
1813
		set submenu [string tolower [string map {& ""} [lindex $i 1]]]
1814 1815 1816 1817 1818 1819 1820 1821 1822 1823
		lappend params -menu $m.$submenu
	    }
	    "command" {
		lappend params -command $thing
	    }
	    "radiobutton" {
		lappend params -variable [lindex $thing 0] \
		    -value [lindex $thing 1]
	    }
	}
P
Paul Mackerras 已提交
1824
	eval $m add $params [lrange $i 4 end]
1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835
	if {$type eq "cascade"} {
	    makemenu $m.$submenu $thing
	}
    }
}

# translate string and remove ampersands
proc mca {str} {
    return [string map {&& & & {}} [mc $str]]
}

1836
proc makewindow {} {
1837
    global canv canv2 canv3 linespc charspc ctext cflist cscroll
1838
    global tabstop
1839
    global findtype findtypemenu findloc findstring fstring geometry
1840
    global entries sha1entry sha1string sha1but
1841
    global diffcontextstring diffcontext
1842
    global ignorespace
1843
    global maincursor textcursor curtextcursor
1844
    global rowctxmenu fakerowmenu mergemax wrapcomment
1845
    global highlight_files gdttype
1846
    global searchstring sstring
1847
    global bgcolor fgcolor bglist fglist diffcolors selectbgcolor
1848 1849
    global headctxmenu progresscanv progressitem progresscoords statusw
    global fprogitem fprogcoord lastprogupdate progupdatepending
1850
    global rprogitem rprogcoord rownumsel numcommits
1851
    global have_tk85
1852

P
Paul Mackerras 已提交
1853 1854
    # The "mc" arguments here are purely so that xgettext
    # sees the following string as needing to be translated
1855
    makemenu .bar {
P
Paul Mackerras 已提交
1856 1857 1858 1859 1860 1861
	{mc "File" cascade {
	    {mc "Update" command updatecommits -accelerator F5}
	    {mc "Reload" command reloadcommits}
	    {mc "Reread references" command rereadrefs}
	    {mc "List references" command showrefs}
	    {mc "Quit" command doquit}
1862
	}}
P
Paul Mackerras 已提交
1863 1864
	{mc "Edit" cascade {
	    {mc "Preferences" command doprefs}
1865
	}}
P
Paul Mackerras 已提交
1866 1867 1868 1869 1870 1871
	{mc "View" cascade {
	    {mc "New view..." command {newview 0}}
	    {mc "Edit view..." command editview -state disabled}
	    {mc "Delete view" command delview -state disabled}
	    {xx "" separator}
	    {mc "All files" radiobutton {selectedview 0} -command {showview 0}}
1872
	}}
P
Paul Mackerras 已提交
1873 1874 1875
	{mc "Help" cascade {
	    {mc "About gitk" command about}
	    {mc "Key bindings" command keys}
1876 1877
	}}
    }
1878 1879
    . configure -menu .bar

1880
    # the gui has upper and lower half, parts of a paned window.
P
Paul Mackerras 已提交
1881
    panedwindow .ctop -orient vertical
1882 1883

    # possibly use assumed geometry
1884
    if {![info exists geometry(pwsash0)]} {
1885 1886 1887 1888
        set geometry(topheight) [expr {15 * $linespc}]
        set geometry(topwidth) [expr {80 * $charspc}]
        set geometry(botheight) [expr {15 * $linespc}]
        set geometry(botwidth) [expr {50 * $charspc}]
1889 1890
        set geometry(pwsash0) "[expr {40 * $charspc}] 2"
        set geometry(pwsash1) "[expr {60 * $charspc}] 2"
1891 1892 1893 1894 1895 1896 1897 1898 1899 1900
    }

    # 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
1901
    canvas $canv \
1902
	-selectbackground $selectbgcolor \
1903
	-background $bgcolor -bd 0 \
P
Paul Mackerras 已提交
1904
	-yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
1905 1906
    .tf.histframe.pwclist add $canv
    set canv2 .tf.histframe.pwclist.canv2
1907
    canvas $canv2 \
1908
	-selectbackground $selectbgcolor \
1909
	-background $bgcolor -bd 0 -yscrollincr $linespc
1910 1911
    .tf.histframe.pwclist add $canv2
    set canv3 .tf.histframe.pwclist.canv3
1912
    canvas $canv3 \
1913
	-selectbackground $selectbgcolor \
1914
	-background $bgcolor -bd 0 -yscrollincr $linespc
1915
    .tf.histframe.pwclist add $canv3
1916 1917
    eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0)
    eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1)
1918 1919 1920 1921 1922

    # 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}
1923
    lappend bglist $canv $canv2 $canv3
1924
    pack .tf.histframe.pwclist -fill both -expand 1 -side left
1925

1926 1927 1928 1929 1930
    # 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
1931
    set entries $sha1entry
1932
    set sha1but .tf.bar.sha1label
1933
    button $sha1but -text [mc "SHA1 ID: "] -state disabled -relief flat \
1934
	-command gotocommit -width 8
1935
    $sha1but conf -disabledforeground [$sha1but cget -foreground]
1936
    pack .tf.bar.sha1label -side left
1937
    entry $sha1entry -width 40 -font textfont -textvariable sha1string
1938
    trace add variable sha1string write sha1change
1939
    pack $sha1entry -side left -pady 2
1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956

    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};
    }
1957
    button .tf.bar.leftbut -image bm-left -command goback \
1958
	-state disabled -width 26
1959 1960
    pack .tf.bar.leftbut -side left -fill y
    button .tf.bar.rightbut -image bm-right -command goforw \
1961
	-state disabled -width 26
1962
    pack .tf.bar.rightbut -side left -fill y
1963

1964 1965 1966 1967 1968 1969 1970 1971 1972 1973
    label .tf.bar.rowlabel -text [mc "Row"]
    set rownumsel {}
    label .tf.bar.rownum -width 7 -font textfont -textvariable rownumsel \
	-relief sunken -anchor e
    label .tf.bar.rowlabel2 -text "/"
    label .tf.bar.numcommits -width 7 -font textfont -textvariable numcommits \
	-relief sunken -anchor e
    pack .tf.bar.rowlabel .tf.bar.rownum .tf.bar.rowlabel2 .tf.bar.numcommits \
	-side left
    global selectedline
1974
    trace add variable selectedline write selectedline_change
1975

1976 1977
    # Status label and progress bar
    set statusw .tf.bar.status
1978
    label $statusw -width 15 -relief sunken
1979
    pack $statusw -side left -padx 5
1980
    set h [expr {[font metrics uifont -linespace] + 2}]
1981 1982 1983 1984
    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]
1985
    set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
1986 1987 1988
    pack $progresscanv -side right -expand 1 -fill x
    set progresscoords {0 0}
    set fprogcoord 0
1989
    set rprogcoord 0
1990 1991 1992 1993
    bind $progresscanv <Configure> adjustprogress
    set lastprogupdate [clock clicks -milliseconds]
    set progupdatepending 0

1994
    # build up the bottom bar of upper window
1995 1996 1997 1998
    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"] "
1999 2000
    pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \
	-side left -fill y
2001
    set gdttype [mc "containing:"]
2002
    set gm [tk_optionMenu .tf.lbar.gdttype gdttype \
2003 2004 2005
		[mc "containing:"] \
		[mc "touching paths:"] \
		[mc "adding/removing string:"]]
2006 2007 2008
    trace add variable gdttype write gdttype_change
    pack .tf.lbar.gdttype -side left -fill y

2009
    set findstring {}
2010
    set fstring .tf.lbar.findstring
2011
    lappend entries $fstring
2012
    entry $fstring -width 30 -font textfont -textvariable findstring
2013
    trace add variable findstring write find_change
2014
    set findtype [mc "Exact"]
2015
    set findtypemenu [tk_optionMenu .tf.lbar.findtype \
2016
		      findtype [mc "Exact"] [mc "IgnCase"] [mc "Regexp"]]
2017
    trace add variable findtype write findcom_change
2018 2019 2020
    set findloc [mc "All fields"]
    tk_optionMenu .tf.lbar.findloc findloc [mc "All fields"] [mc "Headline"] \
	[mc "Comments"] [mc "Author"] [mc "Committer"]
2021
    trace add variable findloc write find_change
2022 2023 2024
    pack .tf.lbar.findloc -side right
    pack .tf.lbar.findtype -side right
    pack $fstring -side left -expand 1 -fill x
2025 2026 2027 2028 2029 2030

    # 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
2031 2032
    .ctop paneconfigure .tf -height $geometry(topheight)
    .ctop paneconfigure .tf -width $geometry(topwidth)
2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045

    # 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
2046
    frame .bleft.mid
2047
    frame .bleft.bottom
2048

2049
    button .bleft.top.search -text [mc "Search"] -command dosearch
2050 2051
    pack .bleft.top.search -side left -padx 5
    set sstring .bleft.top.sstring
2052
    entry $sstring -width 20 -font textfont -textvariable searchstring
2053 2054 2055
    lappend entries $sstring
    trace add variable searchstring write incrsearch
    pack $sstring -side left -expand 1 -fill x
2056
    radiobutton .bleft.mid.diff -text [mc "Diff"] \
2057
	-command changediffdisp -variable diffelide -value {0 0}
2058
    radiobutton .bleft.mid.old -text [mc "Old version"] \
2059
	-command changediffdisp -variable diffelide -value {0 1}
2060
    radiobutton .bleft.mid.new -text [mc "New version"] \
2061
	-command changediffdisp -variable diffelide -value {1 0}
2062
    label .bleft.mid.labeldiffcontext -text "      [mc "Lines of context"]: "
2063
    pack .bleft.mid.diff .bleft.mid.old .bleft.mid.new -side left
2064
    spinbox .bleft.mid.diffcontext -width 5 -font textfont \
2065 2066 2067 2068 2069 2070 2071
	-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
2072 2073 2074
    checkbutton .bleft.mid.ignspace -text [mc "Ignore space change"] \
	-command changeignorespace -variable ignorespace
    pack .bleft.mid.ignspace -side left -padx 5
2075
    set ctext .bleft.bottom.ctext
2076
    text $ctext -background $bgcolor -foreground $fgcolor \
2077
	-state disabled -font textfont \
2078 2079
	-yscrollcommand scrolltext -wrap none \
	-xscrollcommand ".bleft.bottom.sbhorizontal set"
2080 2081 2082
    if {$have_tk85} {
	$ctext conf -tabstyle wordprocessor
    }
2083 2084 2085
    scrollbar .bleft.bottom.sb -command "$ctext yview"
    scrollbar .bleft.bottom.sbhorizontal -command "$ctext xview" -orient h \
	-width 10
2086
    pack .bleft.top -side top -fill x
2087
    pack .bleft.mid -side top -fill x
2088 2089 2090 2091 2092 2093
    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
2094 2095
    lappend bglist $ctext
    lappend fglist $ctext
2096

2097
    $ctext tag conf comment -wrap $wrapcomment
2098
    $ctext tag conf filesep -font textfontbold -back "#aaaaaa"
2099 2100 2101
    $ctext tag conf hunksep -fore [lindex $diffcolors 2]
    $ctext tag conf d0 -fore [lindex $diffcolors 0]
    $ctext tag conf d1 -fore [lindex $diffcolors 1]
2102 2103 2104 2105 2106
    $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
2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117
    $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"
2118
    $ctext tag conf mmax -fore darkgrey
2119
    set mergemax 16
2120 2121
    $ctext tag conf mresult -font textfontbold
    $ctext tag conf msep -font textfontbold
2122
    $ctext tag conf found -back yellow
2123

2124
    .pwbottom add .bleft
2125
    .pwbottom paneconfigure .bleft -width $geometry(botwidth)
2126 2127 2128 2129

    # lower right
    frame .bright
    frame .bright.mode
2130
    radiobutton .bright.mode.patch -text [mc "Patch"] \
P
Paul Mackerras 已提交
2131
	-command reselectline -variable cmitmode -value "patch"
2132
    radiobutton .bright.mode.tree -text [mc "Tree"] \
P
Paul Mackerras 已提交
2133
	-command reselectline -variable cmitmode -value "tree"
2134 2135 2136
    grid .bright.mode.patch .bright.mode.tree -sticky ew
    pack .bright.mode -side top -fill x
    set cflist .bright.cfiles
2137
    set indent [font measure mainfont "nn"]
2138
    text $cflist \
2139
	-selectbackground $selectbgcolor \
2140
	-background $bgcolor -foreground $fgcolor \
2141
	-font mainfont \
2142
	-tabs [list $indent [expr {2 * $indent}]] \
2143
	-yscrollcommand ".bright.sb set" \
2144 2145
	-cursor [. cget -cursor] \
	-spacing1 1 -spacing3 1
2146 2147
    lappend bglist $cflist
    lappend fglist $cflist
2148 2149
    scrollbar .bright.sb -command "$cflist yview"
    pack .bright.sb -side right -fill y
2150
    pack $cflist -side left -fill both -expand 1
2151 2152
    $cflist tag configure highlight \
	-background [$cflist cget -selectbackground]
2153
    $cflist tag configure bold -font mainfontbold
2154

2155 2156
    .pwbottom add .bright
    .ctop add .pwbottom
2157

2158
    # restore window width & height if known
2159
    if {[info exists geometry(main)]} {
2160 2161 2162 2163 2164 2165 2166 2167 2168
	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"
	}
2169 2170
    }

2171 2172 2173 2174 2175 2176
    if {[tk windowingsystem] eq {aqua}} {
        set M1B M1
    } else {
        set M1B Control
    }

2177 2178
    bind .pwbottom <Configure> {resizecdetpanes %W %w}
    pack .ctop -fill both -expand 1
2179 2180
    bindall <1> {selcanvline %W %x %y}
    #bindall <B1-Motion> {selcanvline %W %x %y}
2181 2182 2183 2184 2185 2186
    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"
2187 2188 2189 2190 2191 2192
        if {[tk windowingsystem] eq "aqua"} {
            bindall <MouseWheel> {
                set delta [expr {- (%D)}]
                allcanvs yview scroll $delta units
            }
        }
2193
    }
2194 2195
    bindall <2> "canvscan mark %W %x %y"
    bindall <B2-Motion> "canvscan dragto %W %x %y"
2196 2197
    bindkey <Home> selfirstline
    bindkey <End> sellastline
2198 2199
    bind . <Key-Up> "selnextline -1"
    bind . <Key-Down> "selnextline 1"
2200 2201
    bind . <Shift-Key-Up> "dofind -1 0"
    bind . <Shift-Key-Down> "dofind 1 0"
2202 2203 2204 2205
    bindkey <Key-Right> "goforw"
    bindkey <Key-Left> "goback"
    bind . <Key-Prior> "selnextpage -1"
    bind . <Key-Next> "selnextpage 1"
2206 2207 2208 2209 2210 2211
    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"
2212 2213 2214
    bindkey <Key-Delete> "$ctext yview scroll -1 pages"
    bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
    bindkey <Key-space> "$ctext yview scroll 1 pages"
2215 2216
    bindkey p "selnextline -1"
    bindkey n "selnextline 1"
R
Robert Suetterlin 已提交
2217 2218 2219 2220 2221 2222
    bindkey z "goback"
    bindkey x "goforw"
    bindkey i "selnextline -1"
    bindkey k "selnextline 1"
    bindkey j "goback"
    bindkey l "goforw"
2223
    bindkey b prevfile
2224 2225
    bindkey d "$ctext yview scroll 18 units"
    bindkey u "$ctext yview scroll -18 units"
2226 2227 2228
    bindkey / {dofind 1 1}
    bindkey <Key-Return> {dofind 1 1}
    bindkey ? {dofind -1 1}
2229
    bindkey f nextfile
2230
    bindkey <F5> updatecommits
2231
    bind . <$M1B-q> doquit
2232 2233
    bind . <$M1B-f> {dofind 1 1}
    bind . <$M1B-g> {dofind 1 0}
2234 2235 2236
    bind . <$M1B-r> dosearchback
    bind . <$M1B-s> dosearch
    bind . <$M1B-equal> {incrfont 1}
2237
    bind . <$M1B-plus> {incrfont 1}
2238 2239 2240
    bind . <$M1B-KP_Add> {incrfont 1}
    bind . <$M1B-minus> {incrfont -1}
    bind . <$M1B-KP_Subtract> {incrfont -1}
2241
    wm protocol . WM_DELETE_WINDOW doquit
2242
    bind . <Destroy> {stop_backends}
2243
    bind . <Button-1> "click %W"
2244
    bind $fstring <Key-Return> {dofind 1 1}
2245
    bind $sha1entry <Key-Return> {gotocommit; break}
2246
    bind $sha1entry <<PasteSelection>> clearsha1
2247 2248
    bind $cflist <1> {sel_flist %W %x %y; break}
    bind $cflist <B1-Motion> {sel_flist %W %x %y; break}
P
Paul Mackerras 已提交
2249
    bind $cflist <ButtonRelease-1> {treeclick %W %x %y}
2250 2251
    global ctxbut
    bind $cflist $ctxbut {pop_flist_menu %W %X %Y %x %y}
2252 2253 2254

    set maincursor [. cget -cursor]
    set textcursor [$ctext cget -cursor]
2255
    set curtextcursor $textcursor
2256

2257
    set rowctxmenu .rowctxmenu
2258
    makemenu $rowctxmenu {
P
Paul Mackerras 已提交
2259 2260 2261 2262 2263 2264 2265 2266
	{mc "Diff this -> selected" command {diffvssel 0}}
	{mc "Diff selected -> this" command {diffvssel 1}}
	{mc "Make patch" command mkpatch}
	{mc "Create tag" command mktag}
	{mc "Write commit to file" command writecommit}
	{mc "Create new branch" command mkbranch}
	{mc "Cherry-pick this commit" command cherrypick}
	{mc "Reset HEAD branch to here" command resethead}
2267 2268
    }
    $rowctxmenu configure -tearoff 0
2269

2270
    set fakerowmenu .fakerowmenu
2271
    makemenu $fakerowmenu {
P
Paul Mackerras 已提交
2272 2273 2274
	{mc "Diff this -> selected" command {diffvssel 0}}
	{mc "Diff selected -> this" command {diffvssel 1}}
	{mc "Make patch" command mkpatch}
2275 2276
    }
    $fakerowmenu configure -tearoff 0
2277

2278
    set headctxmenu .headctxmenu
2279
    makemenu $headctxmenu {
P
Paul Mackerras 已提交
2280 2281
	{mc "Check out this branch" command cobranch}
	{mc "Remove this branch" command rmbranch}
2282 2283
    }
    $headctxmenu configure -tearoff 0
2284 2285 2286

    global flist_menu
    set flist_menu .flistctxmenu
2287
    makemenu $flist_menu {
P
Paul Mackerras 已提交
2288 2289 2290 2291
	{mc "Highlight this too" command {flist_hl 0}}
	{mc "Highlight this only" command {flist_hl 1}}
	{mc "External diff" command {external_diff}}
	{mc "Blame parent commit" command {external_blame 1}}
2292 2293
    }
    $flist_menu configure -tearoff 0
2294 2295
}

2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313
# 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
	    }
	}
    }
}

2314 2315 2316 2317
# Update row number label when selectedline changes
proc selectedline_change {n1 n2 op} {
    global selectedline rownumsel

2318
    if {$selectedline eq {}} {
2319 2320 2321 2322 2323 2324
	set rownumsel {}
    } else {
	set rownumsel [expr {$selectedline + 1}]
    }
}

2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337
# 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 已提交
2338 2339
proc scrollcanv {cscroll f0 f1} {
    $cscroll set $f0 $f1
2340
    drawvisible
2341
    flushhighlights
P
Paul Mackerras 已提交
2342 2343
}

2344 2345 2346 2347
# 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} {
2348
    global entries
2349 2350 2351 2352 2353
    bind . $ev $script
    set escript [bind Entry $ev]
    if {$escript == {}} {
	set escript [bind Entry <Key>]
    }
2354 2355 2356
    foreach e $entries {
	bind $e $ev "$escript; break"
    }
2357 2358 2359
}

# set the focus back to the toplevel for any click outside
2360
# the entry widgets
2361
proc click {w} {
2362 2363
    global ctext entries
    foreach e [concat $entries $ctext] {
2364
	if {$w == $e} return
2365
    }
2366
    focus .
2367 2368
}

2369 2370 2371 2372
# Adjust the progress bar for a change in requested extent or canvas size
proc adjustprogress {} {
    global progresscanv progressitem progresscoords
    global fprogitem fprogcoord lastprogupdate progupdatepending
2373
    global rprogitem rprogcoord
2374 2375 2376 2377 2378 2379 2380

    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
2381
    $progresscanv coords $rprogitem 0 0 [expr {$w * $rprogcoord}] $h
2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401
    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
    }
}

2402
proc savestuff {w} {
2403
    global canv canv2 canv3 mainfont textfont uifont tabstop
2404
    global stuffsaved findmergefiles maxgraphpct
2405
    global maxwidth showneartags showlocalchanges
2406
    global viewname viewfiles viewargs viewargscmd viewperm nextviewnum
2407
    global cmitmode wrapcomment datetimeformat limitdiffs
2408
    global colors bgcolor fgcolor diffcolors diffcontext selectbgcolor
2409
    global autoselect extdifftool perfile_attrs
2410

2411
    if {$stuffsaved} return
2412
    if {![winfo viewable .]} return
2413 2414
    catch {
	set f [open "~/.gitk-new" w]
2415 2416
	puts $f [list set mainfont $mainfont]
	puts $f [list set textfont $textfont]
2417
	puts $f [list set uifont $uifont]
2418
	puts $f [list set tabstop $tabstop]
2419
	puts $f [list set findmergefiles $findmergefiles]
2420
	puts $f [list set maxgraphpct $maxgraphpct]
2421
	puts $f [list set maxwidth $maxwidth]
P
Paul Mackerras 已提交
2422
	puts $f [list set cmitmode $cmitmode]
2423
	puts $f [list set wrapcomment $wrapcomment]
2424
	puts $f [list set autoselect $autoselect]
P
Paul Mackerras 已提交
2425
	puts $f [list set showneartags $showneartags]
2426
	puts $f [list set showlocalchanges $showlocalchanges]
2427
	puts $f [list set datetimeformat $datetimeformat]
2428
	puts $f [list set limitdiffs $limitdiffs]
2429 2430 2431 2432
	puts $f [list set bgcolor $bgcolor]
	puts $f [list set fgcolor $fgcolor]
	puts $f [list set colors $colors]
	puts $f [list set diffcolors $diffcolors]
2433
	puts $f [list set diffcontext $diffcontext]
2434
	puts $f [list set selectbgcolor $selectbgcolor]
2435
	puts $f [list set extdifftool $extdifftool]
2436
	puts $f [list set perfile_attrs $perfile_attrs]
2437

2438
	puts $f "set geometry(main) [wm geometry .]"
2439 2440
	puts $f "set geometry(topwidth) [winfo width .tf]"
	puts $f "set geometry(topheight) [winfo height .tf]"
2441 2442
        puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\""
        puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\""
2443 2444 2445
	puts $f "set geometry(botwidth) [winfo width .bleft]"
	puts $f "set geometry(botheight) [winfo height .bleft]"

2446 2447 2448
	puts -nonewline $f "set permviews {"
	for {set v 0} {$v < $nextviewnum} {incr v} {
	    if {$viewperm($v)} {
2449
		puts $f "{[list $viewname($v) $viewfiles($v) $viewargs($v) $viewargscmd($v)]}"
2450 2451 2452
	    }
	}
	puts $f "}"
2453 2454 2455 2456
	close $f
	file rename -force "~/.gitk-new" "~/.gitk"
    }
    set stuffsaved 1
2457 2458
}

2459 2460
proc resizeclistpanes {win w} {
    global oldwidth
2461
    if {[info exists oldwidth($win)]} {
2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474
	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 已提交
2475
		set sash1 [expr {$sash0 + 20}]
2476 2477
	    }
	    if {$sash1 > $w - 10} {
J
Jeff Hobbs 已提交
2478
		set sash1 [expr {$w - 10}]
2479
		if {$sash0 > $sash1 - 20} {
J
Jeff Hobbs 已提交
2480
		    set sash0 [expr {$sash1 - 20}]
2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491
		}
	    }
	}
	$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
2492
    if {[info exists oldwidth($win)]} {
2493 2494 2495 2496 2497 2498 2499 2500 2501 2502
	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 已提交
2503
		set sash0 [expr {$w - 15}]
2504 2505 2506 2507 2508 2509 2510
	    }
	}
	$win sash place 0 $sash0 [lindex $s0 1]
    }
    set oldwidth($win) $w
}

2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524
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
}

2525
proc about {} {
2526
    global uifont
2527 2528 2529 2530 2531 2532
    set w .about
    if {[winfo exists $w]} {
	raise $w
	return
    }
    toplevel $w
2533 2534
    wm title $w [mc "About gitk"]
    message $w.m -text [mc "
P
Paul Mackerras 已提交
2535
Gitk - a commit viewer for git
2536

P
Paul Mackerras 已提交
2537
Copyright © 2005-2008 Paul Mackerras
2538

2539
Use and redistribute under the terms of the GNU General Public License"] \
2540 2541
	    -justify center -aspect 400 -border 2 -bg white -relief groove
    pack $w.m -side top -fill x -padx 2 -pady 2
2542
    button $w.ok -text [mc "Close"] -command "destroy $w" -default active
2543
    pack $w.ok -side bottom
2544 2545 2546
    bind $w <Visibility> "focus $w.ok"
    bind $w <Key-Escape> "destroy $w"
    bind $w <Key-Return> "destroy $w"
2547 2548
}

2549 2550 2551 2552 2553 2554
proc keys {} {
    set w .keys
    if {[winfo exists $w]} {
	raise $w
	return
    }
2555 2556 2557 2558 2559
    if {[tk windowingsystem] eq {aqua}} {
	set M1T Cmd
    } else {
	set M1T Ctrl
    }
2560
    toplevel $w
2561
    wm title $w [mc "Gitk key bindings"]
2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600
    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"]
" \
2601 2602
	    -justify left -bg white -border 2 -relief groove
    pack $w.m -side top -fill both -padx 2 -pady 2
2603
    button $w.ok -text [mc "Close"] -command "destroy $w" -default active
2604
    pack $w.ok -side bottom
2605 2606 2607
    bind $w <Visibility> "focus $w.ok"
    bind $w <Key-Escape> "destroy $w"
    bind $w <Key-Return> "destroy $w"
2608 2609
}

2610 2611
# Procedures for manipulating the file list window at the
# bottom right of the overall window.
P
Paul Mackerras 已提交
2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664

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
2665
		$w insert end $d [highlight_tag $prefix]
P
Paul Mackerras 已提交
2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676
		$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
2677
		$w insert end $tail [highlight_tag $f]
P
Paul Mackerras 已提交
2678 2679 2680 2681 2682 2683 2684 2685
	    }
	    lappend treecontents($prefix) $tail
	}
    }
    while {$htstack ne {}} {
	set treeheight($prefix) $ht
	incr ht [lindex $htstack end]
	set htstack [lreplace $htstack end end]
2686 2687 2688
	set prefixend [lindex $prefendstack end]
	set prefendstack [lreplace $prefendstack end end]
	set prefix [string range $prefix 0 $prefixend]
P
Paul Mackerras 已提交
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
    }
    $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
	}
    }
}

2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732
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 已提交
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
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) {
2766
	set de $dir$e
P
Paul Mackerras 已提交
2767 2768 2769 2770 2771 2772 2773 2774
	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
2775
	    $w insert e:$ix $e [highlight_tag $de]
P
Paul Mackerras 已提交
2776 2777 2778 2779 2780
	    $w mark set s:$iy e:$ix
	    $w mark gravity s:$iy left
	    set treeheight($de) 1
	} else {
	    $w insert e:$ix $str
2781
	    $w insert e:$ix $e [highlight_tag $de]
P
Paul Mackerras 已提交
2782 2783
	}
    }
2784
    $w mark gravity e:$ix right
P
Paul Mackerras 已提交
2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860
    $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};
}

2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892
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

2893
proc init_flist {first} {
2894
    global cflist cflist_top difffilestart
2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908

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

2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920
proc highlight_tag {f} {
    global highlight_paths

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

proc highlight_filelist {} {
2921
    global cmitmode cflist
2922

2923 2924
    $cflist conf -state normal
    if {$cmitmode ne "tree"} {
2925 2926 2927 2928 2929 2930 2931
	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"
	    }
	}
2932 2933
    } else {
	highlight_tree 2 {}
2934
    }
2935
    $cflist conf -state disabled
2936 2937 2938
}

proc unhighlight_filelist {} {
2939
    global cflist
2940

2941 2942 2943
    $cflist conf -state normal
    $cflist tag remove bold 1.0 end
    $cflist conf -state disabled
2944 2945
}

P
Paul Mackerras 已提交
2946
proc add_flist {fl} {
2947
    global cflist
2948

2949 2950 2951 2952
    $cflist conf -state normal
    foreach f $fl {
	$cflist insert end "\n"
	$cflist insert end $f [highlight_tag $f]
2953
    }
2954
    $cflist conf -state disabled
2955 2956 2957
}

proc sel_flist {w x y} {
2958
    global ctext difffilestart cflist cflist_top cmitmode
2959

P
Paul Mackerras 已提交
2960
    if {$cmitmode eq "tree"} return
2961 2962
    if {![info exists cflist_top]} return
    set l [lindex [split [$w index "@$x,$y"] "."] 0]
2963 2964 2965
    $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 已提交
2966 2967 2968 2969
    if {$l == 1} {
	$ctext yview 1.0
    } else {
	catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
2970 2971 2972
    }
}

2973 2974 2975 2976
proc pop_flist_menu {w X Y x y} {
    global ctext cflist cmitmode flist_menu flist_menu_file
    global treediffs diffids

2977
    stopfinding
2978 2979 2980 2981 2982 2983 2984 2985 2986
    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
2987 2988 2989 2990 2991 2992
    set xdiffstate "normal"
    if {$cmitmode eq "tree"} {
	set xdiffstate "disabled"
    }
    # Disable "External diff" item in tree mode
    $flist_menu entryconf 2 -state $xdiffstate
2993 2994 2995 2996
    tk_popup $flist_menu $X $Y
}

proc flist_hl {only} {
2997
    global flist_menu_file findstring gdttype
2998 2999

    set x [shellquote $flist_menu_file]
3000
    if {$only || $findstring eq {} || $gdttype ne [mc "touching paths:"]} {
3001
	set findstring $x
3002
    } else {
3003
	append findstring " " $x
3004
    }
3005
    set gdttype [mc "touching paths:"]
3006 3007
}

3008 3009 3010 3011 3012 3013 3014
proc save_file_from_commit {filename output what} {
    global nullfile

    if {[catch {exec git show $filename -- > $output} err]} {
	if {[string match "fatal: bad revision *" $err]} {
	    return $nullfile
	}
3015
	error_popup "[mc "Error getting \"%s\" from %s:" $filename $what] $err"
3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071
	return {}
    }
    return $output
}

proc external_diff_get_one_file {diffid filename diffdir} {
    global nullid nullid2 nullfile
    global gitdir

    if {$diffid == $nullid} {
        set difffile [file join [file dirname $gitdir] $filename]
	if {[file exists $difffile]} {
	    return $difffile
	}
	return $nullfile
    }
    if {$diffid == $nullid2} {
        set difffile [file join $diffdir "\[index\] [file tail $filename]"]
        return [save_file_from_commit :$filename $difffile index]
    }
    set difffile [file join $diffdir "\[$diffid\] [file tail $filename]"]
    return [save_file_from_commit $diffid:$filename $difffile \
	       "revision $diffid"]
}

proc external_diff {} {
    global gitktmpdir nullid nullid2
    global flist_menu_file
    global diffids
    global diffnum
    global gitdir extdifftool

    if {[llength $diffids] == 1} {
        # no reference commit given
        set diffidto [lindex $diffids 0]
        if {$diffidto eq $nullid} {
            # diffing working copy with index
            set diffidfrom $nullid2
        } elseif {$diffidto eq $nullid2} {
            # diffing index with HEAD
            set diffidfrom "HEAD"
        } else {
            # use first parent commit
            global parentlist selectedline
            set diffidfrom [lindex $parentlist $selectedline 0]
        }
    } else {
        set diffidfrom [lindex $diffids 0]
        set diffidto [lindex $diffids 1]
    }

    # make sure that several diffs wont collide
    if {![info exists gitktmpdir]} {
	set gitktmpdir [file join [file dirname $gitdir] \
			    [format ".gitk-tmp.%s" [pid]]]
	if {[catch {file mkdir $gitktmpdir} err]} {
3072
	    error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err"
3073 3074 3075 3076 3077 3078 3079 3080
	    unset gitktmpdir
	    return
	}
	set diffnum 0
    }
    incr diffnum
    set diffdir [file join $gitktmpdir $diffnum]
    if {[catch {file mkdir $diffdir} err]} {
3081
	error_popup "[mc "Error creating temporary directory %s:" $diffdir] $err"
3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093
	return
    }

    # gather files to diff
    set difffromfile [external_diff_get_one_file $diffidfrom $flist_menu_file $diffdir]
    set difftofile [external_diff_get_one_file $diffidto $flist_menu_file $diffdir]

    if {$difffromfile ne {} && $difftofile ne {}} {
        set cmd [concat | [shellsplit $extdifftool] \
		     [list $difffromfile $difftofile]]
        if {[catch {set fl [open $cmd r]} err]} {
            file delete -force $diffdir
3094
            error_popup "$extdifftool: [mc "command failed:"] $err"
3095 3096 3097 3098 3099 3100 3101
        } else {
            fconfigure $fl -blocking 0
            filerun $fl [list delete_at_eof $fl $diffdir]
        }
    }
}

3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118
proc external_blame {parent_idx} {
    global flist_menu_file
    global nullid nullid2
    global parentlist selectedline currentid

    if {$parent_idx > 0} {
	set base_commit [lindex $parentlist $selectedline [expr {$parent_idx-1}]]
    } else {
	set base_commit $currentid
    }

    if {$base_commit eq {} || $base_commit eq $nullid || $base_commit eq $nullid2} {
	error_popup [mc "No such commit"]
	return
    }

    if {[catch {exec git gui blame $base_commit $flist_menu_file &} err]} {
3119
	error_popup "[mc "git gui blame: command failed:"] $err"
3120 3121 3122
    }
}

3123 3124 3125 3126 3127
# delete $dir when we see eof on $f (presumably because the child has exited)
proc delete_at_eof {f dir} {
    while {[gets $f line] >= 0} {}
    if {[eof $f]} {
	if {[catch {close $f} err]} {
3128
	    error_popup "[mc "External diff viewer failed:"] $err"
3129 3130 3131 3132 3133 3134 3135
	}
	file delete -force $dir
	return 0
    }
    return 1
}

3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229
# 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
}

3230 3231
# Code to implement multiple views

3232
proc newview {ishighlight} {
3233
    global nextviewnum newviewname newviewperm newishighlight
3234
    global newviewargs revtreeargs viewargscmd newviewargscmd curview
P
Paul Mackerras 已提交
3235

3236
    set newishighlight $ishighlight
P
Paul Mackerras 已提交
3237 3238 3239 3240 3241
    set top .gitkview
    if {[winfo exists $top]} {
	raise $top
	return
    }
3242
    set newviewname($nextviewnum) "[mc "View"] $nextviewnum"
3243
    set newviewperm($nextviewnum) 0
3244
    set newviewargs($nextviewnum) [shellarglist $revtreeargs]
3245
    set newviewargscmd($nextviewnum) $viewargscmd($curview)
3246
    vieweditor $top $nextviewnum [mc "Gitk view definition"]
3247 3248 3249 3250 3251
}

proc editview {} {
    global curview
    global viewname viewperm newviewname newviewperm
3252
    global viewargs newviewargs viewargscmd newviewargscmd
3253 3254 3255 3256 3257 3258 3259 3260

    set top .gitkvedit-$curview
    if {[winfo exists $top]} {
	raise $top
	return
    }
    set newviewname($curview) $viewname($curview)
    set newviewperm($curview) $viewperm($curview)
3261
    set newviewargs($curview) [shellarglist $viewargs($curview)]
3262
    set newviewargscmd($curview) $viewargscmd($curview)
3263 3264 3265 3266
    vieweditor $top $curview "Gitk: edit view $viewname($curview)"
}

proc vieweditor {top n title} {
3267
    global newviewname newviewperm viewfiles bgcolor
3268

P
Paul Mackerras 已提交
3269
    toplevel $top
3270
    wm title $top $title
3271 3272
    label $top.nl -text [mc "Name"]
    entry $top.name -width 20 -textvariable newviewname($n)
3273
    grid $top.nl $top.name -sticky w -pady 5
3274 3275
    checkbutton $top.perm -text [mc "Remember this view"] \
	-variable newviewperm($n)
3276
    grid $top.perm - -pady 5 -sticky w
3277
    message $top.al -aspect 1000 \
3278
	-text [mc "Commits to include (arguments to git log):"]
3279 3280
    grid $top.al - -sticky w -pady 5
    entry $top.args -width 50 -textvariable newviewargs($n) \
3281
	-background $bgcolor
3282
    grid $top.args - -sticky ew -padx 5
3283 3284 3285 3286 3287 3288 3289 3290

    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

3291
    message $top.l -aspect 1000 \
3292
	-text [mc "Enter files and directories to include, one per line:"]
3293
    grid $top.l - -sticky w
3294
    text $top.t -width 40 -height 10 -background $bgcolor -font uifont
3295 3296 3297 3298 3299 3300 3301 3302
    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
    }
3303
    grid $top.t - -sticky ew -padx 5
P
Paul Mackerras 已提交
3304
    frame $top.buts
3305 3306
    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 已提交
3307 3308 3309 3310 3311 3312 3313
    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
}

3314
proc doviewmenu {m first cmd op argv} {
3315 3316 3317
    set nmenu [$m index end]
    for {set i $first} {$i <= $nmenu} {incr i} {
	if {[$m entrycget $i -command] eq $cmd} {
3318
	    eval $m $op $i $argv
3319
	    break
3320 3321
	}
    }
3322 3323 3324
}

proc allviewmenus {n op args} {
3325
    # global viewhlmenu
3326

3327
    doviewmenu .bar.view 5 [list showview $n] $op $args
3328
    # doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
3329 3330 3331
}

proc newviewok {top n} {
3332
    global nextviewnum newviewperm newviewname newishighlight
3333
    global viewname viewfiles viewperm selectedview curview
3334
    global viewargs newviewargs viewargscmd newviewargscmd viewhlmenu
P
Paul Mackerras 已提交
3335

3336 3337 3338
    if {[catch {
	set newargs [shellsplit $newviewargs($n)]
    } err]} {
3339
	error_popup "[mc "Error in commit selection arguments:"] $err"
3340 3341 3342 3343
	wm raise $top
	focus $top
	return
    }
P
Paul Mackerras 已提交
3344
    set files {}
3345
    foreach f [split [$top.t get 0.0 end] "\n"] {
P
Paul Mackerras 已提交
3346 3347 3348 3349 3350
	set ft [string trim $f]
	if {$ft ne {}} {
	    lappend files $ft
	}
    }
3351 3352 3353 3354 3355 3356
    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
3357
	set viewargs($n) $newargs
3358
	set viewargscmd($n) $newviewargscmd($n)
3359 3360
	addviewmenu $n
	if {!$newishighlight} {
3361
	    run showview $n
3362
	} else {
3363
	    run addvhighlight $n
3364
	}
3365 3366 3367 3368 3369
    } else {
	# editing an existing view
	set viewperm($n) $newviewperm($n)
	if {$newviewname($n) ne $viewname($n)} {
	    set viewname($n) $newviewname($n)
3370
	    doviewmenu .bar.view 5 [list showview $n] \
3371
		entryconf [list -label $viewname($n)]
3372 3373
	    # doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
		# entryconf [list -label $viewname($n) -value $viewname($n)]
3374
	}
3375 3376
	if {$files ne $viewfiles($n) || $newargs ne $viewargs($n) || \
		$newviewargscmd($n) ne $viewargscmd($n)} {
3377
	    set viewfiles($n) $files
3378
	    set viewargs($n) $newargs
3379
	    set viewargscmd($n) $newviewargscmd($n)
3380
	    if {$curview == $n} {
3381
		run reloadcommits
3382 3383 3384 3385
	    }
	}
    }
    catch {destroy $top}
P
Paul Mackerras 已提交
3386 3387 3388
}

proc delview {} {
3389
    global curview viewperm hlview selectedhlview
P
Paul Mackerras 已提交
3390 3391

    if {$curview == 0} return
3392
    if {[info exists hlview] && $hlview == $curview} {
3393
	set selectedhlview [mc "None"]
3394 3395
	unset hlview
    }
3396
    allviewmenus $curview delete
3397
    set viewperm($curview) 0
P
Paul Mackerras 已提交
3398 3399 3400
    showview 0
}

3401
proc addviewmenu {n} {
3402
    global viewname viewhlmenu
3403 3404 3405

    .bar.view add radiobutton -label $viewname($n) \
	-command [list showview $n] -variable selectedview -value $n
3406 3407
    #$viewhlmenu add radiobutton -label $viewname($n) \
    #	-command [list addvhighlight $n] -variable selectedhlview
3408 3409
}

P
Paul Mackerras 已提交
3410
proc showview {n} {
3411
    global curview cached_commitrow ordertok
3412
    global displayorder parentlist rowidlist rowisopt rowfinal
3413 3414
    global colormap rowtextx nextcolor canvxmax
    global numcommits viewcomplete
P
Paul Mackerras 已提交
3415
    global selectedline currentid canv canvy0
3416
    global treediffs
3417
    global pending_select mainheadid
3418
    global commitidx
3419
    global selectedview
3420
    global hlview selectedhlview commitinterest
P
Paul Mackerras 已提交
3421 3422 3423

    if {$n == $curview} return
    set selid {}
3424 3425 3426 3427 3428
    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}]
3429
    if {$selectedline ne {}} {
P
Paul Mackerras 已提交
3430 3431 3432 3433 3434
	set selid $currentid
	set y [yc $selectedline]
	if {$ytop < $y && $y < $ybot} {
	    set yscreen [expr {$y - $ytop}]
	}
3435 3436 3437
    } elseif {[info exists pending_select]} {
	set selid $pending_select
	unset pending_select
P
Paul Mackerras 已提交
3438 3439
    }
    unselectline
3440
    normalline
P
Paul Mackerras 已提交
3441 3442
    catch {unset treediffs}
    clear_display
3443 3444
    if {[info exists hlview] && $hlview == $n} {
	unset hlview
3445
	set selectedhlview [mc "None"]
3446
    }
3447
    catch {unset commitinterest}
3448
    catch {unset cached_commitrow}
3449
    catch {unset ordertok}
P
Paul Mackerras 已提交
3450 3451

    set curview $n
3452
    set selectedview $n
3453 3454
    .bar.view entryconf [mca "Edit view..."] -state [expr {$n == 0? "disabled": "normal"}]
    .bar.view entryconf [mca "Delete view"] -state [expr {$n == 0? "disabled": "normal"}]
P
Paul Mackerras 已提交
3455

3456
    run refill_reflist
3457
    if {![info exists viewcomplete($n)]} {
3458
	getcommits $selid
P
Paul Mackerras 已提交
3459 3460 3461
	return
    }

3462 3463 3464 3465 3466
    set displayorder {}
    set parentlist {}
    set rowidlist {}
    set rowisopt {}
    set rowfinal {}
3467
    set numcommits $commitidx($n)
3468

P
Paul Mackerras 已提交
3469 3470
    catch {unset colormap}
    catch {unset rowtextx}
3471 3472
    set nextcolor 0
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
3473 3474 3475 3476
    set curview $n
    set row 0
    setcanvscroll
    set yf 0
3477
    set row {}
3478 3479
    if {$selid ne {} && [commitinview $selid $n]} {
	set row [rowofcommit $selid]
P
Paul Mackerras 已提交
3480 3481 3482 3483 3484 3485 3486 3487 3488 3489
	# 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
3490 3491
    if {$row ne {}} {
	selectline $row 0
3492
    } elseif {!$viewcomplete($n)} {
3493
	reset_pending_select $selid
3494
    } else {
3495 3496 3497 3498 3499 3500 3501 3502 3503
	reset_pending_select {}

	if {[commitinview $pending_select $curview]} {
	    selectline [rowofcommit $pending_select] 1
	} else {
	    set row [first_real_row]
	    if {$row < $numcommits} {
		selectline $row 0
	    }
3504 3505
	}
    }
3506 3507
    if {!$viewcomplete($n)} {
	if {$numcommits == 0} {
3508
	    show_status [mc "Reading commits..."]
3509
	}
3510
    } elseif {$numcommits == 0} {
3511
	show_status [mc "No commits selected"]
3512
    }
P
Paul Mackerras 已提交
3513 3514
}

3515 3516
# Stuff relating to the highlighting facility

3517
proc ishighlighted {id} {
3518
    global vhighlights fhighlights nhighlights rhighlights
3519

3520 3521
    if {[info exists nhighlights($id)] && $nhighlights($id) > 0} {
	return $nhighlights($id)
3522
    }
3523 3524
    if {[info exists vhighlights($id)] && $vhighlights($id) > 0} {
	return $vhighlights($id)
3525
    }
3526 3527
    if {[info exists fhighlights($id)] && $fhighlights($id) > 0} {
	return $fhighlights($id)
3528
    }
3529 3530
    if {[info exists rhighlights($id)] && $rhighlights($id) > 0} {
	return $rhighlights($id)
3531
    }
3532 3533 3534 3535
    return 0
}

proc bolden {row font} {
3536
    global canv linehtag selectedline boldrows
3537

3538
    lappend boldrows $row
3539
    $canv itemconf $linehtag($row) -font $font
3540
    if {$row == $selectedline} {
3541 3542 3543 3544 3545 3546 3547 3548 3549
	$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} {
3550
    global canv2 linentag selectedline boldnamerows
3551

3552
    lappend boldnamerows $row
3553
    $canv2 itemconf $linentag($row) -font $font
3554
    if {$row == $selectedline} {
3555 3556 3557 3558 3559 3560 3561 3562
	$canv2 delete secsel
	set t [eval $canv2 create rect [$canv2 bbox $linentag($row)] \
		   -outline {{}} -tags secsel \
		   -fill [$canv2 cget -selectbackground]]
	$canv2 lower $t
    }
}

3563
proc unbolden {} {
3564
    global boldrows
3565

3566 3567
    set stillbold {}
    foreach row $boldrows {
3568
	if {![ishighlighted [commitonrow $row]]} {
3569
	    bolden $row mainfont
3570 3571
	} else {
	    lappend stillbold $row
3572 3573
	}
    }
3574
    set boldrows $stillbold
3575 3576 3577
}

proc addvhighlight {n} {
3578
    global hlview viewcomplete curview vhl_done commitidx
3579 3580

    if {[info exists hlview]} {
3581
	delvhighlight
3582 3583
    }
    set hlview $n
3584
    if {$n != $curview && ![info exists viewcomplete($n)]} {
3585
	start_rev_list $n
3586 3587 3588 3589
    }
    set vhl_done $commitidx($hlview)
    if {$vhl_done > 0} {
	drawvisible
3590 3591 3592
    }
}

3593 3594
proc delvhighlight {} {
    global hlview vhighlights
3595 3596 3597

    if {![info exists hlview]} return
    unset hlview
3598 3599
    catch {unset vhighlights}
    unbolden
3600 3601
}

3602
proc vhighlightmore {} {
3603
    global hlview vhl_done commitidx vhighlights curview
3604 3605

    set max $commitidx($hlview)
3606 3607 3608 3609
    set vr [visiblerows]
    set r0 [lindex $vr 0]
    set r1 [lindex $vr 1]
    for {set i $vhl_done} {$i < $max} {incr i} {
3610 3611 3612
	set id [commitonrow $i $hlview]
	if {[commitinview $id $curview]} {
	    set row [rowofcommit $id]
3613 3614
	    if {$r0 <= $row && $row <= $r1} {
		if {![highlighted $row]} {
3615
		    bolden $row mainfontbold
3616
		}
3617
		set vhighlights($id) 1
3618 3619 3620
	    }
	}
    }
3621
    set vhl_done $max
3622
    return 0
3623 3624 3625
}

proc askvhighlight {row id} {
3626
    global hlview vhighlights iddrawn
3627

3628
    if {[commitinview $id $hlview]} {
3629
	if {[info exists iddrawn($id)] && ![ishighlighted $id]} {
3630
	    bolden $row mainfontbold
3631
	}
3632
	set vhighlights($id) 1
3633
    } else {
3634
	set vhighlights($id) 0
3635 3636 3637
    }
}

3638
proc hfiles_change {} {
3639
    global highlight_files filehighlight fhighlights fh_serial
3640
    global highlight_paths gdttype
3641 3642 3643 3644 3645

    if {[info exists filehighlight]} {
	# delete previous highlights
	catch {close $filehighlight}
	unset filehighlight
3646 3647
	catch {unset fhighlights}
	unbolden
3648
	unhighlight_filelist
3649
    }
3650
    set highlight_paths {}
3651 3652 3653 3654 3655 3656 3657
    after cancel do_file_hl $fh_serial
    incr fh_serial
    if {$highlight_files ne {}} {
	after 300 do_file_hl $fh_serial
    }
}

3658 3659 3660
proc gdttype_change {name ix op} {
    global gdttype highlight_files findstring findpattern

3661
    stopfinding
3662
    if {$findstring ne {}} {
3663
	if {$gdttype eq [mc "containing:"]} {
3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684
	    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

3685
    stopfinding
3686
    if {$gdttype eq [mc "containing:"]} {
3687 3688 3689 3690 3691 3692 3693 3694 3695 3696
	findcom_change
    } else {
	if {$highlight_files ne $findstring} {
	    set highlight_files $findstring
	    hfiles_change
	}
    }
    drawvisible
}

3697
proc findcom_change args {
3698
    global nhighlights boldnamerows
3699 3700
    global findpattern findtype findstring gdttype

3701
    stopfinding
3702 3703
    # delete previous highlights, if any
    foreach row $boldnamerows {
3704
	bolden_name $row mainfont
3705 3706 3707 3708 3709
    }
    set boldnamerows {}
    catch {unset nhighlights}
    unbolden
    unmarkmatches
3710
    if {$gdttype ne [mc "containing:"] || $findstring eq {}} {
3711
	set findpattern {}
3712
    } elseif {$findtype eq [mc "Regexp"]} {
3713 3714 3715 3716 3717 3718 3719 3720
	set findpattern $findstring
    } else {
	set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
		   $findstring]
	set findpattern "*$e*"
    }
}

3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734
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
}

3735
proc do_file_hl {serial} {
3736
    global highlight_files filehighlight highlight_paths gdttype fhl_list
3737

3738
    if {$gdttype eq [mc "touching paths:"]} {
3739 3740 3741 3742
	if {[catch {set paths [shellsplit $highlight_files]}]} return
	set highlight_paths [makepatterns $paths]
	highlight_filelist
	set gdtargs [concat -- $paths]
3743
    } elseif {$gdttype eq [mc "adding/removing string:"]} {
3744
	set gdtargs [list "-S$highlight_files"]
3745 3746 3747
    } else {
	# must be "containing:", i.e. we're searching commit info
	return
3748
    }
3749
    set cmd [concat | git diff-tree -r -s --stdin $gdtargs]
3750 3751
    set filehighlight [open $cmd r+]
    fconfigure $filehighlight -blocking 0
3752
    filerun $filehighlight readfhighlight
3753
    set fhl_list {}
3754 3755 3756 3757 3758
    drawvisible
    flushhighlights
}

proc flushhighlights {} {
3759
    global filehighlight fhl_list
3760 3761

    if {[info exists filehighlight]} {
3762
	lappend fhl_list {}
3763 3764 3765 3766 3767 3768
	puts $filehighlight ""
	flush $filehighlight
    }
}

proc askfilehighlight {row id} {
3769
    global filehighlight fhighlights fhl_list
3770

3771
    lappend fhl_list $id
3772
    set fhighlights($id) -1
3773 3774 3775 3776
    puts $filehighlight $id
}

proc readfhighlight {} {
3777
    global filehighlight fhighlights curview iddrawn
3778
    global fhl_list find_dirn
3779

3780 3781 3782 3783 3784
    if {![info exists filehighlight]} {
	return 0
    }
    set nr 0
    while {[incr nr] <= 100 && [gets $filehighlight line] >= 0} {
3785 3786 3787 3788 3789
	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]
3790
	    set fhighlights($id) 0
3791
	}
3792 3793
	set fhl_list [lrange $fhl_list [expr {$i+1}] end]
	if {$line eq {}} continue
3794 3795
	if {![commitinview $line $curview]} continue
	set row [rowofcommit $line]
3796
	if {[info exists iddrawn($line)] && ![ishighlighted $line]} {
3797
	    bolden $row mainfontbold
3798
	}
3799
	set fhighlights($line) 1
3800
    }
3801 3802
    if {[eof $filehighlight]} {
	# strange...
3803
	puts "oops, git diff-tree died"
3804 3805
	catch {close $filehighlight}
	unset filehighlight
3806
	return 0
3807
    }
3808
    if {[info exists find_dirn]} {
3809
	run findmore
3810
    }
3811
    return 1
3812 3813
}

3814
proc doesmatch {f} {
3815
    global findtype findpattern
3816

3817
    if {$findtype eq [mc "Regexp"]} {
3818
	return [regexp $findpattern $f]
3819
    } elseif {$findtype eq [mc "IgnCase"]} {
3820 3821 3822 3823 3824 3825
	return [string match -nocase $findpattern $f]
    } else {
	return [string match $findpattern $f]
    }
}

3826
proc askfindhighlight {row id} {
3827
    global nhighlights commitinfo iddrawn
3828 3829
    global findloc
    global markingmatches
3830 3831 3832 3833

    if {![info exists commitinfo($id)]} {
	getcommit $id
    }
3834
    set info $commitinfo($id)
3835
    set isbold 0
3836
    set fldtypes [list [mc Headline] [mc Author] [mc Date] [mc Committer] [mc CDate] [mc Comments]]
3837
    foreach f $info ty $fldtypes {
3838
	if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
3839
	    [doesmatch $f]} {
3840
	    if {$ty eq [mc "Author"]} {
3841
		set isbold 2
3842
		break
3843
	    }
3844
	    set isbold 1
3845 3846
	}
    }
3847
    if {$isbold && [info exists iddrawn($id)]} {
3848
	if {![ishighlighted $id]} {
3849
	    bolden $row mainfontbold
3850
	    if {$isbold > 1} {
3851
		bolden_name $row mainfontbold
3852
	    }
3853
	}
3854
	if {$markingmatches} {
3855
	    markrowmatches $row $id
3856 3857
	}
    }
3858
    set nhighlights($id) $isbold
3859 3860
}

3861 3862
proc markrowmatches {row id} {
    global canv canv2 linehtag linentag commitinfo findloc
3863

3864 3865
    set headline [lindex $commitinfo($id) 0]
    set author [lindex $commitinfo($id) 1]
3866 3867
    $canv delete match$row
    $canv2 delete match$row
3868
    if {$findloc eq [mc "All fields"] || $findloc eq [mc "Headline"]} {
3869 3870 3871 3872 3873
	set m [findmatches $headline]
	if {$m ne {}} {
	    markmatches $canv $row $headline $linehtag($row) $m \
		[$canv itemcget $linehtag($row) -font] $row
	}
3874
    }
3875
    if {$findloc eq [mc "All fields"] || $findloc eq [mc "Author"]} {
3876 3877 3878 3879 3880
	set m [findmatches $author]
	if {$m ne {}} {
	    markmatches $canv2 $row $author $linentag($row) $m \
		[$canv2 itemcget $linentag($row) -font] $row
	}
3881 3882 3883
    }
}

3884 3885 3886 3887
proc vrel_change {name ix op} {
    global highlight_related

    rhighlight_none
3888
    if {$highlight_related ne [mc "None"]} {
3889
	run drawvisible
3890 3891 3892 3893 3894 3895
    }
}

# prepare for testing whether commits are descendents or ancestors of a
proc rhighlight_sel {a} {
    global descendent desc_todo ancestor anc_todo
3896
    global highlight_related
3897 3898 3899 3900 3901

    catch {unset descendent}
    set desc_todo [list $a]
    catch {unset ancestor}
    set anc_todo [list $a]
3902
    if {$highlight_related ne [mc "None"]} {
3903
	rhighlight_none
3904
	run drawvisible
3905 3906 3907 3908 3909 3910
    }
}

proc rhighlight_none {} {
    global rhighlights

3911 3912
    catch {unset rhighlights}
    unbolden
3913 3914 3915
}

proc is_descendent {a} {
3916
    global curview children descendent desc_todo
3917 3918

    set v $curview
3919
    set la [rowofcommit $a]
3920 3921 3922 3923 3924
    set todo $desc_todo
    set leftover {}
    set done 0
    for {set i 0} {$i < [llength $todo]} {incr i} {
	set do [lindex $todo $i]
3925
	if {[rowofcommit $do] < $la} {
3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947
	    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} {
3948
    global curview parents ancestor anc_todo
3949 3950

    set v $curview
3951
    set la [rowofcommit $a]
3952 3953 3954 3955 3956
    set todo $anc_todo
    set leftover {}
    set done 0
    for {set i 0} {$i < [llength $todo]} {incr i} {
	set do [lindex $todo $i]
3957
	if {![commitinview $do $v] || [rowofcommit $do] > $la} {
3958 3959 3960
	    lappend leftover $do
	    continue
	}
3961
	foreach np $parents($v,$do) {
3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979
	    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} {
3980
    global descendent highlight_related iddrawn rhighlights
3981 3982
    global selectedline ancestor

3983
    if {$selectedline eq {}} return
3984
    set isbold 0
3985 3986
    if {$highlight_related eq [mc "Descendant"] ||
	$highlight_related eq [mc "Not descendant"]} {
3987 3988 3989
	if {![info exists descendent($id)]} {
	    is_descendent $id
	}
3990
	if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} {
3991 3992
	    set isbold 1
	}
3993 3994
    } elseif {$highlight_related eq [mc "Ancestor"] ||
	      $highlight_related eq [mc "Not ancestor"]} {
3995 3996 3997
	if {![info exists ancestor($id)]} {
	    is_ancestor $id
	}
3998
	if {$ancestor($id) == ($highlight_related eq [mc "Ancestor"])} {
3999 4000 4001 4002
	    set isbold 1
	}
    }
    if {[info exists iddrawn($id)]} {
4003
	if {$isbold && ![ishighlighted $id]} {
4004
	    bolden $row mainfontbold
4005 4006
	}
    }
4007
    set rhighlights($id) $isbold
4008 4009
}

4010 4011
# Graph layout functions

P
Paul Mackerras 已提交
4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027
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 {}
4028 4029 4030 4031
    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 已提交
4032
	}
4033
	set o [concat $o $o]
P
Paul Mackerras 已提交
4034
    }
4035
    return $ret
P
Paul Mackerras 已提交
4036 4037
}

4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057
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
	}
4058 4059
	set id [first_real_child $curview,$p]
	if {$id eq {}} {
4060
	    # it's a root
4061
	    set tok [lindex $varctok($curview) $varcid($curview,$p)]
4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082
	    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
}

4083 4084 4085
# Work out where id should go in idlist so that order-token
# values increase from left to right
proc idcol {idlist id {i 0}} {
4086
    set t [ordertoken $id]
4087 4088 4089
    if {$i < 0} {
	set i 0
    }
4090
    if {$i >= [llength $idlist] || $t < [ordertoken [lindex $idlist $i]]} {
4091 4092
	if {$i > [llength $idlist]} {
	    set i [llength $idlist]
P
Paul Mackerras 已提交
4093
	}
4094
	while {[incr i -1] >= 0 && $t < [ordertoken [lindex $idlist $i]]} {}
4095 4096
	incr i
    } else {
4097
	if {$t > [ordertoken [lindex $idlist $i]]} {
4098
	    while {[incr i] < [llength $idlist] &&
4099
		   $t >= [ordertoken [lindex $idlist $i]]} {}
P
Paul Mackerras 已提交
4100 4101
	}
    }
4102
    return $i
P
Paul Mackerras 已提交
4103 4104 4105
}

proc initlayout {} {
4106
    global rowidlist rowisopt rowfinal displayorder parentlist
4107
    global numcommits canvxmax canv
4108
    global nextcolor
4109
    global colormap rowtextx
P
Paul Mackerras 已提交
4110

4111 4112
    set numcommits 0
    set displayorder {}
4113
    set parentlist {}
4114
    set nextcolor 0
4115 4116
    set rowidlist {}
    set rowisopt {}
4117
    set rowfinal {}
4118
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
4119 4120
    catch {unset colormap}
    catch {unset rowtextx}
4121
    setcanvscroll
4122 4123 4124 4125
}

proc setcanvscroll {} {
    global canv canv2 canv3 numcommits linespc canvxmax canvy0
4126
    global lastscrollset lastscrollrows
4127 4128 4129 4130 4131

    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]
4132 4133
    set lastscrollset [clock clicks -milliseconds]
    set lastscrollrows $numcommits
P
Paul Mackerras 已提交
4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154
}

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

4155
proc layoutmore {} {
4156
    global commitidx viewcomplete curview
4157
    global numcommits pending_select curview
4158
    global lastscrollset lastscrollrows
4159 4160 4161

    if {$lastscrollrows < 100 || $viewcomplete($curview) ||
	[clock clicks -milliseconds] - $lastscrollset > 500} {
4162 4163
	setcanvscroll
    }
4164
    if {[info exists pending_select] &&
4165
	[commitinview $pending_select $curview]} {
4166
	update
4167
	selectline [rowofcommit $pending_select] 1
4168
    }
4169
    drawvisible
4170 4171 4172
}

proc doshowlocalchanges {} {
4173
    global curview mainheadid
4174

4175
    if {$mainheadid eq {}} return
4176
    if {[commitinview $mainheadid $curview]} {
4177
	dodiffindex
4178
    } else {
4179
	interestedin $mainheadid dodiffindex
4180 4181 4182 4183
    }
}

proc dohidelocalchanges {} {
4184
    global nullid nullid2 lserial curview
4185

4186
    if {[commitinview $nullid $curview]} {
4187
	removefakerow $nullid
4188
    }
4189
    if {[commitinview $nullid2 $curview]} {
4190
	removefakerow $nullid2
4191 4192 4193 4194
    }
    incr lserial
}

4195
# spawn off a process to do git diff-index --cached HEAD
4196
proc dodiffindex {} {
4197
    global lserial showlocalchanges
4198
    global isworktree
4199

4200
    if {!$showlocalchanges || !$isworktree} return
4201
    incr lserial
4202
    set fd [open "|git diff-index --cached HEAD" r]
4203
    fconfigure $fd -blocking 0
4204 4205
    set i [reg_instance $fd]
    filerun $fd [list readdiffindex $fd $lserial $i]
4206 4207
}

4208
proc readdiffindex {fd serial inst} {
4209
    global mainheadid nullid nullid2 curview commitinfo commitdata lserial
4210

4211
    set isdiff 1
4212
    if {[gets $fd line] < 0} {
4213 4214
	if {![eof $fd]} {
	    return 1
4215
	}
4216
	set isdiff 0
4217 4218
    }
    # we only need to see one line and we don't really care what it says...
4219
    stop_instance $inst
4220

P
Paul Mackerras 已提交
4221 4222
    if {$serial != $lserial} {
	return 0
4223 4224
    }

P
Paul Mackerras 已提交
4225 4226 4227
    # 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
4228 4229
    set i [reg_instance $fd]
    filerun $fd [list readdifffiles $fd $serial $i]
P
Paul Mackerras 已提交
4230 4231

    if {$isdiff && ![commitinview $nullid2 $curview]} {
4232
	# add the line for the changes in the index to the graph
4233
	set hl [mc "Local changes checked in to index but not committed"]
4234 4235
	set commitinfo($nullid2) [list  $hl {} {} {} {} "    $hl\n"]
	set commitdata($nullid2) "\n    $hl\n"
4236
	if {[commitinview $nullid $curview]} {
4237
	    removefakerow $nullid
4238
	}
4239
	insertfakerow $nullid2 $mainheadid
P
Paul Mackerras 已提交
4240
    } elseif {!$isdiff && [commitinview $nullid2 $curview]} {
4241
	removefakerow $nullid2
4242 4243 4244 4245
    }
    return 0
}

4246
proc readdifffiles {fd serial inst} {
4247
    global mainheadid nullid nullid2 curview
4248 4249 4250 4251 4252 4253 4254 4255 4256 4257
    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...
4258
    stop_instance $inst
4259

P
Paul Mackerras 已提交
4260 4261 4262 4263 4264
    if {$serial != $lserial} {
	return 0
    }

    if {$isdiff && ![commitinview $nullid $curview]} {
4265
	# add the line for the local diff to the graph
4266
	set hl [mc "Local uncommitted changes, not checked in to index"]
4267 4268
	set commitinfo($nullid) [list  $hl {} {} {} {} "    $hl\n"]
	set commitdata($nullid) "\n    $hl\n"
4269 4270 4271 4272 4273
	if {[commitinview $nullid2 $curview]} {
	    set p $nullid2
	} else {
	    set p $mainheadid
	}
4274
	insertfakerow $nullid $p
P
Paul Mackerras 已提交
4275
    } elseif {!$isdiff && [commitinview $nullid $curview]} {
4276
	removefakerow $nullid
4277 4278
    }
    return 0
P
Paul Mackerras 已提交
4279 4280
}

4281
proc nextuse {id row} {
4282
    global curview children
P
Paul Mackerras 已提交
4283

4284 4285
    if {[info exists children($curview,$id)]} {
	foreach kid $children($curview,$id) {
4286
	    if {![commitinview $kid $curview]} {
4287 4288
		return -1
	    }
4289 4290
	    if {[rowofcommit $kid] > $row} {
		return [rowofcommit $kid]
P
Paul Mackerras 已提交
4291 4292
	    }
	}
4293
    }
4294 4295
    if {[commitinview $id $curview]} {
	return [rowofcommit $id]
4296 4297 4298 4299
    }
    return -1
}

4300
proc prevuse {id row} {
4301
    global curview children
4302 4303 4304 4305

    set ret -1
    if {[info exists children($curview,$id)]} {
	foreach kid $children($curview,$id) {
4306 4307 4308
	    if {![commitinview $kid $curview]} break
	    if {[rowofcommit $kid] < $row} {
		set ret [rowofcommit $kid]
4309 4310
	    }
	}
4311 4312 4313 4314
    }
    return $ret
}

4315 4316
proc make_idlist {row} {
    global displayorder parentlist uparrowlen downarrowlen mingaplen
4317
    global commitidx curview children
P
Paul Mackerras 已提交
4318

4319 4320 4321
    set r [expr {$row - $mingaplen - $downarrowlen - 1}]
    if {$r < 0} {
	set r 0
4322
    }
4323 4324 4325 4326 4327 4328 4329 4330
    set ra [expr {$row - $downarrowlen}]
    if {$ra < 0} {
	set ra 0
    }
    set rb [expr {$row + $uparrowlen}]
    if {$rb > $commitidx($curview)} {
	set rb $commitidx($curview)
    }
4331
    make_disporder $r [expr {$rb + 1}]
4332 4333 4334 4335 4336 4337 4338 4339
    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} {
4340
		lappend ids [list [ordertoken $p] $p]
P
Paul Mackerras 已提交
4341 4342
	    }
	}
4343 4344 4345 4346 4347 4348 4349
    }
    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} {
4350
		lappend ids [list [ordertoken $p] $p]
P
Paul Mackerras 已提交
4351 4352
	    }
	}
4353 4354
    }
    set id [lindex $displayorder $row]
4355
    lappend ids [list [ordertoken $id] $id]
4356 4357 4358
    while {$r < $rb} {
	foreach p [lindex $parentlist $r] {
	    set firstkid [lindex $children($curview,$p) 0]
4359
	    if {[rowofcommit $firstkid] < $row} {
4360
		lappend ids [list [ordertoken $p] $p]
P
Paul Mackerras 已提交
4361 4362
	    }
	}
4363 4364 4365 4366
	incr r
	set id [lindex $displayorder $r]
	if {$id ne {}} {
	    set firstkid [lindex $children($curview,$id) 0]
4367
	    if {$firstkid ne {} && [rowofcommit $firstkid] < $row} {
4368
		lappend ids [list [ordertoken $id] $id]
4369
	    }
P
Paul Mackerras 已提交
4370 4371
	}
    }
4372 4373 4374 4375 4376
    set idlist {}
    foreach idx [lsort -unique $ids] {
	lappend idlist [lindex $idx 1]
    }
    return $idlist
P
Paul Mackerras 已提交
4377 4378
}

4379 4380 4381 4382 4383 4384 4385 4386
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 已提交
4387 4388
}

4389 4390
proc makeupline {id row rend col} {
    global rowidlist uparrowlen downarrowlen mingaplen
P
Paul Mackerras 已提交
4391

4392 4393 4394 4395 4396 4397 4398
    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}]
4399
    }
4400 4401 4402 4403 4404 4405 4406
    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 已提交
4407 4408 4409
    }
}

4410
proc layoutrows {row endrow} {
4411
    global rowidlist rowisopt rowfinal displayorder
4412 4413
    global uparrowlen downarrowlen maxwidth mingaplen
    global children parentlist
4414
    global commitidx viewcomplete curview
P
Paul Mackerras 已提交
4415

4416
    make_disporder [expr {$row - 1}] [expr {$endrow + $uparrowlen}]
4417 4418
    set idlist {}
    if {$row > 0} {
4419 4420
	set rm1 [expr {$row - 1}]
	foreach id [lindex $rowidlist $rm1] {
4421 4422 4423 4424
	    if {$id ne {}} {
		lappend idlist $id
	    }
	}
4425
	set final [lindex $rowfinal $rm1]
4426
    }
4427 4428
    for {} {$row < $endrow} {incr row} {
	set rm1 [expr {$row - 1}]
4429
	if {$rm1 < 0 || $idlist eq {}} {
4430
	    set idlist [make_idlist $row]
4431
	    set final 1
4432 4433 4434 4435 4436 4437 4438 4439
	} 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]
4440 4441 4442 4443
		    # 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
		    }
4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461
		}
	    }
	    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]
4462 4463 4464
		if {$children($curview,$id) ne {}} {
		    makeupline $id $rm1 $row $col
		}
4465 4466 4467 4468 4469 4470 4471
	    }
	    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]
4472
		    if {[rowofcommit $fk] < $row} {
4473 4474 4475 4476 4477 4478 4479 4480
			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]
4481
			if {$fk ne {} && [rowofcommit $fk] < $row} {
4482 4483 4484 4485 4486 4487 4488
			    set x [idcol $idlist $p $x]
			    set idlist [linsert $idlist $x $p]
			}
		    }
		}
	    }
	}
4489 4490 4491 4492 4493
	if {$final && !$viewcomplete($curview) &&
	    $row + $uparrowlen + $mingaplen + $downarrowlen
		>= $commitidx($curview)} {
	    set final 0
	}
4494 4495 4496 4497
	set l [llength $rowidlist]
	if {$row == $l} {
	    lappend rowidlist $idlist
	    lappend rowisopt 0
4498
	    lappend rowfinal $final
4499
	} elseif {$row < $l} {
4500
	    if {![rowsequal $idlist [lindex $rowidlist $row]]} {
4501 4502 4503
		lset rowidlist $row $idlist
		changedrow $row
	    }
4504
	    lset rowfinal $row $final
4505
	} else {
4506 4507
	    set pad [ntimes [expr {$row - $l}] {}]
	    set rowidlist [concat $rowidlist $pad]
4508
	    lappend rowidlist $idlist
4509 4510
	    set rowfinal [concat $rowfinal $pad]
	    lappend rowfinal $final
4511 4512
	    set rowisopt [concat $rowisopt [ntimes [expr {$row - $l + 1}] 0]]
	}
P
Paul Mackerras 已提交
4513
    }
4514
    return $row
P
Paul Mackerras 已提交
4515 4516
}

4517 4518
proc changedrow {row} {
    global displayorder iddrawn rowisopt need_redisplay
P
Paul Mackerras 已提交
4519

4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532
    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 已提交
4533 4534 4535 4536
    }
}

proc insert_pad {row col npad} {
4537
    global rowidlist
P
Paul Mackerras 已提交
4538 4539

    set pad [ntimes $npad {}]
P
Paul Mackerras 已提交
4540 4541 4542 4543 4544 4545 4546 4547
    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]
4548
    changedrow $row
P
Paul Mackerras 已提交
4549 4550 4551
}

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

4554 4555 4556
    if {$row < 1} {
	set row 1
    }
4557 4558
    for {} {$row < $endrow} {incr row; set col 0} {
	if {[lindex $rowisopt $row]} continue
P
Paul Mackerras 已提交
4559
	set haspad 0
4560 4561
	set y0 [expr {$row - 1}]
	set ym [expr {$row - 2}]
4562 4563 4564 4565 4566 4567 4568 4569 4570
	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 {}
	}
4571 4572 4573 4574 4575 4576
	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 已提交
4577 4578 4579
		set haspad 1
		continue
	    }
4580 4581 4582
	    set x0 [lsearch -exact $previdlist $id]
	    if {$x0 < 0} continue
	    set z [expr {$x0 - $col}]
P
Paul Mackerras 已提交
4583
	    set isarrow 0
4584 4585 4586 4587 4588 4589 4590
	    set z0 {}
	    if {$ym >= 0} {
		set xm [lsearch -exact $pprevidlist $id]
		if {$xm >= 0} {
		    set z0 [expr {$xm - $x0}]
		}
	    }
P
Paul Mackerras 已提交
4591
	    if {$z0 eq {}} {
4592 4593 4594
		# 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 已提交
4595 4596 4597
		    set isarrow 1
		}
	    }
P
Paul Mackerras 已提交
4598 4599 4600 4601
	    if {!$isarrow && $id ne [lindex $displayorder $row] &&
		[lsearch -exact [lindex $rowidlist [expr {$row+1}]] $id] < 0} {
		set isarrow 1
	    }
4602 4603 4604 4605
	    # 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 已提交
4606
	    if {$z < -1 || ($z < 0 && $isarrow)} {
4607 4608
		# Line currently goes left too much;
		# insert pads in the previous row, then optimize it
P
Paul Mackerras 已提交
4609 4610 4611 4612 4613
		set npad [expr {-1 - $z + $isarrow}]
		insert_pad $y0 $x0 $npad
		if {$y0 > 0} {
		    optimize_rows $y0 $x0 $row
		}
4614 4615 4616 4617 4618 4619 4620 4621
		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 已提交
4622
	    } elseif {$z > 1 || ($z > 0 && $isarrow)} {
4623
		# Line currently goes right too much;
4624
		# insert pads in this line
P
Paul Mackerras 已提交
4625
		set npad [expr {$z - 1 + $isarrow}]
P
Paul Mackerras 已提交
4626 4627
		insert_pad $row $col $npad
		set idlist [lindex $rowidlist $row]
P
Paul Mackerras 已提交
4628
		incr col $npad
4629
		set z [expr {$x0 - $col}]
P
Paul Mackerras 已提交
4630 4631
		set haspad 1
	    }
4632
	    if {$z0 eq {} && !$isarrow && $ym >= 0} {
4633
		# this line links to its first child on row $row-2
4634 4635
		set id [lindex $displayorder $ym]
		set xc [lsearch -exact $pprevidlist $id]
4636 4637 4638 4639
		if {$xc >= 0} {
		    set z0 [expr {$xc - $x0}]
		}
	    }
4640
	    # avoid lines jigging left then immediately right
P
Paul Mackerras 已提交
4641 4642
	    if {$z0 ne {} && $z < 0 && $z0 > 0} {
		insert_pad $y0 $x0 1
4643 4644 4645
		incr x0
		optimize_rows $y0 $x0 $row
		set previdlist [lindex $rowidlist $y0]
P
Paul Mackerras 已提交
4646 4647 4648
	    }
	}
	if {!$haspad} {
4649
	    # Find the first column that doesn't have a line going right
P
Paul Mackerras 已提交
4650
	    for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
4651 4652 4653 4654
		set id [lindex $idlist $col]
		if {$id eq {}} break
		set x0 [lsearch -exact $previdlist $id]
		if {$x0 < 0} {
4655
		    # check if this is the link to the first child
4656 4657
		    set kid [lindex $displayorder $y0]
		    if {[lindex $children($curview,$id) 0] eq $kid} {
4658
			# it is, work out offset to child
4659
			set x0 [lsearch -exact $previdlist $kid]
4660 4661
		    }
		}
4662
		if {$x0 <= $col} break
P
Paul Mackerras 已提交
4663
	    }
4664
	    # Insert a pad at that column as long as it has a line and
4665 4666
	    # isn't the last column
	    if {$x0 >= 0 && [incr col] < [llength $idlist]} {
P
Paul Mackerras 已提交
4667
		set idlist [linsert $idlist $col {}]
4668 4669
		lset rowidlist $row $idlist
		changedrow $row
P
Paul Mackerras 已提交
4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684
	    }
	}
    }
}

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

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

4685 4686 4687 4688 4689 4690 4691 4692 4693 4694
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 已提交
4695
proc rowranges {id} {
4696
    global curview children uparrowlen downarrowlen
4697
    global rowidlist
P
Paul Mackerras 已提交
4698

4699 4700 4701
    set kids $children($curview,$id)
    if {$kids eq {}} {
	return {}
4702
    }
4703 4704 4705
    set ret {}
    lappend kids $id
    foreach child $kids {
4706 4707
	if {![commitinview $child $curview]} break
	set row [rowofcommit $child]
4708 4709
	if {![info exists prev]} {
	    lappend ret [expr {$row + 1}]
4710
	} else {
4711
	    if {$row <= $prevrow} {
4712
		puts "oops children of [shortids $id] out of order [shortids $child] $row <= [shortids $prev] $prevrow"
4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743
	    }
	    # 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
4744
	}
4745
	set prev $child
4746
	set prevrow $row
P
Paul Mackerras 已提交
4747
    }
4748
    return $ret
4749 4750 4751 4752
}

proc drawlineseg {id row endrow arrowlow} {
    global rowidlist displayorder iddrawn linesegs
P
Paul Mackerras 已提交
4753
    global canv colormap linespc curview maxlinelen parentlist
4754 4755 4756 4757

    set cols [list [lsearch -exact [lindex $rowidlist $row] $id]]
    set le [expr {$row + 1}]
    set arrowhigh 1
P
Paul Mackerras 已提交
4758
    while {1} {
4759 4760 4761 4762 4763 4764 4765 4766 4767 4768
	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 已提交
4769
	}
4770 4771 4772 4773 4774 4775 4776 4777 4778
	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 已提交
4779
    }
4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827
    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 已提交
4828 4829 4830 4831 4832
    } elseif {$arrowlow} {
	if {[lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0 ||
	    [lsearch -exact [lindex $parentlist [expr {$row-1}]] $id] >= 0} {
	    set arrowlow 0
	}
4833 4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 4844 4845 4846 4847 4848 4849 4850
    }
    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 已提交
4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863
	    } 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} {
4864 4865 4866 4867 4868
		    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
4869
	    }
4870 4871 4872 4873
	    lappend coords [xc $row $x] [yc $row]
	} else {
	    set xn [xc $row $xp]
	    set yn [yc $row]
P
Paul Mackerras 已提交
4874
	    lappend coords $xn $yn
4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909
	}
	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
4910 4911
	}
    }
4912 4913 4914

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

4917 4918
proc drawparentlinks {id row} {
    global rowidlist canv colormap curview parentlist
4919
    global idpos linespc
P
Paul Mackerras 已提交
4920

4921 4922 4923 4924
    set rowids [lindex $rowidlist $row]
    set col [lsearch -exact $rowids $id]
    if {$col < 0} return
    set olds [lindex $parentlist $row]
P
Paul Mackerras 已提交
4925 4926 4927 4928
    set row2 [expr {$row + 1}]
    set x [xc $row $col]
    set y [yc $row]
    set y2 [yc $row2]
P
Paul Mackerras 已提交
4929
    set d [expr {int(0.5 * $linespc)}]
4930
    set ymid [expr {$y + $d}]
4931
    set ids [lindex $rowidlist $row2]
P
Paul Mackerras 已提交
4932 4933 4934
    # rmx = right-most X coord used
    set rmx 0
    foreach p $olds {
4935 4936 4937 4938 4939 4940 4941 4942 4943
	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
	}
4944 4945
	set j [lsearch -exact $rowids $p]
	if {$j < 0} {
4946 4947 4948
	    # drawlineseg will do this one for us
	    continue
	}
P
Paul Mackerras 已提交
4949 4950 4951
	assigncolor $p
	# should handle duplicated parents here...
	set coords [list $x $y]
4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 4972 4973
	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 已提交
4974
	}
4975
	set t [$canv create line $coords -width [linewidth $p] \
P
Paul Mackerras 已提交
4976 4977 4978 4979
		   -fill $colormap($p) -tags lines.$p]
	$canv lower $t
	bindline $t $p
    }
4980 4981 4982 4983
    if {$rmx > [lindex $idpos($id) 1]} {
	lset idpos($id) 1 $rmx
	redrawtags $id
    }
P
Paul Mackerras 已提交
4984 4985
}

4986
proc drawlines {id} {
4987
    global canv
P
Paul Mackerras 已提交
4988

4989
    $canv itemconf lines.$id -width [linewidth $id]
P
Paul Mackerras 已提交
4990 4991
}

4992
proc drawcmittext {id row col} {
4993 4994
    global linespc canv canv2 canv3 fgcolor curview
    global cmitlisted commitinfo rowidlist parentlist
P
Paul Mackerras 已提交
4995
    global rowtextx idpos idtags idheads idotherrefs
4996
    global linehtag linentag linedtag selectedline
4997
    global canvxmax boldrows boldnamerows fgcolor
4998
    global mainheadid nullid nullid2 circleitem circlecolors ctxbut
P
Paul Mackerras 已提交
4999

5000
    # listed is 0 for boundary, 1 for normal, 2 for negative, 3 for left, 4 for right
5001
    set listed $cmitlisted($curview,$id)
5002 5003
    if {$id eq $nullid} {
	set ofill red
5004
    } elseif {$id eq $nullid2} {
5005
	set ofill green
5006 5007
    } elseif {$id eq $mainheadid} {
	set ofill yellow
5008
    } else {
5009
	set ofill [lindex $circlecolors $listed]
5010
    }
P
Paul Mackerras 已提交
5011 5012 5013
    set x [xc $row $col]
    set y [yc $row]
    set orad [expr {$linespc / 3}]
5014
    if {$listed <= 2} {
5015 5016 5017
	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]
5018
    } elseif {$listed == 3} {
5019 5020 5021 5022 5023 5024 5025 5026 5027 5028 5029 5030 5031 5032
	# 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]
    }
5033
    set circleitem($row) $t
P
Paul Mackerras 已提交
5034 5035
    $canv raise $t
    $canv bind $t <1> {selcanvline {} %x %y}
5036 5037 5038 5039 5040 5041 5042 5043 5044 5045
    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 已提交
5046
    }
5047
    set xt [xc $row $rmx]
P
Paul Mackerras 已提交
5048 5049 5050 5051 5052 5053 5054 5055 5056 5057
    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]
5058 5059
    set font mainfont
    set nfont mainfont
5060
    set isbold [ishighlighted $id]
5061
    if {$isbold > 0} {
5062
	lappend boldrows $row
5063
	set font mainfontbold
5064
	if {$isbold > 1} {
5065
	    lappend boldnamerows $row
5066
	    set nfont mainfontbold
5067
	}
5068
    }
5069 5070
    set linehtag($row) [$canv create text $xt $y -anchor w -fill $fgcolor \
			    -text $headline -font $font -tags text]
5071
    $canv bind $linehtag($row) $ctxbut "rowmenu %X %Y $id"
5072 5073 5074
    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 \
5075
			    -text $date -font mainfont -tags text]
5076
    if {$selectedline == $row} {
5077 5078
	make_secsel $row
    }
5079
    set xr [expr {$xt + [font measure $font $headline]}]
5080 5081 5082 5083
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
P
Paul Mackerras 已提交
5084 5085 5086
}

proc drawcmitrow {row} {
5087
    global displayorder rowidlist nrows_drawn
5088
    global iddrawn markingmatches
5089
    global commitinfo numcommits
5090
    global filehighlight fhighlights findpattern nhighlights
5091
    global hlview vhighlights
5092
    global highlight_related rhighlights
P
Paul Mackerras 已提交
5093

5094
    if {$row >= $numcommits} return
P
Paul Mackerras 已提交
5095 5096

    set id [lindex $displayorder $row]
5097
    if {[info exists hlview] && ![info exists vhighlights($id)]} {
5098 5099
	askvhighlight $row $id
    }
5100
    if {[info exists filehighlight] && ![info exists fhighlights($id)]} {
5101 5102
	askfilehighlight $row $id
    }
5103
    if {$findpattern ne {} && ![info exists nhighlights($id)]} {
5104
	askfindhighlight $row $id
5105
    }
5106
    if {$highlight_related ne [mc "None"] && ![info exists rhighlights($id)]} {
5107 5108
	askrelhighlight $row $id
    }
5109 5110 5111 5112 5113 5114 5115 5116 5117 5118 5119 5120
    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
5121
	incr nrows_drawn
P
Paul Mackerras 已提交
5122
    }
5123 5124
    if {$markingmatches} {
	markrowmatches $row $id
P
Paul Mackerras 已提交
5125 5126 5127
    }
}

5128
proc drawcommits {row {endrow {}}} {
5129
    global numcommits iddrawn displayorder curview need_redisplay
5130
    global parentlist rowidlist rowfinal uparrowlen downarrowlen nrows_drawn
P
Paul Mackerras 已提交
5131 5132 5133 5134

    if {$row < 0} {
	set row 0
    }
5135 5136 5137
    if {$endrow eq {}} {
	set endrow $row
    }
P
Paul Mackerras 已提交
5138 5139 5140
    if {$endrow >= $numcommits} {
	set endrow [expr {$numcommits - 1}]
    }
5141

5142 5143 5144 5145 5146 5147 5148 5149 5150 5151 5152 5153 5154
    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} {
5155
	if {[lindex $rowidlist $r] ne {} && [lindex $rowfinal $r]} {
5156 5157 5158 5159 5160 5161 5162 5163 5164 5165 5166 5167 5168 5169 5170
	    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
    }

5171 5172 5173 5174 5175 5176 5177 5178 5179 5180 5181 5182 5183
    # 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)]
5184
	drawcmitrow $r
5185 5186
	if {$r == $er} break
	set nextid [lindex $displayorder [expr {$r + 1}]]
5187
	if {$wasdrawn && [info exists iddrawn($nextid)]} continue
5188 5189 5190 5191 5192
	drawparentlinks $id $r

	set rowids [lindex $rowidlist $r]
	foreach lid $rowids {
	    if {$lid eq {}} continue
5193
	    if {[info exists lineend($lid)] && $lineend($lid) > $r} continue
5194 5195 5196 5197 5198
	    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
5199
			set lineend($p) [drawlineseg $p $r $er 0]
5200 5201
		    }
		}
5202 5203
	    } else {
		set lineend($lid) [drawlineseg $lid $r $er 1]
5204 5205
	    }
	}
P
Paul Mackerras 已提交
5206 5207 5208
    }
}

5209 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226
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
    }
}

5227 5228
proc drawvisible {} {
    global canv linespc curview vrowmod selectedline targetrow targetid
5229
    global need_redisplay cscroll numcommits
5230

5231
    set fs [$canv yview]
5232
    set ymax [lindex [$canv cget -scrollregion] 3]
5233
    if {$ymax eq {} || $ymax == 0 || $numcommits == 0} return
5234 5235
    set f0 [lindex $fs 0]
    set f1 [lindex $fs 1]
5236 5237
    set y0 [expr {int($f0 * $ymax)}]
    set y1 [expr {int($f1 * $ymax)}]
5238 5239

    if {[info exists targetid]} {
5240 5241 5242 5243 5244 5245 5246 5247 5248 5249 5250 5251 5252 5253 5254 5255 5256 5257 5258
	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
5259 5260 5261 5262
	}
    }

    set row [expr {int(($y0 - 3) / $linespc) - 1}]
5263
    set endrow [expr {int(($y1 - 3) / $linespc) + 1}]
5264 5265 5266
    if {$endrow >= $vrowmod($curview)} {
	update_arcrows $curview
    }
5267
    if {$selectedline ne {} &&
5268 5269
	$row <= $selectedline && $selectedline <= $endrow} {
	set targetrow $selectedline
5270
    } elseif {[info exists targetid]} {
5271 5272
	set targetrow [expr {int(($row + $endrow) / 2)}]
    }
5273 5274 5275 5276 5277
    if {[info exists targetrow]} {
	if {$targetrow >= $numcommits} {
	    set targetrow [expr {$numcommits - 1}]
	}
	set targetid [commitonrow $targetrow]
5278
    }
5279 5280 5281
    drawcommits $row $endrow
}

P
Paul Mackerras 已提交
5282
proc clear_display {} {
5283
    global iddrawn linesegs need_redisplay nrows_drawn
5284
    global vhighlights fhighlights nhighlights rhighlights
5285
    global linehtag linentag linedtag boldrows boldnamerows
P
Paul Mackerras 已提交
5286 5287 5288

    allcanvs delete all
    catch {unset iddrawn}
5289
    catch {unset linesegs}
5290 5291 5292
    catch {unset linehtag}
    catch {unset linentag}
    catch {unset linedtag}
5293 5294
    set boldrows {}
    set boldnamerows {}
5295 5296 5297
    catch {unset vhighlights}
    catch {unset fhighlights}
    catch {unset nhighlights}
5298
    catch {unset rhighlights}
5299 5300
    set need_redisplay 0
    set nrows_drawn 0
P
Paul Mackerras 已提交
5301 5302
}

P
Paul Mackerras 已提交
5303
proc findcrossings {id} {
5304
    global rowidlist parentlist numcommits displayorder
P
Paul Mackerras 已提交
5305 5306 5307 5308 5309 5310 5311

    set cross {}
    set ccross {}
    foreach {s e} [rowranges $id] {
	if {$e >= $numcommits} {
	    set e [expr {$numcommits - 1}]
	}
5312
	if {$e <= $s} continue
P
Paul Mackerras 已提交
5313
	for {set row $e} {[incr row -1] >= $s} {} {
5314 5315
	    set x [lsearch -exact [lindex $rowidlist $row] $id]
	    if {$x < 0} break
P
Paul Mackerras 已提交
5316 5317 5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337
	    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]
}

5338
proc assigncolor {id} {
P
Paul Mackerras 已提交
5339
    global colormap colors nextcolor
5340
    global parents children children curview
5341

5342
    if {[info exists colormap($id)]} return
5343
    set ncolors [llength $colors]
5344 5345
    if {[info exists children($curview,$id)]} {
	set kids $children($curview,$id)
5346 5347 5348 5349 5350
    } else {
	set kids {}
    }
    if {[llength $kids] == 1} {
	set child [lindex $kids 0]
5351
	if {[info exists colormap($child)]
5352
	    && [llength $parents($curview,$child)] == 1} {
5353 5354
	    set colormap($id) $colormap($child)
	    return
5355
	}
5356 5357
    }
    set badcolors {}
P
Paul Mackerras 已提交
5358 5359 5360 5361 5362 5363
    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
5364
	}
P
Paul Mackerras 已提交
5365 5366 5367
	if {[info exists colormap($x)]
	    && [lsearch -exact $badcolors $colormap($x)] < 0} {
	    lappend badcolors $colormap($x)
5368 5369
	}
    }
P
Paul Mackerras 已提交
5370 5371
    if {[llength $badcolors] >= $ncolors} {
	set badcolors $origbad
5372
    }
P
Paul Mackerras 已提交
5373
    set origbad $badcolors
5374
    if {[llength $badcolors] < $ncolors - 1} {
5375
	foreach child $kids {
5376 5377 5378 5379
	    if {[info exists colormap($child)]
		&& [lsearch -exact $badcolors $colormap($child)] < 0} {
		lappend badcolors $colormap($child)
	    }
5380
	    foreach p $parents($curview,$child) {
5381 5382 5383
		if {[info exists colormap($p)]
		    && [lsearch -exact $badcolors $colormap($p)] < 0} {
		    lappend badcolors $colormap($p)
5384 5385 5386 5387 5388 5389
		}
	    }
	}
	if {[llength $badcolors] >= $ncolors} {
	    set badcolors $origbad
	}
5390 5391 5392 5393 5394
    }
    for {set i 0} {$i <= $ncolors} {incr i} {
	set c [lindex $colors $nextcolor]
	if {[incr nextcolor] >= $ncolors} {
	    set nextcolor 0
5395
	}
5396
	if {[lsearch -exact $badcolors $c]} break
5397
    }
5398
    set colormap($id) $c
5399 5400
}

5401 5402 5403 5404 5405 5406
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"
5407
    $canv bind $t <Button-1> "lineclick %x %y $id 1"
5408 5409
}

5410
proc drawtags {id x xt y1} {
5411
    global idtags idheads idotherrefs mainhead
5412
    global linespc lthickness
5413
    global canv rowtextx curview fgcolor bgcolor ctxbut
5414 5415 5416

    set marks {}
    set ntags 0
5417
    set nheads 0
5418 5419 5420 5421 5422 5423
    if {[info exists idtags($id)]} {
	set marks $idtags($id)
	set ntags [llength $marks]
    }
    if {[info exists idheads($id)]} {
	set marks [concat $marks $idheads($id)]
5424 5425 5426 5427
	set nheads [llength $idheads($id)]
    }
    if {[info exists idotherrefs($id)]} {
	set marks [concat $marks $idotherrefs($id)]
5428 5429 5430 5431 5432 5433
    }
    if {$marks eq {}} {
	return $xt
    }

    set delta [expr {int(0.5 * ($linespc - $lthickness))}]
J
Jeff Hobbs 已提交
5434 5435
    set yt [expr {$y1 - 0.5 * $linespc}]
    set yb [expr {$yt + $linespc - 1}]
5436 5437
    set xvals {}
    set wvals {}
5438
    set i -1
5439
    foreach tag $marks {
5440 5441
	incr i
	if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} {
5442
	    set wid [font measure mainfontbold $tag]
5443
	} else {
5444
	    set wid [font measure mainfont $tag]
5445
	}
5446 5447 5448 5449 5450 5451 5452 5453
	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 已提交
5454 5455
	set xl [expr {$x + $delta}]
	set xr [expr {$x + $delta + $wid + $lthickness}]
5456
	set font mainfont
5457 5458
	if {[incr ntags -1] >= 0} {
	    # draw a tag
J
Jeff Hobbs 已提交
5459 5460
	    set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
		       $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
5461 5462
		       -width 1 -outline black -fill yellow -tags tag.$id]
	    $canv bind $t <1> [list showtag $tag 1]
5463
	    set rowtextx([rowofcommit $id]) [expr {$xr + $linespc}]
5464
	} else {
5465 5466 5467
	    # draw a head or other ref
	    if {[incr nheads -1] >= 0} {
		set col green
5468
		if {$tag eq $mainhead} {
5469
		    set font mainfontbold
5470
		}
5471 5472 5473
	    } else {
		set col "#ddddff"
	    }
J
Jeff Hobbs 已提交
5474
	    set xl [expr {$xl - $delta/2}]
5475
	    $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
5476
		-width 1 -outline black -fill $col -tags tag.$id
5477
	    if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
5478
	        set rwid [font measure mainfont $remoteprefix]
5479 5480 5481 5482 5483 5484
		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
	    }
5485
	}
5486
	set t [$canv create text $xl $y1 -anchor w -text $tag -fill $fgcolor \
5487
		   -font $font -tags [list tag.$id text]]
5488 5489
	if {$ntags >= 0} {
	    $canv bind $t <1> [list showtag $tag 1]
5490
	} elseif {$nheads >= 0} {
5491
	    $canv bind $t $ctxbut [list headmenu %X %Y $id $tag]
5492
	}
5493 5494 5495 5496
    }
    return $xt
}

5497 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507
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
}
5508

5509
proc show_status {msg} {
5510
    global canv fgcolor
5511 5512

    clear_display
5513
    $canv create text 3 3 -anchor nw -text $msg -font mainfont \
5514
	-tags text -fill $fgcolor
5515 5516
}

5517 5518 5519 5520 5521 5522 5523 5524 5525
# 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
5526 5527
}

5528 5529
proc nowbusy {what {name {}}} {
    global isbusy busyname statusw
5530 5531 5532 5533 5534 5535

    if {[array names isbusy] eq {}} {
	. config -cursor watch
	settextcursor watch
    }
    set isbusy($what) 1
5536 5537 5538 5539
    set busyname($what) $name
    if {$name ne {}} {
	$statusw conf -text $name
    }
5540 5541 5542
}

proc notbusy {what} {
5543
    global isbusy maincursor textcursor busyname statusw
5544

5545 5546 5547 5548 5549 5550 5551
    catch {
	unset isbusy($what)
	if {$busyname($what) ne {} &&
	    [$statusw cget -text] eq $busyname($what)} {
	    $statusw conf -text {}
	}
    }
5552 5553 5554 5555 5556 5557
    if {[array names isbusy] eq {}} {
	. config -cursor $maincursor
	settextcursor $textcursor
    }
}

5558
proc findmatches {f} {
5559
    global findtype findstring
5560
    if {$findtype == [mc "Regexp"]} {
5561
	set matches [regexp -indices -all -inline $findstring $f]
5562
    } else {
5563
	set fs $findstring
5564
	if {$findtype == [mc "IgnCase"]} {
5565 5566
	    set f [string tolower $f]
	    set fs [string tolower $fs]
5567 5568 5569
	}
	set matches {}
	set i 0
5570 5571 5572 5573
	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}]
5574 5575 5576 5577 5578
	}
    }
    return $matches
}

5579
proc dofind {{dirn 1} {wrap 1}} {
5580
    global findstring findstartline findcurline selectedline numcommits
5581
    global gdttype filehighlight fh_serial find_dirn findallowwrap
5582

5583 5584 5585 5586
    if {[info exists find_dirn]} {
	if {$find_dirn == $dirn} return
	stopfinding
    }
5587
    focus .
5588
    if {$findstring eq {} || $numcommits == 0} return
5589
    if {$selectedline eq {}} {
5590
	set findstartline [lindex [visiblerows] [expr {$dirn < 0}]]
5591
    } else {
5592
	set findstartline $selectedline
5593
    }
5594
    set findcurline $findstartline
5595 5596
    nowbusy finding [mc "Searching"]
    if {$gdttype ne [mc "containing:"] && ![info exists filehighlight]} {
5597 5598
	after cancel do_file_hl $fh_serial
	do_file_hl $fh_serial
5599
    }
5600 5601 5602
    set find_dirn $dirn
    set findallowwrap $wrap
    run findmore
5603 5604
}

5605 5606
proc stopfinding {} {
    global find_dirn findcurline fprogcoord
5607

5608 5609 5610 5611 5612 5613
    if {[info exists find_dirn]} {
	unset find_dirn
	unset findcurline
	notbusy finding
	set fprogcoord 0
	adjustprogress
5614 5615 5616 5617
    }
}

proc findmore {} {
5618
    global commitdata commitinfo numcommits findpattern findloc
5619
    global findstartline findcurline findallowwrap
5620
    global find_dirn gdttype fhighlights fprogcoord
5621
    global curview varcorder vrownum varccommits vrowmod
5622

5623
    if {![info exists find_dirn]} {
5624 5625
	return 0
    }
5626
    set fldtypes [list [mc "Headline"] [mc "Author"] [mc "Date"] [mc "Committer"] [mc "CDate"] [mc "Comments"]]
5627
    set l $findcurline
5628 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638
    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 已提交
5639
	}
5640
    } else {
5641 5642
	if {$l == 0} {
	    set l $numcommits
5643
	}
5644 5645 5646
	incr l -1
	if {$l >= $findstartline} {
	    set lim [expr {$findstartline - 1}]
5647
	} else {
5648 5649
	    set lim -1
	    set moretodo $findallowwrap
5650
	}
5651
    }
5652 5653 5654 5655
    set n [expr {($lim - $l) * $find_dirn}]
    if {$n > 500} {
	set n 500
	set moretodo 1
5656
    }
5657 5658 5659
    if {$l + ($find_dirn > 0? $n: 1) > $vrowmod($curview)} {
	update_arcrows $curview
    }
5660 5661
    set found 0
    set domore 1
5662 5663 5664 5665 5666
    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]}]
5667
    if {$gdttype eq [mc "containing:"]} {
5668
	for {} {$n > 0} {incr n -1; incr l $find_dirn} {
5669 5670 5671 5672 5673 5674 5675 5676
	    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}]]
5677
	    # shouldn't happen unless git log doesn't give all the commits...
5678 5679 5680 5681
	    if {![info exists commitdata($id)] ||
		![doesmatch $commitdata($id)]} {
		continue
	    }
5682 5683 5684 5685 5686
	    if {![info exists commitinfo($id)]} {
		getcommit $id
	    }
	    set info $commitinfo($id)
	    foreach f $info ty $fldtypes {
5687
		if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
5688 5689 5690 5691 5692 5693
		    [doesmatch $f]} {
		    set found 1
		    break
		}
	    }
	    if {$found} break
5694
	}
5695
    } else {
5696
	for {} {$n > 0} {incr n -1; incr l $find_dirn} {
5697 5698 5699 5700 5701 5702 5703 5704
	    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}]]
5705 5706
	    if {![info exists fhighlights($id)]} {
		# this sets fhighlights($id) to -1
5707
		askfilehighlight $l $id
5708
	    }
5709
	    if {$fhighlights($id) > 0} {
5710 5711 5712
		set found $domore
		break
	    }
5713
	    if {$fhighlights($id) < 0} {
5714 5715
		if {$domore} {
		    set domore 0
5716
		    set findcurline [expr {$l - $find_dirn}]
5717
		}
5718 5719 5720
	    }
	}
    }
5721
    if {$found || ($domore && !$moretodo)} {
5722
	unset findcurline
5723
	unset find_dirn
5724
	notbusy finding
5725 5726 5727 5728 5729 5730 5731
	set fprogcoord 0
	adjustprogress
	if {$found} {
	    findselectline $l
	} else {
	    bell
	}
5732
	return 0
5733
    }
5734 5735
    if {!$domore} {
	flushhighlights
5736
    } else {
5737
	set findcurline [expr {$l - $find_dirn}]
5738
    }
5739
    set n [expr {($findcurline - $findstartline) * $find_dirn - 1}]
5740 5741
    if {$n < 0} {
	incr n $numcommits
5742
    }
5743 5744 5745
    set fprogcoord [expr {$n * 1.0 / $numcommits}]
    adjustprogress
    return $domore
5746 5747 5748
}

proc findselectline {l} {
5749
    global findloc commentend ctext findcurline markingmatches gdttype
5750 5751 5752

    set markingmatches 1
    set findcurline $l
5753
    selectline $l 1
5754
    if {$findloc == [mc "All fields"] || $findloc == [mc "Comments"]} {
5755 5756 5757 5758 5759
	# 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 已提交
5760
	    set end [expr {[lindex $match 1] + 1}]
5761 5762
	    $ctext tag add found "1.0 + $start c" "1.0 + $end c"
	}
5763
    }
5764
    drawvisible
5765 5766
}

5767
# mark the bits of a headline or author that match a find string
5768 5769 5770
proc markmatches {canv l str tag matches font row} {
    global selectedline

5771 5772 5773 5774 5775 5776 5777 5778
    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 已提交
5779 5780 5781 5782
	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 \
5783
		   -outline {} -tags [list match$l matches] -fill yellow]
5784
	$canv lower $t
5785
	if {$row == $selectedline} {
5786 5787
	    $canv raise $t secsel
	}
5788 5789 5790 5791
    }
}

proc unmarkmatches {} {
5792
    global markingmatches
5793

5794
    allcanvs delete matches
5795
    set markingmatches 0
5796
    stopfinding
5797 5798
}

5799
proc selcanvline {w x y} {
5800
    global canv canvy0 ctext linespc
P
Paul Mackerras 已提交
5801
    global rowtextx
5802
    set ymax [lindex [$canv cget -scrollregion] 3]
5803
    if {$ymax == {}} return
5804 5805 5806 5807 5808 5809
    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
    }
5810
    if {$w eq $canv} {
5811 5812 5813
	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
5814
    }
5815
    unmarkmatches
5816
    selectline $l 1
5817 5818
}

5819 5820
proc commit_descriptor {p} {
    global commitinfo
5821 5822 5823
    if {![info exists commitinfo($p)]} {
	getcommit $p
    }
5824
    set l "..."
5825
    if {[llength $commitinfo($p)] > 1} {
5826 5827
	set l [lindex $commitinfo($p) 0]
    }
P
Paul Mackerras 已提交
5828
    return "$p ($l)\n"
5829 5830
}

5831 5832
# append some text to the ctext widget, and make any SHA1 ID
# that we know about be a clickable link.
5833
proc appendwithlinks {text tags} {
5834
    global ctext linknum curview
5835 5836

    set start [$ctext index "end - 1c"]
5837
    $ctext insert end $text $tags
5838
    set links [regexp -indices -all -inline {\m[0-9a-f]{6,40}\M} $text]
5839 5840 5841 5842 5843
    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 已提交
5844
	$ctext tag delete link$linknum
5845
	$ctext tag add link$linknum "$start + $s c" "$start + $e c"
5846
	setlink $linkid link$linknum
5847 5848
	incr linknum
    }
5849 5850 5851
}

proc setlink {id lk} {
5852
    global curview ctext pendinglinks
5853

5854 5855 5856 5857 5858 5859 5860 5861 5862 5863 5864 5865
    set known 0
    if {[string length $id] < 40} {
	set matches [longid $id]
	if {[llength $matches] > 0} {
	    if {[llength $matches] > 1} return
	    set known 1
	    set id [lindex $matches 0]
	}
    } else {
	set known [commitinview $id $curview]
    }
    if {$known} {
5866
	$ctext tag conf $lk -foreground blue -underline 1
5867
	$ctext tag bind $lk <1> [list selbyid $id]
5868 5869 5870 5871
	$ctext tag bind $lk <Enter> {linkcursor %W 1}
	$ctext tag bind $lk <Leave> {linkcursor %W -1}
    } else {
	lappend pendinglinks($id) $lk
5872
	interestedin $id {makelink %P}
5873 5874 5875 5876 5877 5878 5879 5880 5881 5882 5883 5884 5885 5886 5887 5888 5889 5890 5891 5892 5893 5894 5895 5896
    }
}

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

5899 5900 5901 5902 5903 5904 5905 5906 5907 5908 5909 5910 5911 5912 5913 5914
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}]
}

5915 5916
# add a list of tag or branch names at position pos
# returns the number of names inserted
5917
proc appendrefs {pos ids var} {
5918
    global ctext linknum curview $var maxrefs
P
Paul Mackerras 已提交
5919

5920 5921 5922
    if {[catch {$ctext index $pos}]} {
	return 0
    }
5923 5924 5925 5926 5927 5928 5929 5930
    $ctext conf -state normal
    $ctext delete $pos "$pos lineend"
    set tags {}
    foreach id $ids {
	foreach tag [set $var\($id\)] {
	    lappend tags [list $tag $id]
	}
    }
5931 5932 5933 5934 5935 5936 5937 5938 5939 5940 5941 5942
    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
5943
	    setlink $id $lk
5944
	    set sep ", "
P
Paul Mackerras 已提交
5945 5946
	}
    }
5947
    $ctext conf -state disabled
5948
    return [llength $tags]
P
Paul Mackerras 已提交
5949 5950
}

5951 5952 5953
# called when we have finished computing the nearby tags
proc dispneartags {delay} {
    global selectedline currentid showneartags tagphase
5954

5955
    if {$selectedline eq {} || !$showneartags} return
5956 5957 5958 5959 5960 5961 5962
    after cancel dispnexttag
    if {$delay} {
	after 200 dispnexttag
	set tagphase -1
    } else {
	after idle dispnexttag
	set tagphase 0
5963 5964 5965
    }
}

5966 5967
proc dispnexttag {} {
    global selectedline currentid showneartags tagphase ctext
P
Paul Mackerras 已提交
5968

5969
    if {$selectedline eq {} || !$showneartags} return
5970 5971 5972 5973 5974 5975 5976 5977 5978 5979 5980 5981 5982 5983 5984 5985 5986 5987 5988 5989 5990 5991 5992 5993
    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
		}
	    }
5994 5995
	}
    }
5996 5997
    if {[incr tagphase] <= 2} {
	after idle dispnexttag
P
Paul Mackerras 已提交
5998 5999 6000
    }
}

6001 6002 6003 6004 6005 6006 6007 6008 6009 6010 6011 6012 6013 6014 6015 6016 6017 6018
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
}

6019
proc selectline {l isnew} {
6020
    global canv ctext commitinfo selectedline
6021
    global canvy0 linespc parents children curview
6022
    global currentid sha1entry
P
Paul Mackerras 已提交
6023
    global commentend idtags linknum
6024
    global mergemax numcommits pending_select
6025
    global cmitmode showneartags allcommits
6026
    global targetrow targetid lastscrollrows
6027
    global autoselect
6028

6029
    catch {unset pending_select}
6030
    $canv delete hover
6031
    normalline
6032
    unsel_reflist
6033
    stopfinding
6034
    if {$l < 0 || $l >= $numcommits} return
6035 6036 6037
    set id [commitonrow $l]
    set targetid $id
    set targetrow $l
6038 6039 6040 6041 6042
    set selectedline $l
    set currentid $id
    if {$lastscrollrows < $numcommits} {
	setcanvscroll
    }
6043

6044
    set y [expr {$canvy0 + $l * $linespc}]
6045
    set ymax [lindex [$canv cget -scrollregion] 3]
6046 6047
    set ytop [expr {$y - $linespc - 1}]
    set ybot [expr {$y + $linespc + 1}]
6048
    set wnow [$canv yview]
J
Jeff Hobbs 已提交
6049 6050
    set wtop [expr {[lindex $wnow 0] * $ymax}]
    set wbot [expr {[lindex $wnow 1] * $ymax}]
6051 6052
    set wh [expr {$wbot - $wtop}]
    set newtop $wtop
6053
    if {$ytop < $wtop} {
6054 6055 6056 6057 6058 6059 6060
	if {$ybot < $wtop} {
	    set newtop [expr {$y - $wh / 2.0}]
	} else {
	    set newtop $ytop
	    if {$newtop > $wtop - $linespc} {
		set newtop [expr {$wtop - $linespc}]
	    }
6061
	}
6062 6063 6064 6065 6066 6067 6068 6069
    } 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}]
	    }
6070
	}
6071 6072 6073 6074 6075
    }
    if {$newtop != $wtop} {
	if {$newtop < 0} {
	    set newtop 0
	}
J
Jeff Hobbs 已提交
6076
	allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
P
Paul Mackerras 已提交
6077
	drawvisible
6078
    }
6079

6080
    make_secsel $l
P
Paul Mackerras 已提交
6081

6082
    if {$isnew} {
6083
	addtohistory [list selbyid $id]
6084 6085
    }

6086 6087
    $sha1entry delete 0 end
    $sha1entry insert 0 $id
6088 6089 6090 6091
    if {$autoselect} {
	$sha1entry selection from 0
	$sha1entry selection to end
    }
6092
    rhighlight_sel $id
6093

6094
    $ctext conf -state normal
6095
    clear_ctext
6096
    set linknum 0
6097 6098 6099
    if {![info exists commitinfo($id)]} {
	getcommit $id
    }
6100
    set info $commitinfo($id)
P
Paul Mackerras 已提交
6101
    set date [formatdate [lindex $info 2]]
6102
    $ctext insert end "[mc "Author"]: [lindex $info 1]  $date\n"
P
Paul Mackerras 已提交
6103
    set date [formatdate [lindex $info 4]]
6104
    $ctext insert end "[mc "Committer"]: [lindex $info 3]  $date\n"
6105
    if {[info exists idtags($id)]} {
6106
	$ctext insert end [mc "Tags:"]
6107 6108 6109 6110 6111
	foreach tag $idtags($id) {
	    $ctext insert end " $tag"
	}
	$ctext insert end "\n"
    }
6112

6113
    set headers {}
6114
    set olds $parents($curview,$id)
6115
    if {[llength $olds] > 1} {
6116
	set np 0
6117
	foreach p $olds {
6118 6119 6120 6121 6122
	    if {$np >= $mergemax} {
		set tag mmax
	    } else {
		set tag m$np
	    }
6123
	    $ctext insert end "[mc "Parent"]: " $tag
6124
	    appendwithlinks [commit_descriptor $p] {}
6125 6126 6127
	    incr np
	}
    } else {
6128
	foreach p $olds {
6129
	    append headers "[mc "Parent"]: [commit_descriptor $p]"
6130 6131
	}
    }
6132

6133
    foreach c $children($curview,$id) {
6134
	append headers "[mc "Child"]:  [commit_descriptor $c]"
6135
    }
6136 6137

    # make anything that looks like a SHA1 ID be a clickable link
6138
    appendwithlinks $headers {}
P
Paul Mackerras 已提交
6139 6140 6141 6142
    if {$showneartags} {
	if {![info exists allcommits]} {
	    getallcommits
	}
6143
	$ctext insert end "[mc "Branch"]: "
6144 6145
	$ctext mark set branch "end -1c"
	$ctext mark gravity branch left
6146
	$ctext insert end "\n[mc "Follows"]: "
P
Paul Mackerras 已提交
6147 6148
	$ctext mark set follows "end -1c"
	$ctext mark gravity follows left
6149
	$ctext insert end "\n[mc "Precedes"]: "
P
Paul Mackerras 已提交
6150 6151 6152
	$ctext mark set precedes "end -1c"
	$ctext mark gravity precedes left
	$ctext insert end "\n"
6153
	dispneartags 1
P
Paul Mackerras 已提交
6154 6155
    }
    $ctext insert end "\n"
6156 6157 6158 6159 6160
    set comment [lindex $info 5]
    if {[string first "\r" $comment] >= 0} {
	set comment [string map {"\r" "\n    "} $comment]
    }
    appendwithlinks $comment {comment}
6161

6162
    $ctext tag remove found 1.0 end
6163
    $ctext conf -state disabled
6164
    set commentend [$ctext index "end - 1c"]
6165

6166
    init_flist [mc "Comments"]
P
Paul Mackerras 已提交
6167 6168 6169
    if {$cmitmode eq "tree"} {
	gettree $id
    } elseif {[llength $olds] <= 1} {
6170
	startdiff $id
6171
    } else {
6172
	mergediff $id
6173 6174 6175
    }
}

6176 6177 6178 6179 6180 6181 6182 6183 6184 6185 6186 6187
proc selfirstline {} {
    unmarkmatches
    selectline 0 1
}

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

6188 6189
proc selnextline {dir} {
    global selectedline
6190
    focus .
6191
    if {$selectedline eq {}} return
J
Jeff Hobbs 已提交
6192
    set l [expr {$selectedline + $dir}]
6193
    unmarkmatches
6194 6195 6196
    selectline $l 1
}

6197 6198 6199 6200 6201 6202 6203 6204
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
6205
    drawvisible
6206
    if {$selectedline eq {}} return
6207 6208 6209 6210 6211 6212 6213
    set l [expr {$selectedline + $dir * $lpp}]
    if {$l < 0} {
	set l 0
    } elseif {$l >= $numcommits} {
        set l [expr $numcommits - 1]
    }
    unmarkmatches
6214
    selectline $l 1
6215 6216
}

6217
proc unselectline {} {
P
Paul Mackerras 已提交
6218
    global selectedline currentid
6219

6220
    set selectedline {}
P
Paul Mackerras 已提交
6221
    catch {unset currentid}
6222
    allcanvs delete secsel
6223
    rhighlight_none
6224 6225
}

P
Paul Mackerras 已提交
6226 6227 6228
proc reselectline {} {
    global selectedline

6229
    if {$selectedline ne {}} {
P
Paul Mackerras 已提交
6230 6231 6232 6233
	selectline $selectedline 0
    }
}

6234
proc addtohistory {cmd} {
6235
    global history historyindex curview
6236

6237
    set elt [list $curview $cmd]
6238
    if {$historyindex > 0
6239
	&& [lindex $history [expr {$historyindex - 1}]] == $elt} {
6240 6241 6242 6243
	return
    }

    if {$historyindex < [llength $history]} {
6244
	set history [lreplace $history $historyindex end $elt]
6245
    } else {
6246
	lappend history $elt
6247 6248 6249
    }
    incr historyindex
    if {$historyindex > 1} {
6250
	.tf.bar.leftbut conf -state normal
6251
    } else {
6252
	.tf.bar.leftbut conf -state disabled
6253
    }
6254
    .tf.bar.rightbut conf -state disabled
6255 6256
}

6257 6258 6259 6260 6261 6262 6263 6264 6265 6266 6267
proc godo {elt} {
    global curview

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

6268 6269
proc goback {} {
    global history historyindex
6270
    focus .
6271 6272 6273

    if {$historyindex > 1} {
	incr historyindex -1
6274
	godo [lindex $history [expr {$historyindex - 1}]]
6275
	.tf.bar.rightbut conf -state normal
6276 6277
    }
    if {$historyindex <= 1} {
6278
	.tf.bar.leftbut conf -state disabled
6279 6280 6281 6282 6283
    }
}

proc goforw {} {
    global history historyindex
6284
    focus .
6285 6286

    if {$historyindex < [llength $history]} {
6287
	set cmd [lindex $history $historyindex]
6288
	incr historyindex
6289
	godo $cmd
6290
	.tf.bar.leftbut conf -state normal
6291 6292
    }
    if {$historyindex >= [llength $history]} {
6293
	.tf.bar.rightbut conf -state disabled
6294
    }
6295 6296
}

P
Paul Mackerras 已提交
6297
proc gettree {id} {
6298 6299
    global treefilelist treeidlist diffids diffmergeid treepending
    global nullid nullid2
P
Paul Mackerras 已提交
6300 6301 6302 6303 6304

    set diffids $id
    catch {unset diffmergeid}
    if {![info exists treefilelist($id)]} {
	if {![info exists treepending]} {
6305 6306 6307 6308
	    if {$id eq $nullid} {
		set cmd [list | git ls-files]
	    } elseif {$id eq $nullid2} {
		set cmd [list | git ls-files --stage -t]
6309
	    } else {
6310
		set cmd [list | git ls-tree -r $id]
6311 6312
	    }
	    if {[catch {set gtf [open $cmd r]}]} {
P
Paul Mackerras 已提交
6313 6314 6315 6316 6317
		return
	    }
	    set treepending $id
	    set treefilelist($id) {}
	    set treeidlist($id) {}
6318
	    fconfigure $gtf -blocking 0 -encoding binary
6319
	    filerun $gtf [list gettreeline $gtf $id]
P
Paul Mackerras 已提交
6320 6321 6322 6323 6324 6325 6326
	}
    } else {
	setfilelist $id
    }
}

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

6329 6330
    set nl 0
    while {[incr nl] <= 1000 && [gets $gtf line] >= 0} {
6331 6332 6333
	if {$diffids eq $nullid} {
	    set fname $line
	} else {
6334 6335 6336
	    set i [string first "\t" $line]
	    if {$i < 0} continue
	    set fname [string range $line [expr {$i+1}] end]
6337 6338 6339
	    set line [string range $line 0 [expr {$i-1}]]
	    if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue
	    set sha1 [lindex $line 2]
6340 6341
	    lappend treeidlist($id) $sha1
	}
6342 6343 6344 6345
	if {[string index $fname 0] eq "\""} {
	    set fname [lindex $fname 0]
	}
	set fname [encoding convertfrom $fname]
6346 6347 6348 6349
	lappend treefilelist($id) $fname
    }
    if {![eof $gtf]} {
	return [expr {$nl >= 1000? 2: 1}]
P
Paul Mackerras 已提交
6350 6351 6352 6353 6354 6355 6356 6357 6358 6359 6360 6361
    }
    close $gtf
    unset treepending
    if {$cmitmode ne "tree"} {
	if {![info exists diffmergeid]} {
	    gettreediffs $diffids
	}
    } elseif {$id ne $diffids} {
	gettree $diffids
    } else {
	setfilelist $id
    }
6362
    return 0
P
Paul Mackerras 已提交
6363 6364 6365
}

proc showfile {f} {
6366
    global treefilelist treeidlist diffids nullid nullid2
P
Paul Mackerras 已提交
6367 6368 6369 6370 6371 6372 6373
    global ctext commentend

    set i [lsearch -exact $treefilelist($diffids) $f]
    if {$i < 0} {
	puts "oops, $f not in list for id $diffids"
	return
    }
6374 6375 6376
    if {$diffids eq $nullid} {
	if {[catch {set bf [open $f r]} err]} {
	    puts "oops, can't read $f: $err"
6377 6378 6379
	    return
	}
    } else {
6380 6381 6382
	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"
6383 6384
	    return
	}
P
Paul Mackerras 已提交
6385
    }
6386
    fconfigure $bf -blocking 0 -encoding [get_path_encoding $f]
6387
    filerun $bf [list getblobline $bf $diffids]
P
Paul Mackerras 已提交
6388
    $ctext config -state normal
6389
    clear_ctext $commentend
P
Paul Mackerras 已提交
6390 6391 6392 6393
    $ctext insert end "\n"
    $ctext insert end "$f\n" filesep
    $ctext config -state disabled
    $ctext yview $commentend
6394
    settabs 0
P
Paul Mackerras 已提交
6395 6396 6397 6398 6399 6400 6401
}

proc getblobline {bf id} {
    global diffids cmitmode ctext

    if {$id ne $diffids || $cmitmode ne "tree"} {
	catch {close $bf}
6402
	return 0
P
Paul Mackerras 已提交
6403 6404
    }
    $ctext config -state normal
6405 6406
    set nl 0
    while {[incr nl] <= 1000 && [gets $bf line] >= 0} {
P
Paul Mackerras 已提交
6407 6408 6409 6410 6411 6412
	$ctext insert end "$line\n"
    }
    if {[eof $bf]} {
	# delete last newline
	$ctext delete "end - 2c" "end - 1c"
	close $bf
6413
	return 0
P
Paul Mackerras 已提交
6414 6415
    }
    $ctext config -state disabled
6416
    return [expr {$nl >= 1000? 2: 1}]
P
Paul Mackerras 已提交
6417 6418
}

6419
proc mergediff {id} {
6420
    global diffmergeid mdifffd
6421
    global diffids treediffs
6422
    global parents
6423
    global diffcontext
6424
    global diffencoding
6425
    global limitdiffs vfilelimit curview
6426

6427
    set diffmergeid $id
6428
    set diffids $id
6429
    set treediffs($id) {}
6430
    # this doesn't seem to actually affect anything...
6431
    set cmd [concat | git diff-tree --no-commit-id --cc -U$diffcontext $id]
6432 6433
    if {$limitdiffs && $vfilelimit($curview) ne {}} {
	set cmd [concat $cmd -- $vfilelimit($curview)]
6434
    }
6435
    if {[catch {set mdf [open $cmd r]} err]} {
6436
	error_popup "[mc "Error getting merge diffs:"] $err"
6437
	return
6438
    }
6439
    fconfigure $mdf -blocking 0 -encoding binary
6440
    set mdifffd($id) $mdf
6441
    set np [llength $parents($curview,$id)]
6442
    set diffencoding [get_path_encoding {}]
6443
    settabs $np
6444
    filerun $mdf [list getmergediffline $mdf $id $np]
6445 6446
}

6447
proc getmergediffline {mdf id np} {
6448
    global diffmergeid ctext cflist mergemax
6449
    global difffilestart mdifffd treediffs
6450
    global diffencoding
6451

6452 6453 6454 6455 6456
    $ctext conf -state normal
    set nr 0
    while {[incr nr] <= 1000 && [gets $mdf line] >= 0} {
	if {![info exists diffmergeid] || $id != $diffmergeid
	    || $mdf != $mdifffd($id)} {
6457
	    close $mdf
6458
	    return 0
6459
	}
6460 6461
	if {[regexp {^diff --cc (.*)} $line match fname]} {
	    # start of a new file
6462
	    set fname [encoding convertfrom $fname]
6463 6464 6465
	    $ctext insert end "\n"
	    set here [$ctext index "end - 1c"]
	    lappend difffilestart $here
6466
	    lappend treediffs($id) $fname
6467
	    add_flist [list $fname]
6468
	    set diffencoding [get_path_encoding $fname]
6469 6470 6471 6472
	    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]} {
6473
	    set line [encoding convertfrom $diffencoding $line]
6474 6475 6476 6477
	    $ctext insert end "$line\n" hunksep
	} elseif {[regexp {^[0-9a-f]{40}$} $line] || [regexp {^index} $line]} {
	    # do nothing
	} else {
6478
	    set line [encoding convertfrom $diffencoding $line]
6479 6480 6481 6482 6483 6484 6485 6486 6487 6488 6489 6490 6491 6492 6493 6494 6495
	    # 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
		}
6496
	    }
6497 6498 6499 6500 6501 6502 6503 6504 6505
	    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]
6506
	    }
6507 6508 6509 6510 6511 6512 6513
	    if {$num ne {}} {
		if {$num >= $mergemax} {
		    set num "max"
		}
		lappend tags m$num
	    }
	    $ctext insert end "$line\n" $tags
6514
	}
6515 6516
    }
    $ctext conf -state disabled
6517 6518 6519
    if {[eof $mdf]} {
	close $mdf
	return 0
6520
    }
6521
    return [expr {$nr >= 1000? 2: 1}]
6522 6523
}

6524
proc startdiff {ids} {
6525
    global treediffs diffids treepending diffmergeid nullid nullid2
6526

6527
    settabs 1
6528
    set diffids $ids
6529
    catch {unset diffmergeid}
6530 6531 6532
    if {![info exists treediffs($ids)] ||
	[lsearch -exact $ids $nullid] >= 0 ||
	[lsearch -exact $ids $nullid2] >= 0} {
6533
	if {![info exists treepending]} {
6534
	    gettreediffs $ids
6535 6536
	}
    } else {
6537
	addtocflist $ids
6538 6539 6540
    }
}

6541 6542 6543
proc path_filter {filter name} {
    foreach p $filter {
	set l [string length $p]
6544 6545 6546 6547 6548 6549 6550 6551 6552 6553
	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
	    }
6554 6555 6556 6557 6558
	}
    }
    return 0
}

6559
proc addtocflist {ids} {
6560
    global treediffs
6561

6562
    add_flist $treediffs($ids)
6563
    getblobdiffs $ids
6564 6565
}

6566
proc diffcmd {ids flags} {
6567
    global nullid nullid2
6568 6569

    set i [lsearch -exact $ids $nullid]
6570
    set j [lsearch -exact $ids $nullid2]
6571
    if {$i >= 0} {
6572 6573 6574 6575 6576 6577 6578 6579 6580 6581 6582 6583 6584 6585 6586 6587 6588
	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]
6589
	if {[llength $ids] > 1} {
6590
	    # comparing index with specific revision
6591 6592 6593 6594 6595 6596
	    if {$i == 0} {
		lappend cmd -R [lindex $ids 1]
	    } else {
		lappend cmd [lindex $ids 0]
	    }
	} else {
6597
	    # comparing index with HEAD
6598 6599 6600
	    lappend cmd HEAD
	}
    } else {
6601
	set cmd [concat | git diff-tree -r $flags $ids]
6602 6603 6604 6605
    }
    return $cmd
}

6606
proc gettreediffs {ids} {
6607
    global treediff treepending
6608

6609 6610
    if {[catch {set gdtf [open [diffcmd $ids {--no-commit-id}] r]}]} return

6611
    set treepending $ids
6612
    set treediff {}
6613
    fconfigure $gdtf -blocking 0 -encoding binary
6614
    filerun $gdtf [list gettreediffline $gdtf $ids]
6615 6616
}

6617
proc gettreediffline {gdtf ids} {
6618
    global treediff treediffs treepending diffids diffmergeid
6619
    global cmitmode vfilelimit curview limitdiffs perfile_attrs
6620

6621
    set nr 0
6622
    set sublist {}
6623 6624 6625 6626 6627 6628 6629 6630 6631 6632
    set max 1000
    if {$perfile_attrs} {
	# cache_gitattr is slow, and even slower on win32 where we
	# have to invoke it for only about 30 paths at a time
	set max 500
	if {[tk windowingsystem] == "win32"} {
	    set max 120
	}
    }
    while {[incr nr] <= $max && [gets $gdtf line] >= 0} {
6633 6634 6635 6636 6637 6638
	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]
	    }
6639
	    set file [encoding convertfrom $file]
6640
	    lappend treediff $file
6641
	    lappend sublist $file
6642
	}
6643
    }
6644 6645 6646
    if {$perfile_attrs} {
	cache_gitattr encoding $sublist
    }
6647
    if {![eof $gdtf]} {
6648
	return [expr {$nr >= $max? 2: 1}]
6649 6650
    }
    close $gdtf
6651
    if {$limitdiffs && $vfilelimit($curview) ne {}} {
6652 6653
	set flist {}
	foreach f $treediff {
6654
	    if {[path_filter $vfilelimit($curview) $f]} {
6655 6656 6657 6658 6659 6660 6661
		lappend flist $f
	    }
	}
	set treediffs($ids) $flist
    } else {
	set treediffs($ids) $treediff
    }
6662 6663 6664 6665 6666 6667
    unset treepending
    if {$cmitmode eq "tree"} {
	gettree $diffids
    } elseif {$ids != $diffids} {
	if {![info exists diffmergeid]} {
	    gettreediffs $diffids
6668
	}
6669 6670
    } else {
	addtocflist $ids
6671
    }
6672
    return 0
6673 6674
}

6675 6676 6677 6678 6679 6680 6681 6682 6683 6684 6685 6686 6687 6688 6689 6690
# 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
	}
    }
}

6691 6692 6693 6694
proc changeignorespace {} {
    reselectline
}

6695
proc getblobdiffs {ids} {
6696
    global blobdifffd diffids env
6697
    global diffinhdr treediffs
6698
    global diffcontext
6699
    global ignorespace
6700
    global limitdiffs vfilelimit curview
6701
    global diffencoding
6702

6703
    set cmd [diffcmd $ids "-p -C --no-commit-id -U$diffcontext"]
6704 6705 6706
    if {$ignorespace} {
	append cmd " -w"
    }
6707 6708
    if {$limitdiffs && $vfilelimit($curview) ne {}} {
	set cmd [concat $cmd -- $vfilelimit($curview)]
6709 6710
    }
    if {[catch {set bdf [open $cmd r]} err]} {
6711 6712 6713
	puts "error getting diffs: $err"
	return
    }
6714
    set diffinhdr 0
6715 6716
    set diffencoding [get_path_encoding {}]
    fconfigure $bdf -blocking 0 -encoding binary
6717
    set blobdifffd($ids) $bdf
6718
    filerun $bdf [list getblobdiffline $bdf $diffids]
6719 6720
}

6721 6722 6723 6724 6725 6726 6727 6728 6729 6730 6731 6732 6733
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
    }
}

6734 6735 6736 6737 6738 6739 6740 6741 6742 6743 6744 6745
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
}

6746
proc getblobdiffline {bdf ids} {
6747
    global diffids blobdifffd ctext curdiffstart
6748
    global diffnexthead diffnextnote difffilestart
6749
    global diffinhdr treediffs
6750
    global diffencoding
6751

6752
    set nr 0
6753
    $ctext conf -state normal
6754 6755 6756 6757
    while {[incr nr] <= 1000 && [gets $bdf line] >= 0} {
	if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
	    close $bdf
	    return 0
6758
	}
6759 6760 6761 6762
	if {![string compare -length 11 "diff --git " $line]} {
	    # trim off "diff --git "
	    set line [string range $line 11 end]
	    set diffinhdr 1
6763 6764
	    # start of a new file
	    $ctext insert end "\n"
6765 6766 6767 6768 6769 6770
	    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
6771 6772
	    # "rename to" or "copy from" and "copy to" lines following this,
	    # and we'll use them to get the filenames.
6773 6774 6775 6776 6777 6778 6779 6780
	    # 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
6781
	    }
6782 6783 6784 6785 6786
	    # 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}]]
6787
	    }
6788 6789
	    set fname [encoding convertfrom $fname]
	    set diffencoding [get_path_encoding $fname]
6790 6791 6792
	    makediffhdr $fname $ids

	} elseif {[regexp {^@@ -([0-9]+)(,[0-9]+)? \+([0-9]+)(,[0-9]+)? @@(.*)} \
6793
		       $line match f1l f1c f2l f2c rest]} {
6794
	    set line [encoding convertfrom $diffencoding $line]
6795 6796
	    $ctext insert end "$line\n" hunksep
	    set diffinhdr 0
6797 6798

	} elseif {$diffinhdr} {
6799
	    if {![string compare -length 12 "rename from " $line]} {
6800
		set fname [string range $line [expr 6 + [string first " from " $line] ] end]
6801 6802 6803
		if {[string index $fname 0] eq "\""} {
		    set fname [lindex $fname 0]
		}
6804
		set fname [encoding convertfrom $fname]
6805 6806 6807 6808
		set i [lsearch -exact $treediffs($ids) $fname]
		if {$i >= 0} {
		    setinlist difffilestart $i $curdiffstart
		}
6809 6810 6811
	    } 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]
6812 6813 6814
		if {[string index $fname 0] eq "\""} {
		    set fname [lindex $fname 0]
		}
6815 6816
		set fname [encoding convertfrom $fname]
		set diffencoding [get_path_encoding $fname]
6817 6818 6819 6820 6821 6822 6823 6824 6825 6826
		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

6827
	} else {
6828
	    set line [encoding convertfrom $diffencoding $line]
6829 6830 6831 6832 6833 6834 6835
	    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 {
6836 6837 6838
		# "\ No newline at end of file",
		# or something else we don't recognize
		$ctext insert end "$line\n" hunksep
6839 6840 6841 6842
	    }
	}
    }
    $ctext conf -state disabled
6843 6844 6845
    if {[eof $bdf]} {
	close $bdf
	return 0
6846
    }
6847
    return [expr {$nr >= 1000? 2: 1}]
6848 6849
}

6850 6851 6852 6853 6854 6855 6856
proc changediffdisp {} {
    global ctext diffelide

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

6857 6858 6859 6860 6861 6862 6863 6864 6865 6866
proc highlightfile {loc cline} {
    global ctext cflist cflist_top

    $ctext yview $loc
    $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
    $cflist tag add highlight $cline.0 "$cline.0 lineend"
    $cflist see $cline.0
    set cflist_top $cline
}

6867
proc prevfile {} {
6868 6869 6870 6871 6872
    global difffilestart ctext cmitmode

    if {$cmitmode eq "tree"} return
    set prev 0.0
    set prevline 1
6873 6874 6875
    set here [$ctext index @0,0]
    foreach loc $difffilestart {
	if {[$ctext compare $loc >= $here]} {
6876
	    highlightfile $prev $prevline
6877 6878 6879
	    return
	}
	set prev $loc
6880
	incr prevline
6881
    }
6882
    highlightfile $prev $prevline
6883 6884
}

6885
proc nextfile {} {
6886 6887 6888
    global difffilestart ctext cmitmode

    if {$cmitmode eq "tree"} return
6889
    set here [$ctext index @0,0]
6890
    set line 1
6891
    foreach loc $difffilestart {
6892
	incr line
6893
	if {[$ctext compare $loc > $here]} {
6894
	    highlightfile $loc $line
6895
	    return
6896 6897
	}
    }
6898 6899
}

6900 6901
proc clear_ctext {{first 1.0}} {
    global ctext smarktop smarkbot
6902
    global pendinglinks
6903

6904 6905 6906
    set l [lindex [split $first .] 0]
    if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} {
	set smarktop $l
6907
    }
6908 6909
    if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} {
	set smarkbot $l
6910 6911
    }
    $ctext delete $first end
6912 6913 6914
    if {$first eq "1.0"} {
	catch {unset pendinglinks}
    }
6915 6916
}

6917
proc settabs {{firstab {}}} {
6918
    global firsttabstop tabstop ctext have_tk85
6919 6920 6921 6922

    if {$firstab ne {} && $have_tk85} {
	set firsttabstop $firstab
    }
6923
    set w [font measure textfont "0"]
6924
    if {$firsttabstop != 0} {
6925 6926
	$ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \
			       [expr {($firsttabstop + 2 * $tabstop) * $w}]]
6927 6928 6929 6930 6931
    } elseif {$have_tk85 || $tabstop != 8} {
	$ctext conf -tabs [expr {$tabstop * $w}]
    } else {
	$ctext conf -tabs {}
    }
6932 6933 6934
}

proc incrsearch {name ix op} {
6935
    global ctext searchstring searchdirn
6936 6937

    $ctext tag remove found 1.0 end
6938 6939 6940 6941 6942 6943 6944 6945 6946 6947 6948
    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]
	}
    }
6949
    if {$searchstring ne {}} {
6950 6951 6952 6953
	set here [$ctext search $searchdirn -- $searchstring anchor]
	if {$here ne {}} {
	    $ctext see $here
	}
6954 6955 6956 6957 6958
	searchmarkvisible 1
    }
}

proc dosearch {} {
6959
    global sstring ctext searchstring searchdirn
6960 6961 6962

    focus $sstring
    $sstring icursor end
6963 6964 6965 6966 6967 6968 6969 6970 6971 6972 6973 6974 6975 6976 6977 6978 6979 6980 6981 6982 6983 6984 6985 6986 6987 6988 6989 6990 6991 6992 6993 6994 6995 6996 6997 6998 6999 7000 7001 7002 7003 7004 7005 7006
    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
7007 7008 7009 7010 7011 7012 7013 7014 7015 7016 7017 7018 7019 7020 7021 7022 7023 7024 7025 7026 7027 7028 7029 7030 7031 7032 7033 7034 7035 7036 7037 7038 7039 7040 7041 7042 7043 7044
    }
}

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} {
7045
    global searchstring
7046

7047
    .bleft.bottom.sb set $f0 $f1
7048 7049 7050 7051 7052
    if {$searchstring ne {}} {
	searchmarkvisible 0
    }
}

7053
proc setcoords {} {
7054
    global linespc charspc canvx0 canvy0
7055
    global xspc1 xspc2 lthickness
7056

7057 7058
    set linespc [font metrics mainfont -linespace]
    set charspc [font measure mainfont "m"]
P
Paul Mackerras 已提交
7059 7060
    set canvy0 [expr {int(3 + 0.5 * $linespc)}]
    set canvx0 [expr {int(3 + 0.5 * $linespc)}]
7061
    set lthickness [expr {int($linespc / 9) + 1}]
7062 7063
    set xspc1(0) $linespc
    set xspc2 $linespc
7064
}
7065

7066
proc redisplay {} {
7067
    global canv
P
Paul Mackerras 已提交
7068 7069 7070 7071 7072 7073
    global selectedline

    set ymax [lindex [$canv cget -scrollregion] 3]
    if {$ymax eq {} || $ymax == 0} return
    set span [$canv yview]
    clear_display
7074
    setcanvscroll
P
Paul Mackerras 已提交
7075 7076
    allcanvs yview moveto [lindex $span 0]
    drawvisible
7077
    if {$selectedline ne {}} {
P
Paul Mackerras 已提交
7078
	selectline $selectedline 0
7079
	allcanvs yview moveto [lindex $span 0]
7080 7081 7082
    }
}

7083 7084 7085 7086 7087 7088 7089 7090 7091
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)}]
7092
    }
7093 7094 7095 7096 7097 7098 7099 7100 7101 7102
    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}
	}
7103
    }
7104 7105 7106 7107 7108 7109 7110 7111 7112 7113 7114 7115 7116 7117 7118 7119
}

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"
7120
    }
7121 7122
    if {$fontattr($f,slant) eq "italic"} {
	lappend n "italic"
7123
    }
7124
    return $n
7125 7126
}

7127
proc incrfont {inc} {
7128
    global mainfont textfont ctext canv cflist showrefstop
7129 7130
    global stopped entries fontattr

7131
    unmarkmatches
7132
    set s $fontattr(mainfont,size)
7133 7134 7135 7136
    incr s $inc
    if {$s < 1} {
	set s 1
    }
7137
    set fontattr(mainfont,size) $s
7138 7139
    font config mainfont -size $s
    font config mainfontbold -size $s
7140 7141
    set mainfont [fontname mainfont]
    set s $fontattr(textfont,size)
7142 7143 7144 7145
    incr s $inc
    if {$s < 1} {
	set s 1
    }
7146
    set fontattr(textfont,size) $s
7147 7148
    font config textfont -size $s
    font config textfontbold -size $s
7149
    set textfont [fontname textfont]
7150
    setcoords
7151
    settabs
7152 7153
    redisplay
}
7154

7155 7156 7157 7158 7159 7160 7161
proc clearsha1 {} {
    global sha1entry sha1string
    if {[string length $sha1string] == 40} {
	$sha1entry delete 0 end
    }
}

7162 7163 7164 7165 7166 7167 7168 7169 7170 7171
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"} {
7172
	$sha1but conf -state normal -relief raised -text "[mc "Goto:"] "
7173
    } else {
7174
	$sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] "
7175 7176 7177 7178
    }
}

proc gotocommit {} {
7179
    global sha1string tagids headids curview varcid
7180

7181 7182 7183 7184
    if {$sha1string == {}
	|| ([info exists currentid] && $sha1string == $currentid)} return
    if {[info exists tagids($sha1string)]} {
	set id $tagids($sha1string)
7185 7186
    } elseif {[info exists headids($sha1string)]} {
	set id $headids($sha1string)
7187 7188
    } else {
	set id [string tolower $sha1string]
7189
	if {[regexp {^[0-9a-f]{4,39}$} $id]} {
7190
	    set matches [longid $id]
7191 7192
	    if {$matches ne {}} {
		if {[llength $matches] > 1} {
7193
		    error_popup [mc "Short SHA1 id %s is ambiguous" $id]
7194 7195
		    return
		}
7196
		set id [lindex $matches 0]
7197 7198
	    }
	}
7199
    }
7200 7201
    if {[commitinview $id $curview]} {
	selectline [rowofcommit $id] 1
7202 7203
	return
    }
7204
    if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
7205
	set msg [mc "SHA1 id %s is not known" $sha1string]
7206
    } else {
7207
	set msg [mc "Tag/Head %s is not known" $sha1string]
7208
    }
7209
    error_popup $msg
7210 7211
}

7212 7213 7214 7215
proc lineenter {x y id} {
    global hoverx hovery hoverid hovertimer
    global commitinfo canv

P
Paul Mackerras 已提交
7216
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
7217 7218 7219 7220 7221 7222 7223 7224 7225 7226 7227 7228 7229 7230 7231 7232 7233 7234 7235 7236 7237 7238 7239 7240 7241 7242 7243 7244 7245 7246 7247 7248 7249 7250 7251 7252 7253 7254 7255
    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
7256
    global commitinfo
7257 7258 7259 7260 7261 7262 7263 7264 7265

    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}]
7266
    set x1 [expr {$x + [font measure mainfont $text] + 2 * $lthickness}]
7267 7268 7269 7270
    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
7271
    set t [$canv create text $x $y -anchor nw -text $text -tags hover \
7272
	       -font mainfont]
7273 7274 7275
    $canv raise $t
}

7276
proc clickisonarrow {id y} {
P
Paul Mackerras 已提交
7277
    global lthickness
7278

P
Paul Mackerras 已提交
7279
    set ranges [rowranges $id]
7280
    set thresh [expr {2 * $lthickness + 6}]
P
Paul Mackerras 已提交
7281
    set n [expr {[llength $ranges] - 1}]
7282
    for {set i 1} {$i < $n} {incr i} {
P
Paul Mackerras 已提交
7283
	set row [lindex $ranges $i]
7284 7285
	if {abs([yc $row] - $y) < $thresh} {
	    return $i
7286 7287 7288 7289 7290
	}
    }
    return {}
}

7291
proc arrowjump {id n y} {
P
Paul Mackerras 已提交
7292
    global canv
7293

7294 7295
    # 1 <-> 2, 3 <-> 4, etc...
    set n [expr {(($n - 1) ^ 1) + 1}]
P
Paul Mackerras 已提交
7296
    set row [lindex [rowranges $id] $n]
7297
    set yt [yc $row]
7298 7299 7300 7301 7302 7303 7304 7305
    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
    }
7306
    allcanvs yview moveto $yfrac
7307 7308
}

7309
proc lineclick {x y id isnew} {
7310
    global ctext commitinfo children canv thickerline curview
7311

P
Paul Mackerras 已提交
7312
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
7313
    unmarkmatches
7314
    unselectline
7315 7316 7317 7318
    normalline
    $canv delete hover
    # draw this line thicker than normal
    set thickerline $id
7319
    drawlines $id
7320
    if {$isnew} {
7321 7322 7323 7324 7325 7326 7327 7328 7329 7330 7331 7332 7333
	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]
7334
    }
7335 7336
    # fill the details pane with info about this line
    $ctext conf -state normal
7337
    clear_ctext
7338
    settabs 0
7339
    $ctext insert end "[mc "Parent"]:\t"
7340 7341
    $ctext insert end $id link0
    setlink $id link0
7342
    set info $commitinfo($id)
7343
    $ctext insert end "\n\t[lindex $info 0]\n"
7344
    $ctext insert end "\t[mc "Author"]:\t[lindex $info 1]\n"
P
Paul Mackerras 已提交
7345
    set date [formatdate [lindex $info 2]]
7346
    $ctext insert end "\t[mc "Date"]:\t$date\n"
7347
    set kids $children($curview,$id)
7348
    if {$kids ne {}} {
7349
	$ctext insert end "\n[mc "Children"]:"
7350
	set i 0
7351
	foreach child $kids {
7352
	    incr i
P
Paul Mackerras 已提交
7353
	    if {![info exists commitinfo($child)] && ![getcommit $child]} continue
7354
	    set info $commitinfo($child)
7355
	    $ctext insert end "\n\t"
7356 7357
	    $ctext insert end $child link$i
	    setlink $child link$i
7358
	    $ctext insert end "\n\t[lindex $info 0]"
7359
	    $ctext insert end "\n\t[mc "Author"]:\t[lindex $info 1]"
P
Paul Mackerras 已提交
7360
	    set date [formatdate [lindex $info 2]]
7361
	    $ctext insert end "\n\t[mc "Date"]:\t$date\n"
7362 7363 7364
	}
    }
    $ctext conf -state disabled
7365
    init_flist {}
7366 7367
}

7368 7369 7370
proc normalline {} {
    global thickerline
    if {[info exists thickerline]} {
7371
	set id $thickerline
7372
	unset thickerline
7373
	drawlines $id
7374 7375 7376
    }
}

7377
proc selbyid {id} {
7378 7379 7380
    global curview
    if {[commitinview $id $curview]} {
	selectline [rowofcommit $id] 1
7381 7382 7383 7384 7385 7386 7387 7388 7389 7390 7391 7392
    }
}

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} {
7393
    global rowctxmenu selectedline rowmenuid curview
7394
    global nullid nullid2 fakerowmenu mainhead
7395

7396
    stopfinding
7397
    set rowmenuid $id
7398
    if {$selectedline eq {} || [rowofcommit $id] eq $selectedline} {
7399 7400 7401 7402
	set state disabled
    } else {
	set state normal
    }
7403
    if {$id ne $nullid && $id ne $nullid2} {
7404
	set menu $rowctxmenu
7405 7406 7407 7408 7409
	if {$mainhead ne {}} {
	    $menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead]
	} else {
	    $menu entryconfigure 7 -label [mc "Detached head: can't reset" $mainhead] -state disabled
	}
7410 7411 7412
    } else {
	set menu $fakerowmenu
    }
7413 7414 7415
    $menu entryconfigure [mca "Diff this -> selected"] -state $state
    $menu entryconfigure [mca "Diff selected -> this"] -state $state
    $menu entryconfigure [mca "Make patch"] -state $state
7416
    tk_popup $menu $x $y
7417 7418 7419
}

proc diffvssel {dirn} {
7420
    global rowmenuid selectedline
7421

7422
    if {$selectedline eq {}} return
7423
    if {$dirn} {
7424
	set oldid [commitonrow $selectedline]
7425 7426 7427
	set newid $rowmenuid
    } else {
	set oldid $rowmenuid
7428
	set newid [commitonrow $selectedline]
7429
    }
7430 7431 7432 7433 7434
    addtohistory [list doseldiff $oldid $newid]
    doseldiff $oldid $newid
}

proc doseldiff {oldid newid} {
7435
    global ctext
7436 7437
    global commitinfo

7438
    $ctext conf -state normal
7439
    clear_ctext
7440 7441
    init_flist [mc "Top"]
    $ctext insert end "[mc "From"] "
7442 7443
    $ctext insert end $oldid link0
    setlink $oldid link0
7444
    $ctext insert end "\n     "
7445
    $ctext insert end [lindex $commitinfo($oldid) 0]
7446
    $ctext insert end "\n\n[mc "To"]   "
7447 7448
    $ctext insert end $newid link1
    setlink $newid link1
7449
    $ctext insert end "\n     "
7450 7451 7452 7453
    $ctext insert end [lindex $commitinfo($newid) 0]
    $ctext insert end "\n"
    $ctext conf -state disabled
    $ctext tag remove found 1.0 end
7454
    startdiff [list $oldid $newid]
7455 7456
}

7457 7458 7459 7460 7461 7462 7463 7464 7465 7466 7467 7468
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
7469
    label $top.title -text [mc "Generate patch"]
7470
    grid $top.title - -pady 10
7471
    label $top.from -text [mc "From:"]
7472
    entry $top.fromsha1 -width 40 -relief flat
7473 7474 7475
    $top.fromsha1 insert 0 $oldid
    $top.fromsha1 conf -state readonly
    grid $top.from $top.fromsha1 -sticky w
7476
    entry $top.fromhead -width 60 -relief flat
7477 7478 7479
    $top.fromhead insert 0 $oldhead
    $top.fromhead conf -state readonly
    grid x $top.fromhead -sticky w
7480
    label $top.to -text [mc "To:"]
7481
    entry $top.tosha1 -width 40 -relief flat
7482 7483 7484
    $top.tosha1 insert 0 $newid
    $top.tosha1 conf -state readonly
    grid $top.to $top.tosha1 -sticky w
7485
    entry $top.tohead -width 60 -relief flat
7486 7487 7488
    $top.tohead insert 0 $newhead
    $top.tohead conf -state readonly
    grid x $top.tohead -sticky w
7489
    button $top.rev -text [mc "Reverse"] -command mkpatchrev -padx 5
7490
    grid $top.rev x -pady 10
7491
    label $top.flab -text [mc "Output file:"]
7492 7493 7494
    entry $top.fname -width 60
    $top.fname insert 0 [file normalize "patch$patchnum.patch"]
    incr patchnum
7495
    grid $top.flab $top.fname -sticky w
7496
    frame $top.buts
7497 7498
    button $top.buts.gen -text [mc "Generate"] -command mkpatchgo
    button $top.buts.can -text [mc "Cancel"] -command mkpatchcan
7499 7500 7501 7502
    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
7503
    focus $top.fname
7504 7505 7506 7507 7508 7509 7510 7511 7512 7513 7514 7515 7516 7517 7518 7519 7520 7521 7522
}

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 {} {
7523
    global patchtop nullid nullid2
7524 7525 7526 7527

    set oldid [$patchtop.fromsha1 get]
    set newid [$patchtop.tosha1 get]
    set fname [$patchtop.fname get]
7528
    set cmd [diffcmd [list $oldid $newid] -p]
7529 7530
    # trim off the initial "|"
    set cmd [lrange $cmd 1 end]
7531 7532
    lappend cmd >$fname &
    if {[catch {eval exec $cmd} err]} {
7533
	error_popup "[mc "Error creating patch:"] $err"
7534 7535 7536 7537 7538 7539 7540 7541 7542 7543 7544 7545
    }
    catch {destroy $patchtop}
    unset patchtop
}

proc mkpatchcan {} {
    global patchtop

    catch {destroy $patchtop}
    unset patchtop
}

7546 7547 7548 7549 7550 7551 7552
proc mktag {} {
    global rowmenuid mktagtop commitinfo

    set top .maketag
    set mktagtop $top
    catch {destroy $top}
    toplevel $top
7553
    label $top.title -text [mc "Create tag"]
7554
    grid $top.title - -pady 10
7555
    label $top.id -text [mc "ID:"]
7556
    entry $top.sha1 -width 40 -relief flat
7557 7558 7559
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
7560
    entry $top.head -width 60 -relief flat
7561 7562 7563
    $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
    $top.head conf -state readonly
    grid x $top.head -sticky w
7564
    label $top.tlab -text [mc "Tag name:"]
7565
    entry $top.tag -width 60
7566 7567
    grid $top.tlab $top.tag -sticky w
    frame $top.buts
7568 7569
    button $top.buts.gen -text [mc "Create"] -command mktaggo
    button $top.buts.can -text [mc "Cancel"] -command mktagcan
7570 7571 7572 7573 7574 7575 7576 7577 7578 7579 7580 7581 7582
    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 == {}} {
7583
	error_popup [mc "No tag name specified"]
7584 7585 7586
	return
    }
    if {[info exists tagids($tag)]} {
7587
	error_popup [mc "Tag \"%s\" already exists" $tag]
7588 7589 7590
	return
    }
    if {[catch {
7591
	exec git tag $tag $id
7592
    } err]} {
7593
	error_popup "[mc "Error creating tag:"] $err"
7594 7595 7596 7597 7598
	return
    }

    set tagids($tag) $id
    lappend idtags($id) $tag
7599
    redrawtags $id
7600
    addedtag $id
7601 7602
    dispneartags 0
    run refill_reflist
7603 7604 7605
}

proc redrawtags {id} {
7606 7607
    global canv linehtag idpos currentid curview cmitlisted
    global canvxmax iddrawn circleitem mainheadid circlecolors
7608

7609
    if {![commitinview $id $curview]} return
7610
    if {![info exists iddrawn($id)]} return
7611
    set row [rowofcommit $id]
7612 7613 7614 7615 7616 7617
    if {$id eq $mainheadid} {
	set ofill yellow
    } else {
	set ofill [lindex $circlecolors $cmitlisted($curview,$id)]
    }
    $canv itemconf $circleitem($row) -fill $ofill
7618 7619
    $canv delete tag.$id
    set xt [eval drawtags $id $idpos($id)]
7620 7621 7622 7623
    $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 已提交
7624 7625 7626 7627
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
7628 7629
    if {[info exists currentid] && $currentid == $id} {
	make_secsel $row
7630 7631 7632 7633 7634 7635 7636 7637 7638 7639 7640 7641 7642 7643 7644
    }
}

proc mktagcan {} {
    global mktagtop

    catch {destroy $mktagtop}
    unset mktagtop
}

proc mktaggo {} {
    domktag
    mktagcan
}

7645 7646 7647 7648 7649 7650 7651
proc writecommit {} {
    global rowmenuid wrcomtop commitinfo wrcomcmd

    set top .writecommit
    set wrcomtop $top
    catch {destroy $top}
    toplevel $top
7652
    label $top.title -text [mc "Write commit to file"]
7653
    grid $top.title - -pady 10
7654
    label $top.id -text [mc "ID:"]
7655 7656 7657 7658 7659 7660 7661 7662
    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
7663
    label $top.clab -text [mc "Command:"]
7664 7665
    entry $top.cmd -width 60 -textvariable wrcomcmd
    grid $top.clab $top.cmd -sticky w -pady 10
7666
    label $top.flab -text [mc "Output file:"]
7667 7668 7669 7670
    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
7671 7672
    button $top.buts.gen -text [mc "Write"] -command wrcomgo
    button $top.buts.can -text [mc "Cancel"] -command wrcomcan
7673 7674 7675 7676 7677 7678 7679 7680 7681 7682 7683 7684 7685 7686
    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]} {
7687
	error_popup "[mc "Error writing commit:"] $err"
7688 7689 7690 7691 7692 7693 7694 7695 7696 7697 7698 7699
    }
    catch {destroy $wrcomtop}
    unset wrcomtop
}

proc wrcomcan {} {
    global wrcomtop

    catch {destroy $wrcomtop}
    unset wrcomtop
}

7700 7701 7702 7703 7704 7705
proc mkbranch {} {
    global rowmenuid mkbrtop

    set top .makebranch
    catch {destroy $top}
    toplevel $top
7706
    label $top.title -text [mc "Create new branch"]
7707
    grid $top.title - -pady 10
7708
    label $top.id -text [mc "ID:"]
7709 7710 7711 7712
    entry $top.sha1 -width 40 -relief flat
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
7713
    label $top.nlab -text [mc "Name:"]
7714
    entry $top.name -width 40
7715
    bind $top.name <Key-Return> "[list mkbrgo $top]"
7716 7717
    grid $top.nlab $top.name -sticky w
    frame $top.buts
7718 7719
    button $top.buts.go -text [mc "Create"] -command [list mkbrgo $top]
    button $top.buts.can -text [mc "Cancel"] -command "catch {destroy $top}"
7720 7721 7722 7723 7724 7725 7726 7727 7728 7729 7730 7731
    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]
7732 7733
    set cmdargs {}
    set old_id {}
7734
    if {$name eq {}} {
7735
	error_popup [mc "Please specify a name for the new branch"]
7736 7737
	return
    }
7738 7739 7740 7741 7742 7743 7744 7745
    if {[info exists headids($name)]} {
	if {![confirm_popup [mc \
		"Branch '%s' already exists. Overwrite?" $name]]} {
	    return
	}
	set old_id $headids($name)
	lappend cmdargs -f
    }
7746
    catch {destroy $top}
7747
    lappend cmdargs $name $id
7748 7749 7750
    nowbusy newbranch
    update
    if {[catch {
7751
	eval exec git branch $cmdargs
7752 7753 7754 7755 7756
    } err]} {
	notbusy newbranch
	error_popup $err
    } else {
	notbusy newbranch
7757 7758 7759 7760 7761 7762 7763 7764 7765 7766 7767
	if {$old_id ne {}} {
	    movehead $id $name
	    movedhead $id $name
	    redrawtags $old_id
	    redrawtags $id
	} else {
	    set headids($name) $id
	    lappend idheads($id) $name
	    addedhead $id $name
	    redrawtags $id
	}
7768
	dispneartags 0
7769
	run refill_reflist
7770 7771 7772
    }
}

7773
proc cherrypick {} {
7774
    global rowmenuid curview
7775
    global mainhead mainheadid
7776

7777 7778 7779
    set oldhead [exec git rev-parse HEAD]
    set dheads [descheads $rowmenuid]
    if {$dheads ne {} && [lsearch -exact $dheads $oldhead] >= 0} {
7780 7781 7782
	set ok [confirm_popup [mc "Commit %s is already\
		included in branch %s -- really re-apply it?" \
				   [string range $rowmenuid 0 7] $mainhead]]
7783 7784
	if {!$ok} return
    }
7785
    nowbusy cherrypick [mc "Cherry-picking"]
7786 7787 7788 7789 7790 7791 7792 7793 7794 7795 7796
    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
7797
	error_popup [mc "No changes committed"]
7798 7799
	return
    }
7800
    addnewchild $newhead $oldhead
7801 7802
    if {[commitinview $oldhead $curview]} {
	insertrow $newhead $oldhead $curview
7803
	if {$mainhead ne {}} {
7804
	    movehead $newhead $mainhead
7805 7806
	    movedhead $newhead $mainhead
	}
7807
	set mainheadid $newhead
7808 7809
	redrawtags $oldhead
	redrawtags $newhead
7810
	selbyid $newhead
7811 7812 7813 7814
    }
    notbusy cherrypick
}

7815
proc resethead {} {
7816
    global mainhead rowmenuid confirm_ok resettype
7817 7818 7819 7820 7821

    set confirm_ok 0
    set w ".confirmreset"
    toplevel $w
    wm transient $w .
7822
    wm title $w [mc "Confirm reset"]
7823
    message $w.m -text \
7824
	[mc "Reset branch %s to %s?" $mainhead [string range $rowmenuid 0 7]] \
7825 7826 7827
	-justify center -aspect 1000
    pack $w.m -side top -fill x -padx 20 -pady 20
    frame $w.f -relief sunken -border 2
7828
    message $w.f.rt -text [mc "Reset type:"] -aspect 1000
7829 7830 7831
    grid $w.f.rt -sticky w
    set resettype mixed
    radiobutton $w.f.soft -value soft -variable resettype -justify left \
7832
	-text [mc "Soft: Leave working tree and index untouched"]
7833 7834
    grid $w.f.soft -sticky w
    radiobutton $w.f.mixed -value mixed -variable resettype -justify left \
7835
	-text [mc "Mixed: Leave working tree untouched, reset index"]
7836 7837
    grid $w.f.mixed -sticky w
    radiobutton $w.f.hard -value hard -variable resettype -justify left \
7838
	-text [mc "Hard: Reset working tree and index\n(discard ALL local changes)"]
7839 7840
    grid $w.f.hard -sticky w
    pack $w.f -side top -fill x
7841
    button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w"
7842
    pack $w.ok -side left -fill x -padx 20 -pady 20
7843
    button $w.cancel -text [mc Cancel] -command "destroy $w"
7844 7845 7846 7847
    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
7848
    if {[catch {set fd [open \
7849
	    [list | git reset --$resettype $rowmenuid 2>@1] r]} err]} {
7850 7851
	error_popup $err
    } else {
7852
	dohidelocalchanges
7853
	filerun $fd [list readresetstat $fd]
7854
	nowbusy reset [mc "Resetting"]
7855
	selbyid $rowmenuid
7856 7857 7858
    }
}

7859 7860
proc readresetstat {fd} {
    global mainhead mainheadid showlocalchanges rprogcoord
7861 7862 7863

    if {[gets $fd line] >= 0} {
	if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
7864 7865
	    set rprogcoord [expr {1.0 * $m / $n}]
	    adjustprogress
7866 7867 7868
	}
	return 1
    }
7869 7870
    set rprogcoord 0
    adjustprogress
7871 7872 7873 7874 7875 7876 7877 7878 7879 7880
    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
7881
	redrawtags $oldhead
7882
	redrawtags $newhead
7883 7884 7885 7886
    }
    if {$showlocalchanges} {
	doshowlocalchanges
    }
7887
    return 0
7888 7889
}

7890 7891
# context menu for a head
proc headmenu {x y id head} {
7892
    global headmenuid headmenuhead headctxmenu mainhead
7893

7894
    stopfinding
7895 7896
    set headmenuid $id
    set headmenuhead $head
7897 7898 7899 7900 7901 7902
    set state normal
    if {$head eq $mainhead} {
	set state disabled
    }
    $headctxmenu entryconfigure 0 -state $state
    $headctxmenu entryconfigure 1 -state $state
7903 7904 7905 7906
    tk_popup $headctxmenu $x $y
}

proc cobranch {} {
7907
    global headmenuid headmenuhead headids
7908
    global showlocalchanges mainheadid
7909 7910

    # check the tree is clean first??
7911
    nowbusy checkout [mc "Checking out"]
7912
    update
7913
    dohidelocalchanges
7914
    if {[catch {
7915
	set fd [open [list | git checkout $headmenuhead 2>@1] r]
7916 7917 7918
    } err]} {
	notbusy checkout
	error_popup $err
7919 7920 7921
	if {$showlocalchanges} {
	    dodiffindex
	}
7922
    } else {
7923 7924 7925 7926 7927 7928 7929 7930 7931 7932 7933
	filerun $fd [list readcheckoutstat $fd $headmenuhead $headmenuid]
    }
}

proc readcheckoutstat {fd newhead newheadid} {
    global mainhead mainheadid headids showlocalchanges progresscoords

    if {[gets $fd line] >= 0} {
	if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
	    set progresscoords [list 0 [expr {1.0 * $m / $n}]]
	    adjustprogress
7934
	}
7935 7936 7937 7938 7939 7940 7941 7942
	return 1
    }
    set progresscoords {0 0}
    adjustprogress
    notbusy checkout
    if {[catch {close $fd} err]} {
	error_popup $err
    }
7943
    set oldmainid $mainheadid
7944 7945
    set mainhead $newhead
    set mainheadid $newheadid
7946
    redrawtags $oldmainid
7947 7948
    redrawtags $newheadid
    selbyid $newheadid
7949 7950
    if {$showlocalchanges} {
	dodiffindex
7951 7952 7953 7954
    }
}

proc rmbranch {} {
7955
    global headmenuid headmenuhead mainhead
7956
    global idheads
7957 7958 7959

    set head $headmenuhead
    set id $headmenuid
7960
    # this check shouldn't be needed any more...
7961
    if {$head eq $mainhead} {
7962
	error_popup [mc "Cannot delete the currently checked-out branch"]
7963 7964
	return
    }
7965
    set dheads [descheads $id]
7966
    if {[llength $dheads] == 1 && $idheads($dheads) eq $head} {
7967
	# the stuff on this branch isn't on any other branch
7968 7969
	if {![confirm_popup [mc "The commits on branch %s aren't on any other\
			branch.\nReally delete branch %s?" $head $head]]} return
7970 7971 7972 7973 7974 7975 7976 7977
    }
    nowbusy rmbranch
    update
    if {[catch {exec git branch -D $head} err]} {
	notbusy rmbranch
	error_popup $err
	return
    }
7978
    removehead $id $head
7979
    removedhead $id $head
7980 7981
    redrawtags $id
    notbusy rmbranch
7982
    dispneartags 0
7983 7984 7985 7986 7987
    run refill_reflist
}

# Display a list of tags and heads
proc showrefs {} {
7988 7989
    global showrefstop bgcolor fgcolor selectbgcolor
    global bglist fglist reflistfilter reflist maincursor
7990 7991 7992 7993 7994 7995 7996 7997 7998

    set top .showrefs
    set showrefstop $top
    if {[winfo exists $top]} {
	raise $top
	refill_reflist
	return
    }
    toplevel $top
7999
    wm title $top [mc "Tags and heads: %s" [file tail [pwd]]]
8000
    text $top.list -background $bgcolor -foreground $fgcolor \
8001
	-selectbackground $selectbgcolor -font mainfont \
8002 8003 8004 8005 8006 8007 8008 8009 8010 8011 8012
	-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
8013 8014
    label $top.f.l -text "[mc "Filter"]: "
    entry $top.f.e -width 20 -textvariable reflistfilter
8015 8016 8017 8018 8019
    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
8020
    button $top.close -command [list destroy $top] -text [mc "Close"]
8021 8022 8023 8024 8025 8026 8027 8028 8029 8030 8031 8032 8033 8034 8035 8036 8037 8038 8039 8040 8041 8042 8043 8044 8045 8046 8047 8048 8049 8050 8051 8052 8053 8054 8055 8056 8057 8058 8059 8060 8061
    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
8062
    global curview
8063 8064 8065 8066 8067

    if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
    set refs {}
    foreach n [array names headids] {
	if {[string match $reflistfilter $n]} {
8068
	    if {[commitinview $headids($n) $curview]} {
8069 8070
		lappend refs [list $n H]
	    } else {
8071
		interestedin $headids($n) {run refill_reflist}
8072 8073 8074 8075 8076
	    }
	}
    }
    foreach n [array names tagids] {
	if {[string match $reflistfilter $n]} {
8077
	    if {[commitinview $tagids($n) $curview]} {
8078 8079
		lappend refs [list $n T]
	    } else {
8080
		interestedin $tagids($n) {run refill_reflist}
8081 8082 8083 8084 8085
	    }
	}
    }
    foreach n [array names otherrefids] {
	if {[string match $reflistfilter $n]} {
8086
	    if {[commitinview $otherrefids($n) $curview]} {
8087 8088
		lappend refs [list $n o]
	    } else {
8089
		interestedin $otherrefids($n) {run refill_reflist}
8090 8091 8092 8093 8094 8095 8096 8097 8098 8099 8100 8101 8102 8103 8104 8105 8106 8107 8108 8109 8110 8111 8112 8113 8114 8115 8116 8117 8118 8119 8120 8121 8122 8123 8124 8125 8126 8127 8128 8129 8130 8131 8132 8133 8134 8135 8136 8137 8138
	    }
	}
    }
    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
8139 8140
}

P
Paul Mackerras 已提交
8141 8142
# Stuff for finding nearby tags
proc getallcommits {} {
8143 8144
    global allcommits nextarc seeds allccache allcwait cachedarcs allcupdate
    global idheads idtags idotherrefs allparents tagobjid
8145

8146 8147 8148 8149
    if {![info exists allcommits]} {
	set nextarc 0
	set allcommits 0
	set seeds {}
8150 8151 8152 8153 8154 8155 8156 8157
	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
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
    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
8195
    }
8196 8197 8198 8199 8200 8201 8202 8203 8204 8205 8206 8207 8208 8209 8210 8211 8212 8213
}

# 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} {
8214
    global allparents allchildren idtags idheads nextarc
8215
    global arcnos arcids arctags arcout arcend arcstart archeads growing
8216 8217
    global seeds allcommits cachedarcs allcupdate
    
8218
    set nid 0
8219
    while {[incr nid] <= 1000 && [gets $fd line] >= 0} {
8220 8221 8222 8223 8224
	set id [lindex $line 0]
	if {[info exists allparents($id)]} {
	    # seen it already
	    continue
	}
8225
	set cachedarcs 0
8226 8227 8228 8229 8230 8231 8232 8233 8234 8235 8236 8237
	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 已提交
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 8263 8264 8265 8266 8267 8268 8269 8270 8271 8272 8273 8274 8275 8276 8277 8278 8279 8280 8281 8282 8283 8284
		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
8285
    }
8286 8287 8288 8289 8290 8291
    if {$nid > 0} {
	global cached_dheads cached_dtags cached_atags
	catch {unset cached_dheads}
	catch {unset cached_dtags}
	catch {unset cached_atags}
    }
8292 8293 8294
    if {![eof $fd]} {
	return [expr {$nid >= 1000? 2: 1}]
    }
8295 8296 8297 8298 8299 8300 8301 8302 8303 8304 8305 8306
    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
	}
8307
	error_popup "[mc "Error reading commit topology information;\
8308
		branch and preceding/following tag information\
8309
	        will be incomplete."]\n($err)"
8310 8311
	set cacheok 0
    }
8312 8313
    if {[incr allcommits -1] == 0} {
	notbusy allcommits
8314 8315 8316
	if {$cacheok} {
	    run savecache
	}
8317 8318
    }
    dispneartags 0
8319
    return 0
P
Paul Mackerras 已提交
8320 8321
}

8322 8323
proc recalcarc {a} {
    global arctags archeads arcids idtags idheads
P
Paul Mackerras 已提交
8324

8325 8326 8327 8328 8329 8330 8331 8332
    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 已提交
8333
	}
8334
    }
8335 8336
    set arctags($a) $at
    set archeads($a) $ah
P
Paul Mackerras 已提交
8337 8338
}

8339
proc splitarc {p} {
8340
    global arcnos arcids nextarc arctags archeads idtags idheads
8341
    global arcstart arcend arcout allparents growing
8342

8343 8344 8345 8346 8347 8348 8349 8350 8351 8352 8353 8354 8355 8356 8357 8358 8359 8360 8361 8362 8363 8364 8365 8366 8367 8368 8369 8370 8371 8372 8373 8374 8375
    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
8376
	} else {
8377 8378
	    set j [lsearch -exact $arcnos($id) $a]
	    set arcnos($id) [lreplace $arcnos($id) $j $j $na]
8379
	}
8380 8381 8382 8383 8384 8385 8386 8387 8388 8389 8390 8391 8392 8393 8394
    }

    # 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} {
8395
    global allparents allchildren idtags nextarc
8396
    global arcnos arcids arctags arcout arcend arcstart archeads growing
8397
    global seeds allcommits
8398

8399
    if {![info exists allcommits] || ![info exists arcnos($p)]} return
8400 8401 8402 8403 8404 8405 8406 8407 8408 8409 8410 8411 8412 8413 8414 8415 8416 8417
    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]
}

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 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 8531 8532 8533 8534 8535 8536 8537 8538 8539 8540 8541 8542 8543 8544 8545 8546 8547 8548 8549 8550 8551 8552 8553 8554 8555 8556 8557 8558 8559 8560 8561 8562 8563 8564 8565 8566 8567 8568 8569 8570 8571 8572 8573 8574 8575 8576 8577 8578 8579 8580 8581 8582 8583
# 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
    }
}

8584 8585 8586 8587 8588 8589 8590 8591 8592
# 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).
8593 8594
	# Or both can be BMPs with no incoming arcs.
	if {$a eq $b || $arcnos($a) eq {}} {
8595
	    return 0
8596
	}
8597 8598 8599 8600 8601 8602 8603 8604
	# 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
8605 8606
	}
    }
8607 8608 8609 8610 8611 8612 8613

    if {![info exists arcout($a)]} {
	set arc [lindex $arcnos($a) 0]
	if {[info exists arcend($arc)]} {
	    set aend $arcend($arc)
	} else {
	    set aend {}
8614
	}
8615 8616 8617 8618 8619 8620 8621 8622 8623 8624
	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 {}
8625
	}
8626 8627 8628
	set b $arcstart($arc)
    } else {
	set bend $b
8629
    }
8630 8631 8632 8633 8634 8635 8636 8637 8638 8639 8640 8641 8642 8643 8644 8645 8646 8647
    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
	}
8648 8649
    }

8650 8651 8652 8653 8654 8655 8656 8657 8658 8659 8660 8661 8662 8663 8664 8665 8666 8667 8668 8669 8670 8671 8672 8673 8674 8675 8676 8677 8678 8679 8680
    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 已提交
8681

8682 8683 8684 8685 8686 8687 8688 8689 8690 8691 8692 8693 8694 8695 8696 8697 8698 8699 8700
# 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 已提交
8701
	}
8702 8703 8704 8705
	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 已提交
8706
	}
8707 8708 8709 8710 8711 8712 8713 8714 8715 8716 8717 8718 8719 8720 8721 8722 8723 8724 8725 8726 8727 8728 8729 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 8756 8757 8758 8759 8760 8761 8762 8763 8764 8765 8766 8767 8768 8769 8770 8771 8772 8773 8774
    }
    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 已提交
8775 8776
	}
    }
8777 8778 8779
    foreach x [array names growanc] {
	if {$dl($x)} {
	    return 0
P
Paul Mackerras 已提交
8780
	}
8781
	return 0
P
Paul Mackerras 已提交
8782
    }
8783
    return 1
P
Paul Mackerras 已提交
8784 8785
}

8786 8787
proc validate_arctags {a} {
    global arctags idtags
P
Paul Mackerras 已提交
8788

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
    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 已提交
8838
	    }
8839 8840
	    if {$tid ne {}} {
		return $tid
P
Paul Mackerras 已提交
8841 8842
	    }
	}
8843 8844 8845 8846 8847 8848 8849 8850 8851 8852 8853 8854 8855 8856 8857 8858 8859 8860 8861 8862 8863 8864 8865 8866 8867 8868 8869 8870 8871 8872 8873 8874 8875 8876 8877 8878 8879 8880 8881 8882 8883 8884 8885 8886 8887 8888 8889 8890 8891 8892 8893 8894 8895 8896 8897 8898 8899 8900 8901 8902 8903 8904 8905 8906
	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 已提交
8907
	}
8908
    }
8909 8910 8911 8912 8913 8914 8915 8916 8917 8918 8919 8920
    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
8921

8922 8923 8924 8925 8926 8927 8928 8929 8930 8931 8932 8933 8934 8935
    # 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
8936 8937 8938 8939
	    }
	}
    }

8940 8941 8942 8943 8944 8945 8946 8947 8948
    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
	    }
8949
	}
8950 8951 8952 8953
	if {$tags eq $ctags} {
	    set cached_dtags($origid) $tags
	} else {
	    set tags $ctags
8954
	}
8955 8956 8957 8958 8959 8960 8961
    } 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"
8962
    }
8963 8964
    return $tags
}
8965

8966 8967 8968 8969 8970 8971 8972 8973 8974 8975 8976 8977 8978 8979 8980 8981 8982 8983 8984 8985 8986
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
		}
	    }
8987
	}
8988 8989 8990 8991 8992 8993 8994 8995 8996 8997 8998 8999 9000 9001 9002 9003 9004 9005 9006 9007 9008 9009 9010 9011 9012 9013 9014 9015 9016 9017 9018 9019 9020 9021 9022 9023 9024 9025 9026 9027 9028 9029 9030 9031 9032 9033 9034 9035 9036 9037 9038 9039 9040 9041 9042 9043 9044 9045 9046 9047 9048 9049 9050 9051 9052 9053 9054 9055 9056 9057 9058 9059 9060 9061 9062 9063 9064 9065 9066 9067 9068 9069 9070
	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
		}
	    }
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
    # 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
9106
	}
9107 9108 9109 9110 9111 9112 9113
    } 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"
9114
    }
9115
    return $tags
9116 9117
}

9118 9119 9120 9121 9122
# 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
9123

9124 9125 9126
    if {![info exists allparents($id)]} {
	return {}
    }
9127
    set aret {}
9128 9129 9130 9131 9132 9133 9134 9135 9136
    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
9137
		lappend aret $t
9138
	    }
9139
	}
9140
	set id $arcstart($a)
9141
    }
9142 9143 9144
    set origid $id
    set todo [list $id]
    set seen($id) 1
9145
    set ret {}
9146 9147 9148 9149 9150 9151 9152 9153 9154 9155
    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 {}} {
9156 9157 9158 9159
		    validate_archeads $a
		    if {$archeads($a) ne {}} {
			set ret [concat $ret $archeads($a)]
		    }
9160 9161 9162 9163 9164 9165 9166
		}
		set d $arcstart($a)
		if {![info exists seen($d)]} {
		    lappend todo $d
		    set seen($d) 1
		}
	    }
9167 9168
	}
    }
9169 9170
    set ret [lsort -unique $ret]
    set cached_dheads($origid) $ret
9171
    return [concat $ret $aret]
9172 9173
}

9174 9175
proc addedtag {id} {
    global arcnos arcout cached_dtags cached_atags
9176

9177 9178 9179
    if {![info exists arcnos($id)]} return
    if {![info exists arcout($id)]} {
	recalcarc [lindex $arcnos($id) 0]
9180
    }
9181 9182
    catch {unset cached_dtags}
    catch {unset cached_atags}
9183 9184
}

9185 9186 9187 9188 9189 9190 9191 9192 9193 9194 9195 9196 9197 9198 9199 9200 9201 9202
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
9203

9204 9205 9206
    if {![info exists arcnos($hid)]} return
    if {![info exists arcout($hid)]} {
	recalcarc [lindex $arcnos($hid) 0]
9207
    }
9208 9209 9210 9211 9212 9213 9214 9215 9216 9217 9218 9219 9220 9221
    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
	    }
9222 9223
	}
    }
9224 9225 9226
    catch {unset cached_dtags}
    catch {unset cached_atags}
    catch {unset cached_dheads}
9227 9228
}

9229
proc rereadrefs {} {
9230
    global idtags idheads idotherrefs mainheadid
9231 9232 9233 9234 9235 9236 9237 9238

    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]
	}
    }
9239
    set oldmainhead $mainheadid
9240
    readrefs
9241
    changedrefs
9242 9243 9244 9245
    set refids [lsort -unique [concat $refids [array names idtags] \
			[array names idheads] [array names idotherrefs]]]
    foreach id $refids {
	set v [listrefs $id]
9246
	if {![info exists ref($id)] || $ref($id) != $v} {
9247 9248 9249
	    redrawtags $id
	}
    }
9250 9251 9252 9253
    if {$oldmainhead ne $mainheadid} {
	redrawtags $oldmainhead
	redrawtags $mainheadid
    }
9254
    run refill_reflist
9255 9256
}

9257 9258 9259 9260 9261 9262 9263 9264 9265 9266 9267 9268 9269 9270 9271 9272 9273 9274
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]
}

9275
proc showtag {tag isnew} {
9276
    global ctext tagcontents tagids linknum tagobjid
9277 9278 9279 9280 9281

    if {$isnew} {
	addtohistory [list showtag $tag 0]
    }
    $ctext conf -state normal
9282
    clear_ctext
9283
    settabs 0
9284
    set linknum 0
9285 9286 9287 9288 9289
    if {![info exists tagcontents($tag)]} {
	catch {
	    set tagcontents($tag) [exec git cat-file tag $tagobjid($tag)]
	}
    }
9290 9291 9292
    if {[info exists tagcontents($tag)]} {
	set text $tagcontents($tag)
    } else {
9293
	set text "[mc "Tag"]: $tag\n[mc "Id"]:  $tagids($tag)"
9294
    }
9295
    appendwithlinks $text {}
9296
    $ctext conf -state disabled
9297
    init_flist {}
9298 9299
}

9300 9301
proc doquit {} {
    global stopped
9302 9303
    global gitktmpdir

9304
    set stopped 100
9305
    savestuff .
9306
    destroy .
9307 9308 9309 9310

    if {[info exists gitktmpdir]} {
	catch {file delete -force $gitktmpdir}
    }
9311
}
9312

P
Paul Mackerras 已提交
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 9338
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
9339
	wm title $top [mc "Gitk font chooser"]
9340
	label $top.l -textvariable fontparam(which)
P
Paul Mackerras 已提交
9341 9342 9343 9344 9345 9346 9347 9348 9349 9350 9351 9352 9353 9354 9355
	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 \
9356
	    -font {{Times New Roman} 12 bold} -text [mc "B"] -indicatoron 0 \
P
Paul Mackerras 已提交
9357 9358
	    -variable fontparam(weight) -onvalue bold -offvalue normal
	checkbutton $top.g.ital -padx 5 \
9359
	    -font {{Times New Roman} 12 italic} -text [mc "I"] -indicatoron 0  \
P
Paul Mackerras 已提交
9360 9361 9362 9363 9364 9365 9366 9367 9368 9369
	    -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
9370 9371
	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 已提交
9372 9373 9374 9375 9376 9377 9378 9379 9380 9381 9382 9383 9384 9385 9386 9387 9388 9389 9390 9391 9392 9393 9394 9395 9396 9397 9398 9399 9400 9401 9402 9403 9404 9405 9406 9407 9408 9409 9410 9411 9412 9413 9414 9415 9416 9417 9418 9419 9420 9421 9422 9423 9424 9425 9426 9427 9428 9429 9430 9431 9432 9433 9434
	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)
}

9435
proc doprefs {} {
9436
    global maxwidth maxgraphpct
9437
    global oldprefs prefstop showneartags showlocalchanges
9438
    global bgcolor fgcolor ctext diffcolors selectbgcolor
9439
    global tabstop limitdiffs autoselect extdifftool perfile_attrs
P
Paul Mackerras 已提交
9440

9441 9442 9443 9444 9445
    set top .gitkprefs
    set prefstop $top
    if {[winfo exists $top]} {
	raise $top
	return
9446
    }
P
Paul Mackerras 已提交
9447
    foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
9448
		   limitdiffs tabstop perfile_attrs} {
9449
	set oldprefs($v) [set $v]
P
Paul Mackerras 已提交
9450
    }
9451
    toplevel $top
9452 9453
    wm title $top [mc "Gitk preferences"]
    label $top.ldisp -text [mc "Commit list display options"]
9454 9455
    grid $top.ldisp - -sticky w -pady 10
    label $top.spacer -text " "
9456
    label $top.maxwidthl -text [mc "Maximum graph width (lines)"] \
9457 9458 9459
	-font optionfont
    spinbox $top.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
    grid $top.spacer $top.maxwidthl $top.maxwidth -sticky w
9460
    label $top.maxpctl -text [mc "Maximum graph width (% of pane)"] \
9461 9462 9463
	-font optionfont
    spinbox $top.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
    grid x $top.maxpctl $top.maxpct -sticky w
9464
    frame $top.showlocal
9465
    label $top.showlocal.l -text [mc "Show local changes"] -font optionfont
9466 9467 9468
    checkbutton $top.showlocal.b -variable showlocalchanges
    pack $top.showlocal.b $top.showlocal.l -side left
    grid x $top.showlocal -sticky w
9469 9470 9471 9472 9473
    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
9474

9475
    label $top.ddisp -text [mc "Diff display options"]
9476
    grid $top.ddisp - -sticky w -pady 10
9477
    label $top.tabstopl -text [mc "Tab spacing"] -font optionfont
9478 9479
    spinbox $top.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
    grid x $top.tabstopl $top.tabstop -sticky w
P
Paul Mackerras 已提交
9480
    frame $top.ntag
9481
    label $top.ntag.l -text [mc "Display nearby tags"] -font optionfont
P
Paul Mackerras 已提交
9482 9483 9484
    checkbutton $top.ntag.b -variable showneartags
    pack $top.ntag.b $top.ntag.l -side left
    grid x $top.ntag -sticky w
9485
    frame $top.ldiff
9486
    label $top.ldiff.l -text [mc "Limit diffs to listed paths"] -font optionfont
9487 9488 9489
    checkbutton $top.ldiff.b -variable limitdiffs
    pack $top.ldiff.b $top.ldiff.l -side left
    grid x $top.ldiff -sticky w
9490 9491 9492 9493 9494
    frame $top.lattr
    label $top.lattr.l -text [mc "Support per-file encodings"] -font optionfont
    checkbutton $top.lattr.b -variable perfile_attrs
    pack $top.lattr.b $top.lattr.l -side left
    grid x $top.lattr -sticky w
9495

9496 9497 9498 9499 9500 9501 9502 9503 9504
    entry $top.extdifft -textvariable extdifftool
    frame $top.extdifff
    label $top.extdifff.l -text [mc "External diff tool" ] -font optionfont \
	-padx 10
    button $top.extdifff.b -text [mc "Choose..."] -font optionfont \
	-command choose_extdiff
    pack $top.extdifff.l $top.extdifff.b -side left
    grid x $top.extdifff $top.extdifft -sticky w

9505
    label $top.cdisp -text [mc "Colors: press to choose"]
9506 9507
    grid $top.cdisp - -sticky w -pady 10
    label $top.bg -padx 40 -relief sunk -background $bgcolor
9508
    button $top.bgbut -text [mc "Background"] -font optionfont \
9509
	-command [list choosecolor bgcolor {} $top.bg background setbg]
9510 9511
    grid x $top.bgbut $top.bg -sticky w
    label $top.fg -padx 40 -relief sunk -background $fgcolor
9512
    button $top.fgbut -text [mc "Foreground"] -font optionfont \
9513
	-command [list choosecolor fgcolor {} $top.fg foreground setfg]
9514 9515
    grid x $top.fgbut $top.fg -sticky w
    label $top.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]
9516
    button $top.diffoldbut -text [mc "Diff: old lines"] -font optionfont \
9517 9518 9519 9520
	-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]
9521
    button $top.diffnewbut -text [mc "Diff: new lines"] -font optionfont \
9522 9523 9524 9525
	-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]
9526
    button $top.hunksepbut -text [mc "Diff: hunk header"] -font optionfont \
9527 9528 9529 9530
	-command [list choosecolor diffcolors 2 $top.hunksep \
		      "diff hunk header" \
		      [list $ctext tag conf hunksep -foreground]]
    grid x $top.hunksepbut $top.hunksep -sticky w
9531
    label $top.selbgsep -padx 40 -relief sunk -background $selectbgcolor
9532
    button $top.selbgbut -text [mc "Select bg"] -font optionfont \
9533
	-command [list choosecolor selectbgcolor {} $top.selbgsep background setselbg]
9534
    grid x $top.selbgbut $top.selbgsep -sticky w
9535

9536
    label $top.cfont -text [mc "Fonts: press to choose"]
P
Paul Mackerras 已提交
9537
    grid $top.cfont - -sticky w -pady 10
9538 9539 9540
    mkfontdisp mainfont $top [mc "Main font"]
    mkfontdisp textfont $top [mc "Diff display font"]
    mkfontdisp uifont $top [mc "User interface font"]
P
Paul Mackerras 已提交
9541

9542
    frame $top.buts
9543 9544
    button $top.buts.ok -text [mc "OK"] -command prefsok -default active
    button $top.buts.can -text [mc "Cancel"] -command prefscan -default normal
9545 9546 9547 9548
    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
9549
    bind $top <Visibility> "focus $top.buts.ok"
9550 9551
}

9552 9553 9554 9555 9556 9557 9558 9559 9560
proc choose_extdiff {} {
    global extdifftool

    set prog [tk_getOpenFile -title "External diff tool" -multiple false]
    if {$prog ne {}} {
	set extdifftool $prog
    }
}

9561 9562 9563 9564
proc choosecolor {v vi w x cmd} {
    global $v

    set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \
9565
	       -title [mc "Gitk: choose color for %s" $x]]
9566 9567 9568 9569 9570 9571
    if {$c eq {}} return
    $w conf -background $c
    lset $v $vi $c
    eval $cmd $c
}

9572 9573 9574 9575 9576 9577 9578 9579 9580 9581
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
}

9582 9583 9584 9585 9586 9587 9588 9589 9590 9591 9592 9593 9594 9595 9596 9597 9598 9599
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
}

9600
proc prefscan {} {
9601
    global oldprefs prefstop
9602

P
Paul Mackerras 已提交
9603
    foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
9604
		   limitdiffs tabstop perfile_attrs} {
9605
	global $v
9606 9607 9608 9609
	set $v $oldprefs($v)
    }
    catch {destroy $prefstop}
    unset prefstop
P
Paul Mackerras 已提交
9610
    fontcan
9611 9612 9613 9614
}

proc prefsok {} {
    global maxwidth maxgraphpct
9615
    global oldprefs prefstop showneartags showlocalchanges
P
Paul Mackerras 已提交
9616
    global fontpref mainfont textfont uifont
9617
    global limitdiffs treediffs perfile_attrs
9618 9619 9620

    catch {destroy $prefstop}
    unset prefstop
P
Paul Mackerras 已提交
9621 9622 9623 9624 9625 9626 9627 9628 9629 9630 9631 9632 9633 9634 9635 9636 9637 9638 9639 9640 9641
    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]
    }
9642
    settabs
9643 9644 9645 9646 9647 9648 9649
    if {$showlocalchanges != $oldprefs(showlocalchanges)} {
	if {$showlocalchanges} {
	    doshowlocalchanges
	} else {
	    dohidelocalchanges
	}
    }
9650 9651 9652 9653
    if {$limitdiffs != $oldprefs(limitdiffs) ||
	($perfile_attrs && !$oldprefs(perfile_attrs))} {
	# treediffs elements are limited by path;
	# won't have encodings cached if perfile_attrs was just turned on
9654 9655
	catch {unset treediffs}
    }
P
Paul Mackerras 已提交
9656
    if {$fontchanged || $maxwidth != $oldprefs(maxwidth)
9657 9658
	|| $maxgraphpct != $oldprefs(maxgraphpct)} {
	redisplay
9659 9660
    } elseif {$showneartags != $oldprefs(showneartags) ||
	  $limitdiffs != $oldprefs(limitdiffs)} {
P
Paul Mackerras 已提交
9661
	reselectline
9662 9663 9664 9665
    }
}

proc formatdate {d} {
9666
    global datetimeformat
9667
    if {$d ne {}} {
9668
	set d [clock format $d -format $datetimeformat]
9669 9670
    }
    return $d
P
Paul Mackerras 已提交
9671 9672
}

9673 9674 9675 9676 9677 9678 9679 9680 9681 9682 9683 9684 9685 9686 9687 9688 9689 9690 9691 9692 9693 9694 9695 9696 9697 9698 9699 9700 9701 9702 9703 9704 9705 9706 9707 9708 9709 9710 9711 9712 9713 9714 9715 9716 9717 9718 9719 9720 9721 9722 9723 9724 9725 9726 9727 9728 9729 9730 9731 9732 9733 9734 9735 9736 9737 9738 9739 9740 9741 9742 9743 9744 9745 9746 9747 9748 9749 9750 9751 9752 9753 9754 9755 9756 9757 9758 9759 9760 9761 9762 9763 9764 9765 9766 9767 9768 9769 9770 9771 9772 9773 9774 9775 9776 9777 9778 9779 9780 9781 9782 9783 9784 9785 9786 9787 9788 9789 9790 9791 9792 9793 9794 9795 9796 9797 9798 9799 9800 9801 9802 9803 9804 9805 9806 9807 9808 9809 9810 9811 9812 9813 9814 9815 9816 9817 9818 9819 9820 9821 9822 9823 9824 9825 9826 9827 9828 9829 9830 9831 9832 9833 9834 9835 9836 9837 9838 9839 9840 9841 9842 9843 9844 9845 9846 9847 9848 9849 9850 9851 9852 9853 9854 9855 9856 9857 9858 9859 9860 9861 9862 9863 9864 9865 9866 9867 9868 9869 9870 9871 9872 9873 9874 9875 9876
# 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 }
9877
    { Shift_JIS MS_Kanji csShiftJIS ShiftJIS Shift-JIS }
9878 9879 9880 9881 9882 9883 9884 9885 9886 9887 9888 9889 9890 9891 9892 9893 9894 9895 9896 9897 9898 9899 9900 9901 9902 9903 9904 9905 9906 9907 9908 9909 9910 9911
    { 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} {
9912 9913 9914 9915
    global encoding_aliases tcl_encoding_cache
    if {[info exists tcl_encoding_cache($enc)]} {
	return $tcl_encoding_cache($enc)
    }
9916 9917 9918 9919 9920 9921
    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"
9922
	if {[regsub {^(iso|cp|ibm|jis)[-_]} $enc {\1} encx]} {
9923 9924 9925 9926 9927 9928 9929 9930 9931 9932 9933
	    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} {
9934
		    if {[regsub {^(iso|cp|ibm|jis)[-_]} $e {\1} ex]} {
9935 9936 9937 9938 9939 9940 9941 9942
			set i [lsearch -exact $lcnames $ex]
		    }
		}
		if {$i >= 0} break
	    }
	    break
	}
    }
9943
    set tclenc {}
9944
    if {$i >= 0} {
9945
	set tclenc [lindex $names $i]
9946
    }
9947 9948
    set tcl_encoding_cache($enc) $tclenc
    return $tclenc
9949 9950
}

9951
proc gitattr {path attr default} {
9952 9953 9954 9955 9956 9957 9958
    global path_attr_cache
    if {[info exists path_attr_cache($attr,$path)]} {
	set r $path_attr_cache($attr,$path)
    } else {
	set r "unspecified"
	if {![catch {set line [exec git check-attr $attr -- $path]}]} {
	    regexp "(.*): encoding: (.*)" $line m f r
9959
	}
9960
	set path_attr_cache($attr,$path) $r
9961 9962 9963 9964 9965
    }
    if {$r eq "unspecified"} {
	return $default
    }
    return $r
9966 9967
}

9968
proc cache_gitattr {attr pathlist} {
9969 9970 9971 9972 9973 9974 9975 9976 9977 9978 9979 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990
    global path_attr_cache
    set newlist {}
    foreach path $pathlist {
	if {![info exists path_attr_cache($attr,$path)]} {
	    lappend newlist $path
	}
    }
    set lim 1000
    if {[tk windowingsystem] == "win32"} {
	# windows has a 32k limit on the arguments to a command...
	set lim 30
    }
    while {$newlist ne {}} {
	set head [lrange $newlist 0 [expr {$lim - 1}]]
	set newlist [lrange $newlist $lim end]
	if {![catch {set rlist [eval exec git check-attr $attr -- $head]}]} {
	    foreach row [split $rlist "\n"] {
		if {[regexp "(.*): encoding: (.*)" $row m path value]} {
		    if {[string index $path 0] eq "\""} {
			set path [encoding convertfrom [lindex $path 0]]
		    }
		    set path_attr_cache($attr,$path) $value
9991
		}
9992
	    }
9993
	}
9994
    }
9995 9996
}

9997
proc get_path_encoding {path} {
9998 9999 10000 10001 10002 10003
    global gui_encoding perfile_attrs
    set tcl_enc $gui_encoding
    if {$path ne {} && $perfile_attrs} {
	set enc2 [tcl_encoding [gitattr $path encoding $tcl_enc]]
	if {$enc2 ne {}} {
	    set tcl_enc $enc2
10004
	}
10005 10006
    }
    return $tcl_enc
10007 10008
}

10009 10010
# First check that Tcl/Tk is recent enough
if {[catch {package require Tk 8.4} err]} {
10011 10012
    show_error {} . [mc "Sorry, gitk cannot run with this version of Tcl/Tk.\n\
		     Gitk requires at least Tcl/Tk 8.4."]
10013 10014 10015
    exit 1
}

10016
# defaults...
10017
set wrcomcmd "git diff-tree --stdin -p --pretty"
10018

10019
set gitencoding {}
10020
catch {
10021
    set gitencoding [exec git config --get i18n.commitencoding]
10022 10023
}
if {$gitencoding == ""} {
10024 10025 10026 10027 10028
    set gitencoding "utf-8"
}
set tclencoding [tcl_encoding $gitencoding]
if {$tclencoding == {}} {
    puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
10029
}
10030

10031 10032
set gui_encoding [encoding system]
catch {
10033 10034 10035 10036 10037 10038 10039 10040 10041
    set enc [exec git config --get gui.encoding]
    if {$enc ne {}} {
	set tclenc [tcl_encoding $enc]
	if {$tclenc ne {}} {
	    set gui_encoding $tclenc
	} else {
	    puts stderr "Warning: encoding $enc is not supported by Tcl/Tk"
	}
    }
10042 10043
}

10044 10045
set mainfont {Helvetica 9}
set textfont {Courier 9}
10046
set uifont {Helvetica 9 bold}
10047
set tabstop 8
10048
set findmergefiles 0
10049
set maxgraphpct 50
10050
set maxwidth 16
P
Paul Mackerras 已提交
10051
set revlistorder 0
10052
set fastdate 0
10053 10054 10055
set uparrowlen 5
set downarrowlen 5
set mingaplen 100
P
Paul Mackerras 已提交
10056
set cmitmode "patch"
10057
set wrapcomment "none"
P
Paul Mackerras 已提交
10058
set showneartags 1
10059
set maxrefs 20
10060
set maxlinelen 200
10061
set showlocalchanges 1
10062
set limitdiffs 1
10063
set datetimeformat "%Y-%m-%d %H:%M:%S"
10064
set autoselect 1
10065
set perfile_attrs 0
10066

10067 10068
set extdifftool "meld"

10069
set colors {green red blue magenta darkgrey brown orange}
10070 10071 10072
set bgcolor white
set fgcolor black
set diffcolors {red "#00a000" blue}
10073
set diffcontext 3
10074
set ignorespace 0
10075
set selectbgcolor gray85
10076

10077 10078
set circlecolors {white blue gray blue blue}

10079 10080 10081 10082 10083 10084 10085
# button for popping up context menus
if {[tk windowingsystem] eq "aqua"} {
    set ctxbut <Button-2>
} else {
    set ctxbut <Button-3>
}

10086 10087 10088 10089 10090 10091 10092 10093 10094 10095 10096 10097 10098 10099 10100 10101 10102 10103 10104
## 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

10105 10106
catch {source ~/.gitk}

10107
font create optionfont -family sans-serif -size -12
10108

10109 10110 10111 10112 10113 10114 10115 10116 10117 10118
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]
10119

10120 10121
setoptions

10122
# check that we can find a .git directory somewhere...
10123
if {[catch {set gitdir [gitdir]}]} {
10124
    show_error {} . [mc "Cannot find a git repository here."]
10125 10126
    exit 1
}
10127
if {![file isdirectory $gitdir]} {
10128
    show_error {} . [mc "Cannot find the git directory \"%s\"." $gitdir]
10129 10130 10131
    exit 1
}

10132 10133 10134
set selecthead {}
set selectheadid {}

10135
set revtreeargs {}
10136 10137
set cmdline_files {}
set i 0
10138
set revtreeargscmd {}
10139
foreach arg $argv {
10140
    switch -glob -- $arg {
10141
	"" { }
10142 10143 10144 10145
	"--" {
	    set cmdline_files [lrange $argv [expr {$i + 1}] end]
	    break
	}
10146 10147 10148
	"--select-commit=*" {
	    set selecthead [string range $arg 16 end]
	}
10149 10150 10151
	"--argscmd=*" {
	    set revtreeargscmd [string range $arg 10 end]
	}
10152 10153 10154 10155
	default {
	    lappend revtreeargs $arg
	}
    }
10156
    incr i
10157
}
10158

10159 10160 10161 10162
if {$selecthead eq "HEAD"} {
    set selecthead {}
}

10163
if {$i >= [llength $argv] && $revtreeargs ne {}} {
10164
    # no -- on command line, but some arguments (other than --argscmd)
10165
    if {[catch {
10166
	set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs]
10167 10168 10169
	set cmdline_files [split $f "\n"]
	set n [llength $cmdline_files]
	set revtreeargs [lrange $revtreeargs 0 end-$n]
10170 10171 10172 10173 10174
	# 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]} {
10175 10176
		show_error {} . [mc "Ambiguous argument '%s': both revision\
				 and filename" $arg]
10177 10178 10179
		exit 1
	    }
	}
10180 10181 10182 10183 10184
    } 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 已提交
10185
	    set err [string range $err [expr {$i + 6}] end]
10186
	}
10187
	show_error {} . "[mc "Bad arguments to gitk:"]\n$err"
10188 10189 10190 10191
	exit 1
    }
}

10192
set nullid "0000000000000000000000000000000000000000"
10193
set nullid2 "0000000000000000000000000000000000000001"
10194
set nullfile "/dev/null"
10195

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

10198
set runq {}
10199 10200
set history {}
set historyindex 0
10201 10202
set fh_serial 0
set nhl_names {}
10203
set highlight_paths {}
10204
set findpattern {}
10205
set searchdirn -forwards
10206 10207
set boldrows {}
set boldnamerows {}
10208
set diffelide {0 0}
10209
set markingmatches 0
10210
set linkentercount 0
10211 10212
set need_redisplay 0
set nrows_drawn 0
10213
set firsttabstop 0
P
Paul Mackerras 已提交
10214

P
Paul Mackerras 已提交
10215 10216
set nextviewnum 1
set curview 0
10217
set selectedview 0
10218 10219
set selectedhlview [mc "None"]
set highlight_related [mc "None"]
10220
set highlight_files {}
P
Paul Mackerras 已提交
10221
set viewfiles(0) {}
10222
set viewperm(0) 0
10223
set viewargs(0) {}
10224
set viewargscmd(0) {}
P
Paul Mackerras 已提交
10225

10226
set selectedline {}
10227
set numcommits 0
10228
set loginstance 0
10229
set cmdlineok 0
10230
set stopped 0
10231
set stuffsaved 0
10232
set patchnum 0
10233
set lserial 0
10234
set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}]
10235
setcoords
10236
makewindow
10237 10238
# wait for the window to become visible
tkwait visibility .
10239
wm title . "[file tail $argv0]: [file tail [pwd]]"
10240
readrefs
10241

10242
if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} {
P
Paul Mackerras 已提交
10243 10244
    # create a view for the files/dirs specified on the command line
    set curview 1
10245
    set selectedview 1
P
Paul Mackerras 已提交
10246
    set nextviewnum 2
10247
    set viewname(1) [mc "Command line"]
P
Paul Mackerras 已提交
10248
    set viewfiles(1) $cmdline_files
10249
    set viewargs(1) $revtreeargs
10250
    set viewargscmd(1) $revtreeargscmd
10251
    set viewperm(1) 0
10252
    set vdatemode(1) 0
10253
    addviewmenu 1
10254 10255
    .bar.view entryconf [mca "Edit view..."] -state normal
    .bar.view entryconf [mca "Delete view"] -state normal
P
Paul Mackerras 已提交
10256
}
10257 10258 10259 10260 10261 10262 10263

if {[info exists permviews]} {
    foreach v $permviews {
	set n $nextviewnum
	incr nextviewnum
	set viewname($n) [lindex $v 0]
	set viewfiles($n) [lindex $v 1]
10264
	set viewargs($n) [lindex $v 2]
10265
	set viewargscmd($n) [lindex $v 3]
10266
	set viewperm($n) 1
10267
	addviewmenu $n
10268 10269
    }
}
10270
getcommits {}