gitk 294.9 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
		# remove from origargs in case we hit an unknown option
		set origargs [lreplace $origargs $i $i]
		incr i -1
	    }
	    "-[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=*" {
164 165
		# These request or affect diff output, which we don't want.
		# Some could be used to set our defaults for diff display.
P
Paul Mackerras 已提交
166 167 168 169 170 171 172 173 174
		lappend diffargs $arg
	    }
	    "--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" {
175 176
		# These cause our parsing of git log's output to fail, or else
		# they're options we want to set ourselves, so ignore them.
P
Paul Mackerras 已提交
177 178 179 180 181
	    }
	    "--stat=*" - "--numstat" - "--shortstat" - "--summary" -
	    "--check" - "--exit-code" - "--quiet" - "--topo-order" -
	    "--full-history" - "--dense" - "--sparse" -
	    "--follow" - "--left-right" - "--encoding=*" {
182
		# These are harmless, and some are even useful
P
Paul Mackerras 已提交
183 184 185 186 187 188 189
		lappend glflags $arg
	    }
	    "--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" -
190 191
	    "-S*" - "--pickaxe-all" - "--pickaxe-regex" {
		# These mean that we get a subset of the commits
P
Paul Mackerras 已提交
192 193 194 195
		set filtered 1
		lappend glflags $arg
	    }
	    "-n" {
196 197
		# This appears to be the only one that has a value as a
		# separate word following it
P
Paul Mackerras 已提交
198 199 200 201
		set filtered 1
		set nextisval 1
		lappend glflags $arg
	    }
202
	    "--not" - "--all" {
P
Paul Mackerras 已提交
203
		lappend revargs $arg
204 205 206
	    }
	    "--merge" {
		set vmergeonly($n) 1
P
Paul Mackerras 已提交
207 208 209 210
		# git rev-parse doesn't understand --merge
		lappend revargs --gitk-symmetric-diff-marker MERGE_HEAD...HEAD
	    }
	    "-*" {
211
		# Other flag arguments including -<n>
P
Paul Mackerras 已提交
212 213 214 215 216 217 218 219
		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
220 221
	    }
	    default {
222
		# Non-flag arguments specify commits or ranges of commits
P
Paul Mackerras 已提交
223 224 225 226 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
		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
	    }
	}		    
268
	error_popup "[mc "Error parsing revisions:"] $err"
P
Paul Mackerras 已提交
269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290
	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
291
	    }
P
Paul Mackerras 已提交
292
	    lappend pos $id
293
	}
P
Paul Mackerras 已提交
294
	incr sdm -1
295
    }
P
Paul Mackerras 已提交
296 297 298
    set vposids($view) $pos
    set vnegids($view) $neg
    return $ret
299 300
}

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

    set startmsecs [clock clicks -milliseconds]
312
    set commitidx($view) 0
313 314 315
    # these are set this way for the error exits
    set viewcomplete($view) 1
    set viewactive($view) 0
316 317
    varcinit $view

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

    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 已提交
347 348 349 350 351 352 353 354 355 356
    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)
    }

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

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

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

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

proc stop_backends {} {
    global commfd

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

412
proc stop_rev_list {view} {
413
    global viewinstances
414

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

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

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

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

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

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

P
Paul Mackerras 已提交
454
    set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}]
455
    rereadrefs
456 457 458
    set view $curview
    if {$mainheadid ne $viewmainheadid_orig($view)} {
	if {$showlocalchanges} {
459 460
	    dohidelocalchanges
	}
461 462 463 464
	set viewmainheadid($view) $mainheadid
	set viewmainheadid_orig($view) $mainheadid
	if {$vfilelimit($view) ne {}} {
	    get_viewmainhead $view
465 466
	}
    }
467 468 469
    if {$showlocalchanges} {
	doshowlocalchanges
    }
P
Paul Mackerras 已提交
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 499 500 501 502 503
    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)
    }
504 505
    if {[catch {
	set fd [open [concat | git log --no-color -z --pretty=raw --parents \
P
Paul Mackerras 已提交
506
			  --boundary $args "--" $vfilelimit($view)] r]
507
    } err]} {
508
	error_popup "[mc "Error executing git log:"] $err"
P
Paul Mackerras 已提交
509
	return
510 511 512 513
    }
    if {$viewactive($view) == 0} {
	set startmsecs [clock clicks -milliseconds]
    }
514
    set i [reg_instance $fd]
515 516 517 518 519
    lappend viewinstances($view) $i
    fconfigure $fd -blocking 0 -translation lf -eofchar {}
    if {$tclencoding != {}} {
	fconfigure $fd -encoding $tclencoding
    }
520
    filerun $fd [list getcommitlines $fd $i $view 1]
521 522
    incr viewactive($view)
    set viewcomplete($view) 0
523
    reset_pending_select {}
524 525 526 527 528 529 530 531 532
    nowbusy $view "Reading"
    if {$showneartags} {
	getallcommits
    }
}

proc reloadcommits {} {
    global curview viewcomplete selectedline currentid thickerline
    global showneartags treediffs commitinterest cached_commitrow
533
    global targetid
534

535 536 537 538 539
    set selid {}
    if {$selectedline ne {}} {
	set selid $currentid
    }

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

562 563 564 565 566 567 568 569 570 571 572 573 574
# 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]
}

575 576 577 578
# Procedures used in reordering commits from git log (without
# --topo-order) into the order for display.

proc varcinit {view} {
579 580
    global varcstart vupptr vdownptr vleftptr vbackptr varctok varcrow
    global vtokmod varcmod vrowmod varcix vlastins
581 582 583 584 585

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

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)
    }
614
    catch {unset ordertok}
615 616
}

617 618 619 620 621 622 623 624 625 626 627 628 629
# 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
}

630
proc newvarc {view id} {
631
    global varcid varctok parents children vdatemode
632 633
    global vupptr vdownptr vleftptr vbackptr varcrow varcix varcstart
    global commitdata commitinfo vseedcount varccommits vlastins
634 635 636

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

proc splitvarc {p v} {
704
    global varcid varcstart varccommits varctok vtokmod
705
    global vupptr vdownptr vleftptr vbackptr varcix varcrow vlastins
706 707

    set oa $varcid($v,$p)
708
    set otok [lindex $varctok($v) $oa]
709 710 711 712 713
    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"...
714
    set tok "$otok%[strrep $i]"
715 716 717 718 719 720 721 722 723 724
    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]
725
    lappend vlastins($v) [lindex $vlastins($v) $oa]
726
    lset vdownptr($v) $oa $na
727
    lset vlastins($v) $oa 0
728 729
    lappend vupptr($v) $oa
    lappend vleftptr($v) 0
730
    lappend vbackptr($v) 0
731 732 733
    for {set b [lindex $vdownptr($v) $na]} {$b != 0} {set b [lindex $vleftptr($v) $b]} {
	lset vupptr($v) $b $na
    }
734 735 736
    if {[string compare $otok $vtokmod($v)] <= 0} {
	modify_arc $v $oa
    }
737 738 739 740
}

proc renumbervarc {a v} {
    global parents children varctok varcstart varccommits
741
    global vupptr vdownptr vleftptr vbackptr vlastins varcid vtokmod vdatemode
742 743 744 745

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

868 869 870
# 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.
871
proc fix_reversal {p a v} {
P
Paul Mackerras 已提交
872
    global varcid varcstart varctok vupptr
873 874 875 876 877 878

    set pa $varcid($v,$p)
    if {$p ne [lindex $varcstart($v) $pa]} {
	splitvarc $p $v
	set pa $varcid($v,$p)
    }
P
Paul Mackerras 已提交
879 880 881 882
    # seeds always need to be renumbered
    if {[lindex $vupptr($v) $pa] == 0 ||
	[string compare [lindex $varctok($v) $a] \
	     [lindex $varctok($v) $pa]] > 0} {
883 884 885 886 887
	renumbervarc $pa $v
    }
}

proc insertrow {id p v} {
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 913 914 915 916 917 918 919 920 921
    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} {
922
    global varcid varccommits parents children cmitlisted
923
    global commitidx varctok vtokmod targetid targetrow curview numcommits
924

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

950
proc removefakerow {id} {
951
    global varcid varccommits parents children commitidx
952
    global varctok vtokmod cmitlisted currentid selectedline
953
    global targetid curview numcommits
954

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

989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012
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 {}
}

1013 1014 1015 1016 1017 1018 1019
proc vtokcmp {v a b} {
    global varctok varcid

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

1020 1021
# This assumes that if lim is not given, the caller has checked that
# arc a's token is less than $vtokmod($v)
1022 1023
proc modify_arc {v a {lim {}}} {
    global varctok vtokmod varcmod varcrow vupptr curview vrowmod varccommits
1024

1025 1026 1027 1028 1029 1030 1031 1032
    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
	}
    }
1033 1034 1035 1036 1037
    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]
1038
	    set lim {}
1039
	}
1040 1041 1042 1043 1044 1045 1046 1047
	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 已提交
1048
	undolayout $r
1049 1050 1051
    }
}

1052
proc update_arcrows {v} {
1053
    global vtokmod varcmod vrowmod varcrow commitidx currentid selectedline
P
Paul Mackerras 已提交
1054
    global varcid vrownum varcorder varcix varccommits
1055
    global vupptr vdownptr vleftptr varctok
P
Paul Mackerras 已提交
1056
    global displayorder parentlist curview cached_commitrow
1057

1058 1059 1060 1061 1062 1063 1064 1065
    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}
    }
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 1102 1103 1104 1105 1106 1107 1108 1109 1110
    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
    }
1111 1112 1113
    set vtokmod($v) [lindex $varctok($v) $p]
    set varcmod($v) $p
    set vrowmod($v) $row
1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128
    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
1129
    global varctok vtokmod
1130 1131 1132 1133 1134 1135 1136

    set v $curview
    if {![info exists varcid($v,$id)]} {
	puts "oops rowofcommit no arc for [shortids $id]"
	return {}
    }
    set a $varcid($v,$id)
1137
    if {[string compare [lindex $varctok($v) $a] $vtokmod($v)] >= 0} {
1138 1139
	update_arcrows $v
    }
1140 1141 1142
    if {[info exists cached_commitrow($id)]} {
	return $cached_commitrow($id)
    }
1143 1144 1145 1146 1147 1148 1149 1150 1151 1152
    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
}

1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168
# 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]}]
}

1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191
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
1192
    global varccommits varcorder parents vrowmod varcrow
1193 1194
    global d_valid_start d_valid_end

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

    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
1263 1264
	    if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} {
		modify_arc $v $b
1265
	    }
1266
	    lappend varccommits($v,$b) $p
1267
	    incr commitidx($v)
1268
	    set scripts [check_interest $p $scripts]
1269 1270 1271 1272 1273 1274 1275 1276 1277
	}
    }
    if {$missing_parents > 0} {
	foreach s $scripts {
	    eval $s
	}
    }
}

1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297
# 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
1298 1299 1300
	# 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}]
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 1328 1329 1330 1331 1332 1333 1334 1335 1336
# 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
}

1337
proc getcommitlines {fd inst view updating}  {
1338
    global cmitlisted leftover
1339
    global commitidx commitdata vdatemode
1340
    global parents children curview hlview
1341
    global idpending ordertok
1342
    global varccommits varcid varctok vtokmod vfilelimit
1343

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

	if {!$listed && $updating && ![info exists varcid($vid)] &&
1443
	    $vfilelimit($view) ne {}} {
1444 1445 1446 1447 1448 1449 1450
	    # 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 \
1451
			      $id -- $vfilelimit($view)]
1452 1453 1454 1455 1456 1457 1458 1459 1460
	    }]} {
		if {$rwid ne {} && [info exists varcid($view,$rwid)]} {
		    # use $rwid in place of $id
		    rewrite_commit $view $id $rwid
		    continue
		}
	    }
	}

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

1497 1498 1499 1500 1501 1502 1503 1504
	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)]
1505
		    catch {unset ordertok}
1506
		}
1507 1508 1509
		if {[info exists varcid($view,$p)]} {
		    fix_reversal $p $a $view
		}
1510 1511 1512 1513
	    }
	    incr i
	}

1514
	set scripts [check_interest $id $scripts]
1515 1516 1517
	set gotsome 1
    }
    if {$gotsome} {
1518 1519 1520 1521 1522 1523 1524 1525 1526 1527
	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
	}
1528 1529 1530
	foreach s $scripts {
	    eval $s
	}
1531
    }
1532
    return 2
1533 1534
}

1535
proc chewcommits {} {
1536
    global curview hlview viewcomplete
1537
    global pending_select
1538

1539 1540 1541 1542 1543 1544
    layoutmore
    if {$viewcomplete($curview)} {
	global commitidx varctok
	global numcommits startmsecs

	if {[info exists pending_select]} {
1545 1546 1547 1548 1549 1550 1551 1552 1553
	    update
	    reset_pending_select {}

	    if {[commitinview $pending_select $curview]} {
		selectline [rowofcommit $pending_select] 1
	    } else {
		set row [first_real_row]
		selectline $row 1
	    }
1554
	}
1555 1556 1557 1558 1559 1560 1561 1562
	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
1563
    }
1564
    return 0
1565 1566
}

1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584
proc do_readcommit {id} {
    global tclencoding

    # Invoke git-log to handle automatic encoding conversion
    set fd [open [concat | git log --no-color --pretty=raw -1 $id] r]
    # Read the results using i18n.logoutputencoding
    fconfigure $fd -translation lf -eofchar {}
    if {$tclencoding != {}} {
	fconfigure $fd -encoding $tclencoding
    }
    set contents [read $fd]
    close $fd
    # Remove the heading line
    regsub {^commit [0-9a-f]+\n} $contents {} contents

    return $contents
}

1585
proc readcommit {id} {
1586 1587
    if {[catch {set contents [do_readcommit $id]}]} return
    parsecommit $id $contents 1
P
Paul Mackerras 已提交
1588 1589
}

1590
proc parsecommit {id contents listed} {
1591 1592 1593 1594 1595 1596 1597 1598 1599
    global commitinfo cdate

    set inhdr 1
    set comment {}
    set headline {}
    set auname {}
    set audate {}
    set comname {}
    set comdate {}
P
Paul Mackerras 已提交
1600 1601 1602 1603 1604 1605 1606 1607
    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"] {
1608
	set line [split $line " "]
P
Paul Mackerras 已提交
1609 1610 1611
	set tag [lindex $line 0]
	if {$tag == "author"} {
	    set audate [lindex $line end-1]
1612
	    set auname [join [lrange $line 1 end-2] " "]
P
Paul Mackerras 已提交
1613 1614
	} elseif {$tag == "committer"} {
	    set comdate [lindex $line end-1]
1615
	    set comname [join [lrange $line 1 end-2] " "]
1616 1617
	}
    }
P
Paul Mackerras 已提交
1618
    set headline {}
1619 1620 1621
    # 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 已提交
1622
    if {$i >= 0} {
1623 1624 1625 1626 1627 1628
	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 已提交
1629 1630
    }
    if {!$listed} {
1631
	# git log indents the comment by 4 spaces;
1632
	# if we got this via git cat-file, add the indentation
P
Paul Mackerras 已提交
1633 1634 1635 1636
	set newcomment {}
	foreach line [split $comment "\n"] {
	    append newcomment "    "
	    append newcomment $line
1637
	    append newcomment "\n"
P
Paul Mackerras 已提交
1638 1639
	}
	set comment $newcomment
1640 1641
    }
    if {$comdate != {}} {
1642
	set cdate($id) $comdate
1643
    }
1644 1645
    set commitinfo($id) [list $headline $auname $audate \
			     $comname $comdate $comment]
1646 1647
}

1648
proc getcommit {id} {
1649
    global commitdata commitinfo
P
Paul Mackerras 已提交
1650

1651 1652
    if {[info exists commitdata($id)]} {
	parsecommit $id $commitdata($id) 1
P
Paul Mackerras 已提交
1653 1654 1655
    } else {
	readcommit $id
	if {![info exists commitinfo($id)]} {
1656
	    set commitinfo($id) [list [mc "No commit information available"]]
P
Paul Mackerras 已提交
1657 1658 1659 1660 1661
	}
    }
    return 1
}

1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674
# 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
}

1675
proc readrefs {} {
1676
    global tagids idtags headids idheads tagobjid
1677
    global otherrefids idotherrefs mainhead mainheadid
1678
    global selecthead selectheadid
1679

1680 1681 1682
    foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
	catch {unset $v}
    }
1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693
    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
1694
	    }
1695 1696
	} elseif {[string match "heads/*" $name]} {
	    set name [string range $name 6 end]
1697 1698
	    set headids($name) $id
	    lappend idheads($id) $name
1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709
	} 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
1710 1711 1712
	} else {
	    set otherrefids($name) $id
	    lappend idotherrefs($id) $name
1713 1714
	}
    }
1715
    catch {close $refd}
1716
    set mainhead {}
1717
    set mainheadid {}
1718
    catch {
1719
	set mainheadid [exec git rev-parse HEAD]
1720 1721 1722 1723 1724
	set thehead [exec git symbolic-ref HEAD]
	if {[string match "refs/heads/*" $thehead]} {
	    set mainhead [string range $thehead 11 end]
	}
    }
1725 1726 1727 1728 1729 1730
    set selectheadid {}
    if {$selecthead ne {}} {
	catch {
	    set selectheadid [exec git rev-parse --verify $selecthead]
	}
    }
1731 1732
}

1733 1734
# skip over fake commits
proc first_real_row {} {
1735
    global nullid nullid2 numcommits
1736 1737

    for {set row 0} {$row < $numcommits} {incr row} {
1738
	set id [commitonrow $row]
1739 1740 1741 1742 1743 1744 1745
	if {$id ne $nullid && $id ne $nullid2} {
	    break
	}
    }
    return $row
}

1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769
# 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)
}

1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787
proc make_transient {window origin} {
    global have_tk85

    # In MacOS Tk 8.4 transient appears to work by setting
    # overrideredirect, which is utterly useless, since the
    # windows get no border, and are not even kept above
    # the parent.
    if {!$have_tk85 && [tk windowingsystem] eq {aqua}} return

    wm transient $window $origin

    # Windows fails to place transient windows normally, so
    # schedule a callback to center them on the parent.
    if {[tk windowingsystem] eq {win32}} {
	after idle [list tk::PlaceWindow $window widget $origin]
    }
}

P
Paul Mackerras 已提交
1788
proc show_error {w top msg} {
1789 1790
    message $w.m -text $msg -justify center -aspect 400
    pack $w.m -side top -fill x -padx 20 -pady 20
1791
    button $w.ok -text [mc OK] -command "destroy $top"
1792
    pack $w.ok -side bottom -fill x
P
Paul Mackerras 已提交
1793 1794
    bind $top <Visibility> "grab $top; focus $top"
    bind $top <Key-Return> "destroy $top"
1795 1796
    bind $top <Key-space>  "destroy $top"
    bind $top <Key-Escape> "destroy $top"
P
Paul Mackerras 已提交
1797
    tkwait window $top
1798 1799
}

1800
proc error_popup {msg {owner .}} {
1801 1802
    set w .error
    toplevel $w
1803
    make_transient $w $owner
P
Paul Mackerras 已提交
1804
    show_error $w $w $msg
1805 1806
}

1807
proc confirm_popup {msg {owner .}} {
1808 1809 1810 1811
    global confirm_ok
    set confirm_ok 0
    set w .confirm
    toplevel $w
1812
    make_transient $w $owner
1813 1814
    message $w.m -text $msg -justify center -aspect 400
    pack $w.m -side top -fill x -padx 20 -pady 20
1815
    button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w"
1816
    pack $w.ok -side left -fill x
1817
    button $w.cancel -text [mc Cancel] -command "destroy $w"
1818 1819
    pack $w.cancel -side right -fill x
    bind $w <Visibility> "grab $w; focus $w"
1820 1821 1822
    bind $w <Key-Return> "set confirm_ok 1; destroy $w"
    bind $w <Key-space>  "set confirm_ok 1; destroy $w"
    bind $w <Key-Escape> "destroy $w"
1823 1824 1825 1826
    tkwait window $w
    return $confirm_ok
}

1827 1828 1829 1830 1831 1832
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
1833 1834 1835
    if {[tk windowingsystem] ne "aqua"} {
	option add *Menu.font uifont startupFile
    }
1836 1837 1838 1839 1840 1841
    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 已提交
1842 1843 1844 1845 1846 1847 1848 1849
# 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
1850 1851
proc makemenu {m items} {
    menu $m
1852 1853 1854 1855 1856
    if {[tk windowingsystem] eq {aqua}} {
	set Meta1 Cmd
    } else {
	set Meta1 Ctrl
    }
1857
    foreach i $items {
P
Paul Mackerras 已提交
1858 1859 1860
	set name [mc [lindex $i 1]]
	set type [lindex $i 2]
	set thing [lindex $i 3]
1861 1862 1863 1864 1865 1866 1867 1868 1869 1870
	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 已提交
1871
		set submenu [string tolower [string map {& ""} [lindex $i 1]]]
1872 1873 1874 1875 1876 1877 1878 1879 1880 1881
		lappend params -menu $m.$submenu
	    }
	    "command" {
		lappend params -command $thing
	    }
	    "radiobutton" {
		lappend params -variable [lindex $thing 0] \
		    -value [lindex $thing 1]
	    }
	}
1882 1883 1884
	set tail [lrange $i 4 end]
	regsub -all {\yMeta1\y} $tail $Meta1 tail
	eval $m add $params $tail
1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895
	if {$type eq "cascade"} {
	    makemenu $m.$submenu $thing
	}
    }
}

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

1896
proc makewindow {} {
1897
    global canv canv2 canv3 linespc charspc ctext cflist cscroll
1898
    global tabstop
1899
    global findtype findtypemenu findloc findstring fstring geometry
1900
    global entries sha1entry sha1string sha1but
1901
    global diffcontextstring diffcontext
1902
    global ignorespace
1903
    global maincursor textcursor curtextcursor
1904
    global rowctxmenu fakerowmenu mergemax wrapcomment
1905
    global highlight_files gdttype
1906
    global searchstring sstring
1907
    global bgcolor fgcolor bglist fglist diffcolors selectbgcolor
1908 1909
    global headctxmenu progresscanv progressitem progresscoords statusw
    global fprogitem fprogcoord lastprogupdate progupdatepending
1910
    global rprogitem rprogcoord rownumsel numcommits
1911
    global have_tk85
1912

P
Paul Mackerras 已提交
1913 1914
    # The "mc" arguments here are purely so that xgettext
    # sees the following string as needing to be translated
1915 1916
    set file {
	mc "File" cascade {
P
Paul Mackerras 已提交
1917
	    {mc "Update" command updatecommits -accelerator F5}
1918
	    {mc "Reload" command reloadcommits -accelerator Meta1-F5}
P
Paul Mackerras 已提交
1919
	    {mc "Reread references" command rereadrefs}
1920
	    {mc "List references" command showrefs -accelerator F2}
1921 1922 1923
	    {xx "" separator}
	    {mc "Start git gui" command {exec git gui &}}
	    {xx "" separator}
1924
	    {mc "Quit" command doquit -accelerator Meta1-Q}
1925
	}}
1926 1927
    set edit {
	mc "Edit" cascade {
P
Paul Mackerras 已提交
1928
	    {mc "Preferences" command doprefs}
1929
	}}
1930 1931
    set view {
	mc "View" cascade {
1932 1933
	    {mc "New view..." command {newview 0} -accelerator Shift-F4}
	    {mc "Edit view..." command editview -state disabled -accelerator F4}
P
Paul Mackerras 已提交
1934 1935 1936
	    {mc "Delete view" command delview -state disabled}
	    {xx "" separator}
	    {mc "All files" radiobutton {selectedview 0} -command {showview 0}}
1937
	}}
1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950
    if {[tk windowingsystem] ne "aqua"} {
	set help {
	mc "Help" cascade {
	    {mc "About gitk" command about}
	    {mc "Key bindings" command keys}
	}}
	set bar [list $file $edit $view $help]
    } else {
	proc ::tk::mac::ShowPreferences {} {doprefs}
	proc ::tk::mac::Quit {} {doquit}
	lset file end [lreplace [lindex $file end] end-1 end]
	set apple {
	xx "Apple" cascade {
P
Paul Mackerras 已提交
1951
	    {mc "About gitk" command about}
1952 1953 1954 1955
	    {xx "" separator}
	}}
	set help {
	mc "Help" cascade {
P
Paul Mackerras 已提交
1956
	    {mc "Key bindings" command keys}
1957
	}}
1958
	set bar [list $apple $file $view $help]
1959
    }
1960
    makemenu .bar $bar
1961 1962
    . configure -menu .bar

1963
    # the gui has upper and lower half, parts of a paned window.
P
Paul Mackerras 已提交
1964
    panedwindow .ctop -orient vertical
1965 1966

    # possibly use assumed geometry
1967
    if {![info exists geometry(pwsash0)]} {
1968 1969 1970 1971
        set geometry(topheight) [expr {15 * $linespc}]
        set geometry(topwidth) [expr {80 * $charspc}]
        set geometry(botheight) [expr {15 * $linespc}]
        set geometry(botwidth) [expr {50 * $charspc}]
1972 1973
        set geometry(pwsash0) "[expr {40 * $charspc}] 2"
        set geometry(pwsash1) "[expr {60 * $charspc}] 2"
1974 1975 1976 1977 1978 1979 1980 1981 1982 1983
    }

    # 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
1984
    canvas $canv \
1985
	-selectbackground $selectbgcolor \
1986
	-background $bgcolor -bd 0 \
P
Paul Mackerras 已提交
1987
	-yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
1988 1989
    .tf.histframe.pwclist add $canv
    set canv2 .tf.histframe.pwclist.canv2
1990
    canvas $canv2 \
1991
	-selectbackground $selectbgcolor \
1992
	-background $bgcolor -bd 0 -yscrollincr $linespc
1993 1994
    .tf.histframe.pwclist add $canv2
    set canv3 .tf.histframe.pwclist.canv3
1995
    canvas $canv3 \
1996
	-selectbackground $selectbgcolor \
1997
	-background $bgcolor -bd 0 -yscrollincr $linespc
1998
    .tf.histframe.pwclist add $canv3
1999 2000
    eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0)
    eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1)
2001 2002 2003 2004 2005

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

2009 2010 2011 2012 2013
    # 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
2014
    set entries $sha1entry
2015
    set sha1but .tf.bar.sha1label
2016
    button $sha1but -text [mc "SHA1 ID: "] -state disabled -relief flat \
2017
	-command gotocommit -width 8
2018
    $sha1but conf -disabledforeground [$sha1but cget -foreground]
2019
    pack .tf.bar.sha1label -side left
2020
    entry $sha1entry -width 40 -font textfont -textvariable sha1string
2021
    trace add variable sha1string write sha1change
2022
    pack $sha1entry -side left -pady 2
2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039

    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};
    }
2040
    button .tf.bar.leftbut -image bm-left -command goback \
2041
	-state disabled -width 26
2042 2043
    pack .tf.bar.leftbut -side left -fill y
    button .tf.bar.rightbut -image bm-right -command goforw \
2044
	-state disabled -width 26
2045
    pack .tf.bar.rightbut -side left -fill y
2046

2047 2048 2049 2050 2051 2052 2053 2054 2055 2056
    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
2057
    trace add variable selectedline write selectedline_change
2058

2059 2060
    # Status label and progress bar
    set statusw .tf.bar.status
2061
    label $statusw -width 15 -relief sunken
2062
    pack $statusw -side left -padx 5
2063
    set h [expr {[font metrics uifont -linespace] + 2}]
2064 2065 2066 2067
    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]
2068
    set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
2069 2070 2071
    pack $progresscanv -side right -expand 1 -fill x
    set progresscoords {0 0}
    set fprogcoord 0
2072
    set rprogcoord 0
2073 2074 2075 2076
    bind $progresscanv <Configure> adjustprogress
    set lastprogupdate [clock clicks -milliseconds]
    set progupdatepending 0

2077
    # build up the bottom bar of upper window
2078 2079 2080 2081
    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"] "
2082 2083
    pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \
	-side left -fill y
2084
    set gdttype [mc "containing:"]
2085
    set gm [tk_optionMenu .tf.lbar.gdttype gdttype \
2086 2087 2088
		[mc "containing:"] \
		[mc "touching paths:"] \
		[mc "adding/removing string:"]]
2089 2090 2091
    trace add variable gdttype write gdttype_change
    pack .tf.lbar.gdttype -side left -fill y

2092
    set findstring {}
2093
    set fstring .tf.lbar.findstring
2094
    lappend entries $fstring
2095
    entry $fstring -width 30 -font textfont -textvariable findstring
2096
    trace add variable findstring write find_change
2097
    set findtype [mc "Exact"]
2098
    set findtypemenu [tk_optionMenu .tf.lbar.findtype \
2099
		      findtype [mc "Exact"] [mc "IgnCase"] [mc "Regexp"]]
2100
    trace add variable findtype write findcom_change
2101 2102 2103
    set findloc [mc "All fields"]
    tk_optionMenu .tf.lbar.findloc findloc [mc "All fields"] [mc "Headline"] \
	[mc "Comments"] [mc "Author"] [mc "Committer"]
2104
    trace add variable findloc write find_change
2105 2106 2107
    pack .tf.lbar.findloc -side right
    pack .tf.lbar.findtype -side right
    pack $fstring -side left -expand 1 -fill x
2108 2109 2110 2111 2112 2113

    # 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
2114 2115
    .ctop paneconfigure .tf -height $geometry(topheight)
    .ctop paneconfigure .tf -width $geometry(topwidth)
2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128

    # 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
2129
    frame .bleft.mid
2130
    frame .bleft.bottom
2131

2132
    button .bleft.top.search -text [mc "Search"] -command dosearch
2133 2134
    pack .bleft.top.search -side left -padx 5
    set sstring .bleft.top.sstring
2135
    entry $sstring -width 20 -font textfont -textvariable searchstring
2136 2137 2138
    lappend entries $sstring
    trace add variable searchstring write incrsearch
    pack $sstring -side left -expand 1 -fill x
2139
    radiobutton .bleft.mid.diff -text [mc "Diff"] \
2140
	-command changediffdisp -variable diffelide -value {0 0}
2141
    radiobutton .bleft.mid.old -text [mc "Old version"] \
2142
	-command changediffdisp -variable diffelide -value {0 1}
2143
    radiobutton .bleft.mid.new -text [mc "New version"] \
2144
	-command changediffdisp -variable diffelide -value {1 0}
2145
    label .bleft.mid.labeldiffcontext -text "      [mc "Lines of context"]: "
2146
    pack .bleft.mid.diff .bleft.mid.old .bleft.mid.new -side left
2147
    spinbox .bleft.mid.diffcontext -width 5 -font textfont \
2148 2149 2150 2151 2152 2153 2154
	-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
2155 2156 2157
    checkbutton .bleft.mid.ignspace -text [mc "Ignore space change"] \
	-command changeignorespace -variable ignorespace
    pack .bleft.mid.ignspace -side left -padx 5
2158
    set ctext .bleft.bottom.ctext
2159
    text $ctext -background $bgcolor -foreground $fgcolor \
2160
	-state disabled -font textfont \
2161 2162
	-yscrollcommand scrolltext -wrap none \
	-xscrollcommand ".bleft.bottom.sbhorizontal set"
2163 2164 2165
    if {$have_tk85} {
	$ctext conf -tabstyle wordprocessor
    }
2166 2167 2168
    scrollbar .bleft.bottom.sb -command "$ctext yview"
    scrollbar .bleft.bottom.sbhorizontal -command "$ctext xview" -orient h \
	-width 10
2169
    pack .bleft.top -side top -fill x
2170
    pack .bleft.mid -side top -fill x
2171 2172 2173 2174 2175 2176
    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
2177 2178
    lappend bglist $ctext
    lappend fglist $ctext
2179

2180
    $ctext tag conf comment -wrap $wrapcomment
2181
    $ctext tag conf filesep -font textfontbold -back "#aaaaaa"
2182 2183
    $ctext tag conf hunksep -fore [lindex $diffcolors 2]
    $ctext tag conf d0 -fore [lindex $diffcolors 0]
2184
    $ctext tag conf dresult -fore [lindex $diffcolors 1]
2185 2186 2187 2188 2189
    $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
2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200
    $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"
2201
    $ctext tag conf mmax -fore darkgrey
2202
    set mergemax 16
2203 2204
    $ctext tag conf mresult -font textfontbold
    $ctext tag conf msep -font textfontbold
2205
    $ctext tag conf found -back yellow
2206

2207
    .pwbottom add .bleft
2208
    .pwbottom paneconfigure .bleft -width $geometry(botwidth)
2209 2210 2211 2212

    # lower right
    frame .bright
    frame .bright.mode
2213
    radiobutton .bright.mode.patch -text [mc "Patch"] \
P
Paul Mackerras 已提交
2214
	-command reselectline -variable cmitmode -value "patch"
2215
    radiobutton .bright.mode.tree -text [mc "Tree"] \
P
Paul Mackerras 已提交
2216
	-command reselectline -variable cmitmode -value "tree"
2217 2218 2219
    grid .bright.mode.patch .bright.mode.tree -sticky ew
    pack .bright.mode -side top -fill x
    set cflist .bright.cfiles
2220
    set indent [font measure mainfont "nn"]
2221
    text $cflist \
2222
	-selectbackground $selectbgcolor \
2223
	-background $bgcolor -foreground $fgcolor \
2224
	-font mainfont \
2225
	-tabs [list $indent [expr {2 * $indent}]] \
2226
	-yscrollcommand ".bright.sb set" \
2227 2228
	-cursor [. cget -cursor] \
	-spacing1 1 -spacing3 1
2229 2230
    lappend bglist $cflist
    lappend fglist $cflist
2231 2232
    scrollbar .bright.sb -command "$cflist yview"
    pack .bright.sb -side right -fill y
2233
    pack $cflist -side left -fill both -expand 1
2234 2235
    $cflist tag configure highlight \
	-background [$cflist cget -selectbackground]
2236
    $cflist tag configure bold -font mainfontbold
2237

2238 2239
    .pwbottom add .bright
    .ctop add .pwbottom
2240

2241
    # restore window width & height if known
2242
    if {[info exists geometry(main)]} {
2243 2244 2245 2246 2247 2248 2249 2250 2251
	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"
	}
2252 2253
    }

2254 2255
    if {[tk windowingsystem] eq {aqua}} {
        set M1B M1
2256
        set ::BM "3"
2257 2258
    } else {
        set M1B Control
2259
        set ::BM "2"
2260 2261
    }

2262 2263
    bind .pwbottom <Configure> {resizecdetpanes %W %w}
    pack .ctop -fill both -expand 1
2264 2265
    bindall <1> {selcanvline %W %x %y}
    #bindall <B1-Motion> {selcanvline %W %x %y}
2266 2267 2268 2269 2270 2271
    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"
2272 2273 2274 2275 2276
        if {[tk windowingsystem] eq "aqua"} {
            bindall <MouseWheel> {
                set delta [expr {- (%D)}]
                allcanvs yview scroll $delta units
            }
2277 2278 2279 2280
            bindall <Shift-MouseWheel> {
                set delta [expr {- (%D)}]
                $canv xview scroll $delta units
            }
2281
        }
2282
    }
2283 2284
    bindall <$::BM> "canvscan mark %W %x %y"
    bindall <B$::BM-Motion> "canvscan dragto %W %x %y"
2285 2286
    bindkey <Home> selfirstline
    bindkey <End> sellastline
2287 2288
    bind . <Key-Up> "selnextline -1"
    bind . <Key-Down> "selnextline 1"
2289 2290
    bind . <Shift-Key-Up> "dofind -1 0"
    bind . <Shift-Key-Down> "dofind 1 0"
2291 2292 2293 2294
    bindkey <Key-Right> "goforw"
    bindkey <Key-Left> "goback"
    bind . <Key-Prior> "selnextpage -1"
    bind . <Key-Next> "selnextpage 1"
2295 2296 2297 2298 2299 2300
    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"
2301 2302 2303
    bindkey <Key-Delete> "$ctext yview scroll -1 pages"
    bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
    bindkey <Key-space> "$ctext yview scroll 1 pages"
2304 2305
    bindkey p "selnextline -1"
    bindkey n "selnextline 1"
R
Robert Suetterlin 已提交
2306 2307 2308 2309 2310 2311
    bindkey z "goback"
    bindkey x "goforw"
    bindkey i "selnextline -1"
    bindkey k "selnextline 1"
    bindkey j "goback"
    bindkey l "goforw"
2312
    bindkey b prevfile
2313 2314
    bindkey d "$ctext yview scroll 18 units"
    bindkey u "$ctext yview scroll -18 units"
2315
    bindkey / {focus $fstring}
2316 2317
    bindkey <Key-Return> {dofind 1 1}
    bindkey ? {dofind -1 1}
2318
    bindkey f nextfile
2319 2320 2321 2322 2323 2324
    bind . <F5> updatecommits
    bind . <$M1B-F5> reloadcommits
    bind . <F2> showrefs
    bind . <Shift-F4> {newview 0}
    catch { bind . <Shift-Key-XF86_Switch_VT_4> {newview 0} }
    bind . <F4> edit_or_newview
2325
    bind . <$M1B-q> doquit
2326 2327
    bind . <$M1B-f> {dofind 1 1}
    bind . <$M1B-g> {dofind 1 0}
2328 2329 2330
    bind . <$M1B-r> dosearchback
    bind . <$M1B-s> dosearch
    bind . <$M1B-equal> {incrfont 1}
2331
    bind . <$M1B-plus> {incrfont 1}
2332 2333 2334
    bind . <$M1B-KP_Add> {incrfont 1}
    bind . <$M1B-minus> {incrfont -1}
    bind . <$M1B-KP_Subtract> {incrfont -1}
2335
    wm protocol . WM_DELETE_WINDOW doquit
2336
    bind . <Destroy> {stop_backends}
2337
    bind . <Button-1> "click %W"
2338
    bind $fstring <Key-Return> {dofind 1 1}
2339
    bind $sha1entry <Key-Return> {gotocommit; break}
2340
    bind $sha1entry <<PasteSelection>> clearsha1
2341 2342
    bind $cflist <1> {sel_flist %W %x %y; break}
    bind $cflist <B1-Motion> {sel_flist %W %x %y; break}
P
Paul Mackerras 已提交
2343
    bind $cflist <ButtonRelease-1> {treeclick %W %x %y}
2344 2345
    global ctxbut
    bind $cflist $ctxbut {pop_flist_menu %W %X %Y %x %y}
2346
    bind $ctext $ctxbut {pop_diff_menu %W %X %Y %x %y}
2347 2348 2349

    set maincursor [. cget -cursor]
    set textcursor [$ctext cget -cursor]
2350
    set curtextcursor $textcursor
2351

2352
    set rowctxmenu .rowctxmenu
2353
    makemenu $rowctxmenu {
P
Paul Mackerras 已提交
2354 2355 2356 2357 2358 2359 2360 2361
	{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}
2362 2363
    }
    $rowctxmenu configure -tearoff 0
2364

2365
    set fakerowmenu .fakerowmenu
2366
    makemenu $fakerowmenu {
P
Paul Mackerras 已提交
2367 2368 2369
	{mc "Diff this -> selected" command {diffvssel 0}}
	{mc "Diff selected -> this" command {diffvssel 1}}
	{mc "Make patch" command mkpatch}
2370 2371
    }
    $fakerowmenu configure -tearoff 0
2372

2373
    set headctxmenu .headctxmenu
2374
    makemenu $headctxmenu {
P
Paul Mackerras 已提交
2375 2376
	{mc "Check out this branch" command cobranch}
	{mc "Remove this branch" command rmbranch}
2377 2378
    }
    $headctxmenu configure -tearoff 0
2379 2380 2381

    global flist_menu
    set flist_menu .flistctxmenu
2382
    makemenu $flist_menu {
P
Paul Mackerras 已提交
2383 2384 2385 2386
	{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}}
2387 2388
    }
    $flist_menu configure -tearoff 0
2389 2390 2391 2392

    global diff_menu
    set diff_menu .diffctxmenu
    makemenu $diff_menu {
2393
	{mc "Show origin of this line" command show_line_source}
2394 2395 2396
	{mc "Run git gui blame on this line" command {external_blame_diff}}
    }
    $diff_menu configure -tearoff 0
2397 2398
}

2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416
# 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
	    }
	}
    }
}

2417 2418 2419 2420
# Update row number label when selectedline changes
proc selectedline_change {n1 n2 op} {
    global selectedline rownumsel

2421
    if {$selectedline eq {}} {
2422 2423 2424 2425 2426 2427
	set rownumsel {}
    } else {
	set rownumsel [expr {$selectedline + 1}]
    }
}

2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440
# 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 已提交
2441 2442
proc scrollcanv {cscroll f0 f1} {
    $cscroll set $f0 $f1
2443
    drawvisible
2444
    flushhighlights
P
Paul Mackerras 已提交
2445 2446
}

2447 2448 2449 2450
# 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} {
2451
    global entries
2452 2453 2454 2455 2456
    bind . $ev $script
    set escript [bind Entry $ev]
    if {$escript == {}} {
	set escript [bind Entry <Key>]
    }
2457 2458 2459
    foreach e $entries {
	bind $e $ev "$escript; break"
    }
2460 2461 2462
}

# set the focus back to the toplevel for any click outside
2463
# the entry widgets
2464
proc click {w} {
2465 2466
    global ctext entries
    foreach e [concat $entries $ctext] {
2467
	if {$w == $e} return
2468
    }
2469
    focus .
2470 2471
}

2472 2473 2474 2475
# Adjust the progress bar for a change in requested extent or canvas size
proc adjustprogress {} {
    global progresscanv progressitem progresscoords
    global fprogitem fprogcoord lastprogupdate progupdatepending
2476
    global rprogitem rprogcoord
2477 2478 2479 2480 2481 2482 2483

    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
2484
    $progresscanv coords $rprogitem 0 0 [expr {$w * $rprogcoord}] $h
2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504
    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
    }
}

2505
proc savestuff {w} {
2506
    global canv canv2 canv3 mainfont textfont uifont tabstop
2507
    global stuffsaved findmergefiles maxgraphpct
2508
    global maxwidth showneartags showlocalchanges
2509
    global viewname viewfiles viewargs viewargscmd viewperm nextviewnum
2510
    global cmitmode wrapcomment datetimeformat limitdiffs
2511
    global colors bgcolor fgcolor diffcolors diffcontext selectbgcolor
2512
    global autoselect extdifftool perfile_attrs markbgcolor
2513

2514
    if {$stuffsaved} return
2515
    if {![winfo viewable .]} return
2516 2517
    catch {
	set f [open "~/.gitk-new" w]
2518 2519
	puts $f [list set mainfont $mainfont]
	puts $f [list set textfont $textfont]
2520
	puts $f [list set uifont $uifont]
2521
	puts $f [list set tabstop $tabstop]
2522
	puts $f [list set findmergefiles $findmergefiles]
2523
	puts $f [list set maxgraphpct $maxgraphpct]
2524
	puts $f [list set maxwidth $maxwidth]
P
Paul Mackerras 已提交
2525
	puts $f [list set cmitmode $cmitmode]
2526
	puts $f [list set wrapcomment $wrapcomment]
2527
	puts $f [list set autoselect $autoselect]
P
Paul Mackerras 已提交
2528
	puts $f [list set showneartags $showneartags]
2529
	puts $f [list set showlocalchanges $showlocalchanges]
2530
	puts $f [list set datetimeformat $datetimeformat]
2531
	puts $f [list set limitdiffs $limitdiffs]
2532 2533 2534 2535
	puts $f [list set bgcolor $bgcolor]
	puts $f [list set fgcolor $fgcolor]
	puts $f [list set colors $colors]
	puts $f [list set diffcolors $diffcolors]
2536
	puts $f [list set markbgcolor $markbgcolor]
2537
	puts $f [list set diffcontext $diffcontext]
2538
	puts $f [list set selectbgcolor $selectbgcolor]
2539
	puts $f [list set extdifftool $extdifftool]
2540
	puts $f [list set perfile_attrs $perfile_attrs]
2541

2542
	puts $f "set geometry(main) [wm geometry .]"
2543 2544
	puts $f "set geometry(topwidth) [winfo width .tf]"
	puts $f "set geometry(topheight) [winfo height .tf]"
2545 2546
        puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\""
        puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\""
2547 2548 2549
	puts $f "set geometry(botwidth) [winfo width .bleft]"
	puts $f "set geometry(botheight) [winfo height .bleft]"

2550 2551 2552
	puts -nonewline $f "set permviews {"
	for {set v 0} {$v < $nextviewnum} {incr v} {
	    if {$viewperm($v)} {
2553
		puts $f "{[list $viewname($v) $viewfiles($v) $viewargs($v) $viewargscmd($v)]}"
2554 2555 2556
	    }
	}
	puts $f "}"
2557 2558 2559 2560
	close $f
	file rename -force "~/.gitk-new" "~/.gitk"
    }
    set stuffsaved 1
2561 2562
}

2563 2564
proc resizeclistpanes {win w} {
    global oldwidth
2565
    if {[info exists oldwidth($win)]} {
2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578
	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 已提交
2579
		set sash1 [expr {$sash0 + 20}]
2580 2581
	    }
	    if {$sash1 > $w - 10} {
J
Jeff Hobbs 已提交
2582
		set sash1 [expr {$w - 10}]
2583
		if {$sash0 > $sash1 - 20} {
J
Jeff Hobbs 已提交
2584
		    set sash0 [expr {$sash1 - 20}]
2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595
		}
	    }
	}
	$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
2596
    if {[info exists oldwidth($win)]} {
2597 2598 2599 2600 2601 2602 2603 2604 2605 2606
	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 已提交
2607
		set sash0 [expr {$w - 15}]
2608 2609 2610 2611 2612 2613 2614
	    }
	}
	$win sash place 0 $sash0 [lindex $s0 1]
    }
    set oldwidth($win) $w
}

2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628
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
}

2629
proc about {} {
2630
    global uifont
2631 2632 2633 2634 2635 2636
    set w .about
    if {[winfo exists $w]} {
	raise $w
	return
    }
    toplevel $w
2637
    wm title $w [mc "About gitk"]
2638
    make_transient $w .
2639
    message $w.m -text [mc "
P
Paul Mackerras 已提交
2640
Gitk - a commit viewer for git
2641

P
Paul Mackerras 已提交
2642
Copyright © 2005-2008 Paul Mackerras
2643

2644
Use and redistribute under the terms of the GNU General Public License"] \
2645 2646
	    -justify center -aspect 400 -border 2 -bg white -relief groove
    pack $w.m -side top -fill x -padx 2 -pady 2
2647
    button $w.ok -text [mc "Close"] -command "destroy $w" -default active
2648
    pack $w.ok -side bottom
2649 2650 2651
    bind $w <Visibility> "focus $w.ok"
    bind $w <Key-Escape> "destroy $w"
    bind $w <Key-Return> "destroy $w"
2652 2653
}

2654 2655 2656 2657 2658 2659
proc keys {} {
    set w .keys
    if {[winfo exists $w]} {
	raise $w
	return
    }
2660 2661 2662 2663 2664
    if {[tk windowingsystem] eq {aqua}} {
	set M1T Cmd
    } else {
	set M1T Ctrl
    }
2665
    toplevel $w
2666
    wm title $w [mc "Gitk key bindings"]
2667
    make_transient $w .
2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695
    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"]
2696
[mc "/		Focus the search box"]
2697 2698 2699 2700 2701 2702 2703 2704 2705 2706
[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"]
" \
2707 2708
	    -justify left -bg white -border 2 -relief groove
    pack $w.m -side top -fill both -padx 2 -pady 2
2709
    button $w.ok -text [mc "Close"] -command "destroy $w" -default active
2710
    bind $w <Key-Escape> [list destroy $w]
2711
    pack $w.ok -side bottom
2712 2713 2714
    bind $w <Visibility> "focus $w.ok"
    bind $w <Key-Escape> "destroy $w"
    bind $w <Key-Return> "destroy $w"
2715 2716
}

2717 2718
# Procedures for manipulating the file list window at the
# bottom right of the overall window.
P
Paul Mackerras 已提交
2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771

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
2772
		$w insert end $d [highlight_tag $prefix]
P
Paul Mackerras 已提交
2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783
		$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
2784
		$w insert end $tail [highlight_tag $f]
P
Paul Mackerras 已提交
2785 2786 2787 2788 2789 2790 2791 2792
	    }
	    lappend treecontents($prefix) $tail
	}
    }
    while {$htstack ne {}} {
	set treeheight($prefix) $ht
	incr ht [lindex $htstack end]
	set htstack [lreplace $htstack end end]
2793 2794 2795
	set prefixend [lindex $prefendstack end]
	set prefendstack [lreplace $prefendstack end end]
	set prefix [string range $prefix 0 $prefixend]
P
Paul Mackerras 已提交
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
    }
    $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
	}
    }
}

2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839
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 已提交
2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872
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) {
2873
	set de $dir$e
P
Paul Mackerras 已提交
2874 2875 2876 2877 2878 2879 2880 2881
	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
2882
	    $w insert e:$ix $e [highlight_tag $de]
P
Paul Mackerras 已提交
2883 2884 2885 2886 2887
	    $w mark set s:$iy e:$ix
	    $w mark gravity s:$iy left
	    set treeheight($de) 1
	} else {
	    $w insert e:$ix $str
2888
	    $w insert e:$ix $e [highlight_tag $de]
P
Paul Mackerras 已提交
2889 2890
	}
    }
2891
    $w mark gravity e:$ix right
P
Paul Mackerras 已提交
2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931
    $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} {
2932
    global treefilelist cflist jump_to_here
P
Paul Mackerras 已提交
2933 2934

    treeview $cflist $treefilelist($id) 0
2935 2936 2937 2938 2939 2940
    if {$jump_to_here ne {}} {
	set f [lindex $jump_to_here 0]
	if {[lsearch -exact $treefilelist($id) $f] >= 0} {
	    showfile $f
	}
    }
P
Paul Mackerras 已提交
2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973
}

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

2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005
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

3006
proc init_flist {first} {
3007
    global cflist cflist_top difffilestart
3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021

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

3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033
proc highlight_tag {f} {
    global highlight_paths

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

proc highlight_filelist {} {
3034
    global cmitmode cflist
3035

3036 3037
    $cflist conf -state normal
    if {$cmitmode ne "tree"} {
3038 3039 3040 3041 3042 3043 3044
	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"
	    }
	}
3045 3046
    } else {
	highlight_tree 2 {}
3047
    }
3048
    $cflist conf -state disabled
3049 3050 3051
}

proc unhighlight_filelist {} {
3052
    global cflist
3053

3054 3055 3056
    $cflist conf -state normal
    $cflist tag remove bold 1.0 end
    $cflist conf -state disabled
3057 3058
}

P
Paul Mackerras 已提交
3059
proc add_flist {fl} {
3060
    global cflist
3061

3062 3063 3064 3065
    $cflist conf -state normal
    foreach f $fl {
	$cflist insert end "\n"
	$cflist insert end $f [highlight_tag $f]
3066
    }
3067
    $cflist conf -state disabled
3068 3069 3070
}

proc sel_flist {w x y} {
3071
    global ctext difffilestart cflist cflist_top cmitmode
3072

P
Paul Mackerras 已提交
3073
    if {$cmitmode eq "tree"} return
3074 3075
    if {![info exists cflist_top]} return
    set l [lindex [split [$w index "@$x,$y"] "."] 0]
3076 3077 3078
    $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 已提交
3079 3080 3081 3082
    if {$l == 1} {
	$ctext yview 1.0
    } else {
	catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
3083 3084 3085
    }
}

3086 3087 3088 3089
proc pop_flist_menu {w X Y x y} {
    global ctext cflist cmitmode flist_menu flist_menu_file
    global treediffs diffids

3090
    stopfinding
3091 3092 3093 3094 3095 3096 3097 3098 3099
    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
3100 3101 3102 3103 3104 3105
    set xdiffstate "normal"
    if {$cmitmode eq "tree"} {
	set xdiffstate "disabled"
    }
    # Disable "External diff" item in tree mode
    $flist_menu entryconf 2 -state $xdiffstate
3106 3107 3108
    tk_popup $flist_menu $X $Y
}

3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128
proc find_ctext_fileinfo {line} {
    global ctext_file_names ctext_file_lines

    set ok [bsearch $ctext_file_lines $line]
    set tline [lindex $ctext_file_lines $ok]

    if {$ok >= [llength $ctext_file_lines] || $line < $tline} {
        return {}
    } else {
        return [list [lindex $ctext_file_names $ok] $tline]
    }
}

proc pop_diff_menu {w X Y x y} {
    global ctext diff_menu flist_menu_file
    global diff_menu_txtpos diff_menu_line
    global diff_menu_filebase

    set diff_menu_txtpos [split [$w index "@$x,$y"] "."]
    set diff_menu_line [lindex $diff_menu_txtpos 0]
3129 3130 3131 3132 3133
    # don't pop up the menu on hunk-separator or file-separator lines
    if {[lsearch -glob [$ctext tag names $diff_menu_line.0] "*sep"] >= 0} {
	return
    }
    stopfinding
3134 3135 3136 3137 3138 3139 3140
    set f [find_ctext_fileinfo $diff_menu_line]
    if {$f eq {}} return
    set flist_menu_file [lindex $f 0]
    set diff_menu_filebase [lindex $f 1]
    tk_popup $diff_menu $X $Y
}

3141
proc flist_hl {only} {
3142
    global flist_menu_file findstring gdttype
3143 3144

    set x [shellquote $flist_menu_file]
3145
    if {$only || $findstring eq {} || $gdttype ne [mc "touching paths:"]} {
3146
	set findstring $x
3147
    } else {
3148
	append findstring " " $x
3149
    }
3150
    set gdttype [mc "touching paths:"]
3151 3152
}

3153 3154 3155 3156 3157 3158 3159
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
	}
3160
	error_popup "[mc "Error getting \"%s\" from %s:" $filename $what] $err"
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
	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]} {
3217
	    error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err"
3218 3219 3220 3221 3222 3223 3224 3225
	    unset gitktmpdir
	    return
	}
	set diffnum 0
    }
    incr diffnum
    set diffdir [file join $gitktmpdir $diffnum]
    if {[catch {file mkdir $diffdir} err]} {
3226
	error_popup "[mc "Error creating temporary directory %s:" $diffdir] $err"
3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238
	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
3239
            error_popup "$extdifftool: [mc "command failed:"] $err"
3240 3241 3242 3243 3244 3245 3246
        } else {
            fconfigure $fl -blocking 0
            filerun $fl [list delete_at_eof $fl $diffdir]
        }
    }
}

3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274
proc find_hunk_blamespec {base line} {
    global ctext

    # Find and parse the hunk header
    set s_lix [$ctext search -backwards -regexp ^@@ "$line.0 lineend" $base.0]
    if {$s_lix eq {}} return

    set s_line [$ctext get $s_lix "$s_lix + 1 lines"]
    if {![regexp {^@@@*(( -\d+(,\d+)?)+) \+(\d+)(,\d+)? @@} $s_line \
	    s_line old_specs osz osz1 new_line nsz]} {
	return
    }

    # base lines for the parents
    set base_lines [list $new_line]
    foreach old_spec [lrange [split $old_specs " "] 1 end] {
	if {![regexp -- {-(\d+)(,\d+)?} $old_spec \
	        old_spec old_line osz]} {
	    return
	}
	lappend base_lines $old_line
    }

    # Now scan the lines to determine offset within the hunk
    set max_parent [expr {[llength $base_lines]-2}]
    set dline 0
    set s_lno [lindex [split $s_lix "."] 0]

3275 3276 3277
    # Determine if the line is removed
    set chunk [$ctext get $line.0 "$line.1 + $max_parent chars"]
    if {[string match {[-+ ]*} $chunk]} {
3278 3279
	set removed_idx [string first "-" $chunk]
	# Choose a parent index
3280 3281 3282 3283 3284 3285
	if {$removed_idx >= 0} {
	    set parent $removed_idx
	} else {
	    set unchanged_idx [string first " " $chunk]
	    if {$unchanged_idx >= 0} {
		set parent $unchanged_idx
3286
	    } else {
3287 3288
		# blame the current commit
		set parent -1
3289 3290 3291
	    }
	}
	# then count other lines that belong to it
3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304
	for {set i $line} {[incr i -1] > $s_lno} {} {
	    set chunk [$ctext get $i.0 "$i.1 + $max_parent chars"]
	    # Determine if the line is removed
	    set removed_idx [string first "-" $chunk]
	    if {$parent >= 0} {
		set code [string index $chunk $parent]
		if {$code eq "-" || ($removed_idx < 0 && $code ne "+")} {
		    incr dline
		}
	    } else {
		if {$removed_idx < 0} {
		    incr dline
		}
3305 3306
	    }
	}
3307 3308 3309
	incr parent
    } else {
	set parent 0
3310 3311 3312 3313 3314 3315 3316
    }

    incr dline [lindex $base_lines $parent]
    return [list $parent $dline]
}

proc external_blame_diff {} {
3317
    global currentid cmitmode
3318 3319 3320 3321 3322
    global diff_menu_txtpos diff_menu_line
    global diff_menu_filebase flist_menu_file

    if {$cmitmode eq "tree"} {
	set parent_idx 0
3323
	set line [expr {$diff_menu_line - $diff_menu_filebase}]
3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337
    } else {
	set hinfo [find_hunk_blamespec $diff_menu_filebase $diff_menu_line]
	if {$hinfo ne {}} {
	    set parent_idx [lindex $hinfo 0]
	    set line [lindex $hinfo 1]
	} else {
	    set parent_idx 0
	    set line 0
	}
    }

    external_blame $parent_idx $line
}

3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353
# Find the SHA1 ID of the blob for file $fname in the index
# at stage 0 or 2
proc index_sha1 {fname} {
    set f [open [list | git ls-files -s $fname] r]
    while {[gets $f line] >= 0} {
	set info [lindex [split $line "\t"] 0]
	set stage [lindex $info 2]
	if {$stage eq "0" || $stage eq "2"} {
	    close $f
	    return [lindex $info 1]
	}
    }
    close $f
    return {}
}

P
Paul Mackerras 已提交
3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372
# Turn an absolute path into one relative to the current directory
proc make_relative {f} {
    set elts [file split $f]
    set here [file split [pwd]]
    set ei 0
    set hi 0
    set res {}
    foreach d $here {
	if {$ei < $hi || $ei >= [llength $elts] || [lindex $elts $ei] ne $d} {
	    lappend res ".."
	} else {
	    incr ei
	}
	incr hi
    }
    set elts [concat $res [lrange $elts $ei end]]
    return [eval file join $elts]
}

3373
proc external_blame {parent_idx {line {}}} {
P
Paul Mackerras 已提交
3374
    global flist_menu_file gitdir
3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388
    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
    }

3389 3390 3391 3392
    set cmdline [list git gui blame]
    if {$line ne {} && $line > 1} {
	lappend cmdline "--line=$line"
    }
P
Paul Mackerras 已提交
3393 3394 3395 3396 3397
    set f [file join [file dirname $gitdir] $flist_menu_file]
    # Unfortunately it seems git gui blame doesn't like
    # being given an absolute path...
    set f [make_relative $f]
    lappend cmdline $base_commit $f
3398
    if {[catch {eval exec $cmdline &} err]} {
3399
	error_popup "[mc "git gui blame: command failed:"] $err"
3400 3401 3402
    }
}

3403 3404 3405
proc show_line_source {} {
    global cmitmode currentid parents curview blamestuff blameinst
    global diff_menu_line diff_menu_filebase flist_menu_file
3406
    global nullid nullid2 gitdir
3407

3408
    set from_index {}
3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419
    if {$cmitmode eq "tree"} {
	set id $currentid
	set line [expr {$diff_menu_line - $diff_menu_filebase}]
    } else {
	set h [find_hunk_blamespec $diff_menu_filebase $diff_menu_line]
	if {$h eq {}} return
	set pi [lindex $h 0]
	if {$pi == 0} {
	    mark_ctext_line $diff_menu_line
	    return
	}
3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440
	incr pi -1
	if {$currentid eq $nullid} {
	    if {$pi > 0} {
		# must be a merge in progress...
		if {[catch {
		    # get the last line from .git/MERGE_HEAD
		    set f [open [file join $gitdir MERGE_HEAD] r]
		    set id [lindex [split [read $f] "\n"] end-1]
		    close $f
		} err]} {
		    error_popup [mc "Couldn't read merge head: %s" $err]
		    return
		}
	    } elseif {$parents($curview,$currentid) eq $nullid2} {
		# need to do the blame from the index
		if {[catch {
		    set from_index [index_sha1 $flist_menu_file]
		} err]} {
		    error_popup [mc "Error reading index: %s" $err]
		    return
		}
P
Paul Mackerras 已提交
3441 3442
	    } else {
		set id $parents($curview,$currentid)
3443 3444 3445 3446
	    }
	} else {
	    set id [lindex $parents($curview,$currentid) $pi]
	}
3447 3448
	set line [lindex $h 1]
    }
3449 3450 3451 3452 3453 3454 3455 3456 3457 3458
    set blameargs {}
    if {$from_index ne {}} {
	lappend blameargs | git cat-file blob $from_index
    }
    lappend blameargs | git blame -p -L$line,+1
    if {$from_index ne {}} {
	lappend blameargs --contents -
    } else {
	lappend blameargs $id
    }
P
Paul Mackerras 已提交
3459
    lappend blameargs -- [file join [file dirname $gitdir] $flist_menu_file]
3460
    if {[catch {
3461
	set f [open $blameargs r]
3462 3463 3464 3465
    } err]} {
	error_popup [mc "Couldn't start git blame: %s" $err]
	return
    }
3466
    nowbusy blaming [mc "Searching"]
3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479
    fconfigure $f -blocking 0
    set i [reg_instance $f]
    set blamestuff($i) {}
    set blameinst $i
    filerun $f [list read_line_source $f $i]
}

proc stopblaming {} {
    global blameinst

    if {[info exists blameinst]} {
	stop_instance $blameinst
	unset blameinst
3480
	notbusy blaming
3481 3482 3483 3484
    }
}

proc read_line_source {fd inst} {
3485
    global blamestuff curview commfd blameinst nullid nullid2
3486 3487 3488 3489 3490 3491 3492 3493 3494

    while {[gets $fd line] >= 0} {
	lappend blamestuff($inst) $line
    }
    if {![eof $fd]} {
	return 1
    }
    unset commfd($inst)
    unset blameinst
3495
    notbusy blaming
3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517
    fconfigure $fd -blocking 1
    if {[catch {close $fd} err]} {
	error_popup [mc "Error running git blame: %s" $err]
	return 0
    }

    set fname {}
    set line [split [lindex $blamestuff($inst) 0] " "]
    set id [lindex $line 0]
    set lnum [lindex $line 1]
    if {[string length $id] == 40 && [string is xdigit $id] &&
	[string is digit -strict $lnum]} {
	# look for "filename" line
	foreach l $blamestuff($inst) {
	    if {[string match "filename *" $l]} {
		set fname [string range $l 9 end]
		break
	    }
	}
    }
    if {$fname ne {}} {
	# all looks good, select it
3518 3519 3520 3521 3522
	if {$id eq $nullid} {
	    # blame uses all-zeroes to mean not committed,
	    # which would mean a change in the index
	    set id $nullid2
	}
3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534
	if {[commitinview $id $curview]} {
	    selectline [rowofcommit $id] 1 [list $fname $lnum]
	} else {
	    error_popup [mc "That line comes from commit %s, \
			     which is not in this view" [shortids $id]]
	}
    } else {
	puts "oops couldn't parse git blame output"
    }
    return 0
}

3535 3536 3537 3538 3539
# 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]} {
3540
	    error_popup "[mc "External diff viewer failed:"] $err"
3541 3542 3543 3544 3545 3546 3547
	}
	file delete -force $dir
	return 0
    }
    return 1
}

3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641
# 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
}

3642 3643
# Code to implement multiple views

3644
proc newview {ishighlight} {
3645 3646
    global nextviewnum newviewname newishighlight
    global revtreeargs viewargscmd newviewopts curview
P
Paul Mackerras 已提交
3647

3648
    set newishighlight $ishighlight
P
Paul Mackerras 已提交
3649 3650 3651 3652 3653
    set top .gitkview
    if {[winfo exists $top]} {
	raise $top
	return
    }
3654
    set newviewname($nextviewnum) "[mc "View"] $nextviewnum"
3655 3656 3657
    set newviewopts($nextviewnum,perm) 0
    set newviewopts($nextviewnum,cmd)  $viewargscmd($curview)
    decode_view_opts $nextviewnum $revtreeargs
3658
    vieweditor $top $nextviewnum [mc "Gitk view definition"]
3659 3660
}

3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743
set known_view_options {
    {perm    b    . {}               {mc "Remember this view"}}
    {args    t50= + {}               {mc "Commits to include (arguments to git log):"}}
    {all     b    * "--all"          {mc "Use all refs"}}
    {dorder  b    . {"--date-order" "-d"}      {mc "Strictly sort by date"}}
    {lright  b    . "--left-right"   {mc "Mark branch sides"}}
    {since   t15  + {"--since=*" "--after=*"}  {mc "Since date:"}}
    {until   t15  . {"--until=*" "--before=*"} {mc "Until date:"}}
    {limit   t10  + "--max-count=*"  {mc "Max count:"}}
    {skip    t10  . "--skip=*"       {mc "Skip:"}}
    {first   b    . "--first-parent" {mc "Limit to first parent"}}
    {cmd     t50= + {}               {mc "Command to generate more commits to include:"}}
    }

proc encode_view_opts {n} {
    global known_view_options newviewopts

    set rargs [list]
    foreach opt $known_view_options {
	set patterns [lindex $opt 3]
	if {$patterns eq {}} continue
	set pattern [lindex $patterns 0]

	set val $newviewopts($n,[lindex $opt 0])
	
	if {[lindex $opt 1] eq "b"} {
	    if {$val} {
		lappend rargs $pattern
	    }
	} else {
	    set val [string trim $val]
	    if {$val ne {}} {
		set pfix [string range $pattern 0 end-1]
		lappend rargs $pfix$val
	    }
	}
    }
    return [concat $rargs [shellsplit $newviewopts($n,args)]]
}

proc decode_view_opts {n view_args} {
    global known_view_options newviewopts

    foreach opt $known_view_options {
	if {[lindex $opt 1] eq "b"} {
	    set val 0
	} else {
	    set val {}
	}
	set newviewopts($n,[lindex $opt 0]) $val
    }
    set oargs [list]
    foreach arg $view_args {
	if {[regexp -- {^-([0-9]+)$} $arg arg cnt]
	    && ![info exists found(limit)]} {
	    set newviewopts($n,limit) $cnt
	    set found(limit) 1
	    continue
	}
	catch { unset val }
	foreach opt $known_view_options {
	    set id [lindex $opt 0]
	    if {[info exists found($id)]} continue
	    foreach pattern [lindex $opt 3] {
		if {![string match $pattern $arg]} continue
		if {[lindex $opt 1] ne "b"} {
		    set size [string length $pattern]
		    set val [string range $arg [expr {$size-1}] end]
		} else {
		    set val 1
		}
		set newviewopts($n,$id) $val
		set found($id) 1
		break
	    }
	    if {[info exists val]} break
	}
	if {[info exists val]} continue
	lappend oargs $arg
    }
    set newviewopts($n,args) [shellarglist $oargs]
}

3744 3745 3746 3747 3748 3749 3750 3751 3752 3753
proc edit_or_newview {} {
    global curview

    if {$curview > 0} {
	editview
    } else {
	newview 0
    }
}

3754 3755
proc editview {} {
    global curview
3756 3757
    global viewname viewperm newviewname newviewopts
    global viewargs viewargscmd
3758 3759 3760 3761 3762 3763

    set top .gitkvedit-$curview
    if {[winfo exists $top]} {
	raise $top
	return
    }
3764 3765 3766 3767
    set newviewname($curview)      $viewname($curview)
    set newviewopts($curview,perm) $viewperm($curview)
    set newviewopts($curview,cmd)  $viewargscmd($curview)
    decode_view_opts $curview $viewargs($curview)
3768 3769 3770 3771
    vieweditor $top $curview "Gitk: edit view $viewname($curview)"
}

proc vieweditor {top n title} {
3772 3773
    global newviewname newviewopts viewfiles bgcolor
    global known_view_options
3774

P
Paul Mackerras 已提交
3775
    toplevel $top
3776
    wm title $top $title
3777
    make_transient $top .
3778 3779 3780

    # View name
    frame $top.nfr
3781 3782
    label $top.nl -text [mc "Name"]
    entry $top.name -width 20 -textvariable newviewname($n)
3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828
    pack $top.nfr -in $top -fill x -pady 5 -padx 3
    pack $top.nl -in $top.nfr -side left -padx {0 30}
    pack $top.name -in $top.nfr -side left

    # View options
    set cframe $top.nfr
    set cexpand 0
    set cnt 0
    foreach opt $known_view_options {
	set id [lindex $opt 0]
	set type [lindex $opt 1]
	set flags [lindex $opt 2]
	set title [eval [lindex $opt 4]]
	set lxpad 0

	if {$flags eq "+" || $flags eq "*"} {
	    set cframe $top.fr$cnt
	    incr cnt
	    frame $cframe
	    pack $cframe -in $top -fill x -pady 3 -padx 3
	    set cexpand [expr {$flags eq "*"}]
	} else {
	    set lxpad 5
	}

	if {$type eq "b"} {
	    checkbutton $cframe.c_$id -text $title -variable newviewopts($n,$id)
	    pack $cframe.c_$id -in $cframe -side left \
		-padx [list $lxpad 0] -expand $cexpand -anchor w
	} elseif {[regexp {^t(\d+)$} $type type sz]} {
	    message $cframe.l_$id -aspect 1500 -text $title
	    entry $cframe.e_$id -width $sz -background $bgcolor \
		-textvariable newviewopts($n,$id)
	    pack $cframe.l_$id -in $cframe -side left -padx [list $lxpad 0]
	    pack $cframe.e_$id -in $cframe -side left -expand 1 -fill x
	} elseif {[regexp {^t(\d+)=$} $type type sz]} {
	    message $cframe.l_$id -aspect 1500 -text $title
	    entry $cframe.e_$id -width $sz -background $bgcolor \
		-textvariable newviewopts($n,$id)
	    pack $cframe.l_$id -in $cframe -side top -pady [list 3 0] -anchor w
	    pack $cframe.e_$id -in $cframe -side top -fill x
	}
    }

    # Path list
    message $top.l -aspect 1500 \
3829
	-text [mc "Enter files and directories to include, one per line:"]
3830 3831
    pack $top.l -in $top -side top -pady [list 7 0] -anchor w -padx 3
    text $top.t -width 40 -height 5 -background $bgcolor -font uifont
3832 3833 3834 3835 3836 3837 3838 3839
    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
    }
3840
    pack $top.t -in $top -side top -pady [list 0 5] -fill both -expand 1 -padx 3
P
Paul Mackerras 已提交
3841
    frame $top.buts
3842
    button $top.buts.ok -text [mc "OK"] -command [list newviewok $top $n]
3843
    button $top.buts.apply -text [mc "Apply (F5)"] -command [list newviewok $top $n 1]
3844
    button $top.buts.can -text [mc "Cancel"] -command [list destroy $top]
3845 3846
    bind $top <Control-Return> [list newviewok $top $n]
    bind $top <F5> [list newviewok $top $n 1]
3847
    bind $top <Escape> [list destroy $top]
3848
    grid $top.buts.ok $top.buts.apply $top.buts.can
P
Paul Mackerras 已提交
3849 3850
    grid columnconfigure $top.buts 0 -weight 1 -uniform a
    grid columnconfigure $top.buts 1 -weight 1 -uniform a
3851 3852
    grid columnconfigure $top.buts 2 -weight 1 -uniform a
    pack $top.buts -in $top -side top -fill x
P
Paul Mackerras 已提交
3853 3854 3855
    focus $top.t
}

3856
proc doviewmenu {m first cmd op argv} {
3857 3858 3859
    set nmenu [$m index end]
    for {set i $first} {$i <= $nmenu} {incr i} {
	if {[$m entrycget $i -command] eq $cmd} {
3860
	    eval $m $op $i $argv
3861
	    break
3862 3863
	}
    }
3864 3865 3866
}

proc allviewmenus {n op args} {
3867
    # global viewhlmenu
3868

3869
    doviewmenu .bar.view 5 [list showview $n] $op $args
3870
    # doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
3871 3872
}

3873
proc newviewok {top n {apply 0}} {
3874
    global nextviewnum newviewperm newviewname newishighlight
3875
    global viewname viewfiles viewperm selectedview curview
3876
    global viewargs viewargscmd newviewopts viewhlmenu
P
Paul Mackerras 已提交
3877

3878
    if {[catch {
3879
	set newargs [encode_view_opts $n]
3880
    } err]} {
3881
	error_popup "[mc "Error in commit selection arguments:"] $err" $top
3882 3883
	return
    }
P
Paul Mackerras 已提交
3884
    set files {}
3885
    foreach f [split [$top.t get 0.0 end] "\n"] {
P
Paul Mackerras 已提交
3886 3887 3888 3889 3890
	set ft [string trim $f]
	if {$ft ne {}} {
	    lappend files $ft
	}
    }
3891 3892 3893 3894
    if {![info exists viewfiles($n)]} {
	# creating a new view
	incr nextviewnum
	set viewname($n) $newviewname($n)
3895
	set viewperm($n) $newviewopts($n,perm)
3896
	set viewfiles($n) $files
3897
	set viewargs($n) $newargs
3898
	set viewargscmd($n) $newviewopts($n,cmd)
3899 3900
	addviewmenu $n
	if {!$newishighlight} {
3901
	    run showview $n
3902
	} else {
3903
	    run addvhighlight $n
3904
	}
3905 3906
    } else {
	# editing an existing view
3907
	set viewperm($n) $newviewopts($n,perm)
3908 3909
	if {$newviewname($n) ne $viewname($n)} {
	    set viewname($n) $newviewname($n)
3910
	    doviewmenu .bar.view 5 [list showview $n] \
3911
		entryconf [list -label $viewname($n)]
3912 3913
	    # doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
		# entryconf [list -label $viewname($n) -value $viewname($n)]
3914
	}
3915
	if {$files ne $viewfiles($n) || $newargs ne $viewargs($n) || \
3916
		$newviewopts($n,cmd) ne $viewargscmd($n)} {
3917
	    set viewfiles($n) $files
3918
	    set viewargs($n) $newargs
3919
	    set viewargscmd($n) $newviewopts($n,cmd)
3920
	    if {$curview == $n} {
3921
		run reloadcommits
3922 3923 3924
	    }
	}
    }
3925
    if {$apply} return
3926
    catch {destroy $top}
P
Paul Mackerras 已提交
3927 3928 3929
}

proc delview {} {
3930
    global curview viewperm hlview selectedhlview
P
Paul Mackerras 已提交
3931 3932

    if {$curview == 0} return
3933
    if {[info exists hlview] && $hlview == $curview} {
3934
	set selectedhlview [mc "None"]
3935 3936
	unset hlview
    }
3937
    allviewmenus $curview delete
3938
    set viewperm($curview) 0
P
Paul Mackerras 已提交
3939 3940 3941
    showview 0
}

3942
proc addviewmenu {n} {
3943
    global viewname viewhlmenu
3944 3945 3946

    .bar.view add radiobutton -label $viewname($n) \
	-command [list showview $n] -variable selectedview -value $n
3947 3948
    #$viewhlmenu add radiobutton -label $viewname($n) \
    #	-command [list addvhighlight $n] -variable selectedhlview
3949 3950
}

P
Paul Mackerras 已提交
3951
proc showview {n} {
3952
    global curview cached_commitrow ordertok
3953
    global displayorder parentlist rowidlist rowisopt rowfinal
3954 3955
    global colormap rowtextx nextcolor canvxmax
    global numcommits viewcomplete
P
Paul Mackerras 已提交
3956
    global selectedline currentid canv canvy0
3957
    global treediffs
3958
    global pending_select mainheadid
3959
    global commitidx
3960
    global selectedview
3961
    global hlview selectedhlview commitinterest
P
Paul Mackerras 已提交
3962 3963 3964

    if {$n == $curview} return
    set selid {}
3965 3966 3967 3968 3969
    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}]
3970
    if {$selectedline ne {}} {
P
Paul Mackerras 已提交
3971 3972 3973 3974 3975
	set selid $currentid
	set y [yc $selectedline]
	if {$ytop < $y && $y < $ybot} {
	    set yscreen [expr {$y - $ytop}]
	}
3976 3977 3978
    } elseif {[info exists pending_select]} {
	set selid $pending_select
	unset pending_select
P
Paul Mackerras 已提交
3979 3980
    }
    unselectline
3981
    normalline
P
Paul Mackerras 已提交
3982 3983
    catch {unset treediffs}
    clear_display
3984 3985
    if {[info exists hlview] && $hlview == $n} {
	unset hlview
3986
	set selectedhlview [mc "None"]
3987
    }
3988
    catch {unset commitinterest}
3989
    catch {unset cached_commitrow}
3990
    catch {unset ordertok}
P
Paul Mackerras 已提交
3991 3992

    set curview $n
3993
    set selectedview $n
3994 3995
    .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 已提交
3996

3997
    run refill_reflist
3998
    if {![info exists viewcomplete($n)]} {
3999
	getcommits $selid
P
Paul Mackerras 已提交
4000 4001 4002
	return
    }

4003 4004 4005 4006 4007
    set displayorder {}
    set parentlist {}
    set rowidlist {}
    set rowisopt {}
    set rowfinal {}
4008
    set numcommits $commitidx($n)
4009

P
Paul Mackerras 已提交
4010 4011
    catch {unset colormap}
    catch {unset rowtextx}
4012 4013
    set nextcolor 0
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
4014 4015 4016 4017
    set curview $n
    set row 0
    setcanvscroll
    set yf 0
4018
    set row {}
4019 4020
    if {$selid ne {} && [commitinview $selid $n]} {
	set row [rowofcommit $selid]
P
Paul Mackerras 已提交
4021 4022 4023 4024 4025 4026 4027 4028 4029 4030
	# 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
4031 4032
    if {$row ne {}} {
	selectline $row 0
4033
    } elseif {!$viewcomplete($n)} {
4034
	reset_pending_select $selid
4035
    } else {
4036 4037 4038 4039 4040 4041 4042 4043 4044
	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
	    }
4045 4046
	}
    }
4047 4048
    if {!$viewcomplete($n)} {
	if {$numcommits == 0} {
4049
	    show_status [mc "Reading commits..."]
4050
	}
4051
    } elseif {$numcommits == 0} {
4052
	show_status [mc "No commits selected"]
4053
    }
P
Paul Mackerras 已提交
4054 4055
}

4056 4057
# Stuff relating to the highlighting facility

4058
proc ishighlighted {id} {
4059
    global vhighlights fhighlights nhighlights rhighlights
4060

4061 4062
    if {[info exists nhighlights($id)] && $nhighlights($id) > 0} {
	return $nhighlights($id)
4063
    }
4064 4065
    if {[info exists vhighlights($id)] && $vhighlights($id) > 0} {
	return $vhighlights($id)
4066
    }
4067 4068
    if {[info exists fhighlights($id)] && $fhighlights($id) > 0} {
	return $fhighlights($id)
4069
    }
4070 4071
    if {[info exists rhighlights($id)] && $rhighlights($id) > 0} {
	return $rhighlights($id)
4072
    }
4073 4074 4075
    return 0
}

4076 4077
proc bolden {id font} {
    global canv linehtag currentid boldids need_redisplay
4078

4079 4080
    # need_redisplay = 1 means the display is stale and about to be redrawn
    if {$need_redisplay} return
4081 4082 4083
    lappend boldids $id
    $canv itemconf $linehtag($id) -font $font
    if {[info exists currentid] && $id eq $currentid} {
4084
	$canv delete secsel
4085
	set t [eval $canv create rect [$canv bbox $linehtag($id)] \
4086 4087 4088 4089 4090 4091
		   -outline {{}} -tags secsel \
		   -fill [$canv cget -selectbackground]]
	$canv lower $t
    }
}

4092 4093
proc bolden_name {id font} {
    global canv2 linentag currentid boldnameids need_redisplay
4094

4095
    if {$need_redisplay} return
4096 4097 4098
    lappend boldnameids $id
    $canv2 itemconf $linentag($id) -font $font
    if {[info exists currentid] && $id eq $currentid} {
4099
	$canv2 delete secsel
4100
	set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] \
4101 4102 4103 4104 4105 4106
		   -outline {{}} -tags secsel \
		   -fill [$canv2 cget -selectbackground]]
	$canv2 lower $t
    }
}

4107
proc unbolden {} {
4108
    global boldids
4109

4110
    set stillbold {}
4111 4112 4113
    foreach id $boldids {
	if {![ishighlighted $id]} {
	    bolden $id mainfont
4114
	} else {
4115
	    lappend stillbold $id
4116 4117
	}
    }
4118
    set boldids $stillbold
4119 4120 4121
}

proc addvhighlight {n} {
4122
    global hlview viewcomplete curview vhl_done commitidx
4123 4124

    if {[info exists hlview]} {
4125
	delvhighlight
4126 4127
    }
    set hlview $n
4128
    if {$n != $curview && ![info exists viewcomplete($n)]} {
4129
	start_rev_list $n
4130 4131 4132 4133
    }
    set vhl_done $commitidx($hlview)
    if {$vhl_done > 0} {
	drawvisible
4134 4135 4136
    }
}

4137 4138
proc delvhighlight {} {
    global hlview vhighlights
4139 4140 4141

    if {![info exists hlview]} return
    unset hlview
4142 4143
    catch {unset vhighlights}
    unbolden
4144 4145
}

4146
proc vhighlightmore {} {
4147
    global hlview vhl_done commitidx vhighlights curview
4148 4149

    set max $commitidx($hlview)
4150 4151 4152 4153
    set vr [visiblerows]
    set r0 [lindex $vr 0]
    set r1 [lindex $vr 1]
    for {set i $vhl_done} {$i < $max} {incr i} {
4154 4155 4156
	set id [commitonrow $i $hlview]
	if {[commitinview $id $curview]} {
	    set row [rowofcommit $id]
4157 4158
	    if {$r0 <= $row && $row <= $r1} {
		if {![highlighted $row]} {
4159
		    bolden $id mainfontbold
4160
		}
4161
		set vhighlights($id) 1
4162 4163 4164
	    }
	}
    }
4165
    set vhl_done $max
4166
    return 0
4167 4168 4169
}

proc askvhighlight {row id} {
4170
    global hlview vhighlights iddrawn
4171

4172
    if {[commitinview $id $hlview]} {
4173
	if {[info exists iddrawn($id)] && ![ishighlighted $id]} {
4174
	    bolden $id mainfontbold
4175
	}
4176
	set vhighlights($id) 1
4177
    } else {
4178
	set vhighlights($id) 0
4179 4180 4181
    }
}

4182
proc hfiles_change {} {
4183
    global highlight_files filehighlight fhighlights fh_serial
4184
    global highlight_paths
4185 4186 4187 4188 4189

    if {[info exists filehighlight]} {
	# delete previous highlights
	catch {close $filehighlight}
	unset filehighlight
4190 4191
	catch {unset fhighlights}
	unbolden
4192
	unhighlight_filelist
4193
    }
4194
    set highlight_paths {}
4195 4196 4197 4198 4199 4200 4201
    after cancel do_file_hl $fh_serial
    incr fh_serial
    if {$highlight_files ne {}} {
	after 300 do_file_hl $fh_serial
    }
}

4202 4203 4204
proc gdttype_change {name ix op} {
    global gdttype highlight_files findstring findpattern

4205
    stopfinding
4206
    if {$findstring ne {}} {
4207
	if {$gdttype eq [mc "containing:"]} {
4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228
	    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

4229
    stopfinding
4230
    if {$gdttype eq [mc "containing:"]} {
4231 4232 4233 4234 4235 4236 4237 4238 4239 4240
	findcom_change
    } else {
	if {$highlight_files ne $findstring} {
	    set highlight_files $findstring
	    hfiles_change
	}
    }
    drawvisible
}

4241
proc findcom_change args {
4242
    global nhighlights boldnameids
4243 4244
    global findpattern findtype findstring gdttype

4245
    stopfinding
4246
    # delete previous highlights, if any
4247 4248
    foreach id $boldnameids {
	bolden_name $id mainfont
4249
    }
4250
    set boldnameids {}
4251 4252 4253
    catch {unset nhighlights}
    unbolden
    unmarkmatches
4254
    if {$gdttype ne [mc "containing:"] || $findstring eq {}} {
4255
	set findpattern {}
4256
    } elseif {$findtype eq [mc "Regexp"]} {
4257 4258 4259 4260 4261 4262 4263 4264
	set findpattern $findstring
    } else {
	set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
		   $findstring]
	set findpattern "*$e*"
    }
}

4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278
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
}

4279
proc do_file_hl {serial} {
4280
    global highlight_files filehighlight highlight_paths gdttype fhl_list
4281

4282
    if {$gdttype eq [mc "touching paths:"]} {
4283 4284 4285 4286
	if {[catch {set paths [shellsplit $highlight_files]}]} return
	set highlight_paths [makepatterns $paths]
	highlight_filelist
	set gdtargs [concat -- $paths]
4287
    } elseif {$gdttype eq [mc "adding/removing string:"]} {
4288
	set gdtargs [list "-S$highlight_files"]
4289 4290 4291
    } else {
	# must be "containing:", i.e. we're searching commit info
	return
4292
    }
4293
    set cmd [concat | git diff-tree -r -s --stdin $gdtargs]
4294 4295
    set filehighlight [open $cmd r+]
    fconfigure $filehighlight -blocking 0
4296
    filerun $filehighlight readfhighlight
4297
    set fhl_list {}
4298 4299 4300 4301 4302
    drawvisible
    flushhighlights
}

proc flushhighlights {} {
4303
    global filehighlight fhl_list
4304 4305

    if {[info exists filehighlight]} {
4306
	lappend fhl_list {}
4307 4308 4309 4310 4311 4312
	puts $filehighlight ""
	flush $filehighlight
    }
}

proc askfilehighlight {row id} {
4313
    global filehighlight fhighlights fhl_list
4314

4315
    lappend fhl_list $id
4316
    set fhighlights($id) -1
4317 4318 4319 4320
    puts $filehighlight $id
}

proc readfhighlight {} {
4321
    global filehighlight fhighlights curview iddrawn
4322
    global fhl_list find_dirn
4323

4324 4325 4326 4327 4328
    if {![info exists filehighlight]} {
	return 0
    }
    set nr 0
    while {[incr nr] <= 100 && [gets $filehighlight line] >= 0} {
4329 4330 4331 4332 4333
	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]
4334
	    set fhighlights($id) 0
4335
	}
4336 4337
	set fhl_list [lrange $fhl_list [expr {$i+1}] end]
	if {$line eq {}} continue
4338
	if {![commitinview $line $curview]} continue
4339
	if {[info exists iddrawn($line)] && ![ishighlighted $line]} {
4340
	    bolden $line mainfontbold
4341
	}
4342
	set fhighlights($line) 1
4343
    }
4344 4345
    if {[eof $filehighlight]} {
	# strange...
4346
	puts "oops, git diff-tree died"
4347 4348
	catch {close $filehighlight}
	unset filehighlight
4349
	return 0
4350
    }
4351
    if {[info exists find_dirn]} {
4352
	run findmore
4353
    }
4354
    return 1
4355 4356
}

4357
proc doesmatch {f} {
4358
    global findtype findpattern
4359

4360
    if {$findtype eq [mc "Regexp"]} {
4361
	return [regexp $findpattern $f]
4362
    } elseif {$findtype eq [mc "IgnCase"]} {
4363 4364 4365 4366 4367 4368
	return [string match -nocase $findpattern $f]
    } else {
	return [string match $findpattern $f]
    }
}

4369
proc askfindhighlight {row id} {
4370
    global nhighlights commitinfo iddrawn
4371 4372
    global findloc
    global markingmatches
4373 4374 4375 4376

    if {![info exists commitinfo($id)]} {
	getcommit $id
    }
4377
    set info $commitinfo($id)
4378
    set isbold 0
4379
    set fldtypes [list [mc Headline] [mc Author] [mc Date] [mc Committer] [mc CDate] [mc Comments]]
4380
    foreach f $info ty $fldtypes {
4381
	if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
4382
	    [doesmatch $f]} {
4383
	    if {$ty eq [mc "Author"]} {
4384
		set isbold 2
4385
		break
4386
	    }
4387
	    set isbold 1
4388 4389
	}
    }
4390
    if {$isbold && [info exists iddrawn($id)]} {
4391
	if {![ishighlighted $id]} {
4392
	    bolden $id mainfontbold
4393
	    if {$isbold > 1} {
4394
		bolden_name $id mainfontbold
4395
	    }
4396
	}
4397
	if {$markingmatches} {
4398
	    markrowmatches $row $id
4399 4400
	}
    }
4401
    set nhighlights($id) $isbold
4402 4403
}

4404 4405
proc markrowmatches {row id} {
    global canv canv2 linehtag linentag commitinfo findloc
4406

4407 4408
    set headline [lindex $commitinfo($id) 0]
    set author [lindex $commitinfo($id) 1]
4409 4410
    $canv delete match$row
    $canv2 delete match$row
4411
    if {$findloc eq [mc "All fields"] || $findloc eq [mc "Headline"]} {
4412 4413
	set m [findmatches $headline]
	if {$m ne {}} {
4414 4415
	    markmatches $canv $row $headline $linehtag($id) $m \
		[$canv itemcget $linehtag($id) -font] $row
4416
	}
4417
    }
4418
    if {$findloc eq [mc "All fields"] || $findloc eq [mc "Author"]} {
4419 4420
	set m [findmatches $author]
	if {$m ne {}} {
4421 4422
	    markmatches $canv2 $row $author $linentag($id) $m \
		[$canv2 itemcget $linentag($id) -font] $row
4423
	}
4424 4425 4426
    }
}

4427 4428 4429 4430
proc vrel_change {name ix op} {
    global highlight_related

    rhighlight_none
4431
    if {$highlight_related ne [mc "None"]} {
4432
	run drawvisible
4433 4434 4435 4436 4437 4438
    }
}

# prepare for testing whether commits are descendents or ancestors of a
proc rhighlight_sel {a} {
    global descendent desc_todo ancestor anc_todo
4439
    global highlight_related
4440 4441 4442 4443 4444

    catch {unset descendent}
    set desc_todo [list $a]
    catch {unset ancestor}
    set anc_todo [list $a]
4445
    if {$highlight_related ne [mc "None"]} {
4446
	rhighlight_none
4447
	run drawvisible
4448 4449 4450 4451 4452 4453
    }
}

proc rhighlight_none {} {
    global rhighlights

4454 4455
    catch {unset rhighlights}
    unbolden
4456 4457 4458
}

proc is_descendent {a} {
4459
    global curview children descendent desc_todo
4460 4461

    set v $curview
4462
    set la [rowofcommit $a]
4463 4464 4465 4466 4467
    set todo $desc_todo
    set leftover {}
    set done 0
    for {set i 0} {$i < [llength $todo]} {incr i} {
	set do [lindex $todo $i]
4468
	if {[rowofcommit $do] < $la} {
4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 4490
	    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} {
4491
    global curview parents ancestor anc_todo
4492 4493

    set v $curview
4494
    set la [rowofcommit $a]
4495 4496 4497 4498 4499
    set todo $anc_todo
    set leftover {}
    set done 0
    for {set i 0} {$i < [llength $todo]} {incr i} {
	set do [lindex $todo $i]
4500
	if {![commitinview $do $v] || [rowofcommit $do] > $la} {
4501 4502 4503
	    lappend leftover $do
	    continue
	}
4504
	foreach np $parents($v,$do) {
4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522
	    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} {
4523
    global descendent highlight_related iddrawn rhighlights
4524 4525
    global selectedline ancestor

4526
    if {$selectedline eq {}} return
4527
    set isbold 0
4528 4529
    if {$highlight_related eq [mc "Descendant"] ||
	$highlight_related eq [mc "Not descendant"]} {
4530 4531 4532
	if {![info exists descendent($id)]} {
	    is_descendent $id
	}
4533
	if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} {
4534 4535
	    set isbold 1
	}
4536 4537
    } elseif {$highlight_related eq [mc "Ancestor"] ||
	      $highlight_related eq [mc "Not ancestor"]} {
4538 4539 4540
	if {![info exists ancestor($id)]} {
	    is_ancestor $id
	}
4541
	if {$ancestor($id) == ($highlight_related eq [mc "Ancestor"])} {
4542 4543 4544 4545
	    set isbold 1
	}
    }
    if {[info exists iddrawn($id)]} {
4546
	if {$isbold && ![ishighlighted $id]} {
4547
	    bolden $id mainfontbold
4548 4549
	}
    }
4550
    set rhighlights($id) $isbold
4551 4552
}

4553 4554
# Graph layout functions

P
Paul Mackerras 已提交
4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570
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 {}
4571 4572 4573 4574
    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 已提交
4575
	}
4576
	set o [concat $o $o]
P
Paul Mackerras 已提交
4577
    }
4578
    return $ret
P
Paul Mackerras 已提交
4579 4580
}

4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599 4600
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
	}
4601 4602
	set id [first_real_child $curview,$p]
	if {$id eq {}} {
4603
	    # it's a root
4604
	    set tok [lindex $varctok($curview) $varcid($curview,$p)]
4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625
	    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
}

4626 4627 4628
# Work out where id should go in idlist so that order-token
# values increase from left to right
proc idcol {idlist id {i 0}} {
4629
    set t [ordertoken $id]
4630 4631 4632
    if {$i < 0} {
	set i 0
    }
4633
    if {$i >= [llength $idlist] || $t < [ordertoken [lindex $idlist $i]]} {
4634 4635
	if {$i > [llength $idlist]} {
	    set i [llength $idlist]
P
Paul Mackerras 已提交
4636
	}
4637
	while {[incr i -1] >= 0 && $t < [ordertoken [lindex $idlist $i]]} {}
4638 4639
	incr i
    } else {
4640
	if {$t > [ordertoken [lindex $idlist $i]]} {
4641
	    while {[incr i] < [llength $idlist] &&
4642
		   $t >= [ordertoken [lindex $idlist $i]]} {}
P
Paul Mackerras 已提交
4643 4644
	}
    }
4645
    return $i
P
Paul Mackerras 已提交
4646 4647 4648
}

proc initlayout {} {
4649
    global rowidlist rowisopt rowfinal displayorder parentlist
4650
    global numcommits canvxmax canv
4651
    global nextcolor
4652
    global colormap rowtextx
P
Paul Mackerras 已提交
4653

4654 4655
    set numcommits 0
    set displayorder {}
4656
    set parentlist {}
4657
    set nextcolor 0
4658 4659
    set rowidlist {}
    set rowisopt {}
4660
    set rowfinal {}
4661
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
4662 4663
    catch {unset colormap}
    catch {unset rowtextx}
4664
    setcanvscroll
4665 4666 4667 4668
}

proc setcanvscroll {} {
    global canv canv2 canv3 numcommits linespc canvxmax canvy0
4669
    global lastscrollset lastscrollrows
4670 4671 4672 4673 4674

    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]
4675 4676
    set lastscrollset [clock clicks -milliseconds]
    set lastscrollrows $numcommits
P
Paul Mackerras 已提交
4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697
}

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

4698
proc layoutmore {} {
4699
    global commitidx viewcomplete curview
4700
    global numcommits pending_select curview
4701
    global lastscrollset lastscrollrows
4702 4703 4704

    if {$lastscrollrows < 100 || $viewcomplete($curview) ||
	[clock clicks -milliseconds] - $lastscrollset > 500} {
4705 4706
	setcanvscroll
    }
4707
    if {[info exists pending_select] &&
4708
	[commitinview $pending_select $curview]} {
4709
	update
4710
	selectline [rowofcommit $pending_select] 1
4711
    }
4712
    drawvisible
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 4744 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756
# With path limiting, we mightn't get the actual HEAD commit,
# so ask git rev-list what is the first ancestor of HEAD that
# touches a file in the path limit.
proc get_viewmainhead {view} {
    global viewmainheadid vfilelimit viewinstances mainheadid

    catch {
	set rfd [open [concat | git rev-list -1 $mainheadid \
			   -- $vfilelimit($view)] r]
	set j [reg_instance $rfd]
	lappend viewinstances($view) $j
	fconfigure $rfd -blocking 0
	filerun $rfd [list getviewhead $rfd $j $view]
	set viewmainheadid($curview) {}
    }
}

# git rev-list should give us just 1 line to use as viewmainheadid($view)
proc getviewhead {fd inst view} {
    global viewmainheadid commfd curview viewinstances showlocalchanges

    set id {}
    if {[gets $fd line] < 0} {
	if {![eof $fd]} {
	    return 1
	}
    } elseif {[string length $line] == 40 && [string is xdigit $line]} {
	set id $line
    }
    set viewmainheadid($view) $id
    close $fd
    unset commfd($inst)
    set i [lsearch -exact $viewinstances($view) $inst]
    if {$i >= 0} {
	set viewinstances($view) [lreplace $viewinstances($view) $i $i]
    }
    if {$showlocalchanges && $id ne {} && $view == $curview} {
	doshowlocalchanges
    }
    return 0
}

4757
proc doshowlocalchanges {} {
4758
    global curview viewmainheadid
4759

4760 4761
    if {$viewmainheadid($curview) eq {}} return
    if {[commitinview $viewmainheadid($curview) $curview]} {
4762
	dodiffindex
4763
    } else {
4764
	interestedin $viewmainheadid($curview) dodiffindex
4765 4766 4767 4768
    }
}

proc dohidelocalchanges {} {
4769
    global nullid nullid2 lserial curview
4770

4771
    if {[commitinview $nullid $curview]} {
4772
	removefakerow $nullid
4773
    }
4774
    if {[commitinview $nullid2 $curview]} {
4775
	removefakerow $nullid2
4776 4777 4778 4779
    }
    incr lserial
}

4780
# spawn off a process to do git diff-index --cached HEAD
4781
proc dodiffindex {} {
4782
    global lserial showlocalchanges vfilelimit curview
4783
    global isworktree
4784

4785
    if {!$showlocalchanges || !$isworktree} return
4786
    incr lserial
4787 4788 4789 4790 4791
    set cmd "|git diff-index --cached HEAD"
    if {$vfilelimit($curview) ne {}} {
	set cmd [concat $cmd -- $vfilelimit($curview)]
    }
    set fd [open $cmd r]
4792
    fconfigure $fd -blocking 0
4793 4794
    set i [reg_instance $fd]
    filerun $fd [list readdiffindex $fd $lserial $i]
4795 4796
}

4797
proc readdiffindex {fd serial inst} {
4798 4799
    global viewmainheadid nullid nullid2 curview commitinfo commitdata lserial
    global vfilelimit
4800

4801
    set isdiff 1
4802
    if {[gets $fd line] < 0} {
4803 4804
	if {![eof $fd]} {
	    return 1
4805
	}
4806
	set isdiff 0
4807 4808
    }
    # we only need to see one line and we don't really care what it says...
4809
    stop_instance $inst
4810

P
Paul Mackerras 已提交
4811 4812
    if {$serial != $lserial} {
	return 0
4813 4814
    }

P
Paul Mackerras 已提交
4815
    # now see if there are any local changes not checked in to the index
4816 4817 4818 4819 4820
    set cmd "|git diff-files"
    if {$vfilelimit($curview) ne {}} {
	set cmd [concat $cmd -- $vfilelimit($curview)]
    }
    set fd [open $cmd r]
P
Paul Mackerras 已提交
4821
    fconfigure $fd -blocking 0
4822 4823
    set i [reg_instance $fd]
    filerun $fd [list readdifffiles $fd $serial $i]
P
Paul Mackerras 已提交
4824 4825

    if {$isdiff && ![commitinview $nullid2 $curview]} {
4826
	# add the line for the changes in the index to the graph
4827
	set hl [mc "Local changes checked in to index but not committed"]
4828 4829
	set commitinfo($nullid2) [list  $hl {} {} {} {} "    $hl\n"]
	set commitdata($nullid2) "\n    $hl\n"
4830
	if {[commitinview $nullid $curview]} {
4831
	    removefakerow $nullid
4832
	}
4833
	insertfakerow $nullid2 $viewmainheadid($curview)
P
Paul Mackerras 已提交
4834
    } elseif {!$isdiff && [commitinview $nullid2 $curview]} {
4835 4836 4837
	if {[commitinview $nullid $curview]} {
	    removefakerow $nullid
	}
4838
	removefakerow $nullid2
4839 4840 4841 4842
    }
    return 0
}

4843
proc readdifffiles {fd serial inst} {
4844
    global viewmainheadid nullid nullid2 curview
4845 4846 4847 4848 4849 4850 4851 4852 4853 4854
    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...
4855
    stop_instance $inst
4856

P
Paul Mackerras 已提交
4857 4858 4859 4860 4861
    if {$serial != $lserial} {
	return 0
    }

    if {$isdiff && ![commitinview $nullid $curview]} {
4862
	# add the line for the local diff to the graph
4863
	set hl [mc "Local uncommitted changes, not checked in to index"]
4864 4865
	set commitinfo($nullid) [list  $hl {} {} {} {} "    $hl\n"]
	set commitdata($nullid) "\n    $hl\n"
4866 4867 4868
	if {[commitinview $nullid2 $curview]} {
	    set p $nullid2
	} else {
4869
	    set p $viewmainheadid($curview)
4870
	}
4871
	insertfakerow $nullid $p
P
Paul Mackerras 已提交
4872
    } elseif {!$isdiff && [commitinview $nullid $curview]} {
4873
	removefakerow $nullid
4874 4875
    }
    return 0
P
Paul Mackerras 已提交
4876 4877
}

4878
proc nextuse {id row} {
4879
    global curview children
P
Paul Mackerras 已提交
4880

4881 4882
    if {[info exists children($curview,$id)]} {
	foreach kid $children($curview,$id) {
4883
	    if {![commitinview $kid $curview]} {
4884 4885
		return -1
	    }
4886 4887
	    if {[rowofcommit $kid] > $row} {
		return [rowofcommit $kid]
P
Paul Mackerras 已提交
4888 4889
	    }
	}
4890
    }
4891 4892
    if {[commitinview $id $curview]} {
	return [rowofcommit $id]
4893 4894 4895 4896
    }
    return -1
}

4897
proc prevuse {id row} {
4898
    global curview children
4899 4900 4901 4902

    set ret -1
    if {[info exists children($curview,$id)]} {
	foreach kid $children($curview,$id) {
4903 4904 4905
	    if {![commitinview $kid $curview]} break
	    if {[rowofcommit $kid] < $row} {
		set ret [rowofcommit $kid]
4906 4907
	    }
	}
4908 4909 4910 4911
    }
    return $ret
}

4912 4913
proc make_idlist {row} {
    global displayorder parentlist uparrowlen downarrowlen mingaplen
4914
    global commitidx curview children
P
Paul Mackerras 已提交
4915

4916 4917 4918
    set r [expr {$row - $mingaplen - $downarrowlen - 1}]
    if {$r < 0} {
	set r 0
4919
    }
4920 4921 4922 4923 4924 4925 4926 4927
    set ra [expr {$row - $downarrowlen}]
    if {$ra < 0} {
	set ra 0
    }
    set rb [expr {$row + $uparrowlen}]
    if {$rb > $commitidx($curview)} {
	set rb $commitidx($curview)
    }
4928
    make_disporder $r [expr {$rb + 1}]
4929 4930 4931 4932 4933 4934 4935 4936
    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} {
4937
		lappend ids [list [ordertoken $p] $p]
P
Paul Mackerras 已提交
4938 4939
	    }
	}
4940 4941 4942 4943 4944 4945 4946
    }
    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} {
4947
		lappend ids [list [ordertoken $p] $p]
P
Paul Mackerras 已提交
4948 4949
	    }
	}
4950 4951
    }
    set id [lindex $displayorder $row]
4952
    lappend ids [list [ordertoken $id] $id]
4953 4954 4955
    while {$r < $rb} {
	foreach p [lindex $parentlist $r] {
	    set firstkid [lindex $children($curview,$p) 0]
4956
	    if {[rowofcommit $firstkid] < $row} {
4957
		lappend ids [list [ordertoken $p] $p]
P
Paul Mackerras 已提交
4958 4959
	    }
	}
4960 4961 4962 4963
	incr r
	set id [lindex $displayorder $r]
	if {$id ne {}} {
	    set firstkid [lindex $children($curview,$id) 0]
4964
	    if {$firstkid ne {} && [rowofcommit $firstkid] < $row} {
4965
		lappend ids [list [ordertoken $id] $id]
4966
	    }
P
Paul Mackerras 已提交
4967 4968
	}
    }
4969 4970 4971 4972 4973
    set idlist {}
    foreach idx [lsort -unique $ids] {
	lappend idlist [lindex $idx 1]
    }
    return $idlist
P
Paul Mackerras 已提交
4974 4975
}

4976 4977 4978 4979 4980 4981 4982 4983
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 已提交
4984 4985
}

4986 4987
proc makeupline {id row rend col} {
    global rowidlist uparrowlen downarrowlen mingaplen
P
Paul Mackerras 已提交
4988

4989 4990 4991 4992 4993 4994 4995
    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}]
4996
    }
4997 4998 4999 5000 5001 5002 5003
    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 已提交
5004 5005 5006
    }
}

5007
proc layoutrows {row endrow} {
5008
    global rowidlist rowisopt rowfinal displayorder
5009 5010
    global uparrowlen downarrowlen maxwidth mingaplen
    global children parentlist
5011
    global commitidx viewcomplete curview
P
Paul Mackerras 已提交
5012

5013
    make_disporder [expr {$row - 1}] [expr {$endrow + $uparrowlen}]
5014 5015
    set idlist {}
    if {$row > 0} {
5016 5017
	set rm1 [expr {$row - 1}]
	foreach id [lindex $rowidlist $rm1] {
5018 5019 5020 5021
	    if {$id ne {}} {
		lappend idlist $id
	    }
	}
5022
	set final [lindex $rowfinal $rm1]
5023
    }
5024 5025
    for {} {$row < $endrow} {incr row} {
	set rm1 [expr {$row - 1}]
5026
	if {$rm1 < 0 || $idlist eq {}} {
5027
	    set idlist [make_idlist $row]
5028
	    set final 1
5029 5030 5031 5032 5033 5034 5035 5036
	} 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]
5037 5038 5039 5040
		    # 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
		    }
5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058
		}
	    }
	    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]
5059 5060 5061
		if {$children($curview,$id) ne {}} {
		    makeupline $id $rm1 $row $col
		}
5062 5063 5064 5065 5066 5067 5068
	    }
	    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]
5069
		    if {[rowofcommit $fk] < $row} {
5070 5071 5072 5073 5074 5075 5076 5077
			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]
5078
			if {$fk ne {} && [rowofcommit $fk] < $row} {
5079 5080 5081 5082 5083 5084 5085
			    set x [idcol $idlist $p $x]
			    set idlist [linsert $idlist $x $p]
			}
		    }
		}
	    }
	}
5086 5087 5088 5089 5090
	if {$final && !$viewcomplete($curview) &&
	    $row + $uparrowlen + $mingaplen + $downarrowlen
		>= $commitidx($curview)} {
	    set final 0
	}
5091 5092 5093 5094
	set l [llength $rowidlist]
	if {$row == $l} {
	    lappend rowidlist $idlist
	    lappend rowisopt 0
5095
	    lappend rowfinal $final
5096
	} elseif {$row < $l} {
5097
	    if {![rowsequal $idlist [lindex $rowidlist $row]]} {
5098 5099 5100
		lset rowidlist $row $idlist
		changedrow $row
	    }
5101
	    lset rowfinal $row $final
5102
	} else {
5103 5104
	    set pad [ntimes [expr {$row - $l}] {}]
	    set rowidlist [concat $rowidlist $pad]
5105
	    lappend rowidlist $idlist
5106 5107
	    set rowfinal [concat $rowfinal $pad]
	    lappend rowfinal $final
5108 5109
	    set rowisopt [concat $rowisopt [ntimes [expr {$row - $l + 1}] 0]]
	}
P
Paul Mackerras 已提交
5110
    }
5111
    return $row
P
Paul Mackerras 已提交
5112 5113
}

5114 5115
proc changedrow {row} {
    global displayorder iddrawn rowisopt need_redisplay
P
Paul Mackerras 已提交
5116

5117 5118 5119 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129
    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 已提交
5130 5131 5132 5133
    }
}

proc insert_pad {row col npad} {
5134
    global rowidlist
P
Paul Mackerras 已提交
5135 5136

    set pad [ntimes $npad {}]
P
Paul Mackerras 已提交
5137 5138 5139 5140 5141 5142 5143 5144
    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]
5145
    changedrow $row
P
Paul Mackerras 已提交
5146 5147 5148
}

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

5151 5152 5153
    if {$row < 1} {
	set row 1
    }
5154 5155
    for {} {$row < $endrow} {incr row; set col 0} {
	if {[lindex $rowisopt $row]} continue
P
Paul Mackerras 已提交
5156
	set haspad 0
5157 5158
	set y0 [expr {$row - 1}]
	set ym [expr {$row - 2}]
5159 5160 5161 5162 5163 5164 5165 5166 5167
	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 {}
	}
5168 5169 5170 5171 5172 5173
	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 已提交
5174 5175 5176
		set haspad 1
		continue
	    }
5177 5178 5179
	    set x0 [lsearch -exact $previdlist $id]
	    if {$x0 < 0} continue
	    set z [expr {$x0 - $col}]
P
Paul Mackerras 已提交
5180
	    set isarrow 0
5181 5182 5183 5184 5185 5186 5187
	    set z0 {}
	    if {$ym >= 0} {
		set xm [lsearch -exact $pprevidlist $id]
		if {$xm >= 0} {
		    set z0 [expr {$xm - $x0}]
		}
	    }
P
Paul Mackerras 已提交
5188
	    if {$z0 eq {}} {
5189 5190 5191
		# 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 已提交
5192 5193 5194
		    set isarrow 1
		}
	    }
P
Paul Mackerras 已提交
5195 5196 5197 5198
	    if {!$isarrow && $id ne [lindex $displayorder $row] &&
		[lsearch -exact [lindex $rowidlist [expr {$row+1}]] $id] < 0} {
		set isarrow 1
	    }
5199 5200 5201 5202
	    # 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 已提交
5203
	    if {$z < -1 || ($z < 0 && $isarrow)} {
5204 5205
		# Line currently goes left too much;
		# insert pads in the previous row, then optimize it
P
Paul Mackerras 已提交
5206 5207 5208 5209 5210
		set npad [expr {-1 - $z + $isarrow}]
		insert_pad $y0 $x0 $npad
		if {$y0 > 0} {
		    optimize_rows $y0 $x0 $row
		}
5211 5212 5213 5214 5215 5216 5217 5218
		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 已提交
5219
	    } elseif {$z > 1 || ($z > 0 && $isarrow)} {
5220
		# Line currently goes right too much;
5221
		# insert pads in this line
P
Paul Mackerras 已提交
5222
		set npad [expr {$z - 1 + $isarrow}]
P
Paul Mackerras 已提交
5223 5224
		insert_pad $row $col $npad
		set idlist [lindex $rowidlist $row]
P
Paul Mackerras 已提交
5225
		incr col $npad
5226
		set z [expr {$x0 - $col}]
P
Paul Mackerras 已提交
5227 5228
		set haspad 1
	    }
5229
	    if {$z0 eq {} && !$isarrow && $ym >= 0} {
5230
		# this line links to its first child on row $row-2
5231 5232
		set id [lindex $displayorder $ym]
		set xc [lsearch -exact $pprevidlist $id]
5233 5234 5235 5236
		if {$xc >= 0} {
		    set z0 [expr {$xc - $x0}]
		}
	    }
5237
	    # avoid lines jigging left then immediately right
P
Paul Mackerras 已提交
5238 5239
	    if {$z0 ne {} && $z < 0 && $z0 > 0} {
		insert_pad $y0 $x0 1
5240 5241 5242
		incr x0
		optimize_rows $y0 $x0 $row
		set previdlist [lindex $rowidlist $y0]
P
Paul Mackerras 已提交
5243 5244 5245
	    }
	}
	if {!$haspad} {
5246
	    # Find the first column that doesn't have a line going right
P
Paul Mackerras 已提交
5247
	    for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
5248 5249 5250 5251
		set id [lindex $idlist $col]
		if {$id eq {}} break
		set x0 [lsearch -exact $previdlist $id]
		if {$x0 < 0} {
5252
		    # check if this is the link to the first child
5253 5254
		    set kid [lindex $displayorder $y0]
		    if {[lindex $children($curview,$id) 0] eq $kid} {
5255
			# it is, work out offset to child
5256
			set x0 [lsearch -exact $previdlist $kid]
5257 5258
		    }
		}
5259
		if {$x0 <= $col} break
P
Paul Mackerras 已提交
5260
	    }
5261
	    # Insert a pad at that column as long as it has a line and
5262 5263
	    # isn't the last column
	    if {$x0 >= 0 && [incr col] < [llength $idlist]} {
P
Paul Mackerras 已提交
5264
		set idlist [linsert $idlist $col {}]
5265 5266
		lset rowidlist $row $idlist
		changedrow $row
P
Paul Mackerras 已提交
5267 5268 5269 5270 5271 5272 5273 5274 5275 5276 5277 5278 5279 5280 5281
	    }
	}
    }
}

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

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

5282 5283 5284 5285 5286 5287 5288 5289 5290 5291
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 已提交
5292
proc rowranges {id} {
5293
    global curview children uparrowlen downarrowlen
5294
    global rowidlist
P
Paul Mackerras 已提交
5295

5296 5297 5298
    set kids $children($curview,$id)
    if {$kids eq {}} {
	return {}
5299
    }
5300 5301 5302
    set ret {}
    lappend kids $id
    foreach child $kids {
5303 5304
	if {![commitinview $child $curview]} break
	set row [rowofcommit $child]
5305 5306
	if {![info exists prev]} {
	    lappend ret [expr {$row + 1}]
5307
	} else {
5308
	    if {$row <= $prevrow} {
5309
		puts "oops children of [shortids $id] out of order [shortids $child] $row <= [shortids $prev] $prevrow"
5310 5311 5312 5313 5314 5315 5316 5317 5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337 5338 5339 5340
	    }
	    # 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
5341
	}
5342
	set prev $child
5343
	set prevrow $row
P
Paul Mackerras 已提交
5344
    }
5345
    return $ret
5346 5347 5348 5349
}

proc drawlineseg {id row endrow arrowlow} {
    global rowidlist displayorder iddrawn linesegs
P
Paul Mackerras 已提交
5350
    global canv colormap linespc curview maxlinelen parentlist
5351 5352 5353 5354

    set cols [list [lsearch -exact [lindex $rowidlist $row] $id]]
    set le [expr {$row + 1}]
    set arrowhigh 1
P
Paul Mackerras 已提交
5355
    while {1} {
5356 5357 5358 5359 5360 5361 5362 5363 5364 5365
	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 已提交
5366
	}
5367 5368 5369 5370 5371 5372 5373 5374 5375
	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 已提交
5376
    }
5377 5378 5379 5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392 5393 5394 5395 5396 5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423 5424
    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 已提交
5425 5426 5427 5428 5429
    } elseif {$arrowlow} {
	if {[lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0 ||
	    [lsearch -exact [lindex $parentlist [expr {$row-1}]] $id] >= 0} {
	    set arrowlow 0
	}
5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 5441 5442 5443 5444 5445 5446 5447
    }
    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 已提交
5448 5449 5450 5451 5452 5453 5454 5455 5456 5457 5458 5459 5460
	    } 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} {
5461 5462 5463 5464 5465
		    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
5466
	    }
5467 5468 5469 5470
	    lappend coords [xc $row $x] [yc $row]
	} else {
	    set xn [xc $row $xp]
	    set yn [yc $row]
P
Paul Mackerras 已提交
5471
	    lappend coords $xn $yn
5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 5486 5487 5488 5489 5490 5491 5492 5493 5494 5495 5496 5497 5498 5499 5500 5501 5502 5503 5504 5505 5506
	}
	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
5507 5508
	}
    }
5509 5510 5511

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

5514 5515
proc drawparentlinks {id row} {
    global rowidlist canv colormap curview parentlist
5516
    global idpos linespc
P
Paul Mackerras 已提交
5517

5518 5519 5520 5521
    set rowids [lindex $rowidlist $row]
    set col [lsearch -exact $rowids $id]
    if {$col < 0} return
    set olds [lindex $parentlist $row]
P
Paul Mackerras 已提交
5522 5523 5524 5525
    set row2 [expr {$row + 1}]
    set x [xc $row $col]
    set y [yc $row]
    set y2 [yc $row2]
P
Paul Mackerras 已提交
5526
    set d [expr {int(0.5 * $linespc)}]
5527
    set ymid [expr {$y + $d}]
5528
    set ids [lindex $rowidlist $row2]
P
Paul Mackerras 已提交
5529 5530 5531
    # rmx = right-most X coord used
    set rmx 0
    foreach p $olds {
5532 5533 5534 5535 5536 5537 5538 5539 5540
	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
	}
5541 5542
	set j [lsearch -exact $rowids $p]
	if {$j < 0} {
5543 5544 5545
	    # drawlineseg will do this one for us
	    continue
	}
P
Paul Mackerras 已提交
5546 5547 5548
	assigncolor $p
	# should handle duplicated parents here...
	set coords [list $x $y]
5549 5550 5551 5552 5553 5554 5555 5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 5569 5570
	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 已提交
5571
	}
5572
	set t [$canv create line $coords -width [linewidth $p] \
P
Paul Mackerras 已提交
5573 5574 5575 5576
		   -fill $colormap($p) -tags lines.$p]
	$canv lower $t
	bindline $t $p
    }
5577 5578 5579 5580
    if {$rmx > [lindex $idpos($id) 1]} {
	lset idpos($id) 1 $rmx
	redrawtags $id
    }
P
Paul Mackerras 已提交
5581 5582
}

5583
proc drawlines {id} {
5584
    global canv
P
Paul Mackerras 已提交
5585

5586
    $canv itemconf lines.$id -width [linewidth $id]
P
Paul Mackerras 已提交
5587 5588
}

5589
proc drawcmittext {id row col} {
5590 5591
    global linespc canv canv2 canv3 fgcolor curview
    global cmitlisted commitinfo rowidlist parentlist
P
Paul Mackerras 已提交
5592
    global rowtextx idpos idtags idheads idotherrefs
5593
    global linehtag linentag linedtag selectedline
5594
    global canvxmax boldids boldnameids fgcolor
5595
    global mainheadid nullid nullid2 circleitem circlecolors ctxbut
P
Paul Mackerras 已提交
5596

5597
    # listed is 0 for boundary, 1 for normal, 2 for negative, 3 for left, 4 for right
5598
    set listed $cmitlisted($curview,$id)
5599 5600
    if {$id eq $nullid} {
	set ofill red
5601
    } elseif {$id eq $nullid2} {
5602
	set ofill green
5603 5604
    } elseif {$id eq $mainheadid} {
	set ofill yellow
5605
    } else {
5606
	set ofill [lindex $circlecolors $listed]
5607
    }
P
Paul Mackerras 已提交
5608 5609 5610
    set x [xc $row $col]
    set y [yc $row]
    set orad [expr {$linespc / 3}]
5611
    if {$listed <= 2} {
5612 5613 5614
	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]
5615
    } elseif {$listed == 3} {
5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 5628 5629
	# 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]
    }
5630
    set circleitem($row) $t
P
Paul Mackerras 已提交
5631 5632
    $canv raise $t
    $canv bind $t <1> {selcanvline {} %x %y}
5633 5634 5635 5636 5637 5638 5639 5640 5641 5642
    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 已提交
5643
    }
5644
    set xt [xc $row $rmx]
P
Paul Mackerras 已提交
5645 5646 5647 5648 5649 5650 5651 5652 5653 5654
    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]
5655 5656
    set font mainfont
    set nfont mainfont
5657
    set isbold [ishighlighted $id]
5658
    if {$isbold > 0} {
5659
	lappend boldids $id
5660
	set font mainfontbold
5661
	if {$isbold > 1} {
5662
	    lappend boldnameids $id
5663
	    set nfont mainfontbold
5664
	}
5665
    }
5666 5667 5668 5669 5670 5671 5672
    set linehtag($id) [$canv create text $xt $y -anchor w -fill $fgcolor \
			   -text $headline -font $font -tags text]
    $canv bind $linehtag($id) $ctxbut "rowmenu %X %Y $id"
    set linentag($id) [$canv2 create text 3 $y -anchor w -fill $fgcolor \
			   -text $name -font $nfont -tags text]
    set linedtag($id) [$canv3 create text 3 $y -anchor w -fill $fgcolor \
			   -text $date -font mainfont -tags text]
5673
    if {$selectedline == $row} {
5674
	make_secsel $id
5675
    }
5676
    set xr [expr {$xt + [font measure $font $headline]}]
5677 5678 5679 5680
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
P
Paul Mackerras 已提交
5681 5682 5683
}

proc drawcmitrow {row} {
5684
    global displayorder rowidlist nrows_drawn
5685
    global iddrawn markingmatches
5686
    global commitinfo numcommits
5687
    global filehighlight fhighlights findpattern nhighlights
5688
    global hlview vhighlights
5689
    global highlight_related rhighlights
P
Paul Mackerras 已提交
5690

5691
    if {$row >= $numcommits} return
P
Paul Mackerras 已提交
5692 5693

    set id [lindex $displayorder $row]
5694
    if {[info exists hlview] && ![info exists vhighlights($id)]} {
5695 5696
	askvhighlight $row $id
    }
5697
    if {[info exists filehighlight] && ![info exists fhighlights($id)]} {
5698 5699
	askfilehighlight $row $id
    }
5700
    if {$findpattern ne {} && ![info exists nhighlights($id)]} {
5701
	askfindhighlight $row $id
5702
    }
5703
    if {$highlight_related ne [mc "None"] && ![info exists rhighlights($id)]} {
5704 5705
	askrelhighlight $row $id
    }
5706 5707 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717
    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
5718
	incr nrows_drawn
P
Paul Mackerras 已提交
5719
    }
5720 5721
    if {$markingmatches} {
	markrowmatches $row $id
P
Paul Mackerras 已提交
5722 5723 5724
    }
}

5725
proc drawcommits {row {endrow {}}} {
5726
    global numcommits iddrawn displayorder curview need_redisplay
5727
    global parentlist rowidlist rowfinal uparrowlen downarrowlen nrows_drawn
P
Paul Mackerras 已提交
5728 5729 5730 5731

    if {$row < 0} {
	set row 0
    }
5732 5733 5734
    if {$endrow eq {}} {
	set endrow $row
    }
P
Paul Mackerras 已提交
5735 5736 5737
    if {$endrow >= $numcommits} {
	set endrow [expr {$numcommits - 1}]
    }
5738

5739 5740 5741 5742 5743 5744 5745 5746 5747 5748 5749 5750 5751
    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} {
5752
	if {[lindex $rowidlist $r] ne {} && [lindex $rowfinal $r]} {
5753 5754 5755 5756 5757 5758 5759 5760 5761 5762 5763 5764 5765 5766
	    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
    }

5767 5768 5769 5770 5771 5772 5773 5774 5775 5776 5777 5778 5779
    # 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)]
5780
	drawcmitrow $r
5781 5782
	if {$r == $er} break
	set nextid [lindex $displayorder [expr {$r + 1}]]
5783
	if {$wasdrawn && [info exists iddrawn($nextid)]} continue
5784 5785 5786 5787 5788
	drawparentlinks $id $r

	set rowids [lindex $rowidlist $r]
	foreach lid $rowids {
	    if {$lid eq {}} continue
5789
	    if {[info exists lineend($lid)] && $lineend($lid) > $r} continue
5790 5791 5792 5793 5794
	    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
5795
			set lineend($p) [drawlineseg $p $r $er 0]
5796 5797
		    }
		}
5798 5799
	    } else {
		set lineend($lid) [drawlineseg $lid $r $er 1]
5800 5801
	    }
	}
P
Paul Mackerras 已提交
5802 5803 5804
    }
}

5805 5806 5807 5808 5809 5810 5811 5812 5813 5814 5815 5816 5817 5818 5819 5820 5821 5822
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
    }
}

5823 5824
proc drawvisible {} {
    global canv linespc curview vrowmod selectedline targetrow targetid
5825
    global need_redisplay cscroll numcommits
5826

5827
    set fs [$canv yview]
5828
    set ymax [lindex [$canv cget -scrollregion] 3]
5829
    if {$ymax eq {} || $ymax == 0 || $numcommits == 0} return
5830 5831
    set f0 [lindex $fs 0]
    set f1 [lindex $fs 1]
5832 5833
    set y0 [expr {int($f0 * $ymax)}]
    set y1 [expr {int($f1 * $ymax)}]
5834 5835

    if {[info exists targetid]} {
5836 5837 5838 5839 5840 5841 5842 5843 5844 5845 5846 5847 5848 5849 5850 5851 5852 5853 5854
	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
5855 5856 5857 5858
	}
    }

    set row [expr {int(($y0 - 3) / $linespc) - 1}]
5859
    set endrow [expr {int(($y1 - 3) / $linespc) + 1}]
5860 5861 5862
    if {$endrow >= $vrowmod($curview)} {
	update_arcrows $curview
    }
5863
    if {$selectedline ne {} &&
5864 5865
	$row <= $selectedline && $selectedline <= $endrow} {
	set targetrow $selectedline
5866
    } elseif {[info exists targetid]} {
5867 5868
	set targetrow [expr {int(($row + $endrow) / 2)}]
    }
5869 5870 5871 5872 5873
    if {[info exists targetrow]} {
	if {$targetrow >= $numcommits} {
	    set targetrow [expr {$numcommits - 1}]
	}
	set targetid [commitonrow $targetrow]
5874
    }
5875 5876 5877
    drawcommits $row $endrow
}

P
Paul Mackerras 已提交
5878
proc clear_display {} {
5879
    global iddrawn linesegs need_redisplay nrows_drawn
5880
    global vhighlights fhighlights nhighlights rhighlights
5881
    global linehtag linentag linedtag boldids boldnameids
P
Paul Mackerras 已提交
5882 5883 5884

    allcanvs delete all
    catch {unset iddrawn}
5885
    catch {unset linesegs}
5886 5887 5888
    catch {unset linehtag}
    catch {unset linentag}
    catch {unset linedtag}
5889 5890
    set boldids {}
    set boldnameids {}
5891 5892 5893
    catch {unset vhighlights}
    catch {unset fhighlights}
    catch {unset nhighlights}
5894
    catch {unset rhighlights}
5895 5896
    set need_redisplay 0
    set nrows_drawn 0
P
Paul Mackerras 已提交
5897 5898
}

P
Paul Mackerras 已提交
5899
proc findcrossings {id} {
5900
    global rowidlist parentlist numcommits displayorder
P
Paul Mackerras 已提交
5901 5902 5903 5904 5905 5906 5907

    set cross {}
    set ccross {}
    foreach {s e} [rowranges $id] {
	if {$e >= $numcommits} {
	    set e [expr {$numcommits - 1}]
	}
5908
	if {$e <= $s} continue
P
Paul Mackerras 已提交
5909
	for {set row $e} {[incr row -1] >= $s} {} {
5910 5911
	    set x [lsearch -exact [lindex $rowidlist $row] $id]
	    if {$x < 0} break
P
Paul Mackerras 已提交
5912 5913 5914 5915 5916 5917 5918 5919 5920 5921 5922 5923 5924 5925 5926 5927 5928 5929 5930 5931 5932 5933
	    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]
}

5934
proc assigncolor {id} {
P
Paul Mackerras 已提交
5935
    global colormap colors nextcolor
5936
    global parents children children curview
5937

5938
    if {[info exists colormap($id)]} return
5939
    set ncolors [llength $colors]
5940 5941
    if {[info exists children($curview,$id)]} {
	set kids $children($curview,$id)
5942 5943 5944 5945 5946
    } else {
	set kids {}
    }
    if {[llength $kids] == 1} {
	set child [lindex $kids 0]
5947
	if {[info exists colormap($child)]
5948
	    && [llength $parents($curview,$child)] == 1} {
5949 5950
	    set colormap($id) $colormap($child)
	    return
5951
	}
5952 5953
    }
    set badcolors {}
P
Paul Mackerras 已提交
5954 5955 5956 5957 5958 5959
    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
5960
	}
P
Paul Mackerras 已提交
5961 5962 5963
	if {[info exists colormap($x)]
	    && [lsearch -exact $badcolors $colormap($x)] < 0} {
	    lappend badcolors $colormap($x)
5964 5965
	}
    }
P
Paul Mackerras 已提交
5966 5967
    if {[llength $badcolors] >= $ncolors} {
	set badcolors $origbad
5968
    }
P
Paul Mackerras 已提交
5969
    set origbad $badcolors
5970
    if {[llength $badcolors] < $ncolors - 1} {
5971
	foreach child $kids {
5972 5973 5974 5975
	    if {[info exists colormap($child)]
		&& [lsearch -exact $badcolors $colormap($child)] < 0} {
		lappend badcolors $colormap($child)
	    }
5976
	    foreach p $parents($curview,$child) {
5977 5978 5979
		if {[info exists colormap($p)]
		    && [lsearch -exact $badcolors $colormap($p)] < 0} {
		    lappend badcolors $colormap($p)
5980 5981 5982 5983 5984 5985
		}
	    }
	}
	if {[llength $badcolors] >= $ncolors} {
	    set badcolors $origbad
	}
5986 5987 5988 5989 5990
    }
    for {set i 0} {$i <= $ncolors} {incr i} {
	set c [lindex $colors $nextcolor]
	if {[incr nextcolor] >= $ncolors} {
	    set nextcolor 0
5991
	}
5992
	if {[lsearch -exact $badcolors $c]} break
5993
    }
5994
    set colormap($id) $c
5995 5996
}

5997 5998 5999 6000 6001 6002
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"
6003
    $canv bind $t <Button-1> "lineclick %x %y $id 1"
6004 6005
}

6006
proc drawtags {id x xt y1} {
6007
    global idtags idheads idotherrefs mainhead
6008
    global linespc lthickness
6009
    global canv rowtextx curview fgcolor bgcolor ctxbut
6010 6011 6012

    set marks {}
    set ntags 0
6013
    set nheads 0
6014 6015 6016 6017 6018 6019
    if {[info exists idtags($id)]} {
	set marks $idtags($id)
	set ntags [llength $marks]
    }
    if {[info exists idheads($id)]} {
	set marks [concat $marks $idheads($id)]
6020 6021 6022 6023
	set nheads [llength $idheads($id)]
    }
    if {[info exists idotherrefs($id)]} {
	set marks [concat $marks $idotherrefs($id)]
6024 6025 6026 6027 6028 6029
    }
    if {$marks eq {}} {
	return $xt
    }

    set delta [expr {int(0.5 * ($linespc - $lthickness))}]
J
Jeff Hobbs 已提交
6030 6031
    set yt [expr {$y1 - 0.5 * $linespc}]
    set yb [expr {$yt + $linespc - 1}]
6032 6033
    set xvals {}
    set wvals {}
6034
    set i -1
6035
    foreach tag $marks {
6036 6037
	incr i
	if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} {
6038
	    set wid [font measure mainfontbold $tag]
6039
	} else {
6040
	    set wid [font measure mainfont $tag]
6041
	}
6042 6043 6044 6045 6046 6047 6048 6049
	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 已提交
6050 6051
	set xl [expr {$x + $delta}]
	set xr [expr {$x + $delta + $wid + $lthickness}]
6052
	set font mainfont
6053 6054
	if {[incr ntags -1] >= 0} {
	    # draw a tag
J
Jeff Hobbs 已提交
6055 6056
	    set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
		       $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
6057 6058
		       -width 1 -outline black -fill yellow -tags tag.$id]
	    $canv bind $t <1> [list showtag $tag 1]
6059
	    set rowtextx([rowofcommit $id]) [expr {$xr + $linespc}]
6060
	} else {
6061 6062 6063
	    # draw a head or other ref
	    if {[incr nheads -1] >= 0} {
		set col green
6064
		if {$tag eq $mainhead} {
6065
		    set font mainfontbold
6066
		}
6067 6068 6069
	    } else {
		set col "#ddddff"
	    }
J
Jeff Hobbs 已提交
6070
	    set xl [expr {$xl - $delta/2}]
6071
	    $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
6072
		-width 1 -outline black -fill $col -tags tag.$id
6073
	    if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
6074
	        set rwid [font measure mainfont $remoteprefix]
6075 6076 6077 6078 6079 6080
		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
	    }
6081
	}
6082
	set t [$canv create text $xl $y1 -anchor w -text $tag -fill $fgcolor \
6083
		   -font $font -tags [list tag.$id text]]
6084 6085
	if {$ntags >= 0} {
	    $canv bind $t <1> [list showtag $tag 1]
6086
	} elseif {$nheads >= 0} {
6087
	    $canv bind $t $ctxbut [list headmenu %X %Y $id $tag]
6088
	}
6089 6090 6091 6092
    }
    return $xt
}

6093 6094 6095 6096 6097 6098 6099 6100 6101 6102 6103
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
}
6104

6105
proc show_status {msg} {
6106
    global canv fgcolor
6107 6108

    clear_display
6109
    $canv create text 3 3 -anchor nw -text $msg -font mainfont \
6110
	-tags text -fill $fgcolor
6111 6112
}

6113 6114 6115 6116 6117 6118 6119 6120 6121
# 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
6122 6123
}

6124 6125
proc nowbusy {what {name {}}} {
    global isbusy busyname statusw
6126 6127 6128 6129 6130 6131

    if {[array names isbusy] eq {}} {
	. config -cursor watch
	settextcursor watch
    }
    set isbusy($what) 1
6132 6133 6134 6135
    set busyname($what) $name
    if {$name ne {}} {
	$statusw conf -text $name
    }
6136 6137 6138
}

proc notbusy {what} {
6139
    global isbusy maincursor textcursor busyname statusw
6140

6141 6142 6143 6144 6145 6146 6147
    catch {
	unset isbusy($what)
	if {$busyname($what) ne {} &&
	    [$statusw cget -text] eq $busyname($what)} {
	    $statusw conf -text {}
	}
    }
6148 6149 6150 6151 6152 6153
    if {[array names isbusy] eq {}} {
	. config -cursor $maincursor
	settextcursor $textcursor
    }
}

6154
proc findmatches {f} {
6155
    global findtype findstring
6156
    if {$findtype == [mc "Regexp"]} {
6157
	set matches [regexp -indices -all -inline $findstring $f]
6158
    } else {
6159
	set fs $findstring
6160
	if {$findtype == [mc "IgnCase"]} {
6161 6162
	    set f [string tolower $f]
	    set fs [string tolower $fs]
6163 6164 6165
	}
	set matches {}
	set i 0
6166 6167 6168 6169
	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}]
6170 6171 6172 6173 6174
	}
    }
    return $matches
}

6175
proc dofind {{dirn 1} {wrap 1}} {
6176
    global findstring findstartline findcurline selectedline numcommits
6177
    global gdttype filehighlight fh_serial find_dirn findallowwrap
6178

6179 6180 6181 6182
    if {[info exists find_dirn]} {
	if {$find_dirn == $dirn} return
	stopfinding
    }
6183
    focus .
6184
    if {$findstring eq {} || $numcommits == 0} return
6185
    if {$selectedline eq {}} {
6186
	set findstartline [lindex [visiblerows] [expr {$dirn < 0}]]
6187
    } else {
6188
	set findstartline $selectedline
6189
    }
6190
    set findcurline $findstartline
6191 6192
    nowbusy finding [mc "Searching"]
    if {$gdttype ne [mc "containing:"] && ![info exists filehighlight]} {
6193 6194
	after cancel do_file_hl $fh_serial
	do_file_hl $fh_serial
6195
    }
6196 6197 6198
    set find_dirn $dirn
    set findallowwrap $wrap
    run findmore
6199 6200
}

6201 6202
proc stopfinding {} {
    global find_dirn findcurline fprogcoord
6203

6204 6205 6206 6207 6208 6209
    if {[info exists find_dirn]} {
	unset find_dirn
	unset findcurline
	notbusy finding
	set fprogcoord 0
	adjustprogress
6210
    }
6211
    stopblaming
6212 6213 6214
}

proc findmore {} {
6215
    global commitdata commitinfo numcommits findpattern findloc
6216
    global findstartline findcurline findallowwrap
6217
    global find_dirn gdttype fhighlights fprogcoord
6218
    global curview varcorder vrownum varccommits vrowmod
6219

6220
    if {![info exists find_dirn]} {
6221 6222
	return 0
    }
6223
    set fldtypes [list [mc "Headline"] [mc "Author"] [mc "Date"] [mc "Committer"] [mc "CDate"] [mc "Comments"]]
6224
    set l $findcurline
6225 6226 6227 6228 6229 6230 6231 6232 6233 6234 6235
    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 已提交
6236
	}
6237
    } else {
6238 6239
	if {$l == 0} {
	    set l $numcommits
6240
	}
6241 6242 6243
	incr l -1
	if {$l >= $findstartline} {
	    set lim [expr {$findstartline - 1}]
6244
	} else {
6245 6246
	    set lim -1
	    set moretodo $findallowwrap
6247
	}
6248
    }
6249 6250 6251 6252
    set n [expr {($lim - $l) * $find_dirn}]
    if {$n > 500} {
	set n 500
	set moretodo 1
6253
    }
6254 6255 6256
    if {$l + ($find_dirn > 0? $n: 1) > $vrowmod($curview)} {
	update_arcrows $curview
    }
6257 6258
    set found 0
    set domore 1
6259 6260 6261 6262 6263
    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]}]
6264
    if {$gdttype eq [mc "containing:"]} {
6265
	for {} {$n > 0} {incr n -1; incr l $find_dirn} {
6266 6267 6268 6269 6270 6271 6272 6273
	    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}]]
6274
	    # shouldn't happen unless git log doesn't give all the commits...
6275 6276 6277 6278
	    if {![info exists commitdata($id)] ||
		![doesmatch $commitdata($id)]} {
		continue
	    }
6279 6280 6281 6282 6283
	    if {![info exists commitinfo($id)]} {
		getcommit $id
	    }
	    set info $commitinfo($id)
	    foreach f $info ty $fldtypes {
6284
		if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
6285 6286 6287 6288 6289 6290
		    [doesmatch $f]} {
		    set found 1
		    break
		}
	    }
	    if {$found} break
6291
	}
6292
    } else {
6293
	for {} {$n > 0} {incr n -1; incr l $find_dirn} {
6294 6295 6296 6297 6298 6299 6300 6301
	    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}]]
6302 6303
	    if {![info exists fhighlights($id)]} {
		# this sets fhighlights($id) to -1
6304
		askfilehighlight $l $id
6305
	    }
6306
	    if {$fhighlights($id) > 0} {
6307 6308 6309
		set found $domore
		break
	    }
6310
	    if {$fhighlights($id) < 0} {
6311 6312
		if {$domore} {
		    set domore 0
6313
		    set findcurline [expr {$l - $find_dirn}]
6314
		}
6315 6316 6317
	    }
	}
    }
6318
    if {$found || ($domore && !$moretodo)} {
6319
	unset findcurline
6320
	unset find_dirn
6321
	notbusy finding
6322 6323 6324 6325 6326 6327 6328
	set fprogcoord 0
	adjustprogress
	if {$found} {
	    findselectline $l
	} else {
	    bell
	}
6329
	return 0
6330
    }
6331 6332
    if {!$domore} {
	flushhighlights
6333
    } else {
6334
	set findcurline [expr {$l - $find_dirn}]
6335
    }
6336
    set n [expr {($findcurline - $findstartline) * $find_dirn - 1}]
6337 6338
    if {$n < 0} {
	incr n $numcommits
6339
    }
6340 6341 6342
    set fprogcoord [expr {$n * 1.0 / $numcommits}]
    adjustprogress
    return $domore
6343 6344 6345
}

proc findselectline {l} {
6346
    global findloc commentend ctext findcurline markingmatches gdttype
6347

6348
    set markingmatches [expr {$gdttype eq [mc "containing:"]}]
6349
    set findcurline $l
6350
    selectline $l 1
6351 6352
    if {$markingmatches &&
	($findloc eq [mc "All fields"] || $findloc eq [mc "Comments"])} {
6353 6354 6355 6356 6357
	# 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 已提交
6358
	    set end [expr {[lindex $match 1] + 1}]
6359 6360
	    $ctext tag add found "1.0 + $start c" "1.0 + $end c"
	}
6361
    }
6362
    drawvisible
6363 6364
}

6365
# mark the bits of a headline or author that match a find string
6366 6367 6368
proc markmatches {canv l str tag matches font row} {
    global selectedline

6369 6370 6371 6372 6373 6374 6375 6376
    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 已提交
6377 6378 6379 6380
	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 \
6381
		   -outline {} -tags [list match$l matches] -fill yellow]
6382
	$canv lower $t
6383
	if {$row == $selectedline} {
6384 6385
	    $canv raise $t secsel
	}
6386 6387 6388 6389
    }
}

proc unmarkmatches {} {
6390
    global markingmatches
6391

6392
    allcanvs delete matches
6393
    set markingmatches 0
6394
    stopfinding
6395 6396
}

6397
proc selcanvline {w x y} {
6398
    global canv canvy0 ctext linespc
P
Paul Mackerras 已提交
6399
    global rowtextx
6400
    set ymax [lindex [$canv cget -scrollregion] 3]
6401
    if {$ymax == {}} return
6402 6403 6404 6405 6406 6407
    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
    }
6408
    if {$w eq $canv} {
6409 6410 6411
	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
6412
    }
6413
    unmarkmatches
6414
    selectline $l 1
6415 6416
}

6417 6418
proc commit_descriptor {p} {
    global commitinfo
6419 6420 6421
    if {![info exists commitinfo($p)]} {
	getcommit $p
    }
6422
    set l "..."
6423
    if {[llength $commitinfo($p)] > 1} {
6424 6425
	set l [lindex $commitinfo($p) 0]
    }
P
Paul Mackerras 已提交
6426
    return "$p ($l)\n"
6427 6428
}

6429 6430
# append some text to the ctext widget, and make any SHA1 ID
# that we know about be a clickable link.
6431
proc appendwithlinks {text tags} {
6432
    global ctext linknum curview
6433 6434

    set start [$ctext index "end - 1c"]
6435
    $ctext insert end $text $tags
6436
    set links [regexp -indices -all -inline {\m[0-9a-f]{6,40}\M} $text]
6437 6438 6439 6440 6441
    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 已提交
6442
	$ctext tag delete link$linknum
6443
	$ctext tag add link$linknum "$start + $s c" "$start + $e c"
6444
	setlink $linkid link$linknum
6445 6446
	incr linknum
    }
6447 6448 6449
}

proc setlink {id lk} {
6450
    global curview ctext pendinglinks
6451

6452 6453 6454 6455 6456 6457 6458 6459 6460 6461 6462 6463
    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} {
6464
	$ctext tag conf $lk -foreground blue -underline 1
6465
	$ctext tag bind $lk <1> [list selbyid $id]
6466 6467 6468 6469
	$ctext tag bind $lk <Enter> {linkcursor %W 1}
	$ctext tag bind $lk <Leave> {linkcursor %W -1}
    } else {
	lappend pendinglinks($id) $lk
6470
	interestedin $id {makelink %P}
6471 6472 6473 6474 6475 6476 6477 6478 6479 6480 6481 6482 6483 6484 6485 6486 6487 6488 6489 6490 6491 6492 6493 6494
    }
}

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

6497 6498 6499 6500 6501 6502 6503 6504 6505 6506 6507 6508 6509 6510 6511 6512
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}]
}

6513 6514
# add a list of tag or branch names at position pos
# returns the number of names inserted
6515
proc appendrefs {pos ids var} {
6516
    global ctext linknum curview $var maxrefs
P
Paul Mackerras 已提交
6517

6518 6519 6520
    if {[catch {$ctext index $pos}]} {
	return 0
    }
6521 6522 6523 6524 6525 6526 6527 6528
    $ctext conf -state normal
    $ctext delete $pos "$pos lineend"
    set tags {}
    foreach id $ids {
	foreach tag [set $var\($id\)] {
	    lappend tags [list $tag $id]
	}
    }
6529 6530 6531 6532 6533 6534 6535 6536 6537 6538 6539 6540
    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
6541
	    setlink $id $lk
6542
	    set sep ", "
P
Paul Mackerras 已提交
6543 6544
	}
    }
6545
    $ctext conf -state disabled
6546
    return [llength $tags]
P
Paul Mackerras 已提交
6547 6548
}

6549 6550 6551
# called when we have finished computing the nearby tags
proc dispneartags {delay} {
    global selectedline currentid showneartags tagphase
6552

6553
    if {$selectedline eq {} || !$showneartags} return
6554 6555 6556 6557 6558 6559 6560
    after cancel dispnexttag
    if {$delay} {
	after 200 dispnexttag
	set tagphase -1
    } else {
	after idle dispnexttag
	set tagphase 0
6561 6562 6563
    }
}

6564 6565
proc dispnexttag {} {
    global selectedline currentid showneartags tagphase ctext
P
Paul Mackerras 已提交
6566

6567
    if {$selectedline eq {} || !$showneartags} return
6568 6569 6570 6571 6572 6573 6574 6575 6576 6577 6578 6579 6580 6581 6582 6583 6584 6585 6586 6587 6588 6589 6590 6591
    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
		}
	    }
6592 6593
	}
    }
6594 6595
    if {[incr tagphase] <= 2} {
	after idle dispnexttag
P
Paul Mackerras 已提交
6596 6597 6598
    }
}

6599
proc make_secsel {id} {
6600 6601
    global linehtag linentag linedtag canv canv2 canv3

6602
    if {![info exists linehtag($id)]} return
6603
    $canv delete secsel
6604
    set t [eval $canv create rect [$canv bbox $linehtag($id)] -outline {{}} \
6605 6606 6607
	       -tags secsel -fill [$canv cget -selectbackground]]
    $canv lower $t
    $canv2 delete secsel
6608
    set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] -outline {{}} \
6609 6610 6611
	       -tags secsel -fill [$canv2 cget -selectbackground]]
    $canv2 lower $t
    $canv3 delete secsel
6612
    set t [eval $canv3 create rect [$canv3 bbox $linedtag($id)] -outline {{}} \
6613 6614 6615 6616
	       -tags secsel -fill [$canv3 cget -selectbackground]]
    $canv3 lower $t
}

6617
proc selectline {l isnew {desired_loc {}}} {
6618
    global canv ctext commitinfo selectedline
6619
    global canvy0 linespc parents children curview
6620
    global currentid sha1entry
P
Paul Mackerras 已提交
6621
    global commentend idtags linknum
6622
    global mergemax numcommits pending_select
6623
    global cmitmode showneartags allcommits
6624
    global targetrow targetid lastscrollrows
6625
    global autoselect jump_to_here
6626

6627
    catch {unset pending_select}
6628
    $canv delete hover
6629
    normalline
6630
    unsel_reflist
6631
    stopfinding
6632
    if {$l < 0 || $l >= $numcommits} return
6633 6634 6635
    set id [commitonrow $l]
    set targetid $id
    set targetrow $l
6636 6637 6638 6639 6640
    set selectedline $l
    set currentid $id
    if {$lastscrollrows < $numcommits} {
	setcanvscroll
    }
6641

6642
    set y [expr {$canvy0 + $l * $linespc}]
6643
    set ymax [lindex [$canv cget -scrollregion] 3]
6644 6645
    set ytop [expr {$y - $linespc - 1}]
    set ybot [expr {$y + $linespc + 1}]
6646
    set wnow [$canv yview]
J
Jeff Hobbs 已提交
6647 6648
    set wtop [expr {[lindex $wnow 0] * $ymax}]
    set wbot [expr {[lindex $wnow 1] * $ymax}]
6649 6650
    set wh [expr {$wbot - $wtop}]
    set newtop $wtop
6651
    if {$ytop < $wtop} {
6652 6653 6654 6655 6656 6657 6658
	if {$ybot < $wtop} {
	    set newtop [expr {$y - $wh / 2.0}]
	} else {
	    set newtop $ytop
	    if {$newtop > $wtop - $linespc} {
		set newtop [expr {$wtop - $linespc}]
	    }
6659
	}
6660 6661 6662 6663 6664 6665 6666 6667
    } 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}]
	    }
6668
	}
6669 6670 6671 6672 6673
    }
    if {$newtop != $wtop} {
	if {$newtop < 0} {
	    set newtop 0
	}
J
Jeff Hobbs 已提交
6674
	allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
P
Paul Mackerras 已提交
6675
	drawvisible
6676
    }
6677

6678
    make_secsel $id
P
Paul Mackerras 已提交
6679

6680
    if {$isnew} {
6681
	addtohistory [list selbyid $id]
6682 6683
    }

6684 6685
    $sha1entry delete 0 end
    $sha1entry insert 0 $id
6686 6687 6688 6689
    if {$autoselect} {
	$sha1entry selection from 0
	$sha1entry selection to end
    }
6690
    rhighlight_sel $id
6691

6692
    $ctext conf -state normal
6693
    clear_ctext
6694
    set linknum 0
6695 6696 6697
    if {![info exists commitinfo($id)]} {
	getcommit $id
    }
6698
    set info $commitinfo($id)
P
Paul Mackerras 已提交
6699
    set date [formatdate [lindex $info 2]]
6700
    $ctext insert end "[mc "Author"]: [lindex $info 1]  $date\n"
P
Paul Mackerras 已提交
6701
    set date [formatdate [lindex $info 4]]
6702
    $ctext insert end "[mc "Committer"]: [lindex $info 3]  $date\n"
6703
    if {[info exists idtags($id)]} {
6704
	$ctext insert end [mc "Tags:"]
6705 6706 6707 6708 6709
	foreach tag $idtags($id) {
	    $ctext insert end " $tag"
	}
	$ctext insert end "\n"
    }
6710

6711
    set headers {}
6712
    set olds $parents($curview,$id)
6713
    if {[llength $olds] > 1} {
6714
	set np 0
6715
	foreach p $olds {
6716 6717 6718 6719 6720
	    if {$np >= $mergemax} {
		set tag mmax
	    } else {
		set tag m$np
	    }
6721
	    $ctext insert end "[mc "Parent"]: " $tag
6722
	    appendwithlinks [commit_descriptor $p] {}
6723 6724 6725
	    incr np
	}
    } else {
6726
	foreach p $olds {
6727
	    append headers "[mc "Parent"]: [commit_descriptor $p]"
6728 6729
	}
    }
6730

6731
    foreach c $children($curview,$id) {
6732
	append headers "[mc "Child"]:  [commit_descriptor $c]"
6733
    }
6734 6735

    # make anything that looks like a SHA1 ID be a clickable link
6736
    appendwithlinks $headers {}
P
Paul Mackerras 已提交
6737 6738 6739 6740
    if {$showneartags} {
	if {![info exists allcommits]} {
	    getallcommits
	}
6741
	$ctext insert end "[mc "Branch"]: "
6742 6743
	$ctext mark set branch "end -1c"
	$ctext mark gravity branch left
6744
	$ctext insert end "\n[mc "Follows"]: "
P
Paul Mackerras 已提交
6745 6746
	$ctext mark set follows "end -1c"
	$ctext mark gravity follows left
6747
	$ctext insert end "\n[mc "Precedes"]: "
P
Paul Mackerras 已提交
6748 6749 6750
	$ctext mark set precedes "end -1c"
	$ctext mark gravity precedes left
	$ctext insert end "\n"
6751
	dispneartags 1
P
Paul Mackerras 已提交
6752 6753
    }
    $ctext insert end "\n"
6754 6755 6756 6757 6758
    set comment [lindex $info 5]
    if {[string first "\r" $comment] >= 0} {
	set comment [string map {"\r" "\n    "} $comment]
    }
    appendwithlinks $comment {comment}
6759

6760
    $ctext tag remove found 1.0 end
6761
    $ctext conf -state disabled
6762
    set commentend [$ctext index "end - 1c"]
6763

6764
    set jump_to_here $desired_loc
6765
    init_flist [mc "Comments"]
P
Paul Mackerras 已提交
6766 6767 6768
    if {$cmitmode eq "tree"} {
	gettree $id
    } elseif {[llength $olds] <= 1} {
6769
	startdiff $id
6770
    } else {
6771
	mergediff $id
6772 6773 6774
    }
}

6775 6776 6777 6778 6779 6780 6781 6782 6783 6784 6785 6786
proc selfirstline {} {
    unmarkmatches
    selectline 0 1
}

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

6787 6788
proc selnextline {dir} {
    global selectedline
6789
    focus .
6790
    if {$selectedline eq {}} return
J
Jeff Hobbs 已提交
6791
    set l [expr {$selectedline + $dir}]
6792
    unmarkmatches
6793 6794 6795
    selectline $l 1
}

6796 6797 6798 6799 6800 6801 6802 6803
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
6804
    drawvisible
6805
    if {$selectedline eq {}} return
6806 6807 6808 6809 6810 6811 6812
    set l [expr {$selectedline + $dir * $lpp}]
    if {$l < 0} {
	set l 0
    } elseif {$l >= $numcommits} {
        set l [expr $numcommits - 1]
    }
    unmarkmatches
6813
    selectline $l 1
6814 6815
}

6816
proc unselectline {} {
P
Paul Mackerras 已提交
6817
    global selectedline currentid
6818

6819
    set selectedline {}
P
Paul Mackerras 已提交
6820
    catch {unset currentid}
6821
    allcanvs delete secsel
6822
    rhighlight_none
6823 6824
}

P
Paul Mackerras 已提交
6825 6826 6827
proc reselectline {} {
    global selectedline

6828
    if {$selectedline ne {}} {
P
Paul Mackerras 已提交
6829 6830 6831 6832
	selectline $selectedline 0
    }
}

6833
proc addtohistory {cmd} {
6834
    global history historyindex curview
6835

6836
    set elt [list $curview $cmd]
6837
    if {$historyindex > 0
6838
	&& [lindex $history [expr {$historyindex - 1}]] == $elt} {
6839 6840 6841 6842
	return
    }

    if {$historyindex < [llength $history]} {
6843
	set history [lreplace $history $historyindex end $elt]
6844
    } else {
6845
	lappend history $elt
6846 6847 6848
    }
    incr historyindex
    if {$historyindex > 1} {
6849
	.tf.bar.leftbut conf -state normal
6850
    } else {
6851
	.tf.bar.leftbut conf -state disabled
6852
    }
6853
    .tf.bar.rightbut conf -state disabled
6854 6855
}

6856 6857 6858 6859 6860 6861 6862 6863 6864 6865 6866
proc godo {elt} {
    global curview

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

6867 6868
proc goback {} {
    global history historyindex
6869
    focus .
6870 6871 6872

    if {$historyindex > 1} {
	incr historyindex -1
6873
	godo [lindex $history [expr {$historyindex - 1}]]
6874
	.tf.bar.rightbut conf -state normal
6875 6876
    }
    if {$historyindex <= 1} {
6877
	.tf.bar.leftbut conf -state disabled
6878 6879 6880 6881 6882
    }
}

proc goforw {} {
    global history historyindex
6883
    focus .
6884 6885

    if {$historyindex < [llength $history]} {
6886
	set cmd [lindex $history $historyindex]
6887
	incr historyindex
6888
	godo $cmd
6889
	.tf.bar.leftbut conf -state normal
6890 6891
    }
    if {$historyindex >= [llength $history]} {
6892
	.tf.bar.rightbut conf -state disabled
6893
    }
6894 6895
}

P
Paul Mackerras 已提交
6896
proc gettree {id} {
6897 6898
    global treefilelist treeidlist diffids diffmergeid treepending
    global nullid nullid2
P
Paul Mackerras 已提交
6899 6900 6901 6902 6903

    set diffids $id
    catch {unset diffmergeid}
    if {![info exists treefilelist($id)]} {
	if {![info exists treepending]} {
6904 6905 6906 6907
	    if {$id eq $nullid} {
		set cmd [list | git ls-files]
	    } elseif {$id eq $nullid2} {
		set cmd [list | git ls-files --stage -t]
6908
	    } else {
6909
		set cmd [list | git ls-tree -r $id]
6910 6911
	    }
	    if {[catch {set gtf [open $cmd r]}]} {
P
Paul Mackerras 已提交
6912 6913 6914 6915 6916
		return
	    }
	    set treepending $id
	    set treefilelist($id) {}
	    set treeidlist($id) {}
6917
	    fconfigure $gtf -blocking 0 -encoding binary
6918
	    filerun $gtf [list gettreeline $gtf $id]
P
Paul Mackerras 已提交
6919 6920 6921 6922 6923 6924 6925
	}
    } else {
	setfilelist $id
    }
}

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

6928 6929
    set nl 0
    while {[incr nl] <= 1000 && [gets $gtf line] >= 0} {
6930 6931 6932
	if {$diffids eq $nullid} {
	    set fname $line
	} else {
6933 6934 6935
	    set i [string first "\t" $line]
	    if {$i < 0} continue
	    set fname [string range $line [expr {$i+1}] end]
6936 6937 6938
	    set line [string range $line 0 [expr {$i-1}]]
	    if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue
	    set sha1 [lindex $line 2]
6939 6940
	    lappend treeidlist($id) $sha1
	}
6941 6942 6943 6944
	if {[string index $fname 0] eq "\""} {
	    set fname [lindex $fname 0]
	}
	set fname [encoding convertfrom $fname]
6945 6946 6947 6948
	lappend treefilelist($id) $fname
    }
    if {![eof $gtf]} {
	return [expr {$nl >= 1000? 2: 1}]
P
Paul Mackerras 已提交
6949 6950 6951 6952 6953 6954 6955 6956 6957 6958 6959 6960
    }
    close $gtf
    unset treepending
    if {$cmitmode ne "tree"} {
	if {![info exists diffmergeid]} {
	    gettreediffs $diffids
	}
    } elseif {$id ne $diffids} {
	gettree $diffids
    } else {
	setfilelist $id
    }
6961
    return 0
P
Paul Mackerras 已提交
6962 6963 6964
}

proc showfile {f} {
6965
    global treefilelist treeidlist diffids nullid nullid2
6966
    global ctext_file_names ctext_file_lines
P
Paul Mackerras 已提交
6967 6968 6969 6970 6971 6972 6973
    global ctext commentend

    set i [lsearch -exact $treefilelist($diffids) $f]
    if {$i < 0} {
	puts "oops, $f not in list for id $diffids"
	return
    }
6974 6975 6976
    if {$diffids eq $nullid} {
	if {[catch {set bf [open $f r]} err]} {
	    puts "oops, can't read $f: $err"
6977 6978 6979
	    return
	}
    } else {
6980 6981 6982
	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"
6983 6984
	    return
	}
P
Paul Mackerras 已提交
6985
    }
6986
    fconfigure $bf -blocking 0 -encoding [get_path_encoding $f]
6987
    filerun $bf [list getblobline $bf $diffids]
P
Paul Mackerras 已提交
6988
    $ctext config -state normal
6989
    clear_ctext $commentend
6990 6991
    lappend ctext_file_names $f
    lappend ctext_file_lines [lindex [split $commentend "."] 0]
P
Paul Mackerras 已提交
6992 6993 6994 6995
    $ctext insert end "\n"
    $ctext insert end "$f\n" filesep
    $ctext config -state disabled
    $ctext yview $commentend
6996
    settabs 0
P
Paul Mackerras 已提交
6997 6998 6999 7000 7001 7002 7003
}

proc getblobline {bf id} {
    global diffids cmitmode ctext

    if {$id ne $diffids || $cmitmode ne "tree"} {
	catch {close $bf}
7004
	return 0
P
Paul Mackerras 已提交
7005 7006
    }
    $ctext config -state normal
7007 7008
    set nl 0
    while {[incr nl] <= 1000 && [gets $bf line] >= 0} {
P
Paul Mackerras 已提交
7009 7010 7011
	$ctext insert end "$line\n"
    }
    if {[eof $bf]} {
7012 7013
	global jump_to_here ctext_file_names commentend

P
Paul Mackerras 已提交
7014 7015 7016
	# delete last newline
	$ctext delete "end - 2c" "end - 1c"
	close $bf
7017 7018 7019 7020 7021 7022
	if {$jump_to_here ne {} &&
	    [lindex $jump_to_here 0] eq [lindex $ctext_file_names 0]} {
	    set lnum [expr {[lindex $jump_to_here 1] +
			    [lindex [split $commentend .] 0]}]
	    mark_ctext_line $lnum
	}
7023
	return 0
P
Paul Mackerras 已提交
7024 7025
    }
    $ctext config -state disabled
7026
    return [expr {$nl >= 1000? 2: 1}]
P
Paul Mackerras 已提交
7027 7028
}

7029
proc mark_ctext_line {lnum} {
7030
    global ctext markbgcolor
7031 7032 7033

    $ctext tag delete omark
    $ctext tag add omark $lnum.0 "$lnum.0 + 1 line"
7034
    $ctext tag conf omark -background $markbgcolor
7035 7036 7037
    $ctext see $lnum.0
}

7038
proc mergediff {id} {
7039
    global diffmergeid
7040
    global diffids treediffs
7041
    global parents curview
7042

7043
    set diffmergeid $id
7044
    set diffids $id
7045
    set treediffs($id) {}
7046
    set np [llength $parents($curview,$id)]
7047
    settabs $np
7048
    getblobdiffs $id
7049 7050
}

7051
proc startdiff {ids} {
7052
    global treediffs diffids treepending diffmergeid nullid nullid2
7053

7054
    settabs 1
7055
    set diffids $ids
7056
    catch {unset diffmergeid}
7057 7058 7059
    if {![info exists treediffs($ids)] ||
	[lsearch -exact $ids $nullid] >= 0 ||
	[lsearch -exact $ids $nullid2] >= 0} {
7060
	if {![info exists treepending]} {
7061
	    gettreediffs $ids
7062 7063
	}
    } else {
7064
	addtocflist $ids
7065 7066 7067
    }
}

7068 7069 7070
proc path_filter {filter name} {
    foreach p $filter {
	set l [string length $p]
7071 7072 7073 7074 7075 7076 7077 7078 7079 7080
	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
	    }
7081 7082 7083 7084 7085
	}
    }
    return 0
}

7086
proc addtocflist {ids} {
7087
    global treediffs
7088

7089
    add_flist $treediffs($ids)
7090
    getblobdiffs $ids
7091 7092
}

7093
proc diffcmd {ids flags} {
7094
    global nullid nullid2
7095 7096

    set i [lsearch -exact $ids $nullid]
7097
    set j [lsearch -exact $ids $nullid2]
7098
    if {$i >= 0} {
7099 7100 7101 7102 7103 7104 7105 7106 7107 7108 7109 7110 7111 7112 7113 7114 7115
	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]
7116
	if {[llength $ids] > 1} {
7117
	    # comparing index with specific revision
7118 7119 7120 7121 7122 7123
	    if {$i == 0} {
		lappend cmd -R [lindex $ids 1]
	    } else {
		lappend cmd [lindex $ids 0]
	    }
	} else {
7124
	    # comparing index with HEAD
7125 7126 7127
	    lappend cmd HEAD
	}
    } else {
7128
	set cmd [concat | git diff-tree -r $flags $ids]
7129 7130 7131 7132
    }
    return $cmd
}

7133
proc gettreediffs {ids} {
7134
    global treediff treepending
7135

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

7138
    set treepending $ids
7139
    set treediff {}
7140
    fconfigure $gdtf -blocking 0 -encoding binary
7141
    filerun $gdtf [list gettreediffline $gdtf $ids]
7142 7143
}

7144
proc gettreediffline {gdtf ids} {
7145
    global treediff treediffs treepending diffids diffmergeid
7146
    global cmitmode vfilelimit curview limitdiffs perfile_attrs
7147

7148
    set nr 0
7149
    set sublist {}
7150 7151 7152 7153 7154 7155 7156 7157 7158 7159
    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} {
7160 7161 7162 7163 7164 7165
	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]
	    }
7166
	    set file [encoding convertfrom $file]
7167 7168 7169 7170
	    if {$file ne [lindex $treediff end]} {
		lappend treediff $file
		lappend sublist $file
	    }
7171
	}
7172
    }
7173 7174 7175
    if {$perfile_attrs} {
	cache_gitattr encoding $sublist
    }
7176
    if {![eof $gdtf]} {
7177
	return [expr {$nr >= $max? 2: 1}]
7178 7179
    }
    close $gdtf
7180
    if {$limitdiffs && $vfilelimit($curview) ne {}} {
7181 7182
	set flist {}
	foreach f $treediff {
7183
	    if {[path_filter $vfilelimit($curview) $f]} {
7184 7185 7186 7187 7188 7189 7190
		lappend flist $f
	    }
	}
	set treediffs($ids) $flist
    } else {
	set treediffs($ids) $treediff
    }
7191
    unset treepending
7192
    if {$cmitmode eq "tree" && [llength $diffids] == 1} {
7193 7194 7195 7196
	gettree $diffids
    } elseif {$ids != $diffids} {
	if {![info exists diffmergeid]} {
	    gettreediffs $diffids
7197
	}
7198 7199
    } else {
	addtocflist $ids
7200
    }
7201
    return 0
7202 7203
}

7204 7205 7206 7207 7208 7209 7210 7211 7212 7213 7214 7215 7216 7217 7218 7219
# 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
	}
    }
}

7220 7221 7222 7223
proc changeignorespace {} {
    reselectline
}

7224
proc getblobdiffs {ids} {
7225
    global blobdifffd diffids env
7226
    global diffinhdr treediffs
7227
    global diffcontext
7228
    global ignorespace
7229
    global limitdiffs vfilelimit curview
7230
    global diffencoding targetline diffnparents
7231

7232
    set cmd [diffcmd $ids "-p -C --cc --no-commit-id -U$diffcontext"]
7233 7234 7235
    if {$ignorespace} {
	append cmd " -w"
    }
7236 7237
    if {$limitdiffs && $vfilelimit($curview) ne {}} {
	set cmd [concat $cmd -- $vfilelimit($curview)]
7238 7239
    }
    if {[catch {set bdf [open $cmd r]} err]} {
7240
	error_popup [mc "Error getting diffs: %s" $err]
7241 7242
	return
    }
7243
    set targetline {}
7244
    set diffnparents 0
7245
    set diffinhdr 0
7246
    set diffencoding [get_path_encoding {}]
7247
    fconfigure $bdf -blocking 0 -encoding binary -eofchar {}
7248
    set blobdifffd($ids) $bdf
7249
    filerun $bdf [list getblobdiffline $bdf $diffids]
7250 7251
}

7252 7253 7254 7255 7256 7257 7258 7259 7260 7261 7262 7263 7264
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
    }
}

7265
proc makediffhdr {fname ids} {
7266
    global ctext curdiffstart treediffs diffencoding
7267
    global ctext_file_names jump_to_here targetline diffline
7268

7269 7270
    set fname [encoding convertfrom $fname]
    set diffencoding [get_path_encoding $fname]
7271 7272 7273 7274
    set i [lsearch -exact $treediffs($ids) $fname]
    if {$i >= 0} {
	setinlist difffilestart $i $curdiffstart
    }
7275
    lset ctext_file_names end $fname
7276 7277 7278
    set l [expr {(78 - [string length $fname]) / 2}]
    set pad [string range "----------------------------------------" 1 $l]
    $ctext insert $curdiffstart "$pad $fname $pad" filesep
7279 7280 7281 7282 7283
    set targetline {}
    if {$jump_to_here ne {} && [lindex $jump_to_here 0] eq $fname} {
	set targetline [lindex $jump_to_here 1]
    }
    set diffline 0
7284 7285
}

7286
proc getblobdiffline {bdf ids} {
7287
    global diffids blobdifffd ctext curdiffstart
7288
    global diffnexthead diffnextnote difffilestart
7289
    global ctext_file_names ctext_file_lines
7290
    global diffinhdr treediffs mergemax diffnparents
7291
    global diffencoding jump_to_here targetline diffline
7292

7293
    set nr 0
7294
    $ctext conf -state normal
7295 7296 7297 7298
    while {[incr nr] <= 1000 && [gets $bdf line] >= 0} {
	if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
	    close $bdf
	    return 0
7299
	}
7300 7301 7302 7303 7304 7305
	if {![string compare -length 5 "diff " $line]} {
	    if {![regexp {^diff (--cc|--git) } $line m type]} {
		set line [encoding convertfrom $line]
		$ctext insert end "$line\n" hunksep
		continue
	    }
7306
	    # start of a new file
7307
	    set diffinhdr 1
7308
	    $ctext insert end "\n"
7309
	    set curdiffstart [$ctext index "end - 1c"]
7310 7311
	    lappend ctext_file_names ""
	    lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
7312
	    $ctext insert end "\n" filesep
7313 7314 7315 7316 7317 7318 7319 7320 7321

	    if {$type eq "--cc"} {
		# start of a new file in a merge diff
		set fname [string range $line 10 end]
		if {[lsearch -exact $treediffs($ids) $fname] < 0} {
		    lappend treediffs($ids) $fname
		    add_flist [list $fname]
		}

7322
	    } else {
7323 7324 7325 7326 7327 7328 7329 7330 7331 7332 7333 7334 7335 7336 7337 7338 7339 7340 7341 7342 7343 7344
		set line [string range $line 11 end]
		# 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
		# "rename to" or "copy from" and "copy to" lines following
		# this, and we'll use them to get the filenames.
		# 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
		}
		# 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}]]
		}
7345
	    }
7346 7347
	    makediffhdr $fname $ids

7348 7349 7350 7351 7352 7353 7354 7355 7356 7357 7358 7359
	} elseif {![string compare -length 16 "* Unmerged path " $line]} {
	    set fname [encoding convertfrom [string range $line 16 end]]
	    $ctext insert end "\n"
	    set curdiffstart [$ctext index "end - 1c"]
	    lappend ctext_file_names $fname
	    lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
	    $ctext insert end "$line\n" filesep
	    set i [lsearch -exact $treediffs($ids) $fname]
	    if {$i >= 0} {
		setinlist difffilestart $i $curdiffstart
	    }

7360 7361
	} elseif {![string compare -length 2 "@@" $line]} {
	    regexp {^@@+} $line ats
7362
	    set line [encoding convertfrom $diffencoding $line]
7363
	    $ctext insert end "$line\n" hunksep
7364 7365 7366 7367
	    if {[regexp { \+(\d+),\d+ @@} $line m nl]} {
		set diffline $nl
	    }
	    set diffnparents [expr {[string length $ats] - 1}]
7368
	    set diffinhdr 0
7369 7370

	} elseif {$diffinhdr} {
7371
	    if {![string compare -length 12 "rename from " $line]} {
7372
		set fname [string range $line [expr 6 + [string first " from " $line] ] end]
7373 7374 7375
		if {[string index $fname 0] eq "\""} {
		    set fname [lindex $fname 0]
		}
7376
		set fname [encoding convertfrom $fname]
7377 7378 7379 7380
		set i [lsearch -exact $treediffs($ids) $fname]
		if {$i >= 0} {
		    setinlist difffilestart $i $curdiffstart
		}
7381 7382 7383
	    } 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]
7384 7385 7386 7387 7388 7389 7390 7391 7392 7393 7394 7395 7396
		if {[string index $fname 0] eq "\""} {
		    set fname [lindex $fname 0]
		}
		makediffhdr $fname $ids
	    } elseif {[string compare -length 3 $line "---"] == 0} {
		# do nothing
		continue
	    } elseif {[string compare -length 3 $line "+++"] == 0} {
		set diffinhdr 0
		continue
	    }
	    $ctext insert end "$line\n" filesep

7397
	} else {
7398 7399
	    set line [string map {\x1A ^Z} \
                          [encoding convertfrom $diffencoding $line]]
7400 7401 7402 7403 7404 7405 7406 7407 7408 7409 7410 7411 7412 7413 7414 7415 7416 7417 7418 7419 7420 7421 7422 7423 7424 7425 7426 7427 7428 7429 7430 7431 7432 7433 7434 7435 7436
	    # parse the prefix - one ' ', '-' or '+' for each parent
	    set prefix [string range $line 0 [expr {$diffnparents - 1}]]
	    set tag [expr {$diffnparents > 1? "m": "d"}]
	    if {[string trim $prefix " -+"] eq {}} {
		# prefix only has " ", "-" and "+" in it: normal diff line
		set num [string first "-" $prefix]
		if {$num >= 0} {
		    # removed line, first parent with line is $num
		    if {$num >= $mergemax} {
			set num "max"
		    }
		    $ctext insert end "$line\n" $tag$num
		} else {
		    set tags {}
		    if {[string first "+" $prefix] >= 0} {
			# added line
			lappend tags ${tag}result
			if {$diffnparents > 1} {
			    set num [string first " " $prefix]
			    if {$num >= 0} {
				if {$num >= $mergemax} {
				    set num "max"
				}
				lappend tags m$num
			    }
			}
		    }
		    if {$targetline ne {}} {
			if {$diffline == $targetline} {
			    set seehere [$ctext index "end - 1 chars"]
			    set targetline {}
			} else {
			    incr diffline
			}
		    }
		    $ctext insert end "$line\n" $tags
		}
7437
	    } else {
7438 7439 7440
		# "\ No newline at end of file",
		# or something else we don't recognize
		$ctext insert end "$line\n" hunksep
7441 7442 7443
	    }
	}
    }
7444 7445 7446
    if {[info exists seehere]} {
	mark_ctext_line [lindex [split $seehere .] 0]
    }
7447
    $ctext conf -state disabled
7448 7449 7450
    if {[eof $bdf]} {
	close $bdf
	return 0
7451
    }
7452
    return [expr {$nr >= 1000? 2: 1}]
7453 7454
}

7455 7456 7457 7458
proc changediffdisp {} {
    global ctext diffelide

    $ctext tag conf d0 -elide [lindex $diffelide 0]
7459
    $ctext tag conf dresult -elide [lindex $diffelide 1]
7460 7461
}

7462 7463 7464 7465 7466 7467 7468 7469 7470 7471
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
}

7472
proc prevfile {} {
7473 7474 7475 7476 7477
    global difffilestart ctext cmitmode

    if {$cmitmode eq "tree"} return
    set prev 0.0
    set prevline 1
7478 7479 7480
    set here [$ctext index @0,0]
    foreach loc $difffilestart {
	if {[$ctext compare $loc >= $here]} {
7481
	    highlightfile $prev $prevline
7482 7483 7484
	    return
	}
	set prev $loc
7485
	incr prevline
7486
    }
7487
    highlightfile $prev $prevline
7488 7489
}

7490
proc nextfile {} {
7491 7492 7493
    global difffilestart ctext cmitmode

    if {$cmitmode eq "tree"} return
7494
    set here [$ctext index @0,0]
7495
    set line 1
7496
    foreach loc $difffilestart {
7497
	incr line
7498
	if {[$ctext compare $loc > $here]} {
7499
	    highlightfile $loc $line
7500
	    return
7501 7502
	}
    }
7503 7504
}

7505 7506
proc clear_ctext {{first 1.0}} {
    global ctext smarktop smarkbot
7507
    global ctext_file_names ctext_file_lines
7508
    global pendinglinks
7509

7510 7511 7512
    set l [lindex [split $first .] 0]
    if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} {
	set smarktop $l
7513
    }
7514 7515
    if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} {
	set smarkbot $l
7516 7517
    }
    $ctext delete $first end
7518 7519 7520
    if {$first eq "1.0"} {
	catch {unset pendinglinks}
    }
7521 7522
    set ctext_file_names {}
    set ctext_file_lines {}
7523 7524
}

7525
proc settabs {{firstab {}}} {
7526
    global firsttabstop tabstop ctext have_tk85
7527 7528 7529 7530

    if {$firstab ne {} && $have_tk85} {
	set firsttabstop $firstab
    }
7531
    set w [font measure textfont "0"]
7532
    if {$firsttabstop != 0} {
7533 7534
	$ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \
			       [expr {($firsttabstop + 2 * $tabstop) * $w}]]
7535 7536 7537 7538 7539
    } elseif {$have_tk85 || $tabstop != 8} {
	$ctext conf -tabs [expr {$tabstop * $w}]
    } else {
	$ctext conf -tabs {}
    }
7540 7541 7542
}

proc incrsearch {name ix op} {
7543
    global ctext searchstring searchdirn
7544 7545

    $ctext tag remove found 1.0 end
7546 7547 7548 7549 7550 7551 7552 7553 7554 7555 7556
    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]
	}
    }
7557
    if {$searchstring ne {}} {
7558 7559 7560 7561
	set here [$ctext search $searchdirn -- $searchstring anchor]
	if {$here ne {}} {
	    $ctext see $here
	}
7562 7563 7564 7565 7566
	searchmarkvisible 1
    }
}

proc dosearch {} {
7567
    global sstring ctext searchstring searchdirn
7568 7569 7570

    focus $sstring
    $sstring icursor end
7571 7572 7573 7574 7575 7576 7577 7578 7579 7580 7581 7582 7583 7584 7585 7586 7587 7588 7589 7590 7591 7592 7593 7594 7595 7596 7597 7598 7599 7600 7601 7602 7603 7604 7605 7606 7607 7608 7609 7610 7611 7612 7613 7614
    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
7615 7616 7617 7618 7619 7620 7621 7622 7623 7624 7625 7626 7627 7628 7629 7630 7631 7632 7633 7634 7635 7636 7637 7638 7639 7640 7641 7642 7643 7644 7645 7646 7647 7648 7649 7650 7651 7652
    }
}

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} {
7653
    global searchstring
7654

7655
    .bleft.bottom.sb set $f0 $f1
7656 7657 7658 7659 7660
    if {$searchstring ne {}} {
	searchmarkvisible 0
    }
}

7661
proc setcoords {} {
7662
    global linespc charspc canvx0 canvy0
7663
    global xspc1 xspc2 lthickness
7664

7665 7666
    set linespc [font metrics mainfont -linespace]
    set charspc [font measure mainfont "m"]
P
Paul Mackerras 已提交
7667 7668
    set canvy0 [expr {int(3 + 0.5 * $linespc)}]
    set canvx0 [expr {int(3 + 0.5 * $linespc)}]
7669
    set lthickness [expr {int($linespc / 9) + 1}]
7670 7671
    set xspc1(0) $linespc
    set xspc2 $linespc
7672
}
7673

7674
proc redisplay {} {
7675
    global canv
P
Paul Mackerras 已提交
7676 7677 7678 7679 7680 7681
    global selectedline

    set ymax [lindex [$canv cget -scrollregion] 3]
    if {$ymax eq {} || $ymax == 0} return
    set span [$canv yview]
    clear_display
7682
    setcanvscroll
P
Paul Mackerras 已提交
7683 7684
    allcanvs yview moveto [lindex $span 0]
    drawvisible
7685
    if {$selectedline ne {}} {
P
Paul Mackerras 已提交
7686
	selectline $selectedline 0
7687
	allcanvs yview moveto [lindex $span 0]
7688 7689 7690
    }
}

7691 7692 7693 7694 7695 7696 7697 7698 7699
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)}]
7700
    }
7701 7702 7703 7704 7705 7706 7707 7708 7709 7710
    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}
	}
7711
    }
7712 7713 7714 7715 7716 7717 7718 7719 7720 7721 7722 7723 7724 7725 7726 7727
}

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"
7728
    }
7729 7730
    if {$fontattr($f,slant) eq "italic"} {
	lappend n "italic"
7731
    }
7732
    return $n
7733 7734
}

7735
proc incrfont {inc} {
7736
    global mainfont textfont ctext canv cflist showrefstop
7737 7738
    global stopped entries fontattr

7739
    unmarkmatches
7740
    set s $fontattr(mainfont,size)
7741 7742 7743 7744
    incr s $inc
    if {$s < 1} {
	set s 1
    }
7745
    set fontattr(mainfont,size) $s
7746 7747
    font config mainfont -size $s
    font config mainfontbold -size $s
7748 7749
    set mainfont [fontname mainfont]
    set s $fontattr(textfont,size)
7750 7751 7752 7753
    incr s $inc
    if {$s < 1} {
	set s 1
    }
7754
    set fontattr(textfont,size) $s
7755 7756
    font config textfont -size $s
    font config textfontbold -size $s
7757
    set textfont [fontname textfont]
7758
    setcoords
7759
    settabs
7760 7761
    redisplay
}
7762

7763 7764 7765 7766 7767 7768 7769
proc clearsha1 {} {
    global sha1entry sha1string
    if {[string length $sha1string] == 40} {
	$sha1entry delete 0 end
    }
}

7770 7771 7772 7773 7774 7775 7776 7777 7778 7779
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"} {
7780
	$sha1but conf -state normal -relief raised -text "[mc "Goto:"] "
7781
    } else {
7782
	$sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] "
7783 7784 7785 7786
    }
}

proc gotocommit {} {
7787
    global sha1string tagids headids curview varcid
7788

7789 7790 7791 7792
    if {$sha1string == {}
	|| ([info exists currentid] && $sha1string == $currentid)} return
    if {[info exists tagids($sha1string)]} {
	set id $tagids($sha1string)
7793 7794
    } elseif {[info exists headids($sha1string)]} {
	set id $headids($sha1string)
7795 7796
    } else {
	set id [string tolower $sha1string]
7797
	if {[regexp {^[0-9a-f]{4,39}$} $id]} {
7798
	    set matches [longid $id]
7799 7800
	    if {$matches ne {}} {
		if {[llength $matches] > 1} {
7801
		    error_popup [mc "Short SHA1 id %s is ambiguous" $id]
7802 7803
		    return
		}
7804
		set id [lindex $matches 0]
7805 7806
	    }
	}
7807
    }
7808 7809
    if {[commitinview $id $curview]} {
	selectline [rowofcommit $id] 1
7810 7811
	return
    }
7812
    if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
7813
	set msg [mc "SHA1 id %s is not known" $sha1string]
7814
    } else {
7815
	set msg [mc "Tag/Head %s is not known" $sha1string]
7816
    }
7817
    error_popup $msg
7818 7819
}

7820 7821 7822 7823
proc lineenter {x y id} {
    global hoverx hovery hoverid hovertimer
    global commitinfo canv

P
Paul Mackerras 已提交
7824
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
7825 7826 7827 7828 7829 7830 7831 7832 7833 7834 7835 7836 7837 7838 7839 7840 7841 7842 7843 7844 7845 7846 7847 7848 7849 7850 7851 7852 7853 7854 7855 7856 7857 7858 7859 7860 7861 7862 7863
    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
7864
    global commitinfo
7865 7866 7867 7868 7869 7870 7871 7872 7873

    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}]
7874
    set x1 [expr {$x + [font measure mainfont $text] + 2 * $lthickness}]
7875 7876 7877 7878
    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
7879
    set t [$canv create text $x $y -anchor nw -text $text -tags hover \
7880
	       -font mainfont]
7881 7882 7883
    $canv raise $t
}

7884
proc clickisonarrow {id y} {
P
Paul Mackerras 已提交
7885
    global lthickness
7886

P
Paul Mackerras 已提交
7887
    set ranges [rowranges $id]
7888
    set thresh [expr {2 * $lthickness + 6}]
P
Paul Mackerras 已提交
7889
    set n [expr {[llength $ranges] - 1}]
7890
    for {set i 1} {$i < $n} {incr i} {
P
Paul Mackerras 已提交
7891
	set row [lindex $ranges $i]
7892 7893
	if {abs([yc $row] - $y) < $thresh} {
	    return $i
7894 7895 7896 7897 7898
	}
    }
    return {}
}

7899
proc arrowjump {id n y} {
P
Paul Mackerras 已提交
7900
    global canv
7901

7902 7903
    # 1 <-> 2, 3 <-> 4, etc...
    set n [expr {(($n - 1) ^ 1) + 1}]
P
Paul Mackerras 已提交
7904
    set row [lindex [rowranges $id] $n]
7905
    set yt [yc $row]
7906 7907 7908 7909 7910 7911 7912 7913
    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
    }
7914
    allcanvs yview moveto $yfrac
7915 7916
}

7917
proc lineclick {x y id isnew} {
7918
    global ctext commitinfo children canv thickerline curview
7919

P
Paul Mackerras 已提交
7920
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
7921
    unmarkmatches
7922
    unselectline
7923 7924 7925 7926
    normalline
    $canv delete hover
    # draw this line thicker than normal
    set thickerline $id
7927
    drawlines $id
7928
    if {$isnew} {
7929 7930 7931 7932 7933 7934 7935 7936 7937 7938 7939 7940 7941
	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]
7942
    }
7943 7944
    # fill the details pane with info about this line
    $ctext conf -state normal
7945
    clear_ctext
7946
    settabs 0
7947
    $ctext insert end "[mc "Parent"]:\t"
7948 7949
    $ctext insert end $id link0
    setlink $id link0
7950
    set info $commitinfo($id)
7951
    $ctext insert end "\n\t[lindex $info 0]\n"
7952
    $ctext insert end "\t[mc "Author"]:\t[lindex $info 1]\n"
P
Paul Mackerras 已提交
7953
    set date [formatdate [lindex $info 2]]
7954
    $ctext insert end "\t[mc "Date"]:\t$date\n"
7955
    set kids $children($curview,$id)
7956
    if {$kids ne {}} {
7957
	$ctext insert end "\n[mc "Children"]:"
7958
	set i 0
7959
	foreach child $kids {
7960
	    incr i
P
Paul Mackerras 已提交
7961
	    if {![info exists commitinfo($child)] && ![getcommit $child]} continue
7962
	    set info $commitinfo($child)
7963
	    $ctext insert end "\n\t"
7964 7965
	    $ctext insert end $child link$i
	    setlink $child link$i
7966
	    $ctext insert end "\n\t[lindex $info 0]"
7967
	    $ctext insert end "\n\t[mc "Author"]:\t[lindex $info 1]"
P
Paul Mackerras 已提交
7968
	    set date [formatdate [lindex $info 2]]
7969
	    $ctext insert end "\n\t[mc "Date"]:\t$date\n"
7970 7971 7972
	}
    }
    $ctext conf -state disabled
7973
    init_flist {}
7974 7975
}

7976 7977 7978
proc normalline {} {
    global thickerline
    if {[info exists thickerline]} {
7979
	set id $thickerline
7980
	unset thickerline
7981
	drawlines $id
7982 7983 7984
    }
}

7985
proc selbyid {id} {
7986 7987 7988
    global curview
    if {[commitinview $id $curview]} {
	selectline [rowofcommit $id] 1
7989 7990 7991 7992 7993 7994 7995 7996 7997 7998 7999 8000
    }
}

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} {
8001
    global rowctxmenu selectedline rowmenuid curview
8002
    global nullid nullid2 fakerowmenu mainhead
8003

8004
    stopfinding
8005
    set rowmenuid $id
8006
    if {$selectedline eq {} || [rowofcommit $id] eq $selectedline} {
8007 8008 8009 8010
	set state disabled
    } else {
	set state normal
    }
8011
    if {$id ne $nullid && $id ne $nullid2} {
8012
	set menu $rowctxmenu
8013
	if {$mainhead ne {}} {
8014
	    $menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead] -state normal
8015 8016 8017
	} else {
	    $menu entryconfigure 7 -label [mc "Detached head: can't reset" $mainhead] -state disabled
	}
8018 8019 8020
    } else {
	set menu $fakerowmenu
    }
8021 8022 8023
    $menu entryconfigure [mca "Diff this -> selected"] -state $state
    $menu entryconfigure [mca "Diff selected -> this"] -state $state
    $menu entryconfigure [mca "Make patch"] -state $state
8024
    tk_popup $menu $x $y
8025 8026 8027
}

proc diffvssel {dirn} {
8028
    global rowmenuid selectedline
8029

8030
    if {$selectedline eq {}} return
8031
    if {$dirn} {
8032
	set oldid [commitonrow $selectedline]
8033 8034 8035
	set newid $rowmenuid
    } else {
	set oldid $rowmenuid
8036
	set newid [commitonrow $selectedline]
8037
    }
8038 8039 8040 8041 8042
    addtohistory [list doseldiff $oldid $newid]
    doseldiff $oldid $newid
}

proc doseldiff {oldid newid} {
8043
    global ctext
8044 8045
    global commitinfo

8046
    $ctext conf -state normal
8047
    clear_ctext
8048 8049
    init_flist [mc "Top"]
    $ctext insert end "[mc "From"] "
8050 8051
    $ctext insert end $oldid link0
    setlink $oldid link0
8052
    $ctext insert end "\n     "
8053
    $ctext insert end [lindex $commitinfo($oldid) 0]
8054
    $ctext insert end "\n\n[mc "To"]   "
8055 8056
    $ctext insert end $newid link1
    setlink $newid link1
8057
    $ctext insert end "\n     "
8058 8059 8060 8061
    $ctext insert end [lindex $commitinfo($newid) 0]
    $ctext insert end "\n"
    $ctext conf -state disabled
    $ctext tag remove found 1.0 end
8062
    startdiff [list $oldid $newid]
8063 8064
}

8065 8066 8067 8068 8069 8070 8071 8072 8073 8074 8075 8076
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
8077
    make_transient $top .
8078
    label $top.title -text [mc "Generate patch"]
8079
    grid $top.title - -pady 10
8080
    label $top.from -text [mc "From:"]
8081
    entry $top.fromsha1 -width 40 -relief flat
8082 8083 8084
    $top.fromsha1 insert 0 $oldid
    $top.fromsha1 conf -state readonly
    grid $top.from $top.fromsha1 -sticky w
8085
    entry $top.fromhead -width 60 -relief flat
8086 8087 8088
    $top.fromhead insert 0 $oldhead
    $top.fromhead conf -state readonly
    grid x $top.fromhead -sticky w
8089
    label $top.to -text [mc "To:"]
8090
    entry $top.tosha1 -width 40 -relief flat
8091 8092 8093
    $top.tosha1 insert 0 $newid
    $top.tosha1 conf -state readonly
    grid $top.to $top.tosha1 -sticky w
8094
    entry $top.tohead -width 60 -relief flat
8095 8096 8097
    $top.tohead insert 0 $newhead
    $top.tohead conf -state readonly
    grid x $top.tohead -sticky w
8098
    button $top.rev -text [mc "Reverse"] -command mkpatchrev -padx 5
8099
    grid $top.rev x -pady 10
8100
    label $top.flab -text [mc "Output file:"]
8101 8102 8103
    entry $top.fname -width 60
    $top.fname insert 0 [file normalize "patch$patchnum.patch"]
    incr patchnum
8104
    grid $top.flab $top.fname -sticky w
8105
    frame $top.buts
8106 8107
    button $top.buts.gen -text [mc "Generate"] -command mkpatchgo
    button $top.buts.can -text [mc "Cancel"] -command mkpatchcan
8108 8109
    bind $top <Key-Return> mkpatchgo
    bind $top <Key-Escape> mkpatchcan
8110 8111 8112 8113
    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
8114
    focus $top.fname
8115 8116 8117 8118 8119 8120 8121 8122 8123 8124 8125 8126 8127 8128 8129 8130 8131 8132 8133
}

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 {} {
8134
    global patchtop nullid nullid2
8135 8136 8137 8138

    set oldid [$patchtop.fromsha1 get]
    set newid [$patchtop.tosha1 get]
    set fname [$patchtop.fname get]
8139
    set cmd [diffcmd [list $oldid $newid] -p]
8140 8141
    # trim off the initial "|"
    set cmd [lrange $cmd 1 end]
8142 8143
    lappend cmd >$fname &
    if {[catch {eval exec $cmd} err]} {
8144
	error_popup "[mc "Error creating patch:"] $err" $patchtop
8145 8146 8147 8148 8149 8150 8151 8152 8153 8154 8155 8156
    }
    catch {destroy $patchtop}
    unset patchtop
}

proc mkpatchcan {} {
    global patchtop

    catch {destroy $patchtop}
    unset patchtop
}

8157 8158 8159 8160 8161 8162 8163
proc mktag {} {
    global rowmenuid mktagtop commitinfo

    set top .maketag
    set mktagtop $top
    catch {destroy $top}
    toplevel $top
8164
    make_transient $top .
8165
    label $top.title -text [mc "Create tag"]
8166
    grid $top.title - -pady 10
8167
    label $top.id -text [mc "ID:"]
8168
    entry $top.sha1 -width 40 -relief flat
8169 8170 8171
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
8172
    entry $top.head -width 60 -relief flat
8173 8174 8175
    $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
    $top.head conf -state readonly
    grid x $top.head -sticky w
8176
    label $top.tlab -text [mc "Tag name:"]
8177
    entry $top.tag -width 60
8178 8179
    grid $top.tlab $top.tag -sticky w
    frame $top.buts
8180 8181
    button $top.buts.gen -text [mc "Create"] -command mktaggo
    button $top.buts.can -text [mc "Cancel"] -command mktagcan
8182 8183
    bind $top <Key-Return> mktaggo
    bind $top <Key-Escape> mktagcan
8184 8185 8186 8187 8188 8189 8190 8191 8192 8193 8194 8195 8196
    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 == {}} {
8197 8198
	error_popup [mc "No tag name specified"] $mktagtop
	return 0
8199 8200
    }
    if {[info exists tagids($tag)]} {
8201 8202
	error_popup [mc "Tag \"%s\" already exists" $tag] $mktagtop
	return 0
8203 8204
    }
    if {[catch {
8205
	exec git tag $tag $id
8206
    } err]} {
8207 8208
	error_popup "[mc "Error creating tag:"] $err" $mktagtop
	return 0
8209 8210 8211 8212
    }

    set tagids($tag) $id
    lappend idtags($id) $tag
8213
    redrawtags $id
8214
    addedtag $id
8215 8216
    dispneartags 0
    run refill_reflist
8217
    return 1
8218 8219 8220
}

proc redrawtags {id} {
8221 8222
    global canv linehtag idpos currentid curview cmitlisted
    global canvxmax iddrawn circleitem mainheadid circlecolors
8223

8224
    if {![commitinview $id $curview]} return
8225
    if {![info exists iddrawn($id)]} return
8226
    set row [rowofcommit $id]
8227 8228 8229 8230 8231 8232
    if {$id eq $mainheadid} {
	set ofill yellow
    } else {
	set ofill [lindex $circlecolors $cmitlisted($curview,$id)]
    }
    $canv itemconf $circleitem($row) -fill $ofill
8233 8234
    $canv delete tag.$id
    set xt [eval drawtags $id $idpos($id)]
8235 8236 8237
    $canv coords $linehtag($id) $xt [lindex $idpos($id) 2]
    set text [$canv itemcget $linehtag($id) -text]
    set font [$canv itemcget $linehtag($id) -font]
8238
    set xr [expr {$xt + [font measure $font $text]}]
P
Paul Mackerras 已提交
8239 8240 8241 8242
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
8243
    if {[info exists currentid] && $currentid == $id} {
8244
	make_secsel $id
8245 8246 8247 8248 8249 8250 8251 8252 8253 8254 8255
    }
}

proc mktagcan {} {
    global mktagtop

    catch {destroy $mktagtop}
    unset mktagtop
}

proc mktaggo {} {
8256
    if {![domktag]} return
8257 8258 8259
    mktagcan
}

8260 8261 8262 8263 8264 8265 8266
proc writecommit {} {
    global rowmenuid wrcomtop commitinfo wrcomcmd

    set top .writecommit
    set wrcomtop $top
    catch {destroy $top}
    toplevel $top
8267
    make_transient $top .
8268
    label $top.title -text [mc "Write commit to file"]
8269
    grid $top.title - -pady 10
8270
    label $top.id -text [mc "ID:"]
8271 8272 8273 8274 8275 8276 8277 8278
    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
8279
    label $top.clab -text [mc "Command:"]
8280 8281
    entry $top.cmd -width 60 -textvariable wrcomcmd
    grid $top.clab $top.cmd -sticky w -pady 10
8282
    label $top.flab -text [mc "Output file:"]
8283 8284 8285 8286
    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
8287 8288
    button $top.buts.gen -text [mc "Write"] -command wrcomgo
    button $top.buts.can -text [mc "Cancel"] -command wrcomcan
8289 8290
    bind $top <Key-Return> wrcomgo
    bind $top <Key-Escape> wrcomcan
8291 8292 8293 8294 8295 8296 8297 8298 8299 8300 8301 8302 8303 8304
    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]} {
8305
	error_popup "[mc "Error writing commit:"] $err" $wrcomtop
8306 8307 8308 8309 8310 8311 8312 8313 8314 8315 8316 8317
    }
    catch {destroy $wrcomtop}
    unset wrcomtop
}

proc wrcomcan {} {
    global wrcomtop

    catch {destroy $wrcomtop}
    unset wrcomtop
}

8318 8319 8320 8321 8322 8323
proc mkbranch {} {
    global rowmenuid mkbrtop

    set top .makebranch
    catch {destroy $top}
    toplevel $top
8324
    make_transient $top .
8325
    label $top.title -text [mc "Create new branch"]
8326
    grid $top.title - -pady 10
8327
    label $top.id -text [mc "ID:"]
8328 8329 8330 8331
    entry $top.sha1 -width 40 -relief flat
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
8332
    label $top.nlab -text [mc "Name:"]
8333 8334 8335
    entry $top.name -width 40
    grid $top.nlab $top.name -sticky w
    frame $top.buts
8336 8337
    button $top.buts.go -text [mc "Create"] -command [list mkbrgo $top]
    button $top.buts.can -text [mc "Cancel"] -command "catch {destroy $top}"
8338 8339
    bind $top <Key-Return> [list mkbrgo $top]
    bind $top <Key-Escape> "catch {destroy $top}"
8340 8341 8342 8343 8344 8345 8346 8347 8348 8349 8350 8351
    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]
8352 8353
    set cmdargs {}
    set old_id {}
8354
    if {$name eq {}} {
8355
	error_popup [mc "Please specify a name for the new branch"] $top
8356 8357
	return
    }
8358 8359
    if {[info exists headids($name)]} {
	if {![confirm_popup [mc \
8360
		"Branch '%s' already exists. Overwrite?" $name] $top]} {
8361 8362 8363 8364 8365
	    return
	}
	set old_id $headids($name)
	lappend cmdargs -f
    }
8366
    catch {destroy $top}
8367
    lappend cmdargs $name $id
8368 8369 8370
    nowbusy newbranch
    update
    if {[catch {
8371
	eval exec git branch $cmdargs
8372 8373 8374 8375 8376
    } err]} {
	notbusy newbranch
	error_popup $err
    } else {
	notbusy newbranch
8377 8378 8379 8380 8381 8382 8383 8384 8385 8386 8387
	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
	}
8388
	dispneartags 0
8389
	run refill_reflist
8390 8391 8392
    }
}

8393 8394 8395 8396 8397 8398 8399 8400 8401 8402 8403 8404 8405 8406 8407 8408 8409 8410 8411 8412 8413 8414 8415 8416 8417 8418
proc exec_citool {tool_args {baseid {}}} {
    global commitinfo env

    set save_env [array get env GIT_AUTHOR_*]

    if {$baseid ne {}} {
	if {![info exists commitinfo($baseid)]} {
	    getcommit $baseid
	}
	set author [lindex $commitinfo($baseid) 1]
	set date [lindex $commitinfo($baseid) 2]
	if {[regexp {^\s*(\S.*\S|\S)\s*<(.*)>\s*$} \
	            $author author name email]
	    && $date ne {}} {
	    set env(GIT_AUTHOR_NAME) $name
	    set env(GIT_AUTHOR_EMAIL) $email
	    set env(GIT_AUTHOR_DATE) $date
	}
    }

    eval exec git citool $tool_args &

    array unset env GIT_AUTHOR_*
    array set env $save_env
}

8419
proc cherrypick {} {
8420
    global rowmenuid curview
8421
    global mainhead mainheadid
8422

8423 8424 8425
    set oldhead [exec git rev-parse HEAD]
    set dheads [descheads $rowmenuid]
    if {$dheads ne {} && [lsearch -exact $dheads $oldhead] >= 0} {
8426 8427 8428
	set ok [confirm_popup [mc "Commit %s is already\
		included in branch %s -- really re-apply it?" \
				   [string range $rowmenuid 0 7] $mainhead]]
8429 8430
	if {!$ok} return
    }
8431
    nowbusy cherrypick [mc "Cherry-picking"]
8432 8433 8434 8435 8436
    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
8437
	if {[regexp -line \
8438 8439 8440 8441 8442 8443 8444 8445 8446 8447 8448 8449 8450 8451 8452
		 {Entry '(.*)' (would be overwritten by merge|not uptodate)} \
		 $err msg fname]} {
	    error_popup [mc "Cherry-pick failed because of local changes\
			to file '%s'.\nPlease commit, reset or stash\
			your changes and try again." $fname]
	} elseif {[regexp -line \
		       {^(CONFLICT \(.*\):|Automatic cherry-pick failed)} \
		       $err]} {
	    if {[confirm_popup [mc "Cherry-pick failed because of merge\
			conflict.\nDo you wish to run git citool to\
			resolve it?"]]} {
		# Force citool to read MERGE_MSG
		file delete [file join [gitdir] "GITGUI_MSG"]
		exec_citool {} $rowmenuid
	    }
8453 8454 8455
	} else {
	    error_popup $err
	}
8456
	run updatecommits
8457 8458 8459 8460 8461
	return
    }
    set newhead [exec git rev-parse HEAD]
    if {$newhead eq $oldhead} {
	notbusy cherrypick
8462
	error_popup [mc "No changes committed"]
8463 8464
	return
    }
8465
    addnewchild $newhead $oldhead
8466
    if {[commitinview $oldhead $curview]} {
8467
	# XXX this isn't right if we have a path limit...
8468
	insertrow $newhead $oldhead $curview
8469
	if {$mainhead ne {}} {
8470
	    movehead $newhead $mainhead
8471 8472
	    movedhead $newhead $mainhead
	}
8473
	set mainheadid $newhead
8474 8475
	redrawtags $oldhead
	redrawtags $newhead
8476
	selbyid $newhead
8477 8478 8479 8480
    }
    notbusy cherrypick
}

8481
proc resethead {} {
8482
    global mainhead rowmenuid confirm_ok resettype
8483 8484 8485 8486

    set confirm_ok 0
    set w ".confirmreset"
    toplevel $w
8487
    make_transient $w .
8488
    wm title $w [mc "Confirm reset"]
8489
    message $w.m -text \
8490
	[mc "Reset branch %s to %s?" $mainhead [string range $rowmenuid 0 7]] \
8491 8492 8493
	-justify center -aspect 1000
    pack $w.m -side top -fill x -padx 20 -pady 20
    frame $w.f -relief sunken -border 2
8494
    message $w.f.rt -text [mc "Reset type:"] -aspect 1000
8495 8496 8497
    grid $w.f.rt -sticky w
    set resettype mixed
    radiobutton $w.f.soft -value soft -variable resettype -justify left \
8498
	-text [mc "Soft: Leave working tree and index untouched"]
8499 8500
    grid $w.f.soft -sticky w
    radiobutton $w.f.mixed -value mixed -variable resettype -justify left \
8501
	-text [mc "Mixed: Leave working tree untouched, reset index"]
8502 8503
    grid $w.f.mixed -sticky w
    radiobutton $w.f.hard -value hard -variable resettype -justify left \
8504
	-text [mc "Hard: Reset working tree and index\n(discard ALL local changes)"]
8505 8506
    grid $w.f.hard -sticky w
    pack $w.f -side top -fill x
8507
    button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w"
8508
    pack $w.ok -side left -fill x -padx 20 -pady 20
8509
    button $w.cancel -text [mc Cancel] -command "destroy $w"
8510
    bind $w <Key-Escape> [list destroy $w]
8511 8512 8513 8514
    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
8515
    if {[catch {set fd [open \
8516
	    [list | git reset --$resettype $rowmenuid 2>@1] r]} err]} {
8517 8518
	error_popup $err
    } else {
8519
	dohidelocalchanges
8520
	filerun $fd [list readresetstat $fd]
8521
	nowbusy reset [mc "Resetting"]
8522
	selbyid $rowmenuid
8523 8524 8525
    }
}

8526 8527
proc readresetstat {fd} {
    global mainhead mainheadid showlocalchanges rprogcoord
8528 8529 8530

    if {[gets $fd line] >= 0} {
	if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
8531 8532
	    set rprogcoord [expr {1.0 * $m / $n}]
	    adjustprogress
8533 8534 8535
	}
	return 1
    }
8536 8537
    set rprogcoord 0
    adjustprogress
8538 8539 8540 8541 8542 8543 8544 8545 8546 8547
    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
8548
	redrawtags $oldhead
8549
	redrawtags $newhead
8550 8551 8552 8553
    }
    if {$showlocalchanges} {
	doshowlocalchanges
    }
8554
    return 0
8555 8556
}

8557 8558
# context menu for a head
proc headmenu {x y id head} {
8559
    global headmenuid headmenuhead headctxmenu mainhead
8560

8561
    stopfinding
8562 8563
    set headmenuid $id
    set headmenuhead $head
8564 8565 8566 8567 8568 8569
    set state normal
    if {$head eq $mainhead} {
	set state disabled
    }
    $headctxmenu entryconfigure 0 -state $state
    $headctxmenu entryconfigure 1 -state $state
8570 8571 8572 8573
    tk_popup $headctxmenu $x $y
}

proc cobranch {} {
8574
    global headmenuid headmenuhead headids
8575
    global showlocalchanges
8576 8577

    # check the tree is clean first??
8578
    nowbusy checkout [mc "Checking out"]
8579
    update
8580
    dohidelocalchanges
8581
    if {[catch {
8582
	set fd [open [list | git checkout $headmenuhead 2>@1] r]
8583 8584 8585
    } err]} {
	notbusy checkout
	error_popup $err
8586 8587 8588
	if {$showlocalchanges} {
	    dodiffindex
	}
8589
    } else {
8590 8591 8592 8593 8594 8595
	filerun $fd [list readcheckoutstat $fd $headmenuhead $headmenuid]
    }
}

proc readcheckoutstat {fd newhead newheadid} {
    global mainhead mainheadid headids showlocalchanges progresscoords
8596
    global viewmainheadid curview
8597 8598 8599 8600 8601

    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
8602
	}
8603 8604 8605 8606 8607 8608 8609 8610
	return 1
    }
    set progresscoords {0 0}
    adjustprogress
    notbusy checkout
    if {[catch {close $fd} err]} {
	error_popup $err
    }
8611
    set oldmainid $mainheadid
8612 8613
    set mainhead $newhead
    set mainheadid $newheadid
8614
    set viewmainheadid($curview) $newheadid
8615
    redrawtags $oldmainid
8616 8617
    redrawtags $newheadid
    selbyid $newheadid
8618 8619
    if {$showlocalchanges} {
	dodiffindex
8620 8621 8622 8623
    }
}

proc rmbranch {} {
8624
    global headmenuid headmenuhead mainhead
8625
    global idheads
8626 8627 8628

    set head $headmenuhead
    set id $headmenuid
8629
    # this check shouldn't be needed any more...
8630
    if {$head eq $mainhead} {
8631
	error_popup [mc "Cannot delete the currently checked-out branch"]
8632 8633
	return
    }
8634
    set dheads [descheads $id]
8635
    if {[llength $dheads] == 1 && $idheads($dheads) eq $head} {
8636
	# the stuff on this branch isn't on any other branch
8637 8638
	if {![confirm_popup [mc "The commits on branch %s aren't on any other\
			branch.\nReally delete branch %s?" $head $head]]} return
8639 8640 8641 8642 8643 8644 8645 8646
    }
    nowbusy rmbranch
    update
    if {[catch {exec git branch -D $head} err]} {
	notbusy rmbranch
	error_popup $err
	return
    }
8647
    removehead $id $head
8648
    removedhead $id $head
8649 8650
    redrawtags $id
    notbusy rmbranch
8651
    dispneartags 0
8652 8653 8654 8655 8656
    run refill_reflist
}

# Display a list of tags and heads
proc showrefs {} {
8657 8658
    global showrefstop bgcolor fgcolor selectbgcolor
    global bglist fglist reflistfilter reflist maincursor
8659 8660 8661 8662 8663 8664 8665 8666 8667

    set top .showrefs
    set showrefstop $top
    if {[winfo exists $top]} {
	raise $top
	refill_reflist
	return
    }
    toplevel $top
8668
    wm title $top [mc "Tags and heads: %s" [file tail [pwd]]]
8669
    make_transient $top .
8670
    text $top.list -background $bgcolor -foreground $fgcolor \
8671
	-selectbackground $selectbgcolor -font mainfont \
8672 8673 8674 8675 8676 8677 8678 8679 8680 8681 8682
	-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
8683 8684
    label $top.f.l -text "[mc "Filter"]: "
    entry $top.f.e -width 20 -textvariable reflistfilter
8685 8686 8687 8688 8689
    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
8690
    button $top.close -command [list destroy $top] -text [mc "Close"]
8691
    bind $top <Key-Escape> [list destroy $top]
8692 8693 8694 8695 8696 8697 8698 8699 8700 8701 8702 8703 8704 8705 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
    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
8733
    global curview
8734 8735 8736 8737 8738

    if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
    set refs {}
    foreach n [array names headids] {
	if {[string match $reflistfilter $n]} {
8739
	    if {[commitinview $headids($n) $curview]} {
8740 8741
		lappend refs [list $n H]
	    } else {
8742
		interestedin $headids($n) {run refill_reflist}
8743 8744 8745 8746 8747
	    }
	}
    }
    foreach n [array names tagids] {
	if {[string match $reflistfilter $n]} {
8748
	    if {[commitinview $tagids($n) $curview]} {
8749 8750
		lappend refs [list $n T]
	    } else {
8751
		interestedin $tagids($n) {run refill_reflist}
8752 8753 8754 8755 8756
	    }
	}
    }
    foreach n [array names otherrefids] {
	if {[string match $reflistfilter $n]} {
8757
	    if {[commitinview $otherrefids($n) $curview]} {
8758 8759
		lappend refs [list $n o]
	    } else {
8760
		interestedin $otherrefids($n) {run refill_reflist}
8761 8762 8763 8764 8765 8766 8767 8768 8769 8770 8771 8772 8773 8774 8775 8776 8777 8778 8779 8780 8781 8782 8783 8784 8785 8786 8787 8788 8789 8790 8791 8792 8793 8794 8795 8796 8797 8798 8799 8800 8801 8802 8803 8804 8805 8806 8807 8808 8809
	    }
	}
    }
    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
8810 8811
}

P
Paul Mackerras 已提交
8812 8813
# Stuff for finding nearby tags
proc getallcommits {} {
8814 8815
    global allcommits nextarc seeds allccache allcwait cachedarcs allcupdate
    global idheads idtags idotherrefs allparents tagobjid
8816

8817 8818 8819 8820
    if {![info exists allcommits]} {
	set nextarc 0
	set allcommits 0
	set seeds {}
8821 8822 8823 8824 8825 8826 8827 8828
	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
8829
    }
8830

8831 8832 8833 8834 8835 8836 8837 8838 8839 8840 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
    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
8866
    }
8867 8868 8869 8870 8871 8872 8873 8874 8875 8876 8877 8878 8879 8880 8881 8882 8883 8884
}

# 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} {
8885
    global allparents allchildren idtags idheads nextarc
8886
    global arcnos arcids arctags arcout arcend arcstart archeads growing
8887 8888
    global seeds allcommits cachedarcs allcupdate
    
8889
    set nid 0
8890
    while {[incr nid] <= 1000 && [gets $fd line] >= 0} {
8891 8892 8893 8894 8895
	set id [lindex $line 0]
	if {[info exists allparents($id)]} {
	    # seen it already
	    continue
	}
8896
	set cachedarcs 0
8897 8898 8899 8900 8901 8902 8903 8904 8905 8906 8907 8908
	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 已提交
8909
		}
8910 8911 8912 8913 8914 8915 8916 8917 8918 8919 8920 8921 8922 8923 8924 8925 8926 8927 8928 8929 8930 8931 8932 8933 8934 8935 8936 8937 8938 8939 8940 8941 8942 8943 8944 8945 8946 8947 8948 8949 8950 8951 8952 8953 8954 8955
		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
8956
    }
8957 8958 8959 8960 8961 8962
    if {$nid > 0} {
	global cached_dheads cached_dtags cached_atags
	catch {unset cached_dheads}
	catch {unset cached_dtags}
	catch {unset cached_atags}
    }
8963 8964 8965
    if {![eof $fd]} {
	return [expr {$nid >= 1000? 2: 1}]
    }
8966 8967 8968 8969 8970 8971 8972 8973 8974 8975 8976 8977
    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
	}
8978
	error_popup "[mc "Error reading commit topology information;\
8979
		branch and preceding/following tag information\
8980
	        will be incomplete."]\n($err)"
8981 8982
	set cacheok 0
    }
8983 8984
    if {[incr allcommits -1] == 0} {
	notbusy allcommits
8985 8986 8987
	if {$cacheok} {
	    run savecache
	}
8988 8989
    }
    dispneartags 0
8990
    return 0
P
Paul Mackerras 已提交
8991 8992
}

8993 8994
proc recalcarc {a} {
    global arctags archeads arcids idtags idheads
P
Paul Mackerras 已提交
8995

8996 8997 8998 8999 9000 9001 9002 9003
    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 已提交
9004
	}
9005
    }
9006 9007
    set arctags($a) $at
    set archeads($a) $ah
P
Paul Mackerras 已提交
9008 9009
}

9010
proc splitarc {p} {
9011
    global arcnos arcids nextarc arctags archeads idtags idheads
9012
    global arcstart arcend arcout allparents growing
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
    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
9047
	} else {
9048 9049
	    set j [lsearch -exact $arcnos($id) $a]
	    set arcnos($id) [lreplace $arcnos($id) $j $j $na]
9050
	}
9051 9052 9053 9054 9055 9056 9057 9058 9059 9060 9061 9062 9063 9064 9065
    }

    # 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} {
9066
    global allparents allchildren idtags nextarc
9067
    global arcnos arcids arctags arcout arcend arcstart archeads growing
9068
    global seeds allcommits
9069

9070
    if {![info exists allcommits] || ![info exists arcnos($p)]} return
9071 9072 9073 9074 9075 9076 9077 9078 9079 9080 9081 9082 9083 9084 9085 9086 9087 9088
    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]
}

9089 9090 9091 9092 9093 9094 9095 9096 9097 9098 9099 9100 9101 9102 9103 9104 9105 9106 9107 9108 9109 9110 9111 9112 9113 9114 9115 9116 9117 9118 9119 9120 9121 9122 9123 9124 9125 9126 9127 9128 9129 9130 9131 9132 9133 9134 9135 9136 9137 9138 9139 9140 9141 9142 9143 9144 9145 9146 9147 9148 9149 9150 9151 9152 9153 9154 9155 9156 9157 9158 9159 9160 9161 9162 9163 9164 9165 9166 9167 9168 9169 9170 9171 9172 9173 9174 9175 9176 9177 9178 9179 9180 9181 9182 9183 9184 9185 9186 9187 9188 9189 9190 9191 9192 9193 9194 9195 9196 9197 9198 9199 9200 9201 9202 9203 9204 9205 9206 9207 9208 9209 9210 9211 9212 9213 9214 9215 9216 9217 9218 9219 9220 9221 9222 9223 9224 9225 9226 9227 9228 9229 9230 9231 9232 9233 9234 9235 9236 9237 9238 9239 9240 9241 9242 9243 9244 9245 9246 9247 9248 9249 9250 9251 9252 9253 9254
# 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
    }
}

9255 9256 9257 9258 9259 9260 9261 9262 9263
# 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).
9264 9265
	# Or both can be BMPs with no incoming arcs.
	if {$a eq $b || $arcnos($a) eq {}} {
9266
	    return 0
9267
	}
9268 9269 9270 9271 9272 9273 9274 9275
	# 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
9276 9277
	}
    }
9278 9279 9280 9281 9282 9283 9284

    if {![info exists arcout($a)]} {
	set arc [lindex $arcnos($a) 0]
	if {[info exists arcend($arc)]} {
	    set aend $arcend($arc)
	} else {
	    set aend {}
9285
	}
9286 9287 9288 9289 9290 9291 9292 9293 9294 9295
	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 {}
9296
	}
9297 9298 9299
	set b $arcstart($arc)
    } else {
	set bend $b
9300
    }
9301 9302 9303 9304 9305 9306 9307 9308 9309 9310 9311 9312 9313 9314 9315 9316 9317 9318
    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
	}
9319 9320
    }

9321 9322 9323 9324 9325 9326 9327 9328 9329 9330 9331 9332 9333 9334 9335 9336 9337 9338 9339 9340 9341 9342 9343 9344 9345 9346 9347 9348 9349 9350 9351
    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 已提交
9352

9353 9354 9355 9356 9357 9358 9359 9360 9361 9362 9363 9364 9365 9366 9367 9368 9369 9370 9371
# 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 已提交
9372
	}
9373 9374 9375 9376
	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 已提交
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 9435 9436 9437 9438 9439 9440 9441 9442 9443 9444 9445
    }
    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 已提交
9446 9447
	}
    }
9448 9449 9450
    foreach x [array names growanc] {
	if {$dl($x)} {
	    return 0
P
Paul Mackerras 已提交
9451
	}
9452
	return 0
P
Paul Mackerras 已提交
9453
    }
9454
    return 1
P
Paul Mackerras 已提交
9455 9456
}

9457 9458
proc validate_arctags {a} {
    global arctags idtags
P
Paul Mackerras 已提交
9459

9460 9461 9462 9463 9464 9465 9466 9467 9468 9469 9470 9471 9472 9473 9474 9475 9476 9477 9478 9479 9480 9481 9482 9483 9484 9485 9486 9487 9488 9489 9490 9491 9492 9493 9494 9495 9496 9497 9498 9499 9500 9501 9502 9503 9504 9505 9506 9507 9508
    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 已提交
9509
	    }
9510 9511
	    if {$tid ne {}} {
		return $tid
P
Paul Mackerras 已提交
9512 9513
	    }
	}
9514 9515 9516 9517 9518 9519 9520 9521 9522 9523 9524 9525 9526 9527 9528 9529 9530 9531 9532 9533 9534 9535 9536 9537 9538 9539 9540 9541 9542 9543 9544 9545 9546 9547 9548 9549 9550 9551 9552 9553 9554 9555 9556 9557 9558 9559 9560 9561 9562 9563 9564 9565 9566 9567 9568 9569 9570 9571 9572 9573 9574 9575 9576 9577
	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 已提交
9578
	}
9579
    }
9580 9581 9582 9583 9584 9585 9586 9587 9588 9589 9590 9591
    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
9592

9593 9594 9595 9596 9597 9598 9599 9600 9601 9602 9603 9604 9605 9606
    # 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
9607 9608 9609 9610
	    }
	}
    }

9611 9612 9613 9614 9615 9616 9617 9618 9619
    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
	    }
9620
	}
9621 9622 9623 9624
	if {$tags eq $ctags} {
	    set cached_dtags($origid) $tags
	} else {
	    set tags $ctags
9625
	}
9626 9627 9628 9629 9630 9631 9632
    } 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"
9633
    }
9634 9635
    return $tags
}
9636

9637 9638 9639 9640 9641 9642 9643 9644 9645 9646 9647 9648 9649 9650 9651 9652 9653 9654 9655 9656 9657
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
		}
	    }
9658
	}
9659 9660 9661 9662 9663 9664 9665 9666 9667 9668 9669 9670 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
	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
		}
	    }
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
    # 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
9777
	}
9778 9779 9780 9781 9782 9783 9784
    } 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"
9785
    }
9786
    return $tags
9787 9788
}

9789 9790 9791 9792 9793
# 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
9794

9795 9796 9797
    if {![info exists allparents($id)]} {
	return {}
    }
9798
    set aret {}
9799 9800 9801 9802 9803 9804 9805 9806 9807
    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
9808
		lappend aret $t
9809
	    }
9810
	}
9811
	set id $arcstart($a)
9812
    }
9813 9814 9815
    set origid $id
    set todo [list $id]
    set seen($id) 1
9816
    set ret {}
9817 9818 9819 9820 9821 9822 9823 9824 9825 9826
    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 {}} {
9827 9828 9829 9830
		    validate_archeads $a
		    if {$archeads($a) ne {}} {
			set ret [concat $ret $archeads($a)]
		    }
9831 9832 9833 9834 9835 9836 9837
		}
		set d $arcstart($a)
		if {![info exists seen($d)]} {
		    lappend todo $d
		    set seen($d) 1
		}
	    }
9838 9839
	}
    }
9840 9841
    set ret [lsort -unique $ret]
    set cached_dheads($origid) $ret
9842
    return [concat $ret $aret]
9843 9844
}

9845 9846
proc addedtag {id} {
    global arcnos arcout cached_dtags cached_atags
9847

9848 9849 9850
    if {![info exists arcnos($id)]} return
    if {![info exists arcout($id)]} {
	recalcarc [lindex $arcnos($id) 0]
9851
    }
9852 9853
    catch {unset cached_dtags}
    catch {unset cached_atags}
9854 9855
}

9856 9857 9858 9859 9860 9861 9862 9863 9864 9865 9866 9867 9868 9869 9870 9871 9872 9873
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
9874

9875 9876 9877
    if {![info exists arcnos($hid)]} return
    if {![info exists arcout($hid)]} {
	recalcarc [lindex $arcnos($hid) 0]
9878
    }
9879 9880 9881 9882 9883 9884 9885 9886 9887 9888 9889 9890 9891 9892
    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
	    }
9893 9894
	}
    }
9895 9896 9897
    catch {unset cached_dtags}
    catch {unset cached_atags}
    catch {unset cached_dheads}
9898 9899
}

9900
proc rereadrefs {} {
9901
    global idtags idheads idotherrefs mainheadid
9902 9903 9904 9905 9906 9907 9908 9909

    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]
	}
    }
9910
    set oldmainhead $mainheadid
9911
    readrefs
9912
    changedrefs
9913 9914 9915 9916
    set refids [lsort -unique [concat $refids [array names idtags] \
			[array names idheads] [array names idotherrefs]]]
    foreach id $refids {
	set v [listrefs $id]
9917
	if {![info exists ref($id)] || $ref($id) != $v} {
9918 9919 9920
	    redrawtags $id
	}
    }
9921 9922 9923 9924
    if {$oldmainhead ne $mainheadid} {
	redrawtags $oldmainhead
	redrawtags $mainheadid
    }
9925
    run refill_reflist
9926 9927
}

9928 9929 9930 9931 9932 9933 9934 9935 9936 9937 9938 9939 9940 9941 9942 9943 9944 9945
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]
}

9946
proc showtag {tag isnew} {
9947
    global ctext tagcontents tagids linknum tagobjid
9948 9949 9950 9951 9952

    if {$isnew} {
	addtohistory [list showtag $tag 0]
    }
    $ctext conf -state normal
9953
    clear_ctext
9954
    settabs 0
9955
    set linknum 0
9956 9957 9958 9959 9960
    if {![info exists tagcontents($tag)]} {
	catch {
	    set tagcontents($tag) [exec git cat-file tag $tagobjid($tag)]
	}
    }
9961 9962 9963
    if {[info exists tagcontents($tag)]} {
	set text $tagcontents($tag)
    } else {
9964
	set text "[mc "Tag"]: $tag\n[mc "Id"]:  $tagids($tag)"
9965
    }
9966
    appendwithlinks $text {}
9967
    $ctext conf -state disabled
9968
    init_flist {}
9969 9970
}

9971 9972
proc doquit {} {
    global stopped
9973 9974
    global gitktmpdir

9975
    set stopped 100
9976
    savestuff .
9977
    destroy .
9978 9979 9980 9981

    if {[info exists gitktmpdir]} {
	catch {file delete -force $gitktmpdir}
    }
9982
}
9983

P
Paul Mackerras 已提交
9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 9996
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
9997
    global prefstop
P
Paul Mackerras 已提交
9998 9999 10000 10001 10002 10003 10004 10005 10006 10007 10008 10009 10010

    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
10011
	make_transient $top $prefstop
10012
	wm title $top [mc "Gitk font chooser"]
10013
	label $top.l -textvariable fontparam(which)
P
Paul Mackerras 已提交
10014 10015 10016 10017 10018 10019 10020 10021 10022 10023 10024 10025 10026 10027 10028
	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 \
10029
	    -font {{Times New Roman} 12 bold} -text [mc "B"] -indicatoron 0 \
P
Paul Mackerras 已提交
10030 10031
	    -variable fontparam(weight) -onvalue bold -offvalue normal
	checkbutton $top.g.ital -padx 5 \
10032
	    -font {{Times New Roman} 12 italic} -text [mc "I"] -indicatoron 0  \
P
Paul Mackerras 已提交
10033 10034 10035 10036 10037 10038 10039 10040 10041 10042
	    -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
10043 10044
	button $top.buts.ok -text [mc "OK"] -command fontok -default active
	button $top.buts.can -text [mc "Cancel"] -command fontcan -default normal
10045 10046
	bind $top <Key-Return> fontok
	bind $top <Key-Escape> fontcan
P
Paul Mackerras 已提交
10047 10048 10049 10050 10051 10052 10053 10054 10055 10056 10057 10058 10059 10060 10061 10062 10063 10064 10065 10066 10067 10068 10069 10070 10071 10072 10073 10074 10075 10076 10077 10078 10079 10080 10081 10082 10083 10084 10085 10086 10087 10088 10089 10090 10091 10092 10093 10094 10095 10096 10097 10098 10099 10100 10101 10102 10103 10104 10105 10106 10107 10108 10109
	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)
}

10110
proc doprefs {} {
10111
    global maxwidth maxgraphpct
10112
    global oldprefs prefstop showneartags showlocalchanges
10113
    global bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
10114
    global tabstop limitdiffs autoselect extdifftool perfile_attrs
P
Paul Mackerras 已提交
10115

10116 10117 10118 10119 10120
    set top .gitkprefs
    set prefstop $top
    if {[winfo exists $top]} {
	raise $top
	return
10121
    }
P
Paul Mackerras 已提交
10122
    foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
10123
		   limitdiffs tabstop perfile_attrs} {
10124
	set oldprefs($v) [set $v]
P
Paul Mackerras 已提交
10125
    }
10126
    toplevel $top
10127
    wm title $top [mc "Gitk preferences"]
10128
    make_transient $top .
10129
    label $top.ldisp -text [mc "Commit list display options"]
10130 10131
    grid $top.ldisp - -sticky w -pady 10
    label $top.spacer -text " "
10132
    label $top.maxwidthl -text [mc "Maximum graph width (lines)"] \
10133 10134 10135
	-font optionfont
    spinbox $top.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
    grid $top.spacer $top.maxwidthl $top.maxwidth -sticky w
10136
    label $top.maxpctl -text [mc "Maximum graph width (% of pane)"] \
10137 10138 10139
	-font optionfont
    spinbox $top.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
    grid x $top.maxpctl $top.maxpct -sticky w
10140 10141
    checkbutton $top.showlocal -text [mc "Show local changes"] \
	-font optionfont -variable showlocalchanges
10142
    grid x $top.showlocal -sticky w
10143 10144
    checkbutton $top.autoselect -text [mc "Auto-select SHA1"] \
	-font optionfont -variable autoselect
10145
    grid x $top.autoselect -sticky w
10146

10147
    label $top.ddisp -text [mc "Diff display options"]
10148
    grid $top.ddisp - -sticky w -pady 10
10149
    label $top.tabstopl -text [mc "Tab spacing"] -font optionfont
10150 10151
    spinbox $top.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
    grid x $top.tabstopl $top.tabstop -sticky w
10152 10153
    checkbutton $top.ntag -text [mc "Display nearby tags"] \
	-font optionfont -variable showneartags
P
Paul Mackerras 已提交
10154
    grid x $top.ntag -sticky w
10155 10156
    checkbutton $top.ldiff -text [mc "Limit diffs to listed paths"] \
	-font optionfont -variable limitdiffs
10157
    grid x $top.ldiff -sticky w
10158 10159
    checkbutton $top.lattr -text [mc "Support per-file encodings"] \
	-font optionfont -variable perfile_attrs
10160
    grid x $top.lattr -sticky w
10161

10162 10163 10164 10165 10166 10167 10168 10169 10170
    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

10171
    label $top.cdisp -text [mc "Colors: press to choose"]
10172 10173
    grid $top.cdisp - -sticky w -pady 10
    label $top.bg -padx 40 -relief sunk -background $bgcolor
10174
    button $top.bgbut -text [mc "Background"] -font optionfont \
10175
	-command [list choosecolor bgcolor {} $top.bg [mc "background"] setbg]
10176 10177
    grid x $top.bgbut $top.bg -sticky w
    label $top.fg -padx 40 -relief sunk -background $fgcolor
10178
    button $top.fgbut -text [mc "Foreground"] -font optionfont \
10179
	-command [list choosecolor fgcolor {} $top.fg [mc "foreground"] setfg]
10180 10181
    grid x $top.fgbut $top.fg -sticky w
    label $top.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]
10182
    button $top.diffoldbut -text [mc "Diff: old lines"] -font optionfont \
10183
	-command [list choosecolor diffcolors 0 $top.diffold [mc "diff old lines"] \
10184 10185 10186
		      [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]
10187
    button $top.diffnewbut -text [mc "Diff: new lines"] -font optionfont \
10188
	-command [list choosecolor diffcolors 1 $top.diffnew [mc "diff new lines"] \
10189
		      [list $ctext tag conf dresult -foreground]]
10190 10191
    grid x $top.diffnewbut $top.diffnew -sticky w
    label $top.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2]
10192
    button $top.hunksepbut -text [mc "Diff: hunk header"] -font optionfont \
10193
	-command [list choosecolor diffcolors 2 $top.hunksep \
10194
		      [mc "diff hunk header"] \
10195 10196
		      [list $ctext tag conf hunksep -foreground]]
    grid x $top.hunksepbut $top.hunksep -sticky w
10197 10198 10199 10200 10201 10202
    label $top.markbgsep -padx 40 -relief sunk -background $markbgcolor
    button $top.markbgbut -text [mc "Marked line bg"] -font optionfont \
	-command [list choosecolor markbgcolor {} $top.markbgsep \
		      [mc "marked line background"] \
		      [list $ctext tag conf omark -background]]
    grid x $top.markbgbut $top.markbgsep -sticky w
10203
    label $top.selbgsep -padx 40 -relief sunk -background $selectbgcolor
10204
    button $top.selbgbut -text [mc "Select bg"] -font optionfont \
10205
	-command [list choosecolor selectbgcolor {} $top.selbgsep [mc "background"] setselbg]
10206
    grid x $top.selbgbut $top.selbgsep -sticky w
10207

10208
    label $top.cfont -text [mc "Fonts: press to choose"]
P
Paul Mackerras 已提交
10209
    grid $top.cfont - -sticky w -pady 10
10210 10211 10212
    mkfontdisp mainfont $top [mc "Main font"]
    mkfontdisp textfont $top [mc "Diff display font"]
    mkfontdisp uifont $top [mc "User interface font"]
P
Paul Mackerras 已提交
10213

10214
    frame $top.buts
10215 10216
    button $top.buts.ok -text [mc "OK"] -command prefsok -default active
    button $top.buts.can -text [mc "Cancel"] -command prefscan -default normal
10217 10218
    bind $top <Key-Return> prefsok
    bind $top <Key-Escape> prefscan
10219 10220 10221 10222
    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
10223
    bind $top <Visibility> "focus $top.buts.ok"
10224 10225
}

10226 10227 10228 10229 10230 10231 10232 10233 10234
proc choose_extdiff {} {
    global extdifftool

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

10235 10236 10237 10238
proc choosecolor {v vi w x cmd} {
    global $v

    set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \
10239
	       -title [mc "Gitk: choose color for %s" $x]]
10240 10241 10242 10243 10244 10245
    if {$c eq {}} return
    $w conf -background $c
    lset $v $vi $c
    eval $cmd $c
}

10246 10247 10248 10249 10250 10251 10252 10253 10254 10255
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
}

10256 10257 10258 10259 10260 10261 10262 10263 10264 10265 10266 10267 10268 10269 10270 10271 10272 10273
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
}

10274
proc prefscan {} {
10275
    global oldprefs prefstop
10276

P
Paul Mackerras 已提交
10277
    foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
10278
		   limitdiffs tabstop perfile_attrs} {
10279
	global $v
10280 10281 10282 10283
	set $v $oldprefs($v)
    }
    catch {destroy $prefstop}
    unset prefstop
P
Paul Mackerras 已提交
10284
    fontcan
10285 10286 10287 10288
}

proc prefsok {} {
    global maxwidth maxgraphpct
10289
    global oldprefs prefstop showneartags showlocalchanges
P
Paul Mackerras 已提交
10290
    global fontpref mainfont textfont uifont
10291
    global limitdiffs treediffs perfile_attrs
10292 10293 10294

    catch {destroy $prefstop}
    unset prefstop
P
Paul Mackerras 已提交
10295 10296 10297 10298 10299 10300 10301 10302 10303 10304 10305 10306 10307 10308 10309 10310 10311 10312 10313 10314 10315
    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]
    }
10316
    settabs
10317 10318 10319 10320 10321 10322 10323
    if {$showlocalchanges != $oldprefs(showlocalchanges)} {
	if {$showlocalchanges} {
	    doshowlocalchanges
	} else {
	    dohidelocalchanges
	}
    }
10324 10325 10326 10327
    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
10328 10329
	catch {unset treediffs}
    }
P
Paul Mackerras 已提交
10330
    if {$fontchanged || $maxwidth != $oldprefs(maxwidth)
10331 10332
	|| $maxgraphpct != $oldprefs(maxgraphpct)} {
	redisplay
10333 10334
    } elseif {$showneartags != $oldprefs(showneartags) ||
	  $limitdiffs != $oldprefs(limitdiffs)} {
P
Paul Mackerras 已提交
10335
	reselectline
10336 10337 10338 10339
    }
}

proc formatdate {d} {
10340
    global datetimeformat
10341
    if {$d ne {}} {
10342
	set d [clock format $d -format $datetimeformat]
10343 10344
    }
    return $d
P
Paul Mackerras 已提交
10345 10346
}

10347 10348 10349 10350 10351 10352 10353 10354 10355 10356 10357 10358 10359 10360 10361 10362 10363 10364 10365 10366 10367 10368 10369 10370 10371 10372 10373 10374 10375 10376 10377 10378 10379 10380 10381 10382 10383 10384 10385 10386 10387 10388 10389 10390 10391 10392 10393 10394 10395 10396 10397 10398 10399 10400 10401 10402 10403 10404 10405 10406 10407 10408 10409 10410 10411 10412 10413 10414 10415 10416 10417 10418 10419 10420 10421 10422 10423 10424 10425 10426 10427 10428 10429 10430 10431 10432 10433 10434 10435 10436 10437 10438 10439 10440 10441 10442 10443 10444 10445 10446 10447 10448 10449 10450 10451 10452 10453 10454 10455 10456 10457 10458 10459 10460 10461 10462 10463 10464 10465 10466 10467 10468 10469 10470 10471 10472 10473 10474 10475 10476 10477 10478 10479 10480 10481 10482 10483 10484 10485 10486 10487 10488 10489 10490 10491 10492 10493 10494 10495 10496 10497 10498 10499 10500 10501 10502 10503 10504 10505 10506 10507 10508 10509 10510 10511 10512 10513 10514 10515 10516 10517 10518 10519 10520 10521 10522 10523 10524 10525 10526 10527 10528 10529 10530 10531 10532 10533 10534 10535 10536 10537 10538 10539 10540 10541 10542 10543 10544 10545 10546 10547 10548 10549 10550
# 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 }
10551
    { Shift_JIS MS_Kanji csShiftJIS ShiftJIS Shift-JIS }
10552 10553 10554 10555 10556 10557 10558 10559 10560 10561 10562 10563 10564 10565 10566 10567 10568 10569 10570 10571 10572 10573 10574 10575 10576 10577 10578 10579 10580 10581 10582 10583 10584 10585
    { 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} {
10586 10587 10588 10589
    global encoding_aliases tcl_encoding_cache
    if {[info exists tcl_encoding_cache($enc)]} {
	return $tcl_encoding_cache($enc)
    }
10590 10591 10592 10593 10594 10595
    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"
10596
	if {[regsub {^(iso|cp|ibm|jis)[-_]} $enc {\1} encx]} {
10597 10598 10599 10600 10601 10602 10603 10604 10605 10606 10607
	    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} {
10608
		    if {[regsub {^(iso|cp|ibm|jis)[-_]} $e {\1} ex]} {
10609 10610 10611 10612 10613 10614 10615 10616
			set i [lsearch -exact $lcnames $ex]
		    }
		}
		if {$i >= 0} break
	    }
	    break
	}
    }
10617
    set tclenc {}
10618
    if {$i >= 0} {
10619
	set tclenc [lindex $names $i]
10620
    }
10621 10622
    set tcl_encoding_cache($enc) $tclenc
    return $tclenc
10623 10624
}

10625
proc gitattr {path attr default} {
10626 10627 10628 10629 10630 10631 10632
    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
10633
	}
10634
	set path_attr_cache($attr,$path) $r
10635 10636 10637 10638 10639
    }
    if {$r eq "unspecified"} {
	return $default
    }
    return $r
10640 10641
}

10642
proc cache_gitattr {attr pathlist} {
10643 10644 10645 10646 10647 10648 10649 10650 10651 10652 10653 10654 10655 10656 10657 10658 10659 10660 10661 10662 10663 10664
    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
10665
		}
10666
	    }
10667
	}
10668
    }
10669 10670
}

10671
proc get_path_encoding {path} {
10672 10673 10674 10675 10676 10677
    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
10678
	}
10679 10680
    }
    return $tcl_enc
10681 10682
}

10683 10684
# First check that Tcl/Tk is recent enough
if {[catch {package require Tk 8.4} err]} {
10685 10686
    show_error {} . [mc "Sorry, gitk cannot run with this version of Tcl/Tk.\n\
		     Gitk requires at least Tcl/Tk 8.4."]
10687 10688 10689
    exit 1
}

10690
# defaults...
10691
set wrcomcmd "git diff-tree --stdin -p --pretty"
10692

10693
set gitencoding {}
10694
catch {
10695
    set gitencoding [exec git config --get i18n.commitencoding]
10696
}
10697 10698 10699
catch {
    set gitencoding [exec git config --get i18n.logoutputencoding]
}
10700
if {$gitencoding == ""} {
10701 10702 10703 10704 10705
    set gitencoding "utf-8"
}
set tclencoding [tcl_encoding $gitencoding]
if {$tclencoding == {}} {
    puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
10706
}
10707

10708 10709
set gui_encoding [encoding system]
catch {
10710 10711 10712 10713 10714 10715 10716 10717 10718
    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"
	}
    }
10719 10720
}

10721 10722 10723 10724 10725 10726 10727 10728 10729
if {[tk windowingsystem] eq "aqua"} {
    set mainfont {{Lucida Grande} 9}
    set textfont {Monaco 9}
    set uifont {{Lucida Grande} 9 bold}
} else {
    set mainfont {Helvetica 9}
    set textfont {Courier 9}
    set uifont {Helvetica 9 bold}
}
10730
set tabstop 8
10731
set findmergefiles 0
10732
set maxgraphpct 50
10733
set maxwidth 16
P
Paul Mackerras 已提交
10734
set revlistorder 0
10735
set fastdate 0
10736 10737 10738
set uparrowlen 5
set downarrowlen 5
set mingaplen 100
P
Paul Mackerras 已提交
10739
set cmitmode "patch"
10740
set wrapcomment "none"
P
Paul Mackerras 已提交
10741
set showneartags 1
10742
set maxrefs 20
10743
set maxlinelen 200
10744
set showlocalchanges 1
10745
set limitdiffs 1
10746
set datetimeformat "%Y-%m-%d %H:%M:%S"
10747
set autoselect 1
10748
set perfile_attrs 0
10749

10750 10751 10752 10753 10754
if {[tk windowingsystem] eq "aqua"} {
    set extdifftool "opendiff"
} else {
    set extdifftool "meld"
}
10755

10756
set colors {green red blue magenta darkgrey brown orange}
10757 10758 10759
set bgcolor white
set fgcolor black
set diffcolors {red "#00a000" blue}
10760
set diffcontext 3
10761
set ignorespace 0
10762
set selectbgcolor gray85
10763
set markbgcolor "#e0e0ff"
10764

10765 10766
set circlecolors {white blue gray blue blue}

10767 10768 10769 10770 10771 10772 10773
# button for popping up context menus
if {[tk windowingsystem] eq "aqua"} {
    set ctxbut <Button-2>
} else {
    set ctxbut <Button-3>
}

10774 10775 10776 10777 10778 10779 10780 10781 10782 10783 10784 10785 10786 10787 10788 10789 10790 10791 10792
## 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

10793 10794
catch {source ~/.gitk}

10795
font create optionfont -family sans-serif -size -12
10796

10797 10798 10799 10800 10801 10802 10803 10804 10805 10806
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]
10807

10808 10809
setoptions

10810
# check that we can find a .git directory somewhere...
10811
if {[catch {set gitdir [gitdir]}]} {
10812
    show_error {} . [mc "Cannot find a git repository here."]
10813 10814
    exit 1
}
10815
if {![file isdirectory $gitdir]} {
10816
    show_error {} . [mc "Cannot find the git directory \"%s\"." $gitdir]
10817 10818 10819
    exit 1
}

10820 10821 10822
set selecthead {}
set selectheadid {}

10823
set revtreeargs {}
10824 10825
set cmdline_files {}
set i 0
10826
set revtreeargscmd {}
10827
foreach arg $argv {
10828
    switch -glob -- $arg {
10829
	"" { }
10830 10831 10832 10833
	"--" {
	    set cmdline_files [lrange $argv [expr {$i + 1}] end]
	    break
	}
10834 10835 10836
	"--select-commit=*" {
	    set selecthead [string range $arg 16 end]
	}
10837 10838 10839
	"--argscmd=*" {
	    set revtreeargscmd [string range $arg 10 end]
	}
10840 10841 10842 10843
	default {
	    lappend revtreeargs $arg
	}
    }
10844
    incr i
10845
}
10846

10847 10848 10849 10850
if {$selecthead eq "HEAD"} {
    set selecthead {}
}

10851
if {$i >= [llength $argv] && $revtreeargs ne {}} {
10852
    # no -- on command line, but some arguments (other than --argscmd)
10853
    if {[catch {
10854
	set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs]
10855 10856 10857
	set cmdline_files [split $f "\n"]
	set n [llength $cmdline_files]
	set revtreeargs [lrange $revtreeargs 0 end-$n]
10858 10859 10860 10861 10862
	# 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]} {
10863 10864
		show_error {} . [mc "Ambiguous argument '%s': both revision\
				 and filename" $arg]
10865 10866 10867
		exit 1
	    }
	}
10868 10869 10870 10871 10872
    } 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 已提交
10873
	    set err [string range $err [expr {$i + 6}] end]
10874
	}
10875
	show_error {} . "[mc "Bad arguments to gitk:"]\n$err"
10876 10877 10878 10879
	exit 1
    }
}

10880
set nullid "0000000000000000000000000000000000000000"
10881
set nullid2 "0000000000000000000000000000000000000001"
10882
set nullfile "/dev/null"
10883

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

10886
set runq {}
10887 10888
set history {}
set historyindex 0
10889 10890
set fh_serial 0
set nhl_names {}
10891
set highlight_paths {}
10892
set findpattern {}
10893
set searchdirn -forwards
10894 10895
set boldids {}
set boldnameids {}
10896
set diffelide {0 0}
10897
set markingmatches 0
10898
set linkentercount 0
10899 10900
set need_redisplay 0
set nrows_drawn 0
10901
set firsttabstop 0
P
Paul Mackerras 已提交
10902

P
Paul Mackerras 已提交
10903 10904
set nextviewnum 1
set curview 0
10905
set selectedview 0
10906 10907
set selectedhlview [mc "None"]
set highlight_related [mc "None"]
10908
set highlight_files {}
P
Paul Mackerras 已提交
10909
set viewfiles(0) {}
10910
set viewperm(0) 0
10911
set viewargs(0) {}
10912
set viewargscmd(0) {}
P
Paul Mackerras 已提交
10913

10914
set selectedline {}
10915
set numcommits 0
10916
set loginstance 0
10917
set cmdlineok 0
10918
set stopped 0
10919
set stuffsaved 0
10920
set patchnum 0
10921
set lserial 0
10922
set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}]
10923
setcoords
10924
makewindow
10925 10926 10927 10928 10929 10930 10931 10932 10933 10934 10935 10936 10937 10938 10939 10940 10941 10942
catch {
    image create photo gitlogo      -width 16 -height 16

    image create photo gitlogominus -width  4 -height  2
    gitlogominus put #C00000 -to 0 0 4 2
    gitlogo copy gitlogominus -to  1 5
    gitlogo copy gitlogominus -to  6 5
    gitlogo copy gitlogominus -to 11 5
    image delete gitlogominus

    image create photo gitlogoplus  -width  4 -height  4
    gitlogoplus  put #008000 -to 1 0 3 4
    gitlogoplus  put #008000 -to 0 1 4 3
    gitlogo copy gitlogoplus  -to  1 9
    gitlogo copy gitlogoplus  -to  6 9
    gitlogo copy gitlogoplus  -to 11 9
    image delete gitlogoplus

10943 10944 10945 10946
    image create photo gitlogo32    -width 32 -height 32
    gitlogo32 copy gitlogo -zoom 2 2

    wm iconphoto . -default gitlogo gitlogo32
10947
}
10948 10949
# wait for the window to become visible
tkwait visibility .
10950
wm title . "[file tail $argv0]: [file tail [pwd]]"
10951
readrefs
10952

10953
if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} {
P
Paul Mackerras 已提交
10954 10955
    # create a view for the files/dirs specified on the command line
    set curview 1
10956
    set selectedview 1
P
Paul Mackerras 已提交
10957
    set nextviewnum 2
10958
    set viewname(1) [mc "Command line"]
P
Paul Mackerras 已提交
10959
    set viewfiles(1) $cmdline_files
10960
    set viewargs(1) $revtreeargs
10961
    set viewargscmd(1) $revtreeargscmd
10962
    set viewperm(1) 0
10963
    set vdatemode(1) 0
10964
    addviewmenu 1
10965 10966
    .bar.view entryconf [mca "Edit view..."] -state normal
    .bar.view entryconf [mca "Delete view"] -state normal
P
Paul Mackerras 已提交
10967
}
10968 10969 10970 10971 10972 10973 10974

if {[info exists permviews]} {
    foreach v $permviews {
	set n $nextviewnum
	incr nextviewnum
	set viewname($n) [lindex $v 0]
	set viewfiles($n) [lindex $v 1]
10975
	set viewargs($n) [lindex $v 2]
10976
	set viewargscmd($n) [lindex $v 3]
10977
	set viewperm($n) 1
10978
	addviewmenu $n
10979 10980
    }
}
10981 10982 10983 10984 10985

if {[tk windowingsystem] eq "win32"} {
    focus -force .
}

10986
getcommits {}