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

P
Paul Mackerras 已提交
5
# Copyright (C) 2005-2006 Paul Mackerras.  All rights reserved.
6 7 8 9
# This program is free software; it may be used, copied, modified
# and distributed under the terms of the GNU General Public Licence,
# either version 2, or (at your option) any later version.

10 11 12 13 14
proc gitdir {} {
    global env
    if {[info exists env(GIT_DIR)]} {
	return $env(GIT_DIR)
    } else {
15
	return [exec git rev-parse --git-dir]
16 17 18
    }
}

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

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

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

proc filereadable {fd script} {
    global runq

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

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

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

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

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

93
# Start off a git log process and arrange to read its output
94
proc start_rev_list {view} {
95
    global startmsecs
P
Paul Mackerras 已提交
96
    global commfd leftover tclencoding datemode
P
Paul Mackerras 已提交
97
    global viewargs viewargscmd viewfiles commitidx viewcomplete
98
    global showlocalchanges commitinterest mainheadid
99
    global progressdirn progresscoords proglastnc curview
100
    global viewactive loginstance viewinstances
101
    global pending_select mainheadid
102 103

    set startmsecs [clock clicks -milliseconds]
104
    set commitidx($view) 0
105
    set viewcomplete($view) 0
106 107 108
    set viewactive($view) 1
    varcinit $view

109 110 111 112 113 114 115 116 117 118
    set args $viewargs($view)
    if {$viewargscmd($view) ne {}} {
	if {[catch {
	    set str [exec sh -c $viewargscmd($view)]
	} err]} {
	    error_popup "Error executing --argscmd command: $err"
	    exit 1
	}
	set args [concat $args [split $str "\n"]]
    }
119
    if {[catch {
120
	set fd [open [concat | git log --no-color -z --pretty=raw --parents \
121
			 --boundary $args "--" $viewfiles($view)] r]
122
    } err]} {
P
Paul Mackerras 已提交
123
	error_popup "[mc "Error executing git log:"] $err"
124 125
	exit 1
    }
126 127 128 129
    set i [incr loginstance]
    set viewinstances($view) [list $i]
    set commfd($i) $fd
    set leftover($i) {}
130 131 132
    if {$showlocalchanges} {
	lappend commitinterest($mainheadid) {dodiffindex}
    }
133
    fconfigure $fd -blocking 0 -translation lf -eofchar {}
134
    if {$tclencoding != {}} {
135
	fconfigure $fd -encoding $tclencoding
136
    }
137
    filerun $fd [list getcommitlines $fd $i $view 0]
138
    nowbusy $view [mc "Reading"]
139 140 141 142
    if {$view == $curview} {
	set progressdirn 1
	set progresscoords {0 0}
	set proglastnc 0
143
	set pending_select $mainheadid
144
    }
145 146
}

147 148
proc stop_rev_list {view} {
    global commfd viewinstances leftover
149

150 151 152 153 154 155 156 157 158 159
    foreach inst $viewinstances($view) {
	set fd $commfd($inst)
	catch {
	    set pid [pid $fd]
	    exec kill $pid
	}
	catch {close $fd}
	nukefile $fd
	unset commfd($inst)
	unset leftover($inst)
160
    }
161
    set viewinstances($view) {}
162 163
}

164
proc getcommits {} {
165
    global canv curview need_redisplay
166

167 168
    initlayout
    start_rev_list $curview
169
    show_status [mc "Reading commits..."]
170
    set need_redisplay 1
171 172
}

173
proc updatecommits {} {
174
    global curview viewargs viewfiles viewinstances
P
Paul Mackerras 已提交
175
    global viewactive viewcomplete loginstance tclencoding mainheadid
176
    global startmsecs commfd showneartags showlocalchanges leftover
177
    global mainheadid pending_select
P
Paul Mackerras 已提交
178
    global isworktree
179

P
Paul Mackerras 已提交
180
    set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}]
181
    set oldmainid $mainheadid
182
    rereadrefs
183 184 185 186 187 188 189 190
    if {$showlocalchanges} {
	if {$mainheadid ne $oldmainid} {
	    dohidelocalchanges
	}
	if {[commitinview $mainheadid $curview]} {
	    dodiffindex
	}
    }
191 192 193
    set view $curview
    if {[catch {
	set fd [open [concat | git log --no-color -z --pretty=raw --parents \
194 195
			  --boundary $viewargs($view) --not [seeds $view] \
			  "--" $viewfiles($view)] r]
196 197 198 199 200 201 202 203 204 205 206 207 208 209 210
    } err]} {
	error_popup "Error executing git log: $err"
	exit 1
    }
    if {$viewactive($view) == 0} {
	set startmsecs [clock clicks -milliseconds]
    }
    set i [incr loginstance]
    lappend viewinstances($view) $i
    set commfd($i) $fd
    set leftover($i) {}
    fconfigure $fd -blocking 0 -translation lf -eofchar {}
    if {$tclencoding != {}} {
	fconfigure $fd -encoding $tclencoding
    }
211
    filerun $fd [list getcommitlines $fd $i $view 1]
212 213
    incr viewactive($view)
    set viewcomplete($view) 0
214
    set pending_select $mainheadid
215 216 217 218 219 220 221 222 223
    nowbusy $view "Reading"
    if {$showneartags} {
	getallcommits
    }
}

proc reloadcommits {} {
    global curview viewcomplete selectedline currentid thickerline
    global showneartags treediffs commitinterest cached_commitrow
224
    global progresscoords targetid
225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243

    if {!$viewcomplete($curview)} {
	stop_rev_list $curview
	set progresscoords {0 0}
	adjustprogress
    }
    resetvarcs $curview
    catch {unset selectedline}
    catch {unset currentid}
    catch {unset thickerline}
    catch {unset treediffs}
    readrefs
    changedrefs
    if {$showneartags} {
	getallcommits
    }
    clear_display
    catch {unset commitinterest}
    catch {unset cached_commitrow}
244
    catch {unset targetid}
245 246
    setcanvscroll
    getcommits
247
    return 0
248 249
}

250 251 252 253 254 255 256 257 258 259 260 261 262
# 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]
}

263 264 265 266
# Procedures used in reordering commits from git log (without
# --topo-order) into the order for display.

proc varcinit {view} {
267 268
    global varcstart vupptr vdownptr vleftptr vbackptr varctok varcrow
    global vtokmod varcmod vrowmod varcix vlastins
269 270 271 272 273

    set varcstart($view) {{}}
    set vupptr($view) {0}
    set vdownptr($view) {0}
    set vleftptr($view) {0}
274
    set vbackptr($view) {0}
275 276 277 278
    set varctok($view) {{}}
    set varcrow($view) {{}}
    set vtokmod($view) {}
    set varcmod($view) 0
279
    set vrowmod($view) 0
280
    set varcix($view) {{}}
281
    set vlastins($view) {0}
282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301
}

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)
    }
302
    catch {unset ordertok}
303 304
}

305 306 307 308 309 310 311 312 313 314 315 316 317
# 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
}

318
proc newvarc {view id} {
319 320 321
    global varcid varctok parents children datemode
    global vupptr vdownptr vleftptr vbackptr varcrow varcix varcstart
    global commitdata commitinfo vseedcount varccommits vlastins
322 323 324

    set a [llength $varctok($view)]
    set vid $view,$id
325
    if {[llength $children($vid)] == 0 || $datemode} {
326 327 328 329 330 331 332 333 334 335 336 337 338 339 340
	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 {}
341 342 343 344 345 346 347 348 349
    }
    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]
350
	}
351 352
    }
    if {$ka != 0} {
353 354 355 356
	set i [lsearch -exact $parents($view,$ki) $id]
	set j [expr {[llength $parents($view,$ki)] - 1 - $i}]
	append tok [strrep $j]
    }
357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380
    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
    }
381 382 383 384 385
    lappend varctok($view) $tok
    lappend varcstart($view) $id
    lappend vdownptr($view) 0
    lappend varcrow($view) {}
    lappend varcix($view) {}
386
    set varccommits($view,$a) {}
387
    lappend vlastins($view) 0
388 389 390 391 392
    return $a
}

proc splitvarc {p v} {
    global varcid varcstart varccommits varctok
393
    global vupptr vdownptr vleftptr vbackptr varcix varcrow vlastins
394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411

    set oa $varcid($v,$p)
    set ac $varccommits($v,$oa)
    set i [lsearch -exact $varccommits($v,$oa) $p]
    if {$i <= 0} return
    set na [llength $varctok($v)]
    # "%" sorts before "0"...
    set tok "[lindex $varctok($v) $oa]%[strrep $i]"
    lappend varctok($v) $tok
    lappend varcrow($v) {}
    lappend varcix($v) {}
    set varccommits($v,$oa) [lrange $ac 0 [expr {$i - 1}]]
    set varccommits($v,$na) [lrange $ac $i end]
    lappend varcstart($v) $p
    foreach id $varccommits($v,$na) {
	set varcid($v,$id) $na
    }
    lappend vdownptr($v) [lindex $vdownptr($v) $oa]
412
    lappend vlastins($v) [lindex $vlastins($v) $oa]
413
    lset vdownptr($v) $oa $na
414
    lset vlastins($v) $oa 0
415 416
    lappend vupptr($v) $oa
    lappend vleftptr($v) 0
417
    lappend vbackptr($v) 0
418 419 420 421 422 423 424
    for {set b [lindex $vdownptr($v) $na]} {$b != 0} {set b [lindex $vleftptr($v) $b]} {
	lset vupptr($v) $b $na
    }
}

proc renumbervarc {a v} {
    global parents children varctok varcstart varccommits
425
    global vupptr vdownptr vleftptr vbackptr vlastins varcid vtokmod datemode
426 427 428 429

    set t1 [clock clicks -milliseconds]
    set todo {}
    set isrelated($a) 1
430
    set kidchanged($a) 1
431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453
    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 {
454
	if {![info exists kidchanged($a)]} continue
455
	set id [lindex $varcstart($v) $a]
456 457 458 459 460 461 462 463 464 465 466
	if {[llength $children($v,$id)] > 1} {
	    set children($v,$id) [lsort -command [list vtokcmp $v] \
				      $children($v,$id)]
	}
	set oldtok [lindex $varctok($v) $a]
	if {!$datemode} {
	    set tok {}
	} else {
	    set tok $oldtok
	}
	set ka 0
467 468
	set kid [last_real_child $v,$id]
	if {$kid ne {}} {
469 470 471 472 473
	    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]
474 475
	    }
	}
476
	if {$ka != 0} {
477 478 479 480
	    set i [lsearch -exact $parents($v,$ki) $id]
	    set j [expr {[llength $parents($v,$ki)] - 1 - $i}]
	    append tok [strrep $j]
	}
481 482 483 484 485 486 487 488 489 490 491 492
	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
493 494
	set b [lindex $vupptr($v) $a]
	if {$b != $ka} {
495 496
	    if {[string compare [lindex $varctok($v) $ka] $vtokmod($v)] < 0} {
		modify_arc $v $ka
497
	    }
498 499
	    if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} {
		modify_arc $v $b
500
	    }
501 502 503 504
	    set c [lindex $vbackptr($v) $a]
	    set d [lindex $vleftptr($v) $a]
	    if {$c == 0} {
		lset vdownptr($v) $b $d
505
	    } else {
506 507 508 509
		lset vleftptr($v) $c $d
	    }
	    if {$d != 0} {
		lset vbackptr($v) $d $c
510
	    }
511 512 513
	    if {[lindex $vlastins($v) $b] == $a} {
		lset vlastins($v) $b $c
	    }
514
	    lset vupptr($v) $a $ka
515 516 517 518 519 520 521 522 523 524 525 526
	    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]
527
	    }
528 529 530 531 532 533
	    if {$c == $ka} {
 		lset vdownptr($v) $ka $a
		lset vbackptr($v) $a 0
	    } else {
		lset vleftptr($v) $c $a
		lset vbackptr($v) $a $c
534
	    }
535 536 537 538 539 540 541 542 543 544 545
	    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)]
546 547 548 549 550 551
	}
    }
    set t2 [clock clicks -milliseconds]
    #puts "renumbervarc did [llength $todo] of $ntot arcs in [expr {$t2-$t1}]ms"
}

552 553 554
# 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.
555
proc fix_reversal {p a v} {
P
Paul Mackerras 已提交
556
    global varcid varcstart varctok vupptr
557 558 559 560 561 562

    set pa $varcid($v,$p)
    if {$p ne [lindex $varcstart($v) $pa]} {
	splitvarc $p $v
	set pa $varcid($v,$p)
    }
P
Paul Mackerras 已提交
563 564 565 566
    # seeds always need to be renumbered
    if {[lindex $vupptr($v) $pa] == 0 ||
	[string compare [lindex $varctok($v) $a] \
	     [lindex $varctok($v) $pa]] > 0} {
567 568 569 570 571
	renumbervarc $pa $v
    }
}

proc insertrow {id p v} {
572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605
    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} {
606
    global varcid varccommits parents children cmitlisted
607
    global commitidx varctok vtokmod targetid targetrow curview numcommits
608

609
    set v $curview
610 611 612
    set a $varcid($v,$p)
    set i [lsearch -exact $varccommits($v,$a) $p]
    if {$i < 0} {
613
	puts "oops: insertfakerow can't find [shortids $p] on arc $a"
614 615 616 617 618
	return
    }
    set children($v,$id) {}
    set parents($v,$id) [list $p]
    set varcid($v,$id) $a
619
    lappend children($v,$p) $id
620
    set cmitlisted($v,$id) 1
621
    set numcommits [incr commitidx($v)]
622 623
    # note we deliberately don't update varcstart($v) even if $i == 0
    set varccommits($v,$a) [linsert $varccommits($v,$a) $i $id]
624
    modify_arc $v $a $i
625 626 627 628 629
    if {[info exists targetid]} {
	if {![comes_before $targetid $p]} {
	    incr targetrow
	}
    }
630
    setcanvscroll
631
    drawvisible
632 633
}

634
proc removefakerow {id} {
635
    global varcid varccommits parents children commitidx
636
    global varctok vtokmod cmitlisted currentid selectedline
637
    global targetid curview numcommits
638

639
    set v $curview
640
    if {[llength $parents($v,$id)] != 1} {
641
	puts "oops: removefakerow [shortids $id] has [llength $parents($v,$id)] parents"
642 643 644 645 646 647
	return
    }
    set p [lindex $parents($v,$id) 0]
    set a $varcid($v,$id)
    set i [lsearch -exact $varccommits($v,$a) $id]
    if {$i < 0} {
648
	puts "oops: removefakerow can't find [shortids $id] on arc $a"
649 650 651 652 653 654 655
	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)
656
    set numcommits [incr commitidx($v) -1]
657 658 659 660
    set j [lsearch -exact $children($v,$p) $id]
    if {$j >= 0} {
	set children($v,$p) [lreplace $children($v,$p) $j $j]
    }
661
    modify_arc $v $a $i
662 663 664 665
    if {[info exist currentid] && $id eq $currentid} {
	unset currentid
	unset selectedline
    }
666 667 668
    if {[info exists targetid] && $targetid eq $id} {
	set targetid $p
    }
669
    setcanvscroll
670
    drawvisible
671 672
}

673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696
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 {}
}

697 698 699 700 701 702 703
proc vtokcmp {v a b} {
    global varctok varcid

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

704 705
# This assumes that if lim is not given, the caller has checked that
# arc a's token is less than $vtokmod($v)
706 707
proc modify_arc {v a {lim {}}} {
    global varctok vtokmod varcmod varcrow vupptr curview vrowmod varccommits
708

709 710 711 712 713 714 715 716
    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
	}
    }
717 718 719 720 721
    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]
722
	    set lim {}
723
	}
724 725 726 727 728 729 730 731
	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 已提交
732
	undolayout $r
733 734 735
    }
}

736
proc update_arcrows {v} {
737
    global vtokmod varcmod vrowmod varcrow commitidx currentid selectedline
P
Paul Mackerras 已提交
738
    global varcid vrownum varcorder varcix varccommits
739
    global vupptr vdownptr vleftptr varctok
P
Paul Mackerras 已提交
740
    global displayorder parentlist curview cached_commitrow
741

742 743 744 745 746 747 748 749
    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}
    }
750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794
    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
    }
795 796 797
    set vtokmod($v) [lindex $varctok($v) $p]
    set varcmod($v) $p
    set vrowmod($v) $row
798 799 800 801 802 803 804 805 806 807 808 809 810 811 812
    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
813
    global varctok vtokmod
814 815 816 817 818 819 820

    set v $curview
    if {![info exists varcid($v,$id)]} {
	puts "oops rowofcommit no arc for [shortids $id]"
	return {}
    }
    set a $varcid($v,$id)
821
    if {[string compare [lindex $varctok($v) $a] $vtokmod($v)] >= 0} {
822 823
	update_arcrows $v
    }
824 825 826
    if {[info exists cached_commitrow($id)]} {
	return $cached_commitrow($id)
    }
827 828 829 830 831 832 833 834 835 836
    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
}

837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852
# 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]}]
}

853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875
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
876
    global varccommits varcorder parents vrowmod varcrow
877 878
    global d_valid_start d_valid_end

879
    if {$end > $vrowmod($curview)} {
880 881
	update_arcrows $curview
    }
882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901
    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)
	    }
902
	} elseif {[lindex $displayorder [expr {$r + $al - 1}]] eq {}} {
903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926
	    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
927
    global cmitlisted commitidx commitinterest vtokmod
928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946

    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
947 948
	    if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} {
		modify_arc $v $b
949
	    }
950
	    lappend varccommits($v,$b) $p
951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966
	    incr commitidx($v)
	    if {[info exists commitinterest($p)]} {
		foreach script $commitinterest($p) {
		    lappend scripts [string map [list "%I" $p] $script]
		}
		unset commitinterest($id)
	    }
	}
    }
    if {$missing_parents > 0} {
	foreach s $scripts {
	    eval $s
	}
    }
}

967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986
# 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
987 988 989
	# 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}]
990 991 992 993
    }
}

proc getcommitlines {fd inst view updating}  {
P
Paul Mackerras 已提交
994
    global cmitlisted commitinterest leftover
995
    global commitidx commitdata datemode
996
    global parents children curview hlview
997
    global idpending ordertok
998
    global varccommits varcid varctok vtokmod viewfiles
999

1000
    set stuff [read $fd 500000]
1001
    # git log doesn't terminate the last commit with a null...
1002
    if {$stuff == {} && $leftover($inst) ne {} && [eof $fd]} {
1003 1004
	set stuff "\0"
    }
P
Paul Mackerras 已提交
1005
    if {$stuff == {}} {
1006 1007 1008
	if {![eof $fd]} {
	    return 1
	}
1009 1010 1011 1012 1013 1014
	global commfd viewcomplete viewactive viewname progresscoords
	global viewinstances
	unset commfd($inst)
	set i [lsearch -exact $viewinstances($view) $inst]
	if {$i >= 0} {
	    set viewinstances($view) [lreplace $viewinstances($view) $i $i]
P
Paul Mackerras 已提交
1015
	}
1016
	# set it blocking so we wait for the process to terminate
1017
	fconfigure $fd -blocking 1
1018 1019 1020 1021
	if {[catch {close $fd} err]} {
	    set fv {}
	    if {$view != $curview} {
		set fv " for the \"$viewname($view)\" view"
1022
	    }
1023 1024
	    if {[string range $err 0 4] == "usage"} {
		set err "Gitk: error reading commits$fv:\
1025
			bad arguments to git log."
1026 1027
		if {$viewname($view) eq "Command line"} {
		    append err \
1028
			"  (Note: arguments to gitk are passed to git log\
1029 1030 1031 1032 1033 1034
			 to allow selection of commits to be displayed.)"
		}
	    } else {
		set err "Error reading commits$fv: $err"
	    }
	    error_popup $err
1035
	}
1036 1037 1038 1039 1040 1041 1042 1043 1044
	if {[incr viewactive($view) -1] <= 0} {
	    set viewcomplete($view) 1
	    # Check if we have seen any ids listed as parents that haven't
	    # appeared in the list
	    closevarcs $view
	    notbusy $view
	    set progresscoords {0 0}
	    adjustprogress
	}
1045
	if {$view == $curview} {
1046
	    run chewcommits
1047
	}
1048
	return 0
1049
    }
P
Paul Mackerras 已提交
1050
    set start 0
1051
    set gotsome 0
1052
    set scripts {}
P
Paul Mackerras 已提交
1053 1054 1055
    while 1 {
	set i [string first "\0" $stuff $start]
	if {$i < 0} {
1056
	    append leftover($inst) [string range $stuff $start end]
P
Paul Mackerras 已提交
1057
	    break
1058
	}
P
Paul Mackerras 已提交
1059
	if {$start == 0} {
1060
	    set cmit $leftover($inst)
1061
	    append cmit [string range $stuff 0 [expr {$i - 1}]]
1062
	    set leftover($inst) {}
1063 1064
	} else {
	    set cmit [string range $stuff $start [expr {$i - 1}]]
P
Paul Mackerras 已提交
1065 1066
	}
	set start [expr {$i + 1}]
1067 1068
	set j [string first "\n" $cmit]
	set ok 0
1069
	set listed 1
1070 1071
	if {$j >= 0 && [string match "commit *" $cmit]} {
	    set ids [string range $cmit 7 [expr {$j - 1}]]
1072
	    if {[string match {[-^<>]*} $ids]} {
1073 1074
		switch -- [string index $ids 0] {
		    "-" {set listed 0}
1075 1076 1077
		    "^" {set listed 2}
		    "<" {set listed 3}
		    ">" {set listed 4}
1078
		}
1079 1080
		set ids [string range $ids 1 end]
	    }
1081 1082
	    set ok 1
	    foreach id $ids {
1083
		if {[string length $id] != 40} {
1084 1085 1086 1087 1088 1089
		    set ok 0
		    break
		}
	    }
	}
	if {!$ok} {
1090 1091 1092 1093
	    set shortcmit $cmit
	    if {[string length $shortcmit] > 80} {
		set shortcmit "[string range $shortcmit 0 80]..."
	    }
1094
	    error_popup "[mc "Can't parse git log output:"] {$shortcmit}"
P
Paul Mackerras 已提交
1095 1096
	    exit 1
	}
1097
	set id [lindex $ids 0]
1098
	set vid $view,$id
1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118

	if {!$listed && $updating && ![info exists varcid($vid)] &&
	    $viewfiles($view) ne {}} {
	    # 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 \
			      $id -- $viewfiles($view)]
	    }]} {
		if {$rwid ne {} && [info exists varcid($view,$rwid)]} {
		    # use $rwid in place of $id
		    rewrite_commit $view $id $rwid
		    continue
		}
	    }
	}

1119 1120 1121 1122 1123
	set a 0
	if {[info exists varcid($vid)]} {
	    if {$cmitlisted($vid) || !$listed} continue
	    set a $varcid($vid)
	}
1124 1125 1126 1127 1128
	if {$listed} {
	    set olds [lrange $ids 1 end]
	} else {
	    set olds {}
	}
1129
	set commitdata($id) [string range $cmit [expr {$j + 1}] end]
1130 1131 1132 1133
	set cmitlisted($vid) $listed
	set parents($vid) $olds
	if {![info exists children($vid)]} {
	    set children($vid) {}
1134
	} elseif {$a == 0 && [llength $children($vid)] == 1} {
1135 1136 1137 1138 1139
	    set k [lindex $children($vid) 0]
	    if {[llength $parents($view,$k)] == 1 &&
		(!$datemode ||
		 $varcid($view,$k) == [llength $varctok($view)] - 1)} {
		set a $varcid($view,$k)
1140
	    }
1141
	}
1142 1143 1144 1145
	if {$a == 0} {
	    # new arc
	    set a [newvarc $view $id]
	}
1146 1147 1148
	if {[string compare [lindex $varctok($view) $a] $vtokmod($view)] < 0} {
	    modify_arc $view $a
	}
1149 1150 1151 1152 1153
	if {![info exists varcid($vid)]} {
	    set varcid($vid) $a
	    lappend varccommits($view,$a) $id
	    incr commitidx($view)
	}
1154

1155 1156 1157 1158 1159 1160 1161 1162
	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)]
1163
		    catch {unset ordertok}
1164
		}
1165 1166 1167
		if {[info exists varcid($view,$p)]} {
		    fix_reversal $p $a $view
		}
1168 1169 1170 1171
	    }
	    incr i
	}

1172 1173
	if {[info exists commitinterest($id)]} {
	    foreach script $commitinterest($id) {
1174
		lappend scripts [string map [list "%I" $id] $script]
1175 1176 1177
	    }
	    unset commitinterest($id)
	}
1178 1179 1180
	set gotsome 1
    }
    if {$gotsome} {
1181 1182 1183 1184 1185 1186 1187 1188 1189 1190
	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
	}
1191 1192 1193
	foreach s $scripts {
	    eval $s
	}
1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220
	if {$view == $curview} {
	    # update progress bar
	    global progressdirn progresscoords proglastnc
	    set inc [expr {($commitidx($view) - $proglastnc) * 0.0002}]
	    set proglastnc $commitidx($view)
	    set l [lindex $progresscoords 0]
	    set r [lindex $progresscoords 1]
	    if {$progressdirn} {
		set r [expr {$r + $inc}]
		if {$r >= 1.0} {
		    set r 1.0
		    set progressdirn 0
		}
		if {$r > 0.2} {
		    set l [expr {$r - 0.2}]
		}
	    } else {
		set l [expr {$l - $inc}]
		if {$l <= 0.0} {
		    set l 0.0
		    set progressdirn 1
		}
		set r [expr {$l + 0.2}]
	    }
	    set progresscoords [list $l $r]
	    adjustprogress
	}
1221
    }
1222
    return 2
1223 1224
}

1225
proc chewcommits {} {
1226
    global curview hlview viewcomplete
1227
    global pending_select
1228

1229 1230 1231 1232
    layoutmore
    if {$viewcomplete($curview)} {
	global commitidx varctok
	global numcommits startmsecs
1233
	global mainheadid nullid
1234 1235 1236 1237

	if {[info exists pending_select]} {
	    set row [first_real_row]
	    selectline $row 1
1238
	}
1239 1240 1241 1242 1243 1244 1245 1246
	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
1247
    }
1248
    return 0
1249 1250 1251
}

proc readcommit {id} {
1252
    if {[catch {set contents [exec git cat-file commit $id]}]} return
1253
    parsecommit $id $contents 0
P
Paul Mackerras 已提交
1254 1255
}

1256
proc parsecommit {id contents listed} {
1257 1258 1259 1260 1261 1262 1263 1264 1265
    global commitinfo cdate

    set inhdr 1
    set comment {}
    set headline {}
    set auname {}
    set audate {}
    set comname {}
    set comdate {}
P
Paul Mackerras 已提交
1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280
    set hdrend [string first "\n\n" $contents]
    if {$hdrend < 0} {
	# should never happen...
	set hdrend [string length $contents]
    }
    set header [string range $contents 0 [expr {$hdrend - 1}]]
    set comment [string range $contents [expr {$hdrend + 2}] end]
    foreach line [split $header "\n"] {
	set tag [lindex $line 0]
	if {$tag == "author"} {
	    set audate [lindex $line end-1]
	    set auname [lrange $line 1 end-2]
	} elseif {$tag == "committer"} {
	    set comdate [lindex $line end-1]
	    set comname [lrange $line 1 end-2]
1281 1282
	}
    }
P
Paul Mackerras 已提交
1283
    set headline {}
1284 1285 1286
    # 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 已提交
1287
    if {$i >= 0} {
1288 1289 1290 1291 1292 1293
	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 已提交
1294 1295
    }
    if {!$listed} {
1296
	# git log indents the comment by 4 spaces;
1297
	# if we got this via git cat-file, add the indentation
P
Paul Mackerras 已提交
1298 1299 1300 1301
	set newcomment {}
	foreach line [split $comment "\n"] {
	    append newcomment "    "
	    append newcomment $line
1302
	    append newcomment "\n"
P
Paul Mackerras 已提交
1303 1304
	}
	set comment $newcomment
1305 1306
    }
    if {$comdate != {}} {
1307
	set cdate($id) $comdate
1308
    }
1309 1310
    set commitinfo($id) [list $headline $auname $audate \
			     $comname $comdate $comment]
1311 1312
}

1313
proc getcommit {id} {
1314
    global commitdata commitinfo
P
Paul Mackerras 已提交
1315

1316 1317
    if {[info exists commitdata($id)]} {
	parsecommit $id $commitdata($id) 1
P
Paul Mackerras 已提交
1318 1319 1320
    } else {
	readcommit $id
	if {![info exists commitinfo($id)]} {
1321
	    set commitinfo($id) [list [mc "No commit information available"]]
P
Paul Mackerras 已提交
1322 1323 1324 1325 1326
	}
    }
    return 1
}

1327
proc readrefs {} {
1328
    global tagids idtags headids idheads tagobjid
1329
    global otherrefids idotherrefs mainhead mainheadid
1330

1331 1332 1333
    foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
	catch {unset $v}
    }
1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344
    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
1345
	    }
1346 1347
	} elseif {[string match "heads/*" $name]} {
	    set name [string range $name 6 end]
1348 1349
	    set headids($name) $id
	    lappend idheads($id) $name
1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360
	} 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
1361 1362 1363
	} else {
	    set otherrefids($name) $id
	    lappend idotherrefs($id) $name
1364 1365
	}
    }
1366
    catch {close $refd}
1367
    set mainhead {}
1368
    set mainheadid {}
1369 1370 1371 1372
    catch {
	set thehead [exec git symbolic-ref HEAD]
	if {[string match "refs/heads/*" $thehead]} {
	    set mainhead [string range $thehead 11 end]
1373 1374 1375
	    if {[info exists headids($mainhead)]} {
		set mainheadid $headids($mainhead)
	    }
1376 1377
	}
    }
1378 1379
}

1380 1381
# skip over fake commits
proc first_real_row {} {
1382
    global nullid nullid2 numcommits
1383 1384

    for {set row 0} {$row < $numcommits} {incr row} {
1385
	set id [commitonrow $row]
1386 1387 1388 1389 1390 1391 1392
	if {$id ne $nullid && $id ne $nullid2} {
	    break
	}
    }
    return $row
}

1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416
# update things for a head moved to a child of its previous location
proc movehead {id name} {
    global headids idheads

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

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

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

P
Paul Mackerras 已提交
1417
proc show_error {w top msg} {
1418 1419
    message $w.m -text $msg -justify center -aspect 400
    pack $w.m -side top -fill x -padx 20 -pady 20
1420
    button $w.ok -text [mc OK] -command "destroy $top"
1421
    pack $w.ok -side bottom -fill x
P
Paul Mackerras 已提交
1422 1423 1424
    bind $top <Visibility> "grab $top; focus $top"
    bind $top <Key-Return> "destroy $top"
    tkwait window $top
1425 1426
}

1427 1428 1429 1430
proc error_popup msg {
    set w .error
    toplevel $w
    wm transient $w .
P
Paul Mackerras 已提交
1431
    show_error $w $w $msg
1432 1433
}

1434 1435 1436 1437 1438 1439 1440 1441
proc confirm_popup msg {
    global confirm_ok
    set confirm_ok 0
    set w .confirm
    toplevel $w
    wm transient $w .
    message $w.m -text $msg -justify center -aspect 400
    pack $w.m -side top -fill x -padx 20 -pady 20
1442
    button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w"
1443
    pack $w.ok -side left -fill x
1444
    button $w.cancel -text [mc Cancel] -command "destroy $w"
1445 1446 1447 1448 1449 1450
    pack $w.cancel -side right -fill x
    bind $w <Visibility> "grab $w; focus $w"
    tkwait window $w
    return $confirm_ok
}

1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463
proc setoptions {} {
    option add *Panedwindow.showHandle 1 startupFile
    option add *Panedwindow.sashRelief raised startupFile
    option add *Button.font uifont startupFile
    option add *Checkbutton.font uifont startupFile
    option add *Radiobutton.font uifont startupFile
    option add *Menu.font uifont startupFile
    option add *Menubutton.font uifont startupFile
    option add *Label.font uifont startupFile
    option add *Message.font uifont startupFile
    option add *Entry.font uifont startupFile
}

1464
proc makewindow {} {
1465
    global canv canv2 canv3 linespc charspc ctext cflist cscroll
1466
    global tabstop
1467
    global findtype findtypemenu findloc findstring fstring geometry
1468
    global entries sha1entry sha1string sha1but
1469
    global diffcontextstring diffcontext
1470
    global ignorespace
1471
    global maincursor textcursor curtextcursor
1472
    global rowctxmenu fakerowmenu mergemax wrapcomment
1473
    global highlight_files gdttype
1474
    global searchstring sstring
1475
    global bgcolor fgcolor bglist fglist diffcolors selectbgcolor
1476 1477
    global headctxmenu progresscanv progressitem progresscoords statusw
    global fprogitem fprogcoord lastprogupdate progupdatepending
1478
    global rprogitem rprogcoord
1479
    global have_tk85
1480 1481

    menu .bar
1482
    .bar add cascade -label [mc "File"] -menu .bar.file
1483
    menu .bar.file
1484
    .bar.file add command -label [mc "Update"] -command updatecommits
P
Paul Mackerras 已提交
1485
    .bar.file add command -label [mc "Reload"] -command reloadcommits
1486 1487 1488
    .bar.file add command -label [mc "Reread references"] -command rereadrefs
    .bar.file add command -label [mc "List references"] -command showrefs
    .bar.file add command -label [mc "Quit"] -command doquit
1489
    menu .bar.edit
1490 1491
    .bar add cascade -label [mc "Edit"] -menu .bar.edit
    .bar.edit add command -label [mc "Preferences"] -command doprefs
1492

1493
    menu .bar.view
1494 1495 1496
    .bar add cascade -label [mc "View"] -menu .bar.view
    .bar.view add command -label [mc "New view..."] -command {newview 0}
    .bar.view add command -label [mc "Edit view..."] -command editview \
1497
	-state disabled
1498
    .bar.view add command -label [mc "Delete view"] -command delview -state disabled
P
Paul Mackerras 已提交
1499
    .bar.view add separator
1500
    .bar.view add radiobutton -label [mc "All files"] -command {showview 0} \
1501
	-variable selectedview -value 0
1502

1503
    menu .bar.help
1504 1505 1506
    .bar add cascade -label [mc "Help"] -menu .bar.help
    .bar.help add command -label [mc "About gitk"] -command about
    .bar.help add command -label [mc "Key bindings"] -command keys
1507
    .bar.help configure
1508 1509
    . configure -menu .bar

1510
    # the gui has upper and lower half, parts of a paned window.
P
Paul Mackerras 已提交
1511
    panedwindow .ctop -orient vertical
1512 1513

    # possibly use assumed geometry
1514
    if {![info exists geometry(pwsash0)]} {
1515 1516 1517 1518
        set geometry(topheight) [expr {15 * $linespc}]
        set geometry(topwidth) [expr {80 * $charspc}]
        set geometry(botheight) [expr {15 * $linespc}]
        set geometry(botwidth) [expr {50 * $charspc}]
1519 1520
        set geometry(pwsash0) "[expr {40 * $charspc}] 2"
        set geometry(pwsash1) "[expr {60 * $charspc}] 2"
1521 1522 1523 1524 1525 1526 1527 1528 1529 1530
    }

    # 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
1531
    canvas $canv \
1532
	-selectbackground $selectbgcolor \
1533
	-background $bgcolor -bd 0 \
P
Paul Mackerras 已提交
1534
	-yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
1535 1536
    .tf.histframe.pwclist add $canv
    set canv2 .tf.histframe.pwclist.canv2
1537
    canvas $canv2 \
1538
	-selectbackground $selectbgcolor \
1539
	-background $bgcolor -bd 0 -yscrollincr $linespc
1540 1541
    .tf.histframe.pwclist add $canv2
    set canv3 .tf.histframe.pwclist.canv3
1542
    canvas $canv3 \
1543
	-selectbackground $selectbgcolor \
1544
	-background $bgcolor -bd 0 -yscrollincr $linespc
1545
    .tf.histframe.pwclist add $canv3
1546 1547
    eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0)
    eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1)
1548 1549 1550 1551 1552

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

1556 1557 1558 1559 1560
    # 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
1561
    set entries $sha1entry
1562
    set sha1but .tf.bar.sha1label
1563
    button $sha1but -text [mc "SHA1 ID: "] -state disabled -relief flat \
1564
	-command gotocommit -width 8
1565
    $sha1but conf -disabledforeground [$sha1but cget -foreground]
1566
    pack .tf.bar.sha1label -side left
1567
    entry $sha1entry -width 40 -font textfont -textvariable sha1string
1568
    trace add variable sha1string write sha1change
1569
    pack $sha1entry -side left -pady 2
1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586

    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};
    }
1587
    button .tf.bar.leftbut -image bm-left -command goback \
1588
	-state disabled -width 26
1589 1590
    pack .tf.bar.leftbut -side left -fill y
    button .tf.bar.rightbut -image bm-right -command goforw \
1591
	-state disabled -width 26
1592
    pack .tf.bar.rightbut -side left -fill y
1593

1594 1595
    # Status label and progress bar
    set statusw .tf.bar.status
1596
    label $statusw -width 15 -relief sunken
1597
    pack $statusw -side left -padx 5
1598
    set h [expr {[font metrics uifont -linespace] + 2}]
1599 1600 1601 1602
    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]
1603
    set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
1604 1605 1606
    pack $progresscanv -side right -expand 1 -fill x
    set progresscoords {0 0}
    set fprogcoord 0
1607
    set rprogcoord 0
1608 1609 1610 1611
    bind $progresscanv <Configure> adjustprogress
    set lastprogupdate [clock clicks -milliseconds]
    set progupdatepending 0

1612
    # build up the bottom bar of upper window
1613 1614 1615 1616
    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"] "
1617 1618
    pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \
	-side left -fill y
1619
    set gdttype [mc "containing:"]
1620
    set gm [tk_optionMenu .tf.lbar.gdttype gdttype \
1621 1622 1623
		[mc "containing:"] \
		[mc "touching paths:"] \
		[mc "adding/removing string:"]]
1624 1625 1626
    trace add variable gdttype write gdttype_change
    pack .tf.lbar.gdttype -side left -fill y

1627
    set findstring {}
1628
    set fstring .tf.lbar.findstring
1629
    lappend entries $fstring
1630
    entry $fstring -width 30 -font textfont -textvariable findstring
1631
    trace add variable findstring write find_change
1632
    set findtype [mc "Exact"]
1633
    set findtypemenu [tk_optionMenu .tf.lbar.findtype \
1634
		      findtype [mc "Exact"] [mc "IgnCase"] [mc "Regexp"]]
1635
    trace add variable findtype write findcom_change
1636 1637 1638
    set findloc [mc "All fields"]
    tk_optionMenu .tf.lbar.findloc findloc [mc "All fields"] [mc "Headline"] \
	[mc "Comments"] [mc "Author"] [mc "Committer"]
1639
    trace add variable findloc write find_change
1640 1641 1642
    pack .tf.lbar.findloc -side right
    pack .tf.lbar.findtype -side right
    pack $fstring -side left -expand 1 -fill x
1643 1644 1645 1646 1647 1648

    # 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
1649 1650
    .ctop paneconfigure .tf -height $geometry(topheight)
    .ctop paneconfigure .tf -width $geometry(topwidth)
1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663

    # 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
1664
    frame .bleft.mid
1665
    frame .bleft.bottom
1666

1667
    button .bleft.top.search -text [mc "Search"] -command dosearch
1668 1669
    pack .bleft.top.search -side left -padx 5
    set sstring .bleft.top.sstring
1670
    entry $sstring -width 20 -font textfont -textvariable searchstring
1671 1672 1673
    lappend entries $sstring
    trace add variable searchstring write incrsearch
    pack $sstring -side left -expand 1 -fill x
1674
    radiobutton .bleft.mid.diff -text [mc "Diff"] \
1675
	-command changediffdisp -variable diffelide -value {0 0}
1676
    radiobutton .bleft.mid.old -text [mc "Old version"] \
1677
	-command changediffdisp -variable diffelide -value {0 1}
1678
    radiobutton .bleft.mid.new -text [mc "New version"] \
1679
	-command changediffdisp -variable diffelide -value {1 0}
1680
    label .bleft.mid.labeldiffcontext -text "      [mc "Lines of context"]: "
1681
    pack .bleft.mid.diff .bleft.mid.old .bleft.mid.new -side left
1682
    spinbox .bleft.mid.diffcontext -width 5 -font textfont \
1683 1684 1685 1686 1687 1688 1689
	-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
1690 1691 1692
    checkbutton .bleft.mid.ignspace -text [mc "Ignore space change"] \
	-command changeignorespace -variable ignorespace
    pack .bleft.mid.ignspace -side left -padx 5
1693
    set ctext .bleft.bottom.ctext
1694
    text $ctext -background $bgcolor -foreground $fgcolor \
1695
	-state disabled -font textfont \
1696 1697
	-yscrollcommand scrolltext -wrap none \
	-xscrollcommand ".bleft.bottom.sbhorizontal set"
1698 1699 1700
    if {$have_tk85} {
	$ctext conf -tabstyle wordprocessor
    }
1701 1702 1703
    scrollbar .bleft.bottom.sb -command "$ctext yview"
    scrollbar .bleft.bottom.sbhorizontal -command "$ctext xview" -orient h \
	-width 10
1704
    pack .bleft.top -side top -fill x
1705
    pack .bleft.mid -side top -fill x
1706 1707 1708 1709 1710 1711
    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
1712 1713
    lappend bglist $ctext
    lappend fglist $ctext
1714

1715
    $ctext tag conf comment -wrap $wrapcomment
1716
    $ctext tag conf filesep -font textfontbold -back "#aaaaaa"
1717 1718 1719
    $ctext tag conf hunksep -fore [lindex $diffcolors 2]
    $ctext tag conf d0 -fore [lindex $diffcolors 0]
    $ctext tag conf d1 -fore [lindex $diffcolors 1]
1720 1721 1722 1723 1724
    $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
1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735
    $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"
1736
    $ctext tag conf mmax -fore darkgrey
1737
    set mergemax 16
1738 1739
    $ctext tag conf mresult -font textfontbold
    $ctext tag conf msep -font textfontbold
1740
    $ctext tag conf found -back yellow
1741

1742
    .pwbottom add .bleft
1743
    .pwbottom paneconfigure .bleft -width $geometry(botwidth)
1744 1745 1746 1747

    # lower right
    frame .bright
    frame .bright.mode
1748
    radiobutton .bright.mode.patch -text [mc "Patch"] \
P
Paul Mackerras 已提交
1749
	-command reselectline -variable cmitmode -value "patch"
1750
    radiobutton .bright.mode.tree -text [mc "Tree"] \
P
Paul Mackerras 已提交
1751
	-command reselectline -variable cmitmode -value "tree"
1752 1753 1754
    grid .bright.mode.patch .bright.mode.tree -sticky ew
    pack .bright.mode -side top -fill x
    set cflist .bright.cfiles
1755
    set indent [font measure mainfont "nn"]
1756
    text $cflist \
1757
	-selectbackground $selectbgcolor \
1758
	-background $bgcolor -foreground $fgcolor \
1759
	-font mainfont \
1760
	-tabs [list $indent [expr {2 * $indent}]] \
1761
	-yscrollcommand ".bright.sb set" \
1762 1763
	-cursor [. cget -cursor] \
	-spacing1 1 -spacing3 1
1764 1765
    lappend bglist $cflist
    lappend fglist $cflist
1766 1767
    scrollbar .bright.sb -command "$cflist yview"
    pack .bright.sb -side right -fill y
1768
    pack $cflist -side left -fill both -expand 1
1769 1770
    $cflist tag configure highlight \
	-background [$cflist cget -selectbackground]
1771
    $cflist tag configure bold -font mainfontbold
1772

1773 1774
    .pwbottom add .bright
    .ctop add .pwbottom
1775

1776
    # restore window width & height if known
1777
    if {[info exists geometry(main)]} {
1778 1779 1780 1781 1782 1783 1784 1785 1786
	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"
	}
1787 1788
    }

1789 1790 1791 1792 1793 1794
    if {[tk windowingsystem] eq {aqua}} {
        set M1B M1
    } else {
        set M1B Control
    }

1795 1796
    bind .pwbottom <Configure> {resizecdetpanes %W %w}
    pack .ctop -fill both -expand 1
1797 1798
    bindall <1> {selcanvline %W %x %y}
    #bindall <B1-Motion> {selcanvline %W %x %y}
1799 1800 1801 1802 1803 1804
    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"
1805 1806 1807 1808 1809 1810
        if {[tk windowingsystem] eq "aqua"} {
            bindall <MouseWheel> {
                set delta [expr {- (%D)}]
                allcanvs yview scroll $delta units
            }
        }
1811
    }
1812 1813
    bindall <2> "canvscan mark %W %x %y"
    bindall <B2-Motion> "canvscan dragto %W %x %y"
1814 1815
    bindkey <Home> selfirstline
    bindkey <End> sellastline
1816 1817
    bind . <Key-Up> "selnextline -1"
    bind . <Key-Down> "selnextline 1"
1818 1819
    bind . <Shift-Key-Up> "dofind -1 0"
    bind . <Shift-Key-Down> "dofind 1 0"
1820 1821 1822 1823
    bindkey <Key-Right> "goforw"
    bindkey <Key-Left> "goback"
    bind . <Key-Prior> "selnextpage -1"
    bind . <Key-Next> "selnextpage 1"
1824 1825 1826 1827 1828 1829
    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"
1830 1831 1832
    bindkey <Key-Delete> "$ctext yview scroll -1 pages"
    bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
    bindkey <Key-space> "$ctext yview scroll 1 pages"
1833 1834
    bindkey p "selnextline -1"
    bindkey n "selnextline 1"
R
Robert Suetterlin 已提交
1835 1836 1837 1838 1839 1840
    bindkey z "goback"
    bindkey x "goforw"
    bindkey i "selnextline -1"
    bindkey k "selnextline 1"
    bindkey j "goback"
    bindkey l "goforw"
1841 1842 1843
    bindkey b "$ctext yview scroll -1 pages"
    bindkey d "$ctext yview scroll 18 units"
    bindkey u "$ctext yview scroll -18 units"
1844 1845 1846
    bindkey / {dofind 1 1}
    bindkey <Key-Return> {dofind 1 1}
    bindkey ? {dofind -1 1}
1847
    bindkey f nextfile
1848
    bindkey <F5> updatecommits
1849
    bind . <$M1B-q> doquit
1850 1851
    bind . <$M1B-f> {dofind 1 1}
    bind . <$M1B-g> {dofind 1 0}
1852 1853 1854
    bind . <$M1B-r> dosearchback
    bind . <$M1B-s> dosearch
    bind . <$M1B-equal> {incrfont 1}
1855
    bind . <$M1B-plus> {incrfont 1}
1856 1857 1858
    bind . <$M1B-KP_Add> {incrfont 1}
    bind . <$M1B-minus> {incrfont -1}
    bind . <$M1B-KP_Subtract> {incrfont -1}
1859
    wm protocol . WM_DELETE_WINDOW doquit
1860
    bind . <Button-1> "click %W"
1861
    bind $fstring <Key-Return> {dofind 1 1}
1862
    bind $sha1entry <Key-Return> gotocommit
1863
    bind $sha1entry <<PasteSelection>> clearsha1
1864 1865
    bind $cflist <1> {sel_flist %W %x %y; break}
    bind $cflist <B1-Motion> {sel_flist %W %x %y; break}
P
Paul Mackerras 已提交
1866
    bind $cflist <ButtonRelease-1> {treeclick %W %x %y}
1867
    bind $cflist <Button-3> {pop_flist_menu %W %X %Y %x %y}
1868 1869 1870

    set maincursor [. cget -cursor]
    set textcursor [$ctext cget -cursor]
1871
    set curtextcursor $textcursor
1872

1873 1874
    set rowctxmenu .rowctxmenu
    menu $rowctxmenu -tearoff 0
1875
    $rowctxmenu add command -label [mc "Diff this -> selected"] \
1876
	-command {diffvssel 0}
1877
    $rowctxmenu add command -label [mc "Diff selected -> this"] \
1878
	-command {diffvssel 1}
1879 1880 1881 1882 1883
    $rowctxmenu add command -label [mc "Make patch"] -command mkpatch
    $rowctxmenu add command -label [mc "Create tag"] -command mktag
    $rowctxmenu add command -label [mc "Write commit to file"] -command writecommit
    $rowctxmenu add command -label [mc "Create new branch"] -command mkbranch
    $rowctxmenu add command -label [mc "Cherry-pick this commit"] \
1884
	-command cherrypick
1885
    $rowctxmenu add command -label [mc "Reset HEAD branch to here"] \
1886
	-command resethead
1887

1888 1889
    set fakerowmenu .fakerowmenu
    menu $fakerowmenu -tearoff 0
1890
    $fakerowmenu add command -label [mc "Diff this -> selected"] \
1891
	-command {diffvssel 0}
1892
    $fakerowmenu add command -label [mc "Diff selected -> this"] \
1893
	-command {diffvssel 1}
1894 1895 1896 1897
    $fakerowmenu add command -label [mc "Make patch"] -command mkpatch
#    $fakerowmenu add command -label [mc "Commit"] -command {mkcommit 0}
#    $fakerowmenu add command -label [mc "Commit all"] -command {mkcommit 1}
#    $fakerowmenu add command -label [mc "Revert local changes"] -command revertlocal
1898

1899 1900
    set headctxmenu .headctxmenu
    menu $headctxmenu -tearoff 0
1901
    $headctxmenu add command -label [mc "Check out this branch"] \
1902
	-command cobranch
1903
    $headctxmenu add command -label [mc "Remove this branch"] \
1904
	-command rmbranch
1905 1906 1907 1908

    global flist_menu
    set flist_menu .flistctxmenu
    menu $flist_menu -tearoff 0
1909
    $flist_menu add command -label [mc "Highlight this too"] \
1910
	-command {flist_hl 0}
1911
    $flist_menu add command -label [mc "Highlight this only"] \
1912
	-command {flist_hl 1}
1913 1914
}

1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932
# 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
	    }
	}
    }
}

1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945
# 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 已提交
1946 1947
proc scrollcanv {cscroll f0 f1} {
    $cscroll set $f0 $f1
1948
    drawvisible
1949
    flushhighlights
P
Paul Mackerras 已提交
1950 1951
}

1952 1953 1954 1955
# 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} {
1956
    global entries
1957 1958 1959 1960 1961
    bind . $ev $script
    set escript [bind Entry $ev]
    if {$escript == {}} {
	set escript [bind Entry <Key>]
    }
1962 1963 1964
    foreach e $entries {
	bind $e $ev "$escript; break"
    }
1965 1966 1967
}

# set the focus back to the toplevel for any click outside
1968
# the entry widgets
1969
proc click {w} {
1970 1971
    global ctext entries
    foreach e [concat $entries $ctext] {
1972
	if {$w == $e} return
1973
    }
1974
    focus .
1975 1976
}

1977 1978 1979 1980
# Adjust the progress bar for a change in requested extent or canvas size
proc adjustprogress {} {
    global progresscanv progressitem progresscoords
    global fprogitem fprogcoord lastprogupdate progupdatepending
1981
    global rprogitem rprogcoord
1982 1983 1984 1985 1986 1987 1988

    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
1989
    $progresscanv coords $rprogitem 0 0 [expr {$w * $rprogcoord}] $h
1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
    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
    }
}

2010
proc savestuff {w} {
2011
    global canv canv2 canv3 mainfont textfont uifont tabstop
2012
    global stuffsaved findmergefiles maxgraphpct
2013
    global maxwidth showneartags showlocalchanges
2014
    global viewname viewfiles viewargs viewargscmd viewperm nextviewnum
2015
    global cmitmode wrapcomment datetimeformat limitdiffs
2016
    global colors bgcolor fgcolor diffcolors diffcontext selectbgcolor
2017
    global autoselect
2018

2019
    if {$stuffsaved} return
2020
    if {![winfo viewable .]} return
2021 2022
    catch {
	set f [open "~/.gitk-new" w]
2023 2024
	puts $f [list set mainfont $mainfont]
	puts $f [list set textfont $textfont]
2025
	puts $f [list set uifont $uifont]
2026
	puts $f [list set tabstop $tabstop]
2027
	puts $f [list set findmergefiles $findmergefiles]
2028
	puts $f [list set maxgraphpct $maxgraphpct]
2029
	puts $f [list set maxwidth $maxwidth]
P
Paul Mackerras 已提交
2030
	puts $f [list set cmitmode $cmitmode]
2031
	puts $f [list set wrapcomment $wrapcomment]
2032
	puts $f [list set autoselect $autoselect]
P
Paul Mackerras 已提交
2033
	puts $f [list set showneartags $showneartags]
2034
	puts $f [list set showlocalchanges $showlocalchanges]
2035
	puts $f [list set datetimeformat $datetimeformat]
2036
	puts $f [list set limitdiffs $limitdiffs]
2037 2038 2039 2040
	puts $f [list set bgcolor $bgcolor]
	puts $f [list set fgcolor $fgcolor]
	puts $f [list set colors $colors]
	puts $f [list set diffcolors $diffcolors]
2041
	puts $f [list set diffcontext $diffcontext]
2042
	puts $f [list set selectbgcolor $selectbgcolor]
2043

2044
	puts $f "set geometry(main) [wm geometry .]"
2045 2046
	puts $f "set geometry(topwidth) [winfo width .tf]"
	puts $f "set geometry(topheight) [winfo height .tf]"
2047 2048
        puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\""
        puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\""
2049 2050 2051
	puts $f "set geometry(botwidth) [winfo width .bleft]"
	puts $f "set geometry(botheight) [winfo height .bleft]"

2052 2053 2054
	puts -nonewline $f "set permviews {"
	for {set v 0} {$v < $nextviewnum} {incr v} {
	    if {$viewperm($v)} {
2055
		puts $f "{[list $viewname($v) $viewfiles($v) $viewargs($v) $viewargscmd($v)]}"
2056 2057 2058
	    }
	}
	puts $f "}"
2059 2060 2061 2062
	close $f
	file rename -force "~/.gitk-new" "~/.gitk"
    }
    set stuffsaved 1
2063 2064
}

2065 2066
proc resizeclistpanes {win w} {
    global oldwidth
2067
    if {[info exists oldwidth($win)]} {
2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080
	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 已提交
2081
		set sash1 [expr {$sash0 + 20}]
2082 2083
	    }
	    if {$sash1 > $w - 10} {
J
Jeff Hobbs 已提交
2084
		set sash1 [expr {$w - 10}]
2085
		if {$sash0 > $sash1 - 20} {
J
Jeff Hobbs 已提交
2086
		    set sash0 [expr {$sash1 - 20}]
2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097
		}
	    }
	}
	$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
2098
    if {[info exists oldwidth($win)]} {
2099 2100 2101 2102 2103 2104 2105 2106 2107 2108
	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 已提交
2109
		set sash0 [expr {$w - 15}]
2110 2111 2112 2113 2114 2115 2116
	    }
	}
	$win sash place 0 $sash0 [lindex $s0 1]
    }
    set oldwidth($win) $w
}

2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130
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
}

2131
proc about {} {
2132
    global uifont
2133 2134 2135 2136 2137 2138
    set w .about
    if {[winfo exists $w]} {
	raise $w
	return
    }
    toplevel $w
2139 2140
    wm title $w [mc "About gitk"]
    message $w.m -text [mc "
P
Paul Mackerras 已提交
2141
Gitk - a commit viewer for git
2142

2143
Copyright © 2005-2006 Paul Mackerras
2144

2145
Use and redistribute under the terms of the GNU General Public License"] \
2146 2147
	    -justify center -aspect 400 -border 2 -bg white -relief groove
    pack $w.m -side top -fill x -padx 2 -pady 2
2148
    button $w.ok -text [mc "Close"] -command "destroy $w" -default active
2149
    pack $w.ok -side bottom
2150 2151 2152
    bind $w <Visibility> "focus $w.ok"
    bind $w <Key-Escape> "destroy $w"
    bind $w <Key-Return> "destroy $w"
2153 2154
}

2155 2156 2157 2158 2159 2160
proc keys {} {
    set w .keys
    if {[winfo exists $w]} {
	raise $w
	return
    }
2161 2162 2163 2164 2165
    if {[tk windowingsystem] eq {aqua}} {
	set M1T Cmd
    } else {
	set M1T Ctrl
    }
2166
    toplevel $w
2167
    wm title $w [mc "Gitk key bindings"]
2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206
    message $w.m -text "
[mc "Gitk key bindings:"]

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

2216 2217
# Procedures for manipulating the file list window at the
# bottom right of the overall window.
P
Paul Mackerras 已提交
2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270

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
2271
		$w insert end $d [highlight_tag $prefix]
P
Paul Mackerras 已提交
2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282
		$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
2283
		$w insert end $tail [highlight_tag $f]
P
Paul Mackerras 已提交
2284 2285 2286 2287 2288 2289 2290 2291
	    }
	    lappend treecontents($prefix) $tail
	}
    }
    while {$htstack ne {}} {
	set treeheight($prefix) $ht
	incr ht [lindex $htstack end]
	set htstack [lreplace $htstack end end]
2292 2293 2294
	set prefixend [lindex $prefendstack end]
	set prefendstack [lreplace $prefendstack end end]
	set prefix [string range $prefix 0 $prefixend]
P
Paul Mackerras 已提交
2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322
    }
    $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
	}
    }
}

2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338
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 已提交
2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371
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) {
2372
	set de $dir$e
P
Paul Mackerras 已提交
2373 2374 2375 2376 2377 2378 2379 2380
	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
2381
	    $w insert e:$ix $e [highlight_tag $de]
P
Paul Mackerras 已提交
2382 2383 2384 2385 2386
	    $w mark set s:$iy e:$ix
	    $w mark gravity s:$iy left
	    set treeheight($de) 1
	} else {
	    $w insert e:$ix $str
2387
	    $w insert e:$ix $e [highlight_tag $de]
P
Paul Mackerras 已提交
2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466
	}
    }
    $w mark gravity e:$ix left
    $w conf -state disabled
    set treediropen($dir) 1
    set top [lindex [split [$w index @0,0] .] 0]
    set ht [$w cget -height]
    set l [lindex [split [$w index s:$ix] .] 0]
    if {$l < $top} {
	$w yview $l.0
    } elseif {$l + $n + 1 > $top + $ht} {
	set top [expr {$l + $n + 2 - $ht}]
	if {$l < $top} {
	    set top $l
	}
	$w yview $top.0
    }
}

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

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

proc setfilelist {id} {
    global treefilelist cflist

    treeview $cflist $treefilelist($id) 0
}

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

2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498
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

2499
proc init_flist {first} {
2500
    global cflist cflist_top difffilestart
2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514

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

2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526
proc highlight_tag {f} {
    global highlight_paths

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

proc highlight_filelist {} {
2527
    global cmitmode cflist
2528

2529 2530
    $cflist conf -state normal
    if {$cmitmode ne "tree"} {
2531 2532 2533 2534 2535 2536 2537
	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"
	    }
	}
2538 2539
    } else {
	highlight_tree 2 {}
2540
    }
2541
    $cflist conf -state disabled
2542 2543 2544
}

proc unhighlight_filelist {} {
2545
    global cflist
2546

2547 2548 2549
    $cflist conf -state normal
    $cflist tag remove bold 1.0 end
    $cflist conf -state disabled
2550 2551
}

P
Paul Mackerras 已提交
2552
proc add_flist {fl} {
2553
    global cflist
2554

2555 2556 2557 2558
    $cflist conf -state normal
    foreach f $fl {
	$cflist insert end "\n"
	$cflist insert end $f [highlight_tag $f]
2559
    }
2560
    $cflist conf -state disabled
2561 2562 2563
}

proc sel_flist {w x y} {
2564
    global ctext difffilestart cflist cflist_top cmitmode
2565

P
Paul Mackerras 已提交
2566
    if {$cmitmode eq "tree"} return
2567 2568
    if {![info exists cflist_top]} return
    set l [lindex [split [$w index "@$x,$y"] "."] 0]
2569 2570 2571
    $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 已提交
2572 2573 2574 2575
    if {$l == 1} {
	$ctext yview 1.0
    } else {
	catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
2576 2577 2578
    }
}

2579 2580 2581 2582
proc pop_flist_menu {w X Y x y} {
    global ctext cflist cmitmode flist_menu flist_menu_file
    global treediffs diffids

2583
    stopfinding
2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596
    set l [lindex [split [$w index "@$x,$y"] "."] 0]
    if {$l <= 1} return
    if {$cmitmode eq "tree"} {
	set e [linetoelt $l]
	if {[string index $e end] eq "/"} return
    } else {
	set e [lindex $treediffs($diffids) [expr {$l-2}]]
    }
    set flist_menu_file $e
    tk_popup $flist_menu $X $Y
}

proc flist_hl {only} {
2597
    global flist_menu_file findstring gdttype
2598 2599

    set x [shellquote $flist_menu_file]
2600
    if {$only || $findstring eq {} || $gdttype ne [mc "touching paths:"]} {
2601
	set findstring $x
2602
    } else {
2603
	append findstring " " $x
2604
    }
2605
    set gdttype [mc "touching paths:"]
2606 2607
}

2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 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 2696 2697 2698 2699 2700 2701
# 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
}

2702 2703
# Code to implement multiple views

2704
proc newview {ishighlight} {
2705
    global nextviewnum newviewname newviewperm newishighlight
2706
    global newviewargs revtreeargs viewargscmd newviewargscmd curview
P
Paul Mackerras 已提交
2707

2708
    set newishighlight $ishighlight
P
Paul Mackerras 已提交
2709 2710 2711 2712 2713
    set top .gitkview
    if {[winfo exists $top]} {
	raise $top
	return
    }
2714
    set newviewname($nextviewnum) "[mc "View"] $nextviewnum"
2715
    set newviewperm($nextviewnum) 0
2716
    set newviewargs($nextviewnum) [shellarglist $revtreeargs]
2717
    set newviewargscmd($nextviewnum) $viewargscmd($curview)
2718
    vieweditor $top $nextviewnum [mc "Gitk view definition"]
2719 2720 2721 2722 2723
}

proc editview {} {
    global curview
    global viewname viewperm newviewname newviewperm
2724
    global viewargs newviewargs viewargscmd newviewargscmd
2725 2726 2727 2728 2729 2730 2731 2732

    set top .gitkvedit-$curview
    if {[winfo exists $top]} {
	raise $top
	return
    }
    set newviewname($curview) $viewname($curview)
    set newviewperm($curview) $viewperm($curview)
2733
    set newviewargs($curview) [shellarglist $viewargs($curview)]
2734
    set newviewargscmd($curview) $viewargscmd($curview)
2735 2736 2737 2738
    vieweditor $top $curview "Gitk: edit view $viewname($curview)"
}

proc vieweditor {top n title} {
2739
    global newviewname newviewperm viewfiles bgcolor
2740

P
Paul Mackerras 已提交
2741
    toplevel $top
2742
    wm title $top $title
2743 2744
    label $top.nl -text [mc "Name"]
    entry $top.name -width 20 -textvariable newviewname($n)
2745
    grid $top.nl $top.name -sticky w -pady 5
2746 2747
    checkbutton $top.perm -text [mc "Remember this view"] \
	-variable newviewperm($n)
2748
    grid $top.perm - -pady 5 -sticky w
2749
    message $top.al -aspect 1000 \
2750
	-text [mc "Commits to include (arguments to git log):"]
2751 2752
    grid $top.al - -sticky w -pady 5
    entry $top.args -width 50 -textvariable newviewargs($n) \
2753
	-background $bgcolor
2754
    grid $top.args - -sticky ew -padx 5
2755 2756 2757 2758 2759 2760 2761 2762

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

2763
    message $top.l -aspect 1000 \
2764
	-text [mc "Enter files and directories to include, one per line:"]
2765
    grid $top.l - -sticky w
2766
    text $top.t -width 40 -height 10 -background $bgcolor -font uifont
2767 2768 2769 2770 2771 2772 2773 2774
    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
    }
2775
    grid $top.t - -sticky ew -padx 5
P
Paul Mackerras 已提交
2776
    frame $top.buts
2777 2778
    button $top.buts.ok -text [mc "OK"] -command [list newviewok $top $n]
    button $top.buts.can -text [mc "Cancel"] -command [list destroy $top]
P
Paul Mackerras 已提交
2779 2780 2781 2782 2783 2784 2785
    grid $top.buts.ok $top.buts.can
    grid columnconfigure $top.buts 0 -weight 1 -uniform a
    grid columnconfigure $top.buts 1 -weight 1 -uniform a
    grid $top.buts - -pady 10 -sticky ew
    focus $top.t
}

2786
proc doviewmenu {m first cmd op argv} {
2787 2788 2789
    set nmenu [$m index end]
    for {set i $first} {$i <= $nmenu} {incr i} {
	if {[$m entrycget $i -command] eq $cmd} {
2790
	    eval $m $op $i $argv
2791
	    break
2792 2793
	}
    }
2794 2795 2796
}

proc allviewmenus {n op args} {
2797
    # global viewhlmenu
2798

2799
    doviewmenu .bar.view 5 [list showview $n] $op $args
2800
    # doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
2801 2802 2803
}

proc newviewok {top n} {
2804
    global nextviewnum newviewperm newviewname newishighlight
2805
    global viewname viewfiles viewperm selectedview curview
2806
    global viewargs newviewargs viewargscmd newviewargscmd viewhlmenu
P
Paul Mackerras 已提交
2807

2808 2809 2810
    if {[catch {
	set newargs [shellsplit $newviewargs($n)]
    } err]} {
2811
	error_popup "[mc "Error in commit selection arguments:"] $err"
2812 2813 2814 2815
	wm raise $top
	focus $top
	return
    }
P
Paul Mackerras 已提交
2816
    set files {}
2817
    foreach f [split [$top.t get 0.0 end] "\n"] {
P
Paul Mackerras 已提交
2818 2819 2820 2821 2822
	set ft [string trim $f]
	if {$ft ne {}} {
	    lappend files $ft
	}
    }
2823 2824 2825 2826 2827 2828
    if {![info exists viewfiles($n)]} {
	# creating a new view
	incr nextviewnum
	set viewname($n) $newviewname($n)
	set viewperm($n) $newviewperm($n)
	set viewfiles($n) $files
2829
	set viewargs($n) $newargs
2830
	set viewargscmd($n) $newviewargscmd($n)
2831 2832
	addviewmenu $n
	if {!$newishighlight} {
2833
	    run showview $n
2834
	} else {
2835
	    run addvhighlight $n
2836
	}
2837 2838 2839 2840 2841
    } else {
	# editing an existing view
	set viewperm($n) $newviewperm($n)
	if {$newviewname($n) ne $viewname($n)} {
	    set viewname($n) $newviewname($n)
2842
	    doviewmenu .bar.view 5 [list showview $n] \
2843
		entryconf [list -label $viewname($n)]
2844 2845
	    # doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
		# entryconf [list -label $viewname($n) -value $viewname($n)]
2846
	}
2847 2848
	if {$files ne $viewfiles($n) || $newargs ne $viewargs($n) || \
		$newviewargscmd($n) ne $viewargscmd($n)} {
2849
	    set viewfiles($n) $files
2850
	    set viewargs($n) $newargs
2851
	    set viewargscmd($n) $newviewargscmd($n)
2852
	    if {$curview == $n} {
2853
		run reloadcommits
2854 2855 2856 2857
	    }
	}
    }
    catch {destroy $top}
P
Paul Mackerras 已提交
2858 2859 2860
}

proc delview {} {
2861
    global curview viewperm hlview selectedhlview
P
Paul Mackerras 已提交
2862 2863

    if {$curview == 0} return
2864
    if {[info exists hlview] && $hlview == $curview} {
2865
	set selectedhlview [mc "None"]
2866 2867
	unset hlview
    }
2868
    allviewmenus $curview delete
2869
    set viewperm($curview) 0
P
Paul Mackerras 已提交
2870 2871 2872
    showview 0
}

2873
proc addviewmenu {n} {
2874
    global viewname viewhlmenu
2875 2876 2877

    .bar.view add radiobutton -label $viewname($n) \
	-command [list showview $n] -variable selectedview -value $n
2878 2879
    #$viewhlmenu add radiobutton -label $viewname($n) \
    #	-command [list addvhighlight $n] -variable selectedhlview
2880 2881
}

P
Paul Mackerras 已提交
2882
proc showview {n} {
2883
    global curview viewfiles cached_commitrow ordertok
2884
    global displayorder parentlist rowidlist rowisopt rowfinal
2885 2886
    global colormap rowtextx nextcolor canvxmax
    global numcommits viewcomplete
P
Paul Mackerras 已提交
2887
    global selectedline currentid canv canvy0
2888
    global treediffs
2889
    global pending_select mainheadid
2890
    global commitidx
2891
    global selectedview
2892
    global hlview selectedhlview commitinterest
P
Paul Mackerras 已提交
2893 2894 2895

    if {$n == $curview} return
    set selid {}
2896 2897 2898 2899 2900
    set ymax [lindex [$canv cget -scrollregion] 3]
    set span [$canv yview]
    set ytop [expr {[lindex $span 0] * $ymax}]
    set ybot [expr {[lindex $span 1] * $ymax}]
    set yscreen [expr {($ybot - $ytop) / 2}]
P
Paul Mackerras 已提交
2901 2902 2903 2904 2905 2906
    if {[info exists selectedline]} {
	set selid $currentid
	set y [yc $selectedline]
	if {$ytop < $y && $y < $ybot} {
	    set yscreen [expr {$y - $ytop}]
	}
2907 2908 2909
    } elseif {[info exists pending_select]} {
	set selid $pending_select
	unset pending_select
P
Paul Mackerras 已提交
2910 2911
    }
    unselectline
2912
    normalline
P
Paul Mackerras 已提交
2913 2914
    catch {unset treediffs}
    clear_display
2915 2916
    if {[info exists hlview] && $hlview == $n} {
	unset hlview
2917
	set selectedhlview [mc "None"]
2918
    }
2919
    catch {unset commitinterest}
2920
    catch {unset cached_commitrow}
2921
    catch {unset ordertok}
P
Paul Mackerras 已提交
2922 2923

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

2928
    run refill_reflist
2929
    if {![info exists viewcomplete($n)]} {
2930 2931 2932
	if {$selid ne {}} {
	    set pending_select $selid
	}
2933
	getcommits
P
Paul Mackerras 已提交
2934 2935 2936
	return
    }

2937 2938 2939 2940 2941
    set displayorder {}
    set parentlist {}
    set rowidlist {}
    set rowisopt {}
    set rowfinal {}
2942
    set numcommits $commitidx($n)
2943

P
Paul Mackerras 已提交
2944 2945
    catch {unset colormap}
    catch {unset rowtextx}
2946 2947
    set nextcolor 0
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
2948 2949 2950 2951
    set curview $n
    set row 0
    setcanvscroll
    set yf 0
2952
    set row {}
2953 2954
    if {$selid ne {} && [commitinview $selid $n]} {
	set row [rowofcommit $selid]
P
Paul Mackerras 已提交
2955 2956 2957 2958 2959 2960 2961 2962 2963 2964
	# 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
2965 2966
    if {$row ne {}} {
	selectline $row 0
2967 2968 2969 2970 2971 2972 2973 2974
    } elseif {$mainheadid ne {} && [commitinview $mainheadid $curview]} {
	selectline [rowofcommit $mainheadid] 1
    } elseif {!$viewcomplete($n)} {
	if {$selid ne {}} {
	    set pending_select $selid
	} else {
	    set pending_select $mainheadid
	}
2975
    } else {
2976
	set row [first_real_row]
2977 2978
	if {$row < $numcommits} {
	    selectline $row 0
2979 2980
	}
    }
2981 2982
    if {!$viewcomplete($n)} {
	if {$numcommits == 0} {
2983
	    show_status [mc "Reading commits..."]
2984
	}
2985
    } elseif {$numcommits == 0} {
2986
	show_status [mc "No commits selected"]
2987
    }
P
Paul Mackerras 已提交
2988 2989
}

2990 2991
# Stuff relating to the highlighting facility

2992
proc ishighlighted {id} {
2993
    global vhighlights fhighlights nhighlights rhighlights
2994

2995 2996
    if {[info exists nhighlights($id)] && $nhighlights($id) > 0} {
	return $nhighlights($id)
2997
    }
2998 2999
    if {[info exists vhighlights($id)] && $vhighlights($id) > 0} {
	return $vhighlights($id)
3000
    }
3001 3002
    if {[info exists fhighlights($id)] && $fhighlights($id) > 0} {
	return $fhighlights($id)
3003
    }
3004 3005
    if {[info exists rhighlights($id)] && $rhighlights($id) > 0} {
	return $rhighlights($id)
3006
    }
3007 3008 3009 3010
    return 0
}

proc bolden {row font} {
3011
    global canv linehtag selectedline boldrows
3012

3013
    lappend boldrows $row
3014
    $canv itemconf $linehtag($row) -font $font
3015
    if {[info exists selectedline] && $row == $selectedline} {
3016 3017 3018 3019 3020 3021 3022 3023 3024
	$canv delete secsel
	set t [eval $canv create rect [$canv bbox $linehtag($row)] \
		   -outline {{}} -tags secsel \
		   -fill [$canv cget -selectbackground]]
	$canv lower $t
    }
}

proc bolden_name {row font} {
3025
    global canv2 linentag selectedline boldnamerows
3026

3027
    lappend boldnamerows $row
3028
    $canv2 itemconf $linentag($row) -font $font
3029
    if {[info exists selectedline] && $row == $selectedline} {
3030 3031 3032 3033 3034 3035 3036 3037
	$canv2 delete secsel
	set t [eval $canv2 create rect [$canv2 bbox $linentag($row)] \
		   -outline {{}} -tags secsel \
		   -fill [$canv2 cget -selectbackground]]
	$canv2 lower $t
    }
}

3038
proc unbolden {} {
3039
    global boldrows
3040

3041 3042
    set stillbold {}
    foreach row $boldrows {
3043
	if {![ishighlighted [commitonrow $row]]} {
3044
	    bolden $row mainfont
3045 3046
	} else {
	    lappend stillbold $row
3047 3048
	}
    }
3049
    set boldrows $stillbold
3050 3051 3052
}

proc addvhighlight {n} {
3053
    global hlview viewcomplete curview vhl_done commitidx
3054 3055

    if {[info exists hlview]} {
3056
	delvhighlight
3057 3058
    }
    set hlview $n
3059
    if {$n != $curview && ![info exists viewcomplete($n)]} {
3060
	start_rev_list $n
3061 3062 3063 3064
    }
    set vhl_done $commitidx($hlview)
    if {$vhl_done > 0} {
	drawvisible
3065 3066 3067
    }
}

3068 3069
proc delvhighlight {} {
    global hlview vhighlights
3070 3071 3072

    if {![info exists hlview]} return
    unset hlview
3073 3074
    catch {unset vhighlights}
    unbolden
3075 3076
}

3077
proc vhighlightmore {} {
3078
    global hlview vhl_done commitidx vhighlights curview
3079 3080

    set max $commitidx($hlview)
3081 3082 3083 3084
    set vr [visiblerows]
    set r0 [lindex $vr 0]
    set r1 [lindex $vr 1]
    for {set i $vhl_done} {$i < $max} {incr i} {
3085 3086 3087
	set id [commitonrow $i $hlview]
	if {[commitinview $id $curview]} {
	    set row [rowofcommit $id]
3088 3089
	    if {$r0 <= $row && $row <= $r1} {
		if {![highlighted $row]} {
3090
		    bolden $row mainfontbold
3091
		}
3092
		set vhighlights($id) 1
3093 3094 3095
	    }
	}
    }
3096
    set vhl_done $max
3097
    return 0
3098 3099 3100
}

proc askvhighlight {row id} {
3101
    global hlview vhighlights iddrawn
3102

3103
    if {[commitinview $id $hlview]} {
3104
	if {[info exists iddrawn($id)] && ![ishighlighted $id]} {
3105
	    bolden $row mainfontbold
3106
	}
3107
	set vhighlights($id) 1
3108
    } else {
3109
	set vhighlights($id) 0
3110 3111 3112
    }
}

3113
proc hfiles_change {} {
3114
    global highlight_files filehighlight fhighlights fh_serial
3115
    global highlight_paths gdttype
3116 3117 3118 3119 3120

    if {[info exists filehighlight]} {
	# delete previous highlights
	catch {close $filehighlight}
	unset filehighlight
3121 3122
	catch {unset fhighlights}
	unbolden
3123
	unhighlight_filelist
3124
    }
3125
    set highlight_paths {}
3126 3127 3128 3129 3130 3131 3132
    after cancel do_file_hl $fh_serial
    incr fh_serial
    if {$highlight_files ne {}} {
	after 300 do_file_hl $fh_serial
    }
}

3133 3134 3135
proc gdttype_change {name ix op} {
    global gdttype highlight_files findstring findpattern

3136
    stopfinding
3137
    if {$findstring ne {}} {
3138
	if {$gdttype eq [mc "containing:"]} {
3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159
	    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

3160
    stopfinding
3161
    if {$gdttype eq [mc "containing:"]} {
3162 3163 3164 3165 3166 3167 3168 3169 3170 3171
	findcom_change
    } else {
	if {$highlight_files ne $findstring} {
	    set highlight_files $findstring
	    hfiles_change
	}
    }
    drawvisible
}

3172
proc findcom_change args {
3173
    global nhighlights boldnamerows
3174 3175
    global findpattern findtype findstring gdttype

3176
    stopfinding
3177 3178
    # delete previous highlights, if any
    foreach row $boldnamerows {
3179
	bolden_name $row mainfont
3180 3181 3182 3183 3184
    }
    set boldnamerows {}
    catch {unset nhighlights}
    unbolden
    unmarkmatches
3185
    if {$gdttype ne [mc "containing:"] || $findstring eq {}} {
3186
	set findpattern {}
3187
    } elseif {$findtype eq [mc "Regexp"]} {
3188 3189 3190 3191 3192 3193 3194 3195
	set findpattern $findstring
    } else {
	set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
		   $findstring]
	set findpattern "*$e*"
    }
}

3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209
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
}

3210
proc do_file_hl {serial} {
3211
    global highlight_files filehighlight highlight_paths gdttype fhl_list
3212

3213
    if {$gdttype eq [mc "touching paths:"]} {
3214 3215 3216 3217
	if {[catch {set paths [shellsplit $highlight_files]}]} return
	set highlight_paths [makepatterns $paths]
	highlight_filelist
	set gdtargs [concat -- $paths]
3218
    } elseif {$gdttype eq [mc "adding/removing string:"]} {
3219
	set gdtargs [list "-S$highlight_files"]
3220 3221 3222
    } else {
	# must be "containing:", i.e. we're searching commit info
	return
3223
    }
3224
    set cmd [concat | git diff-tree -r -s --stdin $gdtargs]
3225 3226
    set filehighlight [open $cmd r+]
    fconfigure $filehighlight -blocking 0
3227
    filerun $filehighlight readfhighlight
3228
    set fhl_list {}
3229 3230 3231 3232 3233
    drawvisible
    flushhighlights
}

proc flushhighlights {} {
3234
    global filehighlight fhl_list
3235 3236

    if {[info exists filehighlight]} {
3237
	lappend fhl_list {}
3238 3239 3240 3241 3242 3243
	puts $filehighlight ""
	flush $filehighlight
    }
}

proc askfilehighlight {row id} {
3244
    global filehighlight fhighlights fhl_list
3245

3246
    lappend fhl_list $id
3247
    set fhighlights($id) -1
3248 3249 3250 3251
    puts $filehighlight $id
}

proc readfhighlight {} {
3252
    global filehighlight fhighlights curview iddrawn
3253
    global fhl_list find_dirn
3254

3255 3256 3257 3258 3259
    if {![info exists filehighlight]} {
	return 0
    }
    set nr 0
    while {[incr nr] <= 100 && [gets $filehighlight line] >= 0} {
3260 3261 3262 3263 3264
	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]
3265
	    set fhighlights($id) 0
3266
	}
3267 3268
	set fhl_list [lrange $fhl_list [expr {$i+1}] end]
	if {$line eq {}} continue
3269 3270
	if {![commitinview $line $curview]} continue
	set row [rowofcommit $line]
3271
	if {[info exists iddrawn($line)] && ![ishighlighted $line]} {
3272
	    bolden $row mainfontbold
3273
	}
3274
	set fhighlights($line) 1
3275
    }
3276 3277
    if {[eof $filehighlight]} {
	# strange...
3278
	puts "oops, git diff-tree died"
3279 3280
	catch {close $filehighlight}
	unset filehighlight
3281
	return 0
3282
    }
3283
    if {[info exists find_dirn]} {
3284
	run findmore
3285
    }
3286
    return 1
3287 3288
}

3289
proc doesmatch {f} {
3290
    global findtype findpattern
3291

3292
    if {$findtype eq [mc "Regexp"]} {
3293
	return [regexp $findpattern $f]
3294
    } elseif {$findtype eq [mc "IgnCase"]} {
3295 3296 3297 3298 3299 3300
	return [string match -nocase $findpattern $f]
    } else {
	return [string match $findpattern $f]
    }
}

3301
proc askfindhighlight {row id} {
3302
    global nhighlights commitinfo iddrawn
3303 3304
    global findloc
    global markingmatches
3305 3306 3307 3308

    if {![info exists commitinfo($id)]} {
	getcommit $id
    }
3309
    set info $commitinfo($id)
3310
    set isbold 0
3311
    set fldtypes [list [mc Headline] [mc Author] [mc Date] [mc Committer] [mc CDate] [mc Comments]]
3312
    foreach f $info ty $fldtypes {
3313
	if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
3314
	    [doesmatch $f]} {
3315
	    if {$ty eq [mc "Author"]} {
3316
		set isbold 2
3317
		break
3318
	    }
3319
	    set isbold 1
3320 3321
	}
    }
3322
    if {$isbold && [info exists iddrawn($id)]} {
3323
	if {![ishighlighted $id]} {
3324
	    bolden $row mainfontbold
3325
	    if {$isbold > 1} {
3326
		bolden_name $row mainfontbold
3327
	    }
3328
	}
3329
	if {$markingmatches} {
3330
	    markrowmatches $row $id
3331 3332
	}
    }
3333
    set nhighlights($id) $isbold
3334 3335
}

3336 3337
proc markrowmatches {row id} {
    global canv canv2 linehtag linentag commitinfo findloc
3338

3339 3340
    set headline [lindex $commitinfo($id) 0]
    set author [lindex $commitinfo($id) 1]
3341 3342
    $canv delete match$row
    $canv2 delete match$row
3343
    if {$findloc eq [mc "All fields"] || $findloc eq [mc "Headline"]} {
3344 3345 3346 3347 3348
	set m [findmatches $headline]
	if {$m ne {}} {
	    markmatches $canv $row $headline $linehtag($row) $m \
		[$canv itemcget $linehtag($row) -font] $row
	}
3349
    }
3350
    if {$findloc eq [mc "All fields"] || $findloc eq [mc "Author"]} {
3351 3352 3353 3354 3355
	set m [findmatches $author]
	if {$m ne {}} {
	    markmatches $canv2 $row $author $linentag($row) $m \
		[$canv2 itemcget $linentag($row) -font] $row
	}
3356 3357 3358
    }
}

3359 3360 3361 3362
proc vrel_change {name ix op} {
    global highlight_related

    rhighlight_none
3363
    if {$highlight_related ne [mc "None"]} {
3364
	run drawvisible
3365 3366 3367 3368 3369 3370
    }
}

# prepare for testing whether commits are descendents or ancestors of a
proc rhighlight_sel {a} {
    global descendent desc_todo ancestor anc_todo
3371
    global highlight_related
3372 3373 3374 3375 3376

    catch {unset descendent}
    set desc_todo [list $a]
    catch {unset ancestor}
    set anc_todo [list $a]
3377
    if {$highlight_related ne [mc "None"]} {
3378
	rhighlight_none
3379
	run drawvisible
3380 3381 3382 3383 3384 3385
    }
}

proc rhighlight_none {} {
    global rhighlights

3386 3387
    catch {unset rhighlights}
    unbolden
3388 3389 3390
}

proc is_descendent {a} {
3391
    global curview children descendent desc_todo
3392 3393

    set v $curview
3394
    set la [rowofcommit $a]
3395 3396 3397 3398 3399
    set todo $desc_todo
    set leftover {}
    set done 0
    for {set i 0} {$i < [llength $todo]} {incr i} {
	set do [lindex $todo $i]
3400
	if {[rowofcommit $do] < $la} {
3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422
	    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} {
3423
    global curview parents ancestor anc_todo
3424 3425

    set v $curview
3426
    set la [rowofcommit $a]
3427 3428 3429 3430 3431
    set todo $anc_todo
    set leftover {}
    set done 0
    for {set i 0} {$i < [llength $todo]} {incr i} {
	set do [lindex $todo $i]
3432
	if {![commitinview $do $v] || [rowofcommit $do] > $la} {
3433 3434 3435
	    lappend leftover $do
	    continue
	}
3436
	foreach np $parents($v,$do) {
3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454
	    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} {
3455
    global descendent highlight_related iddrawn rhighlights
3456 3457 3458 3459
    global selectedline ancestor

    if {![info exists selectedline]} return
    set isbold 0
3460 3461
    if {$highlight_related eq [mc "Descendant"] ||
	$highlight_related eq [mc "Not descendant"]} {
3462 3463 3464
	if {![info exists descendent($id)]} {
	    is_descendent $id
	}
3465
	if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} {
3466 3467
	    set isbold 1
	}
3468 3469
    } elseif {$highlight_related eq [mc "Ancestor"] ||
	      $highlight_related eq [mc "Not ancestor"]} {
3470 3471 3472
	if {![info exists ancestor($id)]} {
	    is_ancestor $id
	}
3473
	if {$ancestor($id) == ($highlight_related eq [mc "Ancestor"])} {
3474 3475 3476 3477
	    set isbold 1
	}
    }
    if {[info exists iddrawn($id)]} {
3478
	if {$isbold && ![ishighlighted $id]} {
3479
	    bolden $row mainfontbold
3480 3481
	}
    }
3482
    set rhighlights($id) $isbold
3483 3484
}

3485 3486
# Graph layout functions

P
Paul Mackerras 已提交
3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502
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 {}
3503 3504 3505 3506
    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 已提交
3507
	}
3508
	set o [concat $o $o]
P
Paul Mackerras 已提交
3509
    }
3510
    return $ret
P
Paul Mackerras 已提交
3511 3512
}

3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532
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
	}
3533 3534
	set id [first_real_child $curview,$p]
	if {$id eq {}} {
3535
	    # it's a root
3536
	    set tok [lindex $varctok($curview) $varcid($curview,$p)]
3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557
	    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
}

3558 3559 3560
# Work out where id should go in idlist so that order-token
# values increase from left to right
proc idcol {idlist id {i 0}} {
3561
    set t [ordertoken $id]
3562 3563 3564
    if {$i < 0} {
	set i 0
    }
3565
    if {$i >= [llength $idlist] || $t < [ordertoken [lindex $idlist $i]]} {
3566 3567
	if {$i > [llength $idlist]} {
	    set i [llength $idlist]
P
Paul Mackerras 已提交
3568
	}
3569
	while {[incr i -1] >= 0 && $t < [ordertoken [lindex $idlist $i]]} {}
3570 3571
	incr i
    } else {
3572
	if {$t > [ordertoken [lindex $idlist $i]]} {
3573
	    while {[incr i] < [llength $idlist] &&
3574
		   $t >= [ordertoken [lindex $idlist $i]]} {}
P
Paul Mackerras 已提交
3575 3576
	}
    }
3577
    return $i
P
Paul Mackerras 已提交
3578 3579 3580
}

proc initlayout {} {
3581
    global rowidlist rowisopt rowfinal displayorder parentlist
3582
    global numcommits canvxmax canv
3583
    global nextcolor
3584
    global colormap rowtextx
P
Paul Mackerras 已提交
3585

3586 3587
    set numcommits 0
    set displayorder {}
3588
    set parentlist {}
3589
    set nextcolor 0
3590 3591
    set rowidlist {}
    set rowisopt {}
3592
    set rowfinal {}
3593
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
3594 3595
    catch {unset colormap}
    catch {unset rowtextx}
3596
    setcanvscroll
3597 3598 3599 3600
}

proc setcanvscroll {} {
    global canv canv2 canv3 numcommits linespc canvxmax canvy0
3601
    global lastscrollset lastscrollrows
3602 3603 3604 3605 3606

    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]
3607 3608
    set lastscrollset [clock clicks -milliseconds]
    set lastscrollrows $numcommits
P
Paul Mackerras 已提交
3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629
}

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

3630
proc layoutmore {} {
3631
    global commitidx viewcomplete curview
3632
    global numcommits pending_select selectedline curview
3633 3634 3635 3636
    global lastscrollset lastscrollrows commitinterest

    if {$lastscrollrows < 100 || $viewcomplete($curview) ||
	[clock clicks -milliseconds] - $lastscrollset > 500} {
3637 3638
	setcanvscroll
    }
3639
    if {[info exists pending_select] &&
3640 3641
	[commitinview $pending_select $curview]} {
	selectline [rowofcommit $pending_select] 1
3642
    }
3643
    drawvisible
3644 3645 3646
}

proc doshowlocalchanges {} {
3647
    global curview mainheadid
3648

3649
    if {[commitinview $mainheadid $curview]} {
3650
	dodiffindex
3651 3652
    } else {
	lappend commitinterest($mainheadid) {dodiffindex}
3653 3654 3655 3656
    }
}

proc dohidelocalchanges {} {
3657
    global nullid nullid2 lserial curview
3658

3659
    if {[commitinview $nullid $curview]} {
3660
	removefakerow $nullid
3661
    }
3662
    if {[commitinview $nullid2 $curview]} {
3663
	removefakerow $nullid2
3664 3665 3666 3667
    }
    incr lserial
}

3668
# spawn off a process to do git diff-index --cached HEAD
3669
proc dodiffindex {} {
3670
    global lserial showlocalchanges
3671
    global isworktree
3672

3673
    if {!$showlocalchanges || !$isworktree} return
3674
    incr lserial
3675
    set fd [open "|git diff-index --cached HEAD" r]
3676 3677 3678 3679 3680
    fconfigure $fd -blocking 0
    filerun $fd [list readdiffindex $fd $lserial]
}

proc readdiffindex {fd serial} {
3681
    global mainheadid nullid nullid2 curview commitinfo commitdata lserial
3682

3683
    set isdiff 1
3684
    if {[gets $fd line] < 0} {
3685 3686
	if {![eof $fd]} {
	    return 1
3687
	}
3688
	set isdiff 0
3689 3690 3691 3692
    }
    # we only need to see one line and we don't really care what it says...
    close $fd

P
Paul Mackerras 已提交
3693 3694
    if {$serial != $lserial} {
	return 0
3695 3696
    }

P
Paul Mackerras 已提交
3697 3698 3699 3700 3701 3702
    # now see if there are any local changes not checked in to the index
    set fd [open "|git diff-files" r]
    fconfigure $fd -blocking 0
    filerun $fd [list readdifffiles $fd $serial]

    if {$isdiff && ![commitinview $nullid2 $curview]} {
3703
	# add the line for the changes in the index to the graph
3704
	set hl [mc "Local changes checked in to index but not committed"]
3705 3706
	set commitinfo($nullid2) [list  $hl {} {} {} {} "    $hl\n"]
	set commitdata($nullid2) "\n    $hl\n"
3707
	if {[commitinview $nullid $curview]} {
3708
	    removefakerow $nullid
3709
	}
3710
	insertfakerow $nullid2 $mainheadid
P
Paul Mackerras 已提交
3711
    } elseif {!$isdiff && [commitinview $nullid2 $curview]} {
3712
	removefakerow $nullid2
3713 3714 3715 3716 3717
    }
    return 0
}

proc readdifffiles {fd serial} {
3718
    global mainheadid nullid nullid2 curview
3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730
    global commitinfo commitdata lserial

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

P
Paul Mackerras 已提交
3731 3732 3733 3734 3735
    if {$serial != $lserial} {
	return 0
    }

    if {$isdiff && ![commitinview $nullid $curview]} {
3736
	# add the line for the local diff to the graph
3737
	set hl [mc "Local uncommitted changes, not checked in to index"]
3738 3739
	set commitinfo($nullid) [list  $hl {} {} {} {} "    $hl\n"]
	set commitdata($nullid) "\n    $hl\n"
3740 3741 3742 3743 3744
	if {[commitinview $nullid2 $curview]} {
	    set p $nullid2
	} else {
	    set p $mainheadid
	}
3745
	insertfakerow $nullid $p
P
Paul Mackerras 已提交
3746
    } elseif {!$isdiff && [commitinview $nullid $curview]} {
3747
	removefakerow $nullid
3748 3749
    }
    return 0
P
Paul Mackerras 已提交
3750 3751
}

3752
proc nextuse {id row} {
3753
    global curview children
P
Paul Mackerras 已提交
3754

3755 3756
    if {[info exists children($curview,$id)]} {
	foreach kid $children($curview,$id) {
3757
	    if {![commitinview $kid $curview]} {
3758 3759
		return -1
	    }
3760 3761
	    if {[rowofcommit $kid] > $row} {
		return [rowofcommit $kid]
P
Paul Mackerras 已提交
3762 3763
	    }
	}
3764
    }
3765 3766
    if {[commitinview $id $curview]} {
	return [rowofcommit $id]
3767 3768 3769 3770
    }
    return -1
}

3771
proc prevuse {id row} {
3772
    global curview children
3773 3774 3775 3776

    set ret -1
    if {[info exists children($curview,$id)]} {
	foreach kid $children($curview,$id) {
3777 3778 3779
	    if {![commitinview $kid $curview]} break
	    if {[rowofcommit $kid] < $row} {
		set ret [rowofcommit $kid]
3780 3781
	    }
	}
3782 3783 3784 3785
    }
    return $ret
}

3786 3787
proc make_idlist {row} {
    global displayorder parentlist uparrowlen downarrowlen mingaplen
3788
    global commitidx curview children
P
Paul Mackerras 已提交
3789

3790 3791 3792
    set r [expr {$row - $mingaplen - $downarrowlen - 1}]
    if {$r < 0} {
	set r 0
3793
    }
3794 3795 3796 3797 3798 3799 3800 3801
    set ra [expr {$row - $downarrowlen}]
    if {$ra < 0} {
	set ra 0
    }
    set rb [expr {$row + $uparrowlen}]
    if {$rb > $commitidx($curview)} {
	set rb $commitidx($curview)
    }
3802
    make_disporder $r [expr {$rb + 1}]
3803 3804 3805 3806 3807 3808 3809 3810
    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} {
3811
		lappend ids [list [ordertoken $p] $p]
P
Paul Mackerras 已提交
3812 3813
	    }
	}
3814 3815 3816 3817 3818 3819 3820
    }
    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} {
3821
		lappend ids [list [ordertoken $p] $p]
P
Paul Mackerras 已提交
3822 3823
	    }
	}
3824 3825
    }
    set id [lindex $displayorder $row]
3826
    lappend ids [list [ordertoken $id] $id]
3827 3828 3829
    while {$r < $rb} {
	foreach p [lindex $parentlist $r] {
	    set firstkid [lindex $children($curview,$p) 0]
3830
	    if {[rowofcommit $firstkid] < $row} {
3831
		lappend ids [list [ordertoken $p] $p]
P
Paul Mackerras 已提交
3832 3833
	    }
	}
3834 3835 3836 3837
	incr r
	set id [lindex $displayorder $r]
	if {$id ne {}} {
	    set firstkid [lindex $children($curview,$id) 0]
3838
	    if {$firstkid ne {} && [rowofcommit $firstkid] < $row} {
3839
		lappend ids [list [ordertoken $id] $id]
3840
	    }
P
Paul Mackerras 已提交
3841 3842
	}
    }
3843 3844 3845 3846 3847
    set idlist {}
    foreach idx [lsort -unique $ids] {
	lappend idlist [lindex $idx 1]
    }
    return $idlist
P
Paul Mackerras 已提交
3848 3849
}

3850 3851 3852 3853 3854 3855 3856 3857
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 已提交
3858 3859
}

3860 3861
proc makeupline {id row rend col} {
    global rowidlist uparrowlen downarrowlen mingaplen
P
Paul Mackerras 已提交
3862

3863 3864 3865 3866 3867 3868 3869
    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}]
3870
    }
3871 3872 3873 3874 3875 3876 3877
    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 已提交
3878 3879 3880
    }
}

3881
proc layoutrows {row endrow} {
3882
    global rowidlist rowisopt rowfinal displayorder
3883 3884
    global uparrowlen downarrowlen maxwidth mingaplen
    global children parentlist
3885
    global commitidx viewcomplete curview
P
Paul Mackerras 已提交
3886

3887
    make_disporder [expr {$row - 1}] [expr {$endrow + $uparrowlen}]
3888 3889
    set idlist {}
    if {$row > 0} {
3890 3891
	set rm1 [expr {$row - 1}]
	foreach id [lindex $rowidlist $rm1] {
3892 3893 3894 3895
	    if {$id ne {}} {
		lappend idlist $id
	    }
	}
3896
	set final [lindex $rowfinal $rm1]
3897
    }
3898 3899
    for {} {$row < $endrow} {incr row} {
	set rm1 [expr {$row - 1}]
3900
	if {$rm1 < 0 || $idlist eq {}} {
3901
	    set idlist [make_idlist $row]
3902
	    set final 1
3903 3904 3905 3906 3907 3908 3909 3910
	} 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]
3911 3912 3913 3914
		    # 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
		    }
3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932
		}
	    }
	    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]
3933 3934 3935
		if {$children($curview,$id) ne {}} {
		    makeupline $id $rm1 $row $col
		}
3936 3937 3938 3939 3940 3941 3942
	    }
	    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]
3943
		    if {[rowofcommit $fk] < $row} {
3944 3945 3946 3947 3948 3949 3950 3951
			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]
3952
			if {$fk ne {} && [rowofcommit $fk] < $row} {
3953 3954 3955 3956 3957 3958 3959
			    set x [idcol $idlist $p $x]
			    set idlist [linsert $idlist $x $p]
			}
		    }
		}
	    }
	}
3960 3961 3962 3963 3964
	if {$final && !$viewcomplete($curview) &&
	    $row + $uparrowlen + $mingaplen + $downarrowlen
		>= $commitidx($curview)} {
	    set final 0
	}
3965 3966 3967 3968
	set l [llength $rowidlist]
	if {$row == $l} {
	    lappend rowidlist $idlist
	    lappend rowisopt 0
3969
	    lappend rowfinal $final
3970
	} elseif {$row < $l} {
3971
	    if {![rowsequal $idlist [lindex $rowidlist $row]]} {
3972 3973 3974
		lset rowidlist $row $idlist
		changedrow $row
	    }
3975
	    lset rowfinal $row $final
3976
	} else {
3977 3978
	    set pad [ntimes [expr {$row - $l}] {}]
	    set rowidlist [concat $rowidlist $pad]
3979
	    lappend rowidlist $idlist
3980 3981
	    set rowfinal [concat $rowfinal $pad]
	    lappend rowfinal $final
3982 3983
	    set rowisopt [concat $rowisopt [ntimes [expr {$row - $l + 1}] 0]]
	}
P
Paul Mackerras 已提交
3984
    }
3985
    return $row
P
Paul Mackerras 已提交
3986 3987
}

3988 3989
proc changedrow {row} {
    global displayorder iddrawn rowisopt need_redisplay
P
Paul Mackerras 已提交
3990

3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003
    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 已提交
4004 4005 4006 4007
    }
}

proc insert_pad {row col npad} {
4008
    global rowidlist
P
Paul Mackerras 已提交
4009 4010

    set pad [ntimes $npad {}]
P
Paul Mackerras 已提交
4011 4012 4013 4014 4015 4016 4017 4018
    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]
4019
    changedrow $row
P
Paul Mackerras 已提交
4020 4021 4022
}

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

4025 4026 4027
    if {$row < 1} {
	set row 1
    }
4028 4029
    for {} {$row < $endrow} {incr row; set col 0} {
	if {[lindex $rowisopt $row]} continue
P
Paul Mackerras 已提交
4030
	set haspad 0
4031 4032
	set y0 [expr {$row - 1}]
	set ym [expr {$row - 2}]
4033 4034 4035 4036 4037 4038 4039 4040 4041
	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 {}
	}
4042 4043 4044 4045 4046 4047
	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 已提交
4048 4049 4050
		set haspad 1
		continue
	    }
4051 4052 4053
	    set x0 [lsearch -exact $previdlist $id]
	    if {$x0 < 0} continue
	    set z [expr {$x0 - $col}]
P
Paul Mackerras 已提交
4054
	    set isarrow 0
4055 4056 4057 4058 4059 4060 4061
	    set z0 {}
	    if {$ym >= 0} {
		set xm [lsearch -exact $pprevidlist $id]
		if {$xm >= 0} {
		    set z0 [expr {$xm - $x0}]
		}
	    }
P
Paul Mackerras 已提交
4062
	    if {$z0 eq {}} {
4063 4064 4065
		# 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 已提交
4066 4067 4068
		    set isarrow 1
		}
	    }
P
Paul Mackerras 已提交
4069 4070 4071 4072
	    if {!$isarrow && $id ne [lindex $displayorder $row] &&
		[lsearch -exact [lindex $rowidlist [expr {$row+1}]] $id] < 0} {
		set isarrow 1
	    }
4073 4074 4075 4076
	    # 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 已提交
4077
	    if {$z < -1 || ($z < 0 && $isarrow)} {
4078 4079
		# Line currently goes left too much;
		# insert pads in the previous row, then optimize it
P
Paul Mackerras 已提交
4080 4081 4082 4083 4084
		set npad [expr {-1 - $z + $isarrow}]
		insert_pad $y0 $x0 $npad
		if {$y0 > 0} {
		    optimize_rows $y0 $x0 $row
		}
4085 4086 4087 4088 4089 4090 4091 4092
		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 已提交
4093
	    } elseif {$z > 1 || ($z > 0 && $isarrow)} {
4094
		# Line currently goes right too much;
4095
		# insert pads in this line
P
Paul Mackerras 已提交
4096
		set npad [expr {$z - 1 + $isarrow}]
P
Paul Mackerras 已提交
4097 4098
		insert_pad $row $col $npad
		set idlist [lindex $rowidlist $row]
P
Paul Mackerras 已提交
4099
		incr col $npad
4100
		set z [expr {$x0 - $col}]
P
Paul Mackerras 已提交
4101 4102
		set haspad 1
	    }
4103
	    if {$z0 eq {} && !$isarrow && $ym >= 0} {
4104
		# this line links to its first child on row $row-2
4105 4106
		set id [lindex $displayorder $ym]
		set xc [lsearch -exact $pprevidlist $id]
4107 4108 4109 4110
		if {$xc >= 0} {
		    set z0 [expr {$xc - $x0}]
		}
	    }
4111
	    # avoid lines jigging left then immediately right
P
Paul Mackerras 已提交
4112 4113
	    if {$z0 ne {} && $z < 0 && $z0 > 0} {
		insert_pad $y0 $x0 1
4114 4115 4116
		incr x0
		optimize_rows $y0 $x0 $row
		set previdlist [lindex $rowidlist $y0]
P
Paul Mackerras 已提交
4117 4118 4119
	    }
	}
	if {!$haspad} {
4120
	    # Find the first column that doesn't have a line going right
P
Paul Mackerras 已提交
4121
	    for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
4122 4123 4124 4125
		set id [lindex $idlist $col]
		if {$id eq {}} break
		set x0 [lsearch -exact $previdlist $id]
		if {$x0 < 0} {
4126
		    # check if this is the link to the first child
4127 4128
		    set kid [lindex $displayorder $y0]
		    if {[lindex $children($curview,$id) 0] eq $kid} {
4129
			# it is, work out offset to child
4130
			set x0 [lsearch -exact $previdlist $kid]
4131 4132
		    }
		}
4133
		if {$x0 <= $col} break
P
Paul Mackerras 已提交
4134
	    }
4135
	    # Insert a pad at that column as long as it has a line and
4136 4137
	    # isn't the last column
	    if {$x0 >= 0 && [incr col] < [llength $idlist]} {
P
Paul Mackerras 已提交
4138
		set idlist [linsert $idlist $col {}]
4139 4140
		lset rowidlist $row $idlist
		changedrow $row
P
Paul Mackerras 已提交
4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155
	    }
	}
    }
}

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

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

4156 4157 4158 4159 4160 4161 4162 4163 4164 4165
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 已提交
4166
proc rowranges {id} {
4167
    global curview children uparrowlen downarrowlen
4168
    global rowidlist
P
Paul Mackerras 已提交
4169

4170 4171 4172
    set kids $children($curview,$id)
    if {$kids eq {}} {
	return {}
4173
    }
4174 4175 4176
    set ret {}
    lappend kids $id
    foreach child $kids {
4177 4178
	if {![commitinview $child $curview]} break
	set row [rowofcommit $child]
4179 4180
	if {![info exists prev]} {
	    lappend ret [expr {$row + 1}]
4181
	} else {
4182
	    if {$row <= $prevrow} {
4183
		puts "oops children of [shortids $id] out of order [shortids $child] $row <= [shortids $prev] $prevrow"
4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214
	    }
	    # 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
4215
	}
4216
	set prev $child
4217
	set prevrow $row
P
Paul Mackerras 已提交
4218
    }
4219
    return $ret
4220 4221 4222 4223
}

proc drawlineseg {id row endrow arrowlow} {
    global rowidlist displayorder iddrawn linesegs
P
Paul Mackerras 已提交
4224
    global canv colormap linespc curview maxlinelen parentlist
4225 4226 4227 4228

    set cols [list [lsearch -exact [lindex $rowidlist $row] $id]]
    set le [expr {$row + 1}]
    set arrowhigh 1
P
Paul Mackerras 已提交
4229
    while {1} {
4230 4231 4232 4233 4234 4235 4236 4237 4238 4239
	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 已提交
4240
	}
4241 4242 4243 4244 4245 4246 4247 4248 4249
	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 已提交
4250
    }
4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298
    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 已提交
4299 4300 4301 4302 4303
    } elseif {$arrowlow} {
	if {[lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0 ||
	    [lsearch -exact [lindex $parentlist [expr {$row-1}]] $id] >= 0} {
	    set arrowlow 0
	}
4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321
    }
    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 已提交
4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334
	    } 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} {
4335 4336 4337 4338 4339
		    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
4340
	    }
4341 4342 4343 4344
	    lappend coords [xc $row $x] [yc $row]
	} else {
	    set xn [xc $row $xp]
	    set yn [yc $row]
P
Paul Mackerras 已提交
4345
	    lappend coords $xn $yn
4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380
	}
	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
4381 4382
	}
    }
4383 4384 4385

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

4388 4389
proc drawparentlinks {id row} {
    global rowidlist canv colormap curview parentlist
4390
    global idpos linespc
P
Paul Mackerras 已提交
4391

4392 4393 4394 4395
    set rowids [lindex $rowidlist $row]
    set col [lsearch -exact $rowids $id]
    if {$col < 0} return
    set olds [lindex $parentlist $row]
P
Paul Mackerras 已提交
4396 4397 4398 4399
    set row2 [expr {$row + 1}]
    set x [xc $row $col]
    set y [yc $row]
    set y2 [yc $row2]
P
Paul Mackerras 已提交
4400
    set d [expr {int(0.5 * $linespc)}]
4401
    set ymid [expr {$y + $d}]
4402
    set ids [lindex $rowidlist $row2]
P
Paul Mackerras 已提交
4403 4404 4405
    # rmx = right-most X coord used
    set rmx 0
    foreach p $olds {
4406 4407 4408 4409 4410 4411 4412 4413 4414
	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
	}
4415 4416
	set j [lsearch -exact $rowids $p]
	if {$j < 0} {
4417 4418 4419
	    # drawlineseg will do this one for us
	    continue
	}
P
Paul Mackerras 已提交
4420 4421 4422
	assigncolor $p
	# should handle duplicated parents here...
	set coords [list $x $y]
4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444
	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 已提交
4445
	}
4446
	set t [$canv create line $coords -width [linewidth $p] \
P
Paul Mackerras 已提交
4447 4448 4449 4450
		   -fill $colormap($p) -tags lines.$p]
	$canv lower $t
	bindline $t $p
    }
4451 4452 4453 4454
    if {$rmx > [lindex $idpos($id) 1]} {
	lset idpos($id) 1 $rmx
	redrawtags $id
    }
P
Paul Mackerras 已提交
4455 4456
}

4457
proc drawlines {id} {
4458
    global canv
P
Paul Mackerras 已提交
4459

4460
    $canv itemconf lines.$id -width [linewidth $id]
P
Paul Mackerras 已提交
4461 4462
}

4463
proc drawcmittext {id row col} {
4464 4465
    global linespc canv canv2 canv3 fgcolor curview
    global cmitlisted commitinfo rowidlist parentlist
P
Paul Mackerras 已提交
4466
    global rowtextx idpos idtags idheads idotherrefs
4467
    global linehtag linentag linedtag selectedline
4468
    global canvxmax boldrows boldnamerows fgcolor nullid nullid2
P
Paul Mackerras 已提交
4469

4470
    # listed is 0 for boundary, 1 for normal, 2 for negative, 3 for left, 4 for right
4471
    set listed $cmitlisted($curview,$id)
4472 4473
    if {$id eq $nullid} {
	set ofill red
4474
    } elseif {$id eq $nullid2} {
4475
	set ofill green
4476
    } else {
4477
	set ofill [expr {$listed != 0 ? $listed == 2 ? "gray" : "blue" : "white"}]
4478
    }
P
Paul Mackerras 已提交
4479 4480 4481
    set x [xc $row $col]
    set y [yc $row]
    set orad [expr {$linespc / 3}]
4482
    if {$listed <= 2} {
4483 4484 4485
	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]
4486
    } elseif {$listed == 3} {
4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500
	# triangle pointing left for left-side commits
	set t [$canv create polygon \
		   [expr {$x - $orad}] $y \
		   [expr {$x + $orad - 1}] [expr {$y - $orad}] \
		   [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
		   -fill $ofill -outline $fgcolor -width 1 -tags circle]
    } else {
	# triangle pointing right for right-side commits
	set t [$canv create polygon \
		   [expr {$x + $orad - 1}] $y \
		   [expr {$x - $orad}] [expr {$y - $orad}] \
		   [expr {$x - $orad}] [expr {$y + $orad - 1}] \
		   -fill $ofill -outline $fgcolor -width 1 -tags circle]
    }
P
Paul Mackerras 已提交
4501 4502
    $canv raise $t
    $canv bind $t <1> {selcanvline {} %x %y}
4503 4504 4505 4506 4507 4508 4509 4510 4511 4512
    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 已提交
4513
    }
4514
    set xt [xc $row $rmx]
P
Paul Mackerras 已提交
4515 4516 4517 4518 4519 4520 4521 4522 4523 4524
    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]
4525 4526
    set font mainfont
    set nfont mainfont
4527
    set isbold [ishighlighted $id]
4528
    if {$isbold > 0} {
4529
	lappend boldrows $row
4530
	set font mainfontbold
4531
	if {$isbold > 1} {
4532
	    lappend boldnamerows $row
4533
	    set nfont mainfontbold
4534
	}
4535
    }
4536 4537
    set linehtag($row) [$canv create text $xt $y -anchor w -fill $fgcolor \
			    -text $headline -font $font -tags text]
P
Paul Mackerras 已提交
4538
    $canv bind $linehtag($row) <Button-3> "rowmenu %X %Y $id"
4539 4540 4541
    set linentag($row) [$canv2 create text 3 $y -anchor w -fill $fgcolor \
			    -text $name -font $nfont -tags text]
    set linedtag($row) [$canv3 create text 3 $y -anchor w -fill $fgcolor \
4542
			    -text $date -font mainfont -tags text]
4543 4544 4545
    if {[info exists selectedline] && $selectedline == $row} {
	make_secsel $row
    }
4546
    set xr [expr {$xt + [font measure $font $headline]}]
4547 4548 4549 4550
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
P
Paul Mackerras 已提交
4551 4552 4553
}

proc drawcmitrow {row} {
4554
    global displayorder rowidlist nrows_drawn
4555
    global iddrawn markingmatches
4556
    global commitinfo numcommits
4557
    global filehighlight fhighlights findpattern nhighlights
4558
    global hlview vhighlights
4559
    global highlight_related rhighlights
P
Paul Mackerras 已提交
4560

4561
    if {$row >= $numcommits} return
P
Paul Mackerras 已提交
4562 4563

    set id [lindex $displayorder $row]
4564
    if {[info exists hlview] && ![info exists vhighlights($id)]} {
4565 4566
	askvhighlight $row $id
    }
4567
    if {[info exists filehighlight] && ![info exists fhighlights($id)]} {
4568 4569
	askfilehighlight $row $id
    }
4570
    if {$findpattern ne {} && ![info exists nhighlights($id)]} {
4571
	askfindhighlight $row $id
4572
    }
4573
    if {$highlight_related ne [mc "None"] && ![info exists rhighlights($id)]} {
4574 4575
	askrelhighlight $row $id
    }
4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587
    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
4588
	incr nrows_drawn
P
Paul Mackerras 已提交
4589
    }
4590 4591
    if {$markingmatches} {
	markrowmatches $row $id
P
Paul Mackerras 已提交
4592 4593 4594
    }
}

4595
proc drawcommits {row {endrow {}}} {
4596
    global numcommits iddrawn displayorder curview need_redisplay
4597
    global parentlist rowidlist rowfinal uparrowlen downarrowlen nrows_drawn
P
Paul Mackerras 已提交
4598 4599 4600 4601

    if {$row < 0} {
	set row 0
    }
4602 4603 4604
    if {$endrow eq {}} {
	set endrow $row
    }
P
Paul Mackerras 已提交
4605 4606 4607
    if {$endrow >= $numcommits} {
	set endrow [expr {$numcommits - 1}]
    }
4608

4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621
    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} {
4622
	if {[lindex $rowidlist $r] ne {} && [lindex $rowfinal $r]} {
4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637
	    if {$rl1 < $r} {
		layoutrows $rl1 $r
	    }
	    set rl1 [expr {$r + 1}]
	}
    }
    if {$rl1 < $r} {
	layoutrows $rl1 $r
    }
    optimize_rows $ro1 0 $r2
    if {$need_redisplay || $nrows_drawn > 2000} {
	clear_display
	drawvisible
    }

4638 4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650
    # 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)]
4651
	drawcmitrow $r
4652 4653
	if {$r == $er} break
	set nextid [lindex $displayorder [expr {$r + 1}]]
4654
	if {$wasdrawn && [info exists iddrawn($nextid)]} continue
4655 4656 4657 4658 4659
	drawparentlinks $id $r

	set rowids [lindex $rowidlist $r]
	foreach lid $rowids {
	    if {$lid eq {}} continue
4660
	    if {[info exists lineend($lid)] && $lineend($lid) > $r} continue
4661 4662 4663 4664 4665
	    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
4666
			set lineend($p) [drawlineseg $p $r $er 0]
4667 4668
		    }
		}
4669 4670
	    } else {
		set lineend($lid) [drawlineseg $lid $r $er 1]
4671 4672
	    }
	}
P
Paul Mackerras 已提交
4673 4674 4675
    }
}

4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693
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
    }
}

4694 4695
proc drawvisible {} {
    global canv linespc curview vrowmod selectedline targetrow targetid
4696
    global need_redisplay cscroll numcommits
4697

4698
    set fs [$canv yview]
4699
    set ymax [lindex [$canv cget -scrollregion] 3]
4700
    if {$ymax eq {} || $ymax == 0 || $numcommits == 0} return
4701 4702
    set f0 [lindex $fs 0]
    set f1 [lindex $fs 1]
4703 4704
    set y0 [expr {int($f0 * $ymax)}]
    set y1 [expr {int($f1 * $ymax)}]
4705 4706

    if {[info exists targetid]} {
4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725
	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
4726 4727 4728 4729
	}
    }

    set row [expr {int(($y0 - 3) / $linespc) - 1}]
4730
    set endrow [expr {int(($y1 - 3) / $linespc) + 1}]
4731 4732 4733 4734 4735 4736
    if {$endrow >= $vrowmod($curview)} {
	update_arcrows $curview
    }
    if {[info exists selectedline] &&
	$row <= $selectedline && $selectedline <= $endrow} {
	set targetrow $selectedline
4737
    } elseif {[info exists targetid]} {
4738 4739
	set targetrow [expr {int(($row + $endrow) / 2)}]
    }
4740 4741 4742 4743 4744
    if {[info exists targetrow]} {
	if {$targetrow >= $numcommits} {
	    set targetrow [expr {$numcommits - 1}]
	}
	set targetid [commitonrow $targetrow]
4745
    }
4746 4747 4748
    drawcommits $row $endrow
}

P
Paul Mackerras 已提交
4749
proc clear_display {} {
4750
    global iddrawn linesegs need_redisplay nrows_drawn
4751
    global vhighlights fhighlights nhighlights rhighlights
P
Paul Mackerras 已提交
4752 4753 4754

    allcanvs delete all
    catch {unset iddrawn}
4755
    catch {unset linesegs}
4756 4757 4758
    catch {unset vhighlights}
    catch {unset fhighlights}
    catch {unset nhighlights}
4759
    catch {unset rhighlights}
4760 4761
    set need_redisplay 0
    set nrows_drawn 0
P
Paul Mackerras 已提交
4762 4763
}

P
Paul Mackerras 已提交
4764
proc findcrossings {id} {
4765
    global rowidlist parentlist numcommits displayorder
P
Paul Mackerras 已提交
4766 4767 4768 4769 4770 4771 4772

    set cross {}
    set ccross {}
    foreach {s e} [rowranges $id] {
	if {$e >= $numcommits} {
	    set e [expr {$numcommits - 1}]
	}
4773
	if {$e <= $s} continue
P
Paul Mackerras 已提交
4774
	for {set row $e} {[incr row -1] >= $s} {} {
4775 4776
	    set x [lsearch -exact [lindex $rowidlist $row] $id]
	    if {$x < 0} break
P
Paul Mackerras 已提交
4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798
	    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]
}

4799
proc assigncolor {id} {
P
Paul Mackerras 已提交
4800
    global colormap colors nextcolor
4801
    global parents children children curview
4802

4803
    if {[info exists colormap($id)]} return
4804
    set ncolors [llength $colors]
4805 4806
    if {[info exists children($curview,$id)]} {
	set kids $children($curview,$id)
4807 4808 4809 4810 4811
    } else {
	set kids {}
    }
    if {[llength $kids] == 1} {
	set child [lindex $kids 0]
4812
	if {[info exists colormap($child)]
4813
	    && [llength $parents($curview,$child)] == 1} {
4814 4815
	    set colormap($id) $colormap($child)
	    return
4816
	}
4817 4818
    }
    set badcolors {}
P
Paul Mackerras 已提交
4819 4820 4821 4822 4823 4824
    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
4825
	}
P
Paul Mackerras 已提交
4826 4827 4828
	if {[info exists colormap($x)]
	    && [lsearch -exact $badcolors $colormap($x)] < 0} {
	    lappend badcolors $colormap($x)
4829 4830
	}
    }
P
Paul Mackerras 已提交
4831 4832
    if {[llength $badcolors] >= $ncolors} {
	set badcolors $origbad
4833
    }
P
Paul Mackerras 已提交
4834
    set origbad $badcolors
4835
    if {[llength $badcolors] < $ncolors - 1} {
4836
	foreach child $kids {
4837 4838 4839 4840
	    if {[info exists colormap($child)]
		&& [lsearch -exact $badcolors $colormap($child)] < 0} {
		lappend badcolors $colormap($child)
	    }
4841
	    foreach p $parents($curview,$child) {
4842 4843 4844
		if {[info exists colormap($p)]
		    && [lsearch -exact $badcolors $colormap($p)] < 0} {
		    lappend badcolors $colormap($p)
4845 4846 4847 4848 4849 4850
		}
	    }
	}
	if {[llength $badcolors] >= $ncolors} {
	    set badcolors $origbad
	}
4851 4852 4853 4854 4855
    }
    for {set i 0} {$i <= $ncolors} {incr i} {
	set c [lindex $colors $nextcolor]
	if {[incr nextcolor] >= $ncolors} {
	    set nextcolor 0
4856
	}
4857
	if {[lsearch -exact $badcolors $c]} break
4858
    }
4859
    set colormap($id) $c
4860 4861
}

4862 4863 4864 4865 4866 4867
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"
4868
    $canv bind $t <Button-1> "lineclick %x %y $id 1"
4869 4870
}

4871
proc drawtags {id x xt y1} {
4872
    global idtags idheads idotherrefs mainhead
4873
    global linespc lthickness
4874
    global canv rowtextx curview fgcolor bgcolor
4875 4876 4877

    set marks {}
    set ntags 0
4878
    set nheads 0
4879 4880 4881 4882 4883 4884
    if {[info exists idtags($id)]} {
	set marks $idtags($id)
	set ntags [llength $marks]
    }
    if {[info exists idheads($id)]} {
	set marks [concat $marks $idheads($id)]
4885 4886 4887 4888
	set nheads [llength $idheads($id)]
    }
    if {[info exists idotherrefs($id)]} {
	set marks [concat $marks $idotherrefs($id)]
4889 4890 4891 4892 4893 4894
    }
    if {$marks eq {}} {
	return $xt
    }

    set delta [expr {int(0.5 * ($linespc - $lthickness))}]
J
Jeff Hobbs 已提交
4895 4896
    set yt [expr {$y1 - 0.5 * $linespc}]
    set yb [expr {$yt + $linespc - 1}]
4897 4898
    set xvals {}
    set wvals {}
4899
    set i -1
4900
    foreach tag $marks {
4901 4902
	incr i
	if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} {
4903
	    set wid [font measure mainfontbold $tag]
4904
	} else {
4905
	    set wid [font measure mainfont $tag]
4906
	}
4907 4908 4909 4910 4911 4912 4913 4914
	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 已提交
4915 4916
	set xl [expr {$x + $delta}]
	set xr [expr {$x + $delta + $wid + $lthickness}]
4917
	set font mainfont
4918 4919
	if {[incr ntags -1] >= 0} {
	    # draw a tag
J
Jeff Hobbs 已提交
4920 4921
	    set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
		       $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
4922 4923
		       -width 1 -outline black -fill yellow -tags tag.$id]
	    $canv bind $t <1> [list showtag $tag 1]
4924
	    set rowtextx([rowofcommit $id]) [expr {$xr + $linespc}]
4925
	} else {
4926 4927 4928
	    # draw a head or other ref
	    if {[incr nheads -1] >= 0} {
		set col green
4929
		if {$tag eq $mainhead} {
4930
		    set font mainfontbold
4931
		}
4932 4933 4934
	    } else {
		set col "#ddddff"
	    }
J
Jeff Hobbs 已提交
4935
	    set xl [expr {$xl - $delta/2}]
4936
	    $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
4937
		-width 1 -outline black -fill $col -tags tag.$id
4938
	    if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
4939
	        set rwid [font measure mainfont $remoteprefix]
4940 4941 4942 4943 4944 4945
		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
	    }
4946
	}
4947
	set t [$canv create text $xl $y1 -anchor w -text $tag -fill $fgcolor \
4948
		   -font $font -tags [list tag.$id text]]
4949 4950
	if {$ntags >= 0} {
	    $canv bind $t <1> [list showtag $tag 1]
4951 4952
	} elseif {$nheads >= 0} {
	    $canv bind $t <Button-3> [list headmenu %X %Y $id $tag]
4953
	}
4954 4955 4956 4957
    }
    return $xt
}

4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968
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
}
4969

4970
proc show_status {msg} {
4971
    global canv fgcolor
4972 4973

    clear_display
4974
    $canv create text 3 3 -anchor nw -text $msg -font mainfont \
4975
	-tags text -fill $fgcolor
4976 4977
}

4978 4979 4980 4981 4982 4983 4984 4985 4986
# 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
4987 4988
}

4989 4990
proc nowbusy {what {name {}}} {
    global isbusy busyname statusw
4991 4992 4993 4994 4995 4996

    if {[array names isbusy] eq {}} {
	. config -cursor watch
	settextcursor watch
    }
    set isbusy($what) 1
4997 4998 4999 5000
    set busyname($what) $name
    if {$name ne {}} {
	$statusw conf -text $name
    }
5001 5002 5003
}

proc notbusy {what} {
5004
    global isbusy maincursor textcursor busyname statusw
5005

5006 5007 5008 5009 5010 5011 5012
    catch {
	unset isbusy($what)
	if {$busyname($what) ne {} &&
	    [$statusw cget -text] eq $busyname($what)} {
	    $statusw conf -text {}
	}
    }
5013 5014 5015 5016 5017 5018
    if {[array names isbusy] eq {}} {
	. config -cursor $maincursor
	settextcursor $textcursor
    }
}

5019
proc findmatches {f} {
5020
    global findtype findstring
5021
    if {$findtype == [mc "Regexp"]} {
5022
	set matches [regexp -indices -all -inline $findstring $f]
5023
    } else {
5024
	set fs $findstring
5025
	if {$findtype == [mc "IgnCase"]} {
5026 5027
	    set f [string tolower $f]
	    set fs [string tolower $fs]
5028 5029 5030
	}
	set matches {}
	set i 0
5031 5032 5033 5034
	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}]
5035 5036 5037 5038 5039
	}
    }
    return $matches
}

5040
proc dofind {{dirn 1} {wrap 1}} {
5041
    global findstring findstartline findcurline selectedline numcommits
5042
    global gdttype filehighlight fh_serial find_dirn findallowwrap
5043

5044 5045 5046 5047
    if {[info exists find_dirn]} {
	if {$find_dirn == $dirn} return
	stopfinding
    }
5048
    focus .
5049 5050
    if {$findstring eq {} || $numcommits == 0} return
    if {![info exists selectedline]} {
5051
	set findstartline [lindex [visiblerows] [expr {$dirn < 0}]]
5052
    } else {
5053
	set findstartline $selectedline
5054
    }
5055
    set findcurline $findstartline
5056 5057
    nowbusy finding [mc "Searching"]
    if {$gdttype ne [mc "containing:"] && ![info exists filehighlight]} {
5058 5059
	after cancel do_file_hl $fh_serial
	do_file_hl $fh_serial
5060
    }
5061 5062 5063
    set find_dirn $dirn
    set findallowwrap $wrap
    run findmore
5064 5065
}

5066 5067
proc stopfinding {} {
    global find_dirn findcurline fprogcoord
5068

5069 5070 5071 5072 5073 5074
    if {[info exists find_dirn]} {
	unset find_dirn
	unset findcurline
	notbusy finding
	set fprogcoord 0
	adjustprogress
5075 5076 5077 5078
    }
}

proc findmore {} {
5079
    global commitdata commitinfo numcommits findpattern findloc
5080
    global findstartline findcurline findallowwrap
5081
    global find_dirn gdttype fhighlights fprogcoord
5082
    global curview varcorder vrownum varccommits vrowmod
5083

5084
    if {![info exists find_dirn]} {
5085 5086
	return 0
    }
5087
    set fldtypes [list [mc "Headline"] [mc "Author"] [mc "Date"] [mc "Committer"] [mc "CDate"] [mc "Comments"]]
5088
    set l $findcurline
5089 5090 5091 5092 5093 5094 5095 5096 5097 5098 5099
    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 已提交
5100
	}
5101
    } else {
5102 5103
	if {$l == 0} {
	    set l $numcommits
5104
	}
5105 5106 5107
	incr l -1
	if {$l >= $findstartline} {
	    set lim [expr {$findstartline - 1}]
5108
	} else {
5109 5110
	    set lim -1
	    set moretodo $findallowwrap
5111
	}
5112
    }
5113 5114 5115 5116
    set n [expr {($lim - $l) * $find_dirn}]
    if {$n > 500} {
	set n 500
	set moretodo 1
5117
    }
5118 5119 5120
    if {$l + ($find_dirn > 0? $n: 1) > $vrowmod($curview)} {
	update_arcrows $curview
    }
5121 5122
    set found 0
    set domore 1
5123 5124 5125 5126 5127
    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]}]
5128
    if {$gdttype eq [mc "containing:"]} {
5129
	for {} {$n > 0} {incr n -1; incr l $find_dirn} {
5130 5131 5132 5133 5134 5135 5136 5137
	    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}]]
5138
	    # shouldn't happen unless git log doesn't give all the commits...
5139 5140 5141 5142
	    if {![info exists commitdata($id)] ||
		![doesmatch $commitdata($id)]} {
		continue
	    }
5143 5144 5145 5146 5147
	    if {![info exists commitinfo($id)]} {
		getcommit $id
	    }
	    set info $commitinfo($id)
	    foreach f $info ty $fldtypes {
5148
		if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
5149 5150 5151 5152 5153 5154
		    [doesmatch $f]} {
		    set found 1
		    break
		}
	    }
	    if {$found} break
5155
	}
5156
    } else {
5157
	for {} {$n > 0} {incr n -1; incr l $find_dirn} {
5158 5159 5160 5161 5162 5163 5164 5165
	    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}]]
5166 5167
	    if {![info exists fhighlights($id)]} {
		# this sets fhighlights($id) to -1
5168
		askfilehighlight $l $id
5169
	    }
5170
	    if {$fhighlights($id) > 0} {
5171 5172 5173
		set found $domore
		break
	    }
5174
	    if {$fhighlights($id) < 0} {
5175 5176
		if {$domore} {
		    set domore 0
5177
		    set findcurline [expr {$l - $find_dirn}]
5178
		}
5179 5180 5181
	    }
	}
    }
5182
    if {$found || ($domore && !$moretodo)} {
5183
	unset findcurline
5184
	unset find_dirn
5185
	notbusy finding
5186 5187 5188 5189 5190 5191 5192
	set fprogcoord 0
	adjustprogress
	if {$found} {
	    findselectline $l
	} else {
	    bell
	}
5193
	return 0
5194
    }
5195 5196
    if {!$domore} {
	flushhighlights
5197
    } else {
5198
	set findcurline [expr {$l - $find_dirn}]
5199
    }
5200
    set n [expr {($findcurline - $findstartline) * $find_dirn - 1}]
5201 5202
    if {$n < 0} {
	incr n $numcommits
5203
    }
5204 5205 5206
    set fprogcoord [expr {$n * 1.0 / $numcommits}]
    adjustprogress
    return $domore
5207 5208 5209
}

proc findselectline {l} {
5210
    global findloc commentend ctext findcurline markingmatches gdttype
5211 5212 5213

    set markingmatches 1
    set findcurline $l
5214
    selectline $l 1
5215
    if {$findloc == [mc "All fields"] || $findloc == [mc "Comments"]} {
5216 5217 5218 5219 5220
	# 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 已提交
5221
	    set end [expr {[lindex $match 1] + 1}]
5222 5223
	    $ctext tag add found "1.0 + $start c" "1.0 + $end c"
	}
5224
    }
5225
    drawvisible
5226 5227
}

5228
# mark the bits of a headline or author that match a find string
5229 5230 5231
proc markmatches {canv l str tag matches font row} {
    global selectedline

5232 5233 5234 5235 5236 5237 5238 5239
    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 已提交
5240 5241 5242 5243
	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 \
5244
		   -outline {} -tags [list match$l matches] -fill yellow]
5245
	$canv lower $t
5246 5247 5248
	if {[info exists selectedline] && $row == $selectedline} {
	    $canv raise $t secsel
	}
5249 5250 5251 5252
    }
}

proc unmarkmatches {} {
5253
    global markingmatches
5254

5255
    allcanvs delete matches
5256
    set markingmatches 0
5257
    stopfinding
5258 5259
}

5260
proc selcanvline {w x y} {
5261
    global canv canvy0 ctext linespc
P
Paul Mackerras 已提交
5262
    global rowtextx
5263
    set ymax [lindex [$canv cget -scrollregion] 3]
5264
    if {$ymax == {}} return
5265 5266 5267 5268 5269 5270
    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
    }
5271
    if {$w eq $canv} {
5272 5273 5274
	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
5275
    }
5276
    unmarkmatches
5277
    selectline $l 1
5278 5279
}

5280 5281
proc commit_descriptor {p} {
    global commitinfo
5282 5283 5284
    if {![info exists commitinfo($p)]} {
	getcommit $p
    }
5285
    set l "..."
5286
    if {[llength $commitinfo($p)] > 1} {
5287 5288
	set l [lindex $commitinfo($p) 0]
    }
P
Paul Mackerras 已提交
5289
    return "$p ($l)\n"
5290 5291
}

5292 5293
# append some text to the ctext widget, and make any SHA1 ID
# that we know about be a clickable link.
5294
proc appendwithlinks {text tags} {
5295
    global ctext linknum curview pendinglinks
5296 5297

    set start [$ctext index "end - 1c"]
5298
    $ctext insert end $text $tags
5299 5300 5301 5302 5303 5304
    set links [regexp -indices -all -inline {[0-9a-f]{40}} $text]
    foreach l $links {
	set s [lindex $l 0]
	set e [lindex $l 1]
	set linkid [string range $text $s $e]
	incr e
P
Paul Mackerras 已提交
5305
	$ctext tag delete link$linknum
5306
	$ctext tag add link$linknum "$start + $s c" "$start + $e c"
5307
	setlink $linkid link$linknum
5308 5309
	incr linknum
    }
5310 5311 5312
}

proc setlink {id lk} {
5313
    global curview ctext pendinglinks commitinterest
5314

5315
    if {[commitinview $id $curview]} {
5316
	$ctext tag conf $lk -foreground blue -underline 1
5317
	$ctext tag bind $lk <1> [list selectline [rowofcommit $id] 1]
5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337 5338 5339 5340 5341 5342 5343 5344 5345 5346
	$ctext tag bind $lk <Enter> {linkcursor %W 1}
	$ctext tag bind $lk <Leave> {linkcursor %W -1}
    } else {
	lappend pendinglinks($id) $lk
	lappend commitinterest($id) {makelink %I}
    }
}

proc makelink {id} {
    global pendinglinks

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

proc linkcursor {w inc} {
    global linkentercount curtextcursor

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

5349 5350 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364
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}]
}

5365 5366
# add a list of tag or branch names at position pos
# returns the number of names inserted
5367
proc appendrefs {pos ids var} {
5368
    global ctext linknum curview $var maxrefs
P
Paul Mackerras 已提交
5369

5370 5371 5372
    if {[catch {$ctext index $pos}]} {
	return 0
    }
5373 5374 5375 5376 5377 5378 5379 5380
    $ctext conf -state normal
    $ctext delete $pos "$pos lineend"
    set tags {}
    foreach id $ids {
	foreach tag [set $var\($id\)] {
	    lappend tags [list $tag $id]
	}
    }
5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392
    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
5393
	    setlink $id $lk
5394
	    set sep ", "
P
Paul Mackerras 已提交
5395 5396
	}
    }
5397
    $ctext conf -state disabled
5398
    return [llength $tags]
P
Paul Mackerras 已提交
5399 5400
}

5401 5402 5403
# called when we have finished computing the nearby tags
proc dispneartags {delay} {
    global selectedline currentid showneartags tagphase
5404

5405 5406 5407 5408 5409 5410 5411 5412
    if {![info exists selectedline] || !$showneartags} return
    after cancel dispnexttag
    if {$delay} {
	after 200 dispnexttag
	set tagphase -1
    } else {
	after idle dispnexttag
	set tagphase 0
5413 5414 5415
    }
}

5416 5417
proc dispnexttag {} {
    global selectedline currentid showneartags tagphase ctext
P
Paul Mackerras 已提交
5418 5419

    if {![info exists selectedline] || !$showneartags} return
5420 5421 5422 5423 5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 5441 5442 5443
    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
		}
	    }
5444 5445
	}
    }
5446 5447
    if {[incr tagphase] <= 2} {
	after idle dispnexttag
P
Paul Mackerras 已提交
5448 5449 5450
    }
}

5451 5452 5453 5454 5455 5456 5457 5458 5459 5460 5461 5462 5463 5464 5465 5466 5467 5468
proc make_secsel {l} {
    global linehtag linentag linedtag canv canv2 canv3

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

5469
proc selectline {l isnew} {
5470
    global canv ctext commitinfo selectedline
5471
    global canvy0 linespc parents children curview
5472
    global currentid sha1entry
P
Paul Mackerras 已提交
5473
    global commentend idtags linknum
5474
    global mergemax numcommits pending_select
5475
    global cmitmode showneartags allcommits
5476
    global targetrow targetid lastscrollrows
5477
    global autoselect
5478

5479
    catch {unset pending_select}
5480
    $canv delete hover
5481
    normalline
5482
    unsel_reflist
5483
    stopfinding
5484
    if {$l < 0 || $l >= $numcommits} return
5485 5486 5487
    set id [commitonrow $l]
    set targetid $id
    set targetrow $l
5488 5489 5490 5491 5492
    set selectedline $l
    set currentid $id
    if {$lastscrollrows < $numcommits} {
	setcanvscroll
    }
5493

5494
    set y [expr {$canvy0 + $l * $linespc}]
5495
    set ymax [lindex [$canv cget -scrollregion] 3]
5496 5497
    set ytop [expr {$y - $linespc - 1}]
    set ybot [expr {$y + $linespc + 1}]
5498
    set wnow [$canv yview]
J
Jeff Hobbs 已提交
5499 5500
    set wtop [expr {[lindex $wnow 0] * $ymax}]
    set wbot [expr {[lindex $wnow 1] * $ymax}]
5501 5502
    set wh [expr {$wbot - $wtop}]
    set newtop $wtop
5503
    if {$ytop < $wtop} {
5504 5505 5506 5507 5508 5509 5510
	if {$ybot < $wtop} {
	    set newtop [expr {$y - $wh / 2.0}]
	} else {
	    set newtop $ytop
	    if {$newtop > $wtop - $linespc} {
		set newtop [expr {$wtop - $linespc}]
	    }
5511
	}
5512 5513 5514 5515 5516 5517 5518 5519
    } 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}]
	    }
5520
	}
5521 5522 5523 5524 5525
    }
    if {$newtop != $wtop} {
	if {$newtop < 0} {
	    set newtop 0
	}
J
Jeff Hobbs 已提交
5526
	allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
P
Paul Mackerras 已提交
5527
	drawvisible
5528
    }
5529

5530
    make_secsel $l
P
Paul Mackerras 已提交
5531

5532
    if {$isnew} {
5533
	addtohistory [list selbyid $id]
5534 5535
    }

5536 5537
    $sha1entry delete 0 end
    $sha1entry insert 0 $id
5538 5539 5540 5541
    if {$autoselect} {
	$sha1entry selection from 0
	$sha1entry selection to end
    }
5542
    rhighlight_sel $id
5543

5544
    $ctext conf -state normal
5545
    clear_ctext
5546
    set linknum 0
5547 5548 5549
    if {![info exists commitinfo($id)]} {
	getcommit $id
    }
5550
    set info $commitinfo($id)
P
Paul Mackerras 已提交
5551
    set date [formatdate [lindex $info 2]]
5552
    $ctext insert end "[mc "Author"]: [lindex $info 1]  $date\n"
P
Paul Mackerras 已提交
5553
    set date [formatdate [lindex $info 4]]
5554
    $ctext insert end "[mc "Committer"]: [lindex $info 3]  $date\n"
5555
    if {[info exists idtags($id)]} {
5556
	$ctext insert end [mc "Tags:"]
5557 5558 5559 5560 5561
	foreach tag $idtags($id) {
	    $ctext insert end " $tag"
	}
	$ctext insert end "\n"
    }
5562

5563
    set headers {}
5564
    set olds $parents($curview,$id)
5565
    if {[llength $olds] > 1} {
5566
	set np 0
5567
	foreach p $olds {
5568 5569 5570 5571 5572
	    if {$np >= $mergemax} {
		set tag mmax
	    } else {
		set tag m$np
	    }
5573
	    $ctext insert end "[mc "Parent"]: " $tag
5574
	    appendwithlinks [commit_descriptor $p] {}
5575 5576 5577
	    incr np
	}
    } else {
5578
	foreach p $olds {
5579
	    append headers "[mc "Parent"]: [commit_descriptor $p]"
5580 5581
	}
    }
5582

5583
    foreach c $children($curview,$id) {
5584
	append headers "[mc "Child"]:  [commit_descriptor $c]"
5585
    }
5586 5587

    # make anything that looks like a SHA1 ID be a clickable link
5588
    appendwithlinks $headers {}
P
Paul Mackerras 已提交
5589 5590 5591 5592
    if {$showneartags} {
	if {![info exists allcommits]} {
	    getallcommits
	}
5593
	$ctext insert end "[mc "Branch"]: "
5594 5595
	$ctext mark set branch "end -1c"
	$ctext mark gravity branch left
5596
	$ctext insert end "\n[mc "Follows"]: "
P
Paul Mackerras 已提交
5597 5598
	$ctext mark set follows "end -1c"
	$ctext mark gravity follows left
5599
	$ctext insert end "\n[mc "Precedes"]: "
P
Paul Mackerras 已提交
5600 5601 5602
	$ctext mark set precedes "end -1c"
	$ctext mark gravity precedes left
	$ctext insert end "\n"
5603
	dispneartags 1
P
Paul Mackerras 已提交
5604 5605
    }
    $ctext insert end "\n"
5606 5607 5608 5609 5610
    set comment [lindex $info 5]
    if {[string first "\r" $comment] >= 0} {
	set comment [string map {"\r" "\n    "} $comment]
    }
    appendwithlinks $comment {comment}
5611

5612
    $ctext tag remove found 1.0 end
5613
    $ctext conf -state disabled
5614
    set commentend [$ctext index "end - 1c"]
5615

5616
    init_flist [mc "Comments"]
P
Paul Mackerras 已提交
5617 5618 5619
    if {$cmitmode eq "tree"} {
	gettree $id
    } elseif {[llength $olds] <= 1} {
5620
	startdiff $id
5621
    } else {
5622
	mergediff $id
5623 5624 5625
    }
}

5626 5627 5628 5629 5630 5631 5632 5633 5634 5635 5636 5637
proc selfirstline {} {
    unmarkmatches
    selectline 0 1
}

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

5638 5639
proc selnextline {dir} {
    global selectedline
5640
    focus .
5641
    if {![info exists selectedline]} return
J
Jeff Hobbs 已提交
5642
    set l [expr {$selectedline + $dir}]
5643
    unmarkmatches
5644 5645 5646
    selectline $l 1
}

5647 5648 5649 5650 5651 5652 5653 5654
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
5655
    drawvisible
5656 5657 5658 5659 5660 5661 5662 5663
    if {![info exists selectedline]} return
    set l [expr {$selectedline + $dir * $lpp}]
    if {$l < 0} {
	set l 0
    } elseif {$l >= $numcommits} {
        set l [expr $numcommits - 1]
    }
    unmarkmatches
5664
    selectline $l 1
5665 5666
}

5667
proc unselectline {} {
P
Paul Mackerras 已提交
5668
    global selectedline currentid
5669 5670

    catch {unset selectedline}
P
Paul Mackerras 已提交
5671
    catch {unset currentid}
5672
    allcanvs delete secsel
5673
    rhighlight_none
5674 5675
}

P
Paul Mackerras 已提交
5676 5677 5678 5679 5680 5681 5682 5683
proc reselectline {} {
    global selectedline

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

5684
proc addtohistory {cmd} {
5685
    global history historyindex curview
5686

5687
    set elt [list $curview $cmd]
5688
    if {$historyindex > 0
5689
	&& [lindex $history [expr {$historyindex - 1}]] == $elt} {
5690 5691 5692 5693
	return
    }

    if {$historyindex < [llength $history]} {
5694
	set history [lreplace $history $historyindex end $elt]
5695
    } else {
5696
	lappend history $elt
5697 5698 5699
    }
    incr historyindex
    if {$historyindex > 1} {
5700
	.tf.bar.leftbut conf -state normal
5701
    } else {
5702
	.tf.bar.leftbut conf -state disabled
5703
    }
5704
    .tf.bar.rightbut conf -state disabled
5705 5706
}

5707 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717
proc godo {elt} {
    global curview

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

5718 5719
proc goback {} {
    global history historyindex
5720
    focus .
5721 5722 5723

    if {$historyindex > 1} {
	incr historyindex -1
5724
	godo [lindex $history [expr {$historyindex - 1}]]
5725
	.tf.bar.rightbut conf -state normal
5726 5727
    }
    if {$historyindex <= 1} {
5728
	.tf.bar.leftbut conf -state disabled
5729 5730 5731 5732 5733
    }
}

proc goforw {} {
    global history historyindex
5734
    focus .
5735 5736

    if {$historyindex < [llength $history]} {
5737
	set cmd [lindex $history $historyindex]
5738
	incr historyindex
5739
	godo $cmd
5740
	.tf.bar.leftbut conf -state normal
5741 5742
    }
    if {$historyindex >= [llength $history]} {
5743
	.tf.bar.rightbut conf -state disabled
5744
    }
5745 5746
}

P
Paul Mackerras 已提交
5747
proc gettree {id} {
5748 5749
    global treefilelist treeidlist diffids diffmergeid treepending
    global nullid nullid2
P
Paul Mackerras 已提交
5750 5751 5752 5753 5754

    set diffids $id
    catch {unset diffmergeid}
    if {![info exists treefilelist($id)]} {
	if {![info exists treepending]} {
5755 5756 5757 5758
	    if {$id eq $nullid} {
		set cmd [list | git ls-files]
	    } elseif {$id eq $nullid2} {
		set cmd [list | git ls-files --stage -t]
5759
	    } else {
5760
		set cmd [list | git ls-tree -r $id]
5761 5762
	    }
	    if {[catch {set gtf [open $cmd r]}]} {
P
Paul Mackerras 已提交
5763 5764 5765 5766 5767 5768
		return
	    }
	    set treepending $id
	    set treefilelist($id) {}
	    set treeidlist($id) {}
	    fconfigure $gtf -blocking 0
5769
	    filerun $gtf [list gettreeline $gtf $id]
P
Paul Mackerras 已提交
5770 5771 5772 5773 5774 5775 5776
	}
    } else {
	setfilelist $id
    }
}

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

5779 5780
    set nl 0
    while {[incr nl] <= 1000 && [gets $gtf line] >= 0} {
5781 5782 5783 5784
	if {$diffids eq $nullid} {
	    set fname $line
	} else {
	    if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue
5785 5786 5787 5788
	    set i [string first "\t" $line]
	    if {$i < 0} continue
	    set sha1 [lindex $line 2]
	    set fname [string range $line [expr {$i+1}] end]
5789 5790 5791 5792 5793
	    if {[string index $fname 0] eq "\""} {
		set fname [lindex $fname 0]
	    }
	    lappend treeidlist($id) $sha1
	}
5794 5795 5796 5797
	lappend treefilelist($id) $fname
    }
    if {![eof $gtf]} {
	return [expr {$nl >= 1000? 2: 1}]
P
Paul Mackerras 已提交
5798 5799 5800 5801 5802 5803 5804 5805 5806 5807 5808 5809
    }
    close $gtf
    unset treepending
    if {$cmitmode ne "tree"} {
	if {![info exists diffmergeid]} {
	    gettreediffs $diffids
	}
    } elseif {$id ne $diffids} {
	gettree $diffids
    } else {
	setfilelist $id
    }
5810
    return 0
P
Paul Mackerras 已提交
5811 5812 5813
}

proc showfile {f} {
5814
    global treefilelist treeidlist diffids nullid nullid2
P
Paul Mackerras 已提交
5815 5816 5817 5818 5819 5820 5821
    global ctext commentend

    set i [lsearch -exact $treefilelist($diffids) $f]
    if {$i < 0} {
	puts "oops, $f not in list for id $diffids"
	return
    }
5822 5823 5824
    if {$diffids eq $nullid} {
	if {[catch {set bf [open $f r]} err]} {
	    puts "oops, can't read $f: $err"
5825 5826 5827
	    return
	}
    } else {
5828 5829 5830
	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"
5831 5832
	    return
	}
P
Paul Mackerras 已提交
5833 5834
    }
    fconfigure $bf -blocking 0
5835
    filerun $bf [list getblobline $bf $diffids]
P
Paul Mackerras 已提交
5836
    $ctext config -state normal
5837
    clear_ctext $commentend
P
Paul Mackerras 已提交
5838 5839 5840 5841
    $ctext insert end "\n"
    $ctext insert end "$f\n" filesep
    $ctext config -state disabled
    $ctext yview $commentend
5842
    settabs 0
P
Paul Mackerras 已提交
5843 5844 5845 5846 5847 5848 5849
}

proc getblobline {bf id} {
    global diffids cmitmode ctext

    if {$id ne $diffids || $cmitmode ne "tree"} {
	catch {close $bf}
5850
	return 0
P
Paul Mackerras 已提交
5851 5852
    }
    $ctext config -state normal
5853 5854
    set nl 0
    while {[incr nl] <= 1000 && [gets $bf line] >= 0} {
P
Paul Mackerras 已提交
5855 5856 5857 5858 5859 5860
	$ctext insert end "$line\n"
    }
    if {[eof $bf]} {
	# delete last newline
	$ctext delete "end - 2c" "end - 1c"
	close $bf
5861
	return 0
P
Paul Mackerras 已提交
5862 5863
    }
    $ctext config -state disabled
5864
    return [expr {$nl >= 1000? 2: 1}]
P
Paul Mackerras 已提交
5865 5866
}

5867
proc mergediff {id} {
5868
    global diffmergeid mdifffd
5869
    global diffids
5870
    global parents
5871
    global diffcontext
5872
    global limitdiffs viewfiles curview
5873

5874
    set diffmergeid $id
5875
    set diffids $id
5876
    # this doesn't seem to actually affect anything...
5877
    set cmd [concat | git diff-tree --no-commit-id --cc -U$diffcontext $id]
5878 5879 5880
    if {$limitdiffs && $viewfiles($curview) ne {}} {
	set cmd [concat $cmd -- $viewfiles($curview)]
    }
5881
    if {[catch {set mdf [open $cmd r]} err]} {
5882
	error_popup "[mc "Error getting merge diffs:"] $err"
5883
	return
5884
    }
5885 5886
    fconfigure $mdf -blocking 0
    set mdifffd($id) $mdf
5887
    set np [llength $parents($curview,$id)]
5888
    settabs $np
5889
    filerun $mdf [list getmergediffline $mdf $id $np]
5890 5891
}

5892
proc getmergediffline {mdf id np} {
5893
    global diffmergeid ctext cflist mergemax
5894
    global difffilestart mdifffd
5895

5896 5897 5898 5899 5900
    $ctext conf -state normal
    set nr 0
    while {[incr nr] <= 1000 && [gets $mdf line] >= 0} {
	if {![info exists diffmergeid] || $id != $diffmergeid
	    || $mdf != $mdifffd($id)} {
5901
	    close $mdf
5902
	    return 0
5903
	}
5904 5905 5906 5907 5908 5909 5910 5911 5912 5913 5914 5915 5916 5917 5918 5919 5920 5921 5922 5923 5924 5925 5926 5927 5928 5929 5930 5931 5932 5933 5934
	if {[regexp {^diff --cc (.*)} $line match fname]} {
	    # start of a new file
	    $ctext insert end "\n"
	    set here [$ctext index "end - 1c"]
	    lappend difffilestart $here
	    add_flist [list $fname]
	    set l [expr {(78 - [string length $fname]) / 2}]
	    set pad [string range "----------------------------------------" 1 $l]
	    $ctext insert end "$pad $fname $pad\n" filesep
	} elseif {[regexp {^@@} $line]} {
	    $ctext insert end "$line\n" hunksep
	} elseif {[regexp {^[0-9a-f]{40}$} $line] || [regexp {^index} $line]} {
	    # do nothing
	} else {
	    # parse the prefix - one ' ', '-' or '+' for each parent
	    set spaces {}
	    set minuses {}
	    set pluses {}
	    set isbad 0
	    for {set j 0} {$j < $np} {incr j} {
		set c [string range $line $j $j]
		if {$c == " "} {
		    lappend spaces $j
		} elseif {$c == "-"} {
		    lappend minuses $j
		} elseif {$c == "+"} {
		    lappend pluses $j
		} else {
		    set isbad 1
		    break
		}
5935
	    }
5936 5937 5938 5939 5940 5941 5942 5943 5944
	    set tags {}
	    set num {}
	    if {!$isbad && $minuses ne {} && $pluses eq {}} {
		# line doesn't appear in result, parents in $minuses have the line
		set num [lindex $minuses 0]
	    } elseif {!$isbad && $pluses ne {} && $minuses eq {}} {
		# line appears in result, parents in $pluses don't have the line
		lappend tags mresult
		set num [lindex $spaces 0]
5945
	    }
5946 5947 5948 5949 5950 5951 5952
	    if {$num ne {}} {
		if {$num >= $mergemax} {
		    set num "max"
		}
		lappend tags m$num
	    }
	    $ctext insert end "$line\n" $tags
5953
	}
5954 5955
    }
    $ctext conf -state disabled
5956 5957 5958
    if {[eof $mdf]} {
	close $mdf
	return 0
5959
    }
5960
    return [expr {$nr >= 1000? 2: 1}]
5961 5962
}

5963
proc startdiff {ids} {
5964
    global treediffs diffids treepending diffmergeid nullid nullid2
5965

5966
    settabs 1
5967
    set diffids $ids
5968
    catch {unset diffmergeid}
5969 5970 5971
    if {![info exists treediffs($ids)] ||
	[lsearch -exact $ids $nullid] >= 0 ||
	[lsearch -exact $ids $nullid2] >= 0} {
5972
	if {![info exists treepending]} {
5973
	    gettreediffs $ids
5974 5975
	}
    } else {
5976
	addtocflist $ids
5977 5978 5979
    }
}

5980 5981 5982
proc path_filter {filter name} {
    foreach p $filter {
	set l [string length $p]
5983 5984 5985 5986 5987 5988 5989 5990 5991 5992
	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
	    }
5993 5994 5995 5996 5997
	}
    }
    return 0
}

5998
proc addtocflist {ids} {
5999
    global treediffs
6000

6001
    add_flist $treediffs($ids)
6002
    getblobdiffs $ids
6003 6004
}

6005
proc diffcmd {ids flags} {
6006
    global nullid nullid2
6007 6008

    set i [lsearch -exact $ids $nullid]
6009
    set j [lsearch -exact $ids $nullid2]
6010
    if {$i >= 0} {
6011 6012 6013 6014 6015 6016 6017 6018 6019 6020 6021 6022 6023 6024 6025 6026 6027
	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]
6028
	if {[llength $ids] > 1} {
6029
	    # comparing index with specific revision
6030 6031 6032 6033 6034 6035
	    if {$i == 0} {
		lappend cmd -R [lindex $ids 1]
	    } else {
		lappend cmd [lindex $ids 0]
	    }
	} else {
6036
	    # comparing index with HEAD
6037 6038 6039
	    lappend cmd HEAD
	}
    } else {
6040
	set cmd [concat | git diff-tree -r $flags $ids]
6041 6042 6043 6044
    }
    return $cmd
}

6045
proc gettreediffs {ids} {
6046
    global treediff treepending
6047

6048
    set treepending $ids
6049
    set treediff {}
6050
    if {[catch {set gdtf [open [diffcmd $ids {--no-commit-id}] r]}]} return
6051
    fconfigure $gdtf -blocking 0
6052
    filerun $gdtf [list gettreediffline $gdtf $ids]
6053 6054
}

6055
proc gettreediffline {gdtf ids} {
6056
    global treediff treediffs treepending diffids diffmergeid
6057
    global cmitmode viewfiles curview limitdiffs
6058

6059 6060
    set nr 0
    while {[incr nr] <= 1000 && [gets $gdtf line] >= 0} {
6061 6062 6063 6064 6065 6066 6067 6068
	set i [string first "\t" $line]
	if {$i >= 0} {
	    set file [string range $line [expr {$i+1}] end]
	    if {[string index $file 0] eq "\""} {
		set file [lindex $file 0]
	    }
	    lappend treediff $file
	}
6069 6070 6071 6072 6073
    }
    if {![eof $gdtf]} {
	return [expr {$nr >= 1000? 2: 1}]
    }
    close $gdtf
6074 6075 6076 6077 6078 6079 6080 6081 6082 6083 6084
    if {$limitdiffs && $viewfiles($curview) ne {}} {
	set flist {}
	foreach f $treediff {
	    if {[path_filter $viewfiles($curview) $f]} {
		lappend flist $f
	    }
	}
	set treediffs($ids) $flist
    } else {
	set treediffs($ids) $treediff
    }
6085 6086 6087 6088 6089 6090
    unset treepending
    if {$cmitmode eq "tree"} {
	gettree $diffids
    } elseif {$ids != $diffids} {
	if {![info exists diffmergeid]} {
	    gettreediffs $diffids
6091
	}
6092 6093
    } else {
	addtocflist $ids
6094
    }
6095
    return 0
6096 6097
}

6098 6099 6100 6101 6102 6103 6104 6105 6106 6107 6108 6109 6110 6111 6112 6113
# 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
	}
    }
}

6114 6115 6116 6117
proc changeignorespace {} {
    reselectline
}

6118
proc getblobdiffs {ids} {
6119
    global blobdifffd diffids env
6120
    global diffinhdr treediffs
6121
    global diffcontext
6122
    global ignorespace
6123
    global limitdiffs viewfiles curview
6124

6125
    set cmd [diffcmd $ids "-p -C --no-commit-id -U$diffcontext"]
6126 6127 6128
    if {$ignorespace} {
	append cmd " -w"
    }
6129
    if {$limitdiffs && $viewfiles($curview) ne {}} {
6130
	set cmd [concat $cmd -- $viewfiles($curview)]
6131 6132
    }
    if {[catch {set bdf [open $cmd r]} err]} {
6133 6134 6135
	puts "error getting diffs: $err"
	return
    }
6136
    set diffinhdr 0
6137
    fconfigure $bdf -blocking 0
6138
    set blobdifffd($ids) $bdf
6139
    filerun $bdf [list getblobdiffline $bdf $diffids]
6140 6141
}

6142 6143 6144 6145 6146 6147 6148 6149 6150 6151 6152 6153 6154
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
    }
}

6155 6156 6157 6158 6159 6160 6161 6162 6163 6164 6165 6166
proc makediffhdr {fname ids} {
    global ctext curdiffstart treediffs

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

6167
proc getblobdiffline {bdf ids} {
6168
    global diffids blobdifffd ctext curdiffstart
6169
    global diffnexthead diffnextnote difffilestart
6170
    global diffinhdr treediffs
6171

6172
    set nr 0
6173
    $ctext conf -state normal
6174 6175 6176 6177
    while {[incr nr] <= 1000 && [gets $bdf line] >= 0} {
	if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
	    close $bdf
	    return 0
6178
	}
6179 6180 6181 6182
	if {![string compare -length 11 "diff --git " $line]} {
	    # trim off "diff --git "
	    set line [string range $line 11 end]
	    set diffinhdr 1
6183 6184
	    # start of a new file
	    $ctext insert end "\n"
6185 6186 6187 6188 6189 6190
	    set curdiffstart [$ctext index "end - 1c"]
	    $ctext insert end "\n" filesep
	    # If the name hasn't changed the length will be odd,
	    # the middle char will be a space, and the two bits either
	    # side will be a/name and b/name, or "a/name" and "b/name".
	    # If the name has changed we'll get "rename from" and
6191 6192
	    # "rename to" or "copy from" and "copy to" lines following this,
	    # and we'll use them to get the filenames.
6193 6194 6195 6196 6197 6198 6199 6200
	    # 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
6201
	    }
6202 6203 6204 6205 6206
	    # 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}]]
6207
	    }
6208 6209 6210
	    makediffhdr $fname $ids

	} elseif {[regexp {^@@ -([0-9]+)(,[0-9]+)? \+([0-9]+)(,[0-9]+)? @@(.*)} \
6211 6212 6213
		       $line match f1l f1c f2l f2c rest]} {
	    $ctext insert end "$line\n" hunksep
	    set diffinhdr 0
6214 6215

	} elseif {$diffinhdr} {
6216
	    if {![string compare -length 12 "rename from " $line]} {
6217
		set fname [string range $line [expr 6 + [string first " from " $line] ] end]
6218 6219 6220 6221 6222 6223 6224
		if {[string index $fname 0] eq "\""} {
		    set fname [lindex $fname 0]
		}
		set i [lsearch -exact $treediffs($ids) $fname]
		if {$i >= 0} {
		    setinlist difffilestart $i $curdiffstart
		}
6225 6226 6227
	    } 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]
6228 6229 6230 6231 6232 6233 6234 6235 6236 6237 6238 6239 6240
		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

6241
	} else {
6242 6243 6244 6245 6246 6247 6248
	    set x [string range $line 0 0]
	    if {$x == "-" || $x == "+"} {
		set tag [expr {$x == "+"}]
		$ctext insert end "$line\n" d$tag
	    } elseif {$x == " "} {
		$ctext insert end "$line\n"
	    } else {
6249 6250 6251
		# "\ No newline at end of file",
		# or something else we don't recognize
		$ctext insert end "$line\n" hunksep
6252 6253 6254 6255
	    }
	}
    }
    $ctext conf -state disabled
6256 6257 6258
    if {[eof $bdf]} {
	close $bdf
	return 0
6259
    }
6260
    return [expr {$nr >= 1000? 2: 1}]
6261 6262
}

6263 6264 6265 6266 6267 6268 6269
proc changediffdisp {} {
    global ctext diffelide

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

6270 6271 6272 6273 6274 6275 6276 6277 6278 6279 6280 6281 6282 6283
proc prevfile {} {
    global difffilestart ctext
    set prev [lindex $difffilestart 0]
    set here [$ctext index @0,0]
    foreach loc $difffilestart {
	if {[$ctext compare $loc >= $here]} {
	    $ctext yview $prev
	    return
	}
	set prev $loc
    }
    $ctext yview $prev
}

6284 6285 6286
proc nextfile {} {
    global difffilestart ctext
    set here [$ctext index @0,0]
6287 6288 6289
    foreach loc $difffilestart {
	if {[$ctext compare $loc > $here]} {
	    $ctext yview $loc
6290
	    return
6291 6292
	}
    }
6293 6294
}

6295 6296
proc clear_ctext {{first 1.0}} {
    global ctext smarktop smarkbot
6297
    global pendinglinks
6298

6299 6300 6301
    set l [lindex [split $first .] 0]
    if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} {
	set smarktop $l
6302
    }
6303 6304
    if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} {
	set smarkbot $l
6305 6306
    }
    $ctext delete $first end
6307 6308 6309
    if {$first eq "1.0"} {
	catch {unset pendinglinks}
    }
6310 6311
}

6312
proc settabs {{firstab {}}} {
6313
    global firsttabstop tabstop ctext have_tk85
6314 6315 6316 6317

    if {$firstab ne {} && $have_tk85} {
	set firsttabstop $firstab
    }
6318
    set w [font measure textfont "0"]
6319
    if {$firsttabstop != 0} {
6320 6321
	$ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \
			       [expr {($firsttabstop + 2 * $tabstop) * $w}]]
6322 6323 6324 6325 6326
    } elseif {$have_tk85 || $tabstop != 8} {
	$ctext conf -tabs [expr {$tabstop * $w}]
    } else {
	$ctext conf -tabs {}
    }
6327 6328 6329
}

proc incrsearch {name ix op} {
6330
    global ctext searchstring searchdirn
6331 6332

    $ctext tag remove found 1.0 end
6333 6334 6335 6336 6337 6338 6339 6340 6341 6342 6343
    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]
	}
    }
6344
    if {$searchstring ne {}} {
6345 6346 6347 6348
	set here [$ctext search $searchdirn -- $searchstring anchor]
	if {$here ne {}} {
	    $ctext see $here
	}
6349 6350 6351 6352 6353
	searchmarkvisible 1
    }
}

proc dosearch {} {
6354
    global sstring ctext searchstring searchdirn
6355 6356 6357

    focus $sstring
    $sstring icursor end
6358 6359 6360 6361 6362 6363 6364 6365 6366 6367 6368 6369 6370 6371 6372 6373 6374 6375 6376 6377 6378 6379 6380 6381 6382 6383 6384 6385 6386 6387 6388 6389 6390 6391 6392 6393 6394 6395 6396 6397 6398 6399 6400 6401
    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
6402 6403 6404 6405 6406 6407 6408 6409 6410 6411 6412 6413 6414 6415 6416 6417 6418 6419 6420 6421 6422 6423 6424 6425 6426 6427 6428 6429 6430 6431 6432 6433 6434 6435 6436 6437 6438 6439
    }
}

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} {
6440
    global searchstring
6441

6442
    .bleft.bottom.sb set $f0 $f1
6443 6444 6445 6446 6447
    if {$searchstring ne {}} {
	searchmarkvisible 0
    }
}

6448
proc setcoords {} {
6449
    global linespc charspc canvx0 canvy0
6450
    global xspc1 xspc2 lthickness
6451

6452 6453
    set linespc [font metrics mainfont -linespace]
    set charspc [font measure mainfont "m"]
P
Paul Mackerras 已提交
6454 6455
    set canvy0 [expr {int(3 + 0.5 * $linespc)}]
    set canvx0 [expr {int(3 + 0.5 * $linespc)}]
6456
    set lthickness [expr {int($linespc / 9) + 1}]
6457 6458
    set xspc1(0) $linespc
    set xspc2 $linespc
6459
}
6460

6461
proc redisplay {} {
6462
    global canv
P
Paul Mackerras 已提交
6463 6464 6465 6466 6467 6468
    global selectedline

    set ymax [lindex [$canv cget -scrollregion] 3]
    if {$ymax eq {} || $ymax == 0} return
    set span [$canv yview]
    clear_display
6469
    setcanvscroll
P
Paul Mackerras 已提交
6470 6471 6472 6473
    allcanvs yview moveto [lindex $span 0]
    drawvisible
    if {[info exists selectedline]} {
	selectline $selectedline 0
6474
	allcanvs yview moveto [lindex $span 0]
6475 6476 6477
    }
}

6478 6479 6480 6481 6482 6483 6484 6485 6486
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)}]
6487
    }
6488 6489 6490 6491 6492 6493 6494 6495 6496 6497
    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}
	}
6498
    }
6499 6500 6501 6502 6503 6504 6505 6506 6507 6508 6509 6510 6511 6512 6513 6514
}

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"
6515
    }
6516 6517
    if {$fontattr($f,slant) eq "italic"} {
	lappend n "italic"
6518
    }
6519
    return $n
6520 6521
}

6522
proc incrfont {inc} {
6523
    global mainfont textfont ctext canv cflist showrefstop
6524 6525
    global stopped entries fontattr

6526
    unmarkmatches
6527
    set s $fontattr(mainfont,size)
6528 6529 6530 6531
    incr s $inc
    if {$s < 1} {
	set s 1
    }
6532
    set fontattr(mainfont,size) $s
6533 6534
    font config mainfont -size $s
    font config mainfontbold -size $s
6535 6536
    set mainfont [fontname mainfont]
    set s $fontattr(textfont,size)
6537 6538 6539 6540
    incr s $inc
    if {$s < 1} {
	set s 1
    }
6541
    set fontattr(textfont,size) $s
6542 6543
    font config textfont -size $s
    font config textfontbold -size $s
6544
    set textfont [fontname textfont]
6545
    setcoords
6546
    settabs
6547 6548
    redisplay
}
6549

6550 6551 6552 6553 6554 6555 6556
proc clearsha1 {} {
    global sha1entry sha1string
    if {[string length $sha1string] == 40} {
	$sha1entry delete 0 end
    }
}

6557 6558 6559 6560 6561 6562 6563 6564 6565 6566
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"} {
6567
	$sha1but conf -state normal -relief raised -text "[mc "Goto:"] "
6568
    } else {
6569
	$sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] "
6570 6571 6572 6573
    }
}

proc gotocommit {} {
6574
    global sha1string tagids headids curview varcid
6575

6576 6577 6578 6579
    if {$sha1string == {}
	|| ([info exists currentid] && $sha1string == $currentid)} return
    if {[info exists tagids($sha1string)]} {
	set id $tagids($sha1string)
6580 6581
    } elseif {[info exists headids($sha1string)]} {
	set id $headids($sha1string)
6582 6583
    } else {
	set id [string tolower $sha1string]
6584
	if {[regexp {^[0-9a-f]{4,39}$} $id]} {
6585
	    set matches [array names varcid "$curview,$id*"]
6586 6587
	    if {$matches ne {}} {
		if {[llength $matches] > 1} {
6588
		    error_popup [mc "Short SHA1 id %s is ambiguous" $id]
6589 6590
		    return
		}
6591
		set id [lindex [split [lindex $matches 0] ","] 1]
6592 6593
	    }
	}
6594
    }
6595 6596
    if {[commitinview $id $curview]} {
	selectline [rowofcommit $id] 1
6597 6598
	return
    }
6599
    if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
6600
	set msg [mc "SHA1 id %s is not known" $sha1string]
6601
    } else {
6602
	set msg [mc "Tag/Head %s is not known" $sha1string]
6603
    }
6604
    error_popup $msg
6605 6606
}

6607 6608 6609 6610
proc lineenter {x y id} {
    global hoverx hovery hoverid hovertimer
    global commitinfo canv

P
Paul Mackerras 已提交
6611
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
6612 6613 6614 6615 6616 6617 6618 6619 6620 6621 6622 6623 6624 6625 6626 6627 6628 6629 6630 6631 6632 6633 6634 6635 6636 6637 6638 6639 6640 6641 6642 6643 6644 6645 6646 6647 6648 6649 6650
    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
6651
    global commitinfo
6652 6653 6654 6655 6656 6657 6658 6659 6660

    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}]
6661
    set x1 [expr {$x + [font measure mainfont $text] + 2 * $lthickness}]
6662 6663 6664 6665
    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
6666
    set t [$canv create text $x $y -anchor nw -text $text -tags hover \
6667
	       -font mainfont]
6668 6669 6670
    $canv raise $t
}

6671
proc clickisonarrow {id y} {
P
Paul Mackerras 已提交
6672
    global lthickness
6673

P
Paul Mackerras 已提交
6674
    set ranges [rowranges $id]
6675
    set thresh [expr {2 * $lthickness + 6}]
P
Paul Mackerras 已提交
6676
    set n [expr {[llength $ranges] - 1}]
6677
    for {set i 1} {$i < $n} {incr i} {
P
Paul Mackerras 已提交
6678
	set row [lindex $ranges $i]
6679 6680
	if {abs([yc $row] - $y) < $thresh} {
	    return $i
6681 6682 6683 6684 6685
	}
    }
    return {}
}

6686
proc arrowjump {id n y} {
P
Paul Mackerras 已提交
6687
    global canv
6688

6689 6690
    # 1 <-> 2, 3 <-> 4, etc...
    set n [expr {(($n - 1) ^ 1) + 1}]
P
Paul Mackerras 已提交
6691
    set row [lindex [rowranges $id] $n]
6692
    set yt [yc $row]
6693 6694 6695 6696 6697 6698 6699 6700
    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
    }
6701
    allcanvs yview moveto $yfrac
6702 6703
}

6704
proc lineclick {x y id isnew} {
6705
    global ctext commitinfo children canv thickerline curview
6706

P
Paul Mackerras 已提交
6707
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
6708
    unmarkmatches
6709
    unselectline
6710 6711 6712 6713
    normalline
    $canv delete hover
    # draw this line thicker than normal
    set thickerline $id
6714
    drawlines $id
6715
    if {$isnew} {
6716 6717 6718 6719 6720 6721 6722 6723 6724 6725 6726 6727 6728
	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]
6729
    }
6730 6731
    # fill the details pane with info about this line
    $ctext conf -state normal
6732
    clear_ctext
6733
    settabs 0
6734
    $ctext insert end "[mc "Parent"]:\t"
6735 6736
    $ctext insert end $id link0
    setlink $id link0
6737
    set info $commitinfo($id)
6738
    $ctext insert end "\n\t[lindex $info 0]\n"
6739
    $ctext insert end "\t[mc "Author"]:\t[lindex $info 1]\n"
P
Paul Mackerras 已提交
6740
    set date [formatdate [lindex $info 2]]
6741
    $ctext insert end "\t[mc "Date"]:\t$date\n"
6742
    set kids $children($curview,$id)
6743
    if {$kids ne {}} {
6744
	$ctext insert end "\n[mc "Children"]:"
6745
	set i 0
6746
	foreach child $kids {
6747
	    incr i
P
Paul Mackerras 已提交
6748
	    if {![info exists commitinfo($child)] && ![getcommit $child]} continue
6749
	    set info $commitinfo($child)
6750
	    $ctext insert end "\n\t"
6751 6752
	    $ctext insert end $child link$i
	    setlink $child link$i
6753
	    $ctext insert end "\n\t[lindex $info 0]"
6754
	    $ctext insert end "\n\t[mc "Author"]:\t[lindex $info 1]"
P
Paul Mackerras 已提交
6755
	    set date [formatdate [lindex $info 2]]
6756
	    $ctext insert end "\n\t[mc "Date"]:\t$date\n"
6757 6758 6759
	}
    }
    $ctext conf -state disabled
6760
    init_flist {}
6761 6762
}

6763 6764 6765
proc normalline {} {
    global thickerline
    if {[info exists thickerline]} {
6766
	set id $thickerline
6767
	unset thickerline
6768
	drawlines $id
6769 6770 6771
    }
}

6772
proc selbyid {id} {
6773 6774 6775
    global curview
    if {[commitinview $id $curview]} {
	selectline [rowofcommit $id] 1
6776 6777 6778 6779 6780 6781 6782 6783 6784 6785 6786 6787
    }
}

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} {
6788
    global rowctxmenu selectedline rowmenuid curview
6789
    global nullid nullid2 fakerowmenu mainhead
6790

6791
    stopfinding
6792
    set rowmenuid $id
6793
    if {![info exists selectedline]
6794
	|| [rowofcommit $id] eq $selectedline} {
6795 6796 6797 6798
	set state disabled
    } else {
	set state normal
    }
6799
    if {$id ne $nullid && $id ne $nullid2} {
6800
	set menu $rowctxmenu
6801
	$menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead]
6802 6803 6804
    } else {
	set menu $fakerowmenu
    }
6805 6806 6807
    $menu entryconfigure [mc "Diff this -> selected"] -state $state
    $menu entryconfigure [mc "Diff selected -> this"] -state $state
    $menu entryconfigure [mc "Make patch"] -state $state
6808
    tk_popup $menu $x $y
6809 6810 6811
}

proc diffvssel {dirn} {
6812
    global rowmenuid selectedline
6813 6814 6815

    if {![info exists selectedline]} return
    if {$dirn} {
6816
	set oldid [commitonrow $selectedline]
6817 6818 6819
	set newid $rowmenuid
    } else {
	set oldid $rowmenuid
6820
	set newid [commitonrow $selectedline]
6821
    }
6822 6823 6824 6825 6826
    addtohistory [list doseldiff $oldid $newid]
    doseldiff $oldid $newid
}

proc doseldiff {oldid newid} {
6827
    global ctext
6828 6829
    global commitinfo

6830
    $ctext conf -state normal
6831
    clear_ctext
6832 6833
    init_flist [mc "Top"]
    $ctext insert end "[mc "From"] "
6834 6835
    $ctext insert end $oldid link0
    setlink $oldid link0
6836
    $ctext insert end "\n     "
6837
    $ctext insert end [lindex $commitinfo($oldid) 0]
6838
    $ctext insert end "\n\n[mc "To"]   "
6839 6840
    $ctext insert end $newid link1
    setlink $newid link1
6841
    $ctext insert end "\n     "
6842 6843 6844 6845
    $ctext insert end [lindex $commitinfo($newid) 0]
    $ctext insert end "\n"
    $ctext conf -state disabled
    $ctext tag remove found 1.0 end
6846
    startdiff [list $oldid $newid]
6847 6848
}

6849 6850 6851 6852 6853 6854 6855 6856 6857 6858 6859 6860
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
6861
    label $top.title -text [mc "Generate patch"]
6862
    grid $top.title - -pady 10
6863
    label $top.from -text [mc "From:"]
6864
    entry $top.fromsha1 -width 40 -relief flat
6865 6866 6867
    $top.fromsha1 insert 0 $oldid
    $top.fromsha1 conf -state readonly
    grid $top.from $top.fromsha1 -sticky w
6868
    entry $top.fromhead -width 60 -relief flat
6869 6870 6871
    $top.fromhead insert 0 $oldhead
    $top.fromhead conf -state readonly
    grid x $top.fromhead -sticky w
6872
    label $top.to -text [mc "To:"]
6873
    entry $top.tosha1 -width 40 -relief flat
6874 6875 6876
    $top.tosha1 insert 0 $newid
    $top.tosha1 conf -state readonly
    grid $top.to $top.tosha1 -sticky w
6877
    entry $top.tohead -width 60 -relief flat
6878 6879 6880
    $top.tohead insert 0 $newhead
    $top.tohead conf -state readonly
    grid x $top.tohead -sticky w
6881
    button $top.rev -text [mc "Reverse"] -command mkpatchrev -padx 5
6882
    grid $top.rev x -pady 10
6883
    label $top.flab -text [mc "Output file:"]
6884 6885 6886
    entry $top.fname -width 60
    $top.fname insert 0 [file normalize "patch$patchnum.patch"]
    incr patchnum
6887
    grid $top.flab $top.fname -sticky w
6888
    frame $top.buts
6889 6890
    button $top.buts.gen -text [mc "Generate"] -command mkpatchgo
    button $top.buts.can -text [mc "Cancel"] -command mkpatchcan
6891 6892 6893 6894
    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
6895
    focus $top.fname
6896 6897 6898 6899 6900 6901 6902 6903 6904 6905 6906 6907 6908 6909 6910 6911 6912 6913 6914
}

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 {} {
6915
    global patchtop nullid nullid2
6916 6917 6918 6919

    set oldid [$patchtop.fromsha1 get]
    set newid [$patchtop.tosha1 get]
    set fname [$patchtop.fname get]
6920
    set cmd [diffcmd [list $oldid $newid] -p]
6921 6922
    # trim off the initial "|"
    set cmd [lrange $cmd 1 end]
6923 6924
    lappend cmd >$fname &
    if {[catch {eval exec $cmd} err]} {
6925
	error_popup "[mc "Error creating patch:"] $err"
6926 6927 6928 6929 6930 6931 6932 6933 6934 6935 6936 6937
    }
    catch {destroy $patchtop}
    unset patchtop
}

proc mkpatchcan {} {
    global patchtop

    catch {destroy $patchtop}
    unset patchtop
}

6938 6939 6940 6941 6942 6943 6944
proc mktag {} {
    global rowmenuid mktagtop commitinfo

    set top .maketag
    set mktagtop $top
    catch {destroy $top}
    toplevel $top
6945
    label $top.title -text [mc "Create tag"]
6946
    grid $top.title - -pady 10
6947
    label $top.id -text [mc "ID:"]
6948
    entry $top.sha1 -width 40 -relief flat
6949 6950 6951
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
6952
    entry $top.head -width 60 -relief flat
6953 6954 6955
    $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
    $top.head conf -state readonly
    grid x $top.head -sticky w
6956
    label $top.tlab -text [mc "Tag name:"]
6957
    entry $top.tag -width 60
6958 6959
    grid $top.tlab $top.tag -sticky w
    frame $top.buts
6960 6961
    button $top.buts.gen -text [mc "Create"] -command mktaggo
    button $top.buts.can -text [mc "Cancel"] -command mktagcan
6962 6963 6964 6965 6966 6967 6968 6969 6970 6971 6972 6973 6974
    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 == {}} {
6975
	error_popup [mc "No tag name specified"]
6976 6977 6978
	return
    }
    if {[info exists tagids($tag)]} {
6979
	error_popup [mc "Tag \"%s\" already exists" $tag]
6980 6981 6982
	return
    }
    if {[catch {
6983
	exec git tag $tag $id
6984
    } err]} {
6985
	error_popup "[mc "Error creating tag:"] $err"
6986 6987 6988 6989 6990
	return
    }

    set tagids($tag) $id
    lappend idtags($id) $tag
6991
    redrawtags $id
6992
    addedtag $id
6993 6994
    dispneartags 0
    run refill_reflist
6995 6996 6997
}

proc redrawtags {id} {
6998
    global canv linehtag idpos currentid curview
6999
    global canvxmax iddrawn
7000

7001
    if {![commitinview $id $curview]} return
7002
    if {![info exists iddrawn($id)]} return
7003
    set row [rowofcommit $id]
7004 7005
    $canv delete tag.$id
    set xt [eval drawtags $id $idpos($id)]
7006 7007 7008 7009
    $canv coords $linehtag($row) $xt [lindex $idpos($id) 2]
    set text [$canv itemcget $linehtag($row) -text]
    set font [$canv itemcget $linehtag($row) -font]
    set xr [expr {$xt + [font measure $font $text]}]
P
Paul Mackerras 已提交
7010 7011 7012 7013
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
7014 7015
    if {[info exists currentid] && $currentid == $id} {
	make_secsel $row
7016 7017 7018 7019 7020 7021 7022 7023 7024 7025 7026 7027 7028 7029 7030
    }
}

proc mktagcan {} {
    global mktagtop

    catch {destroy $mktagtop}
    unset mktagtop
}

proc mktaggo {} {
    domktag
    mktagcan
}

7031 7032 7033 7034 7035 7036 7037
proc writecommit {} {
    global rowmenuid wrcomtop commitinfo wrcomcmd

    set top .writecommit
    set wrcomtop $top
    catch {destroy $top}
    toplevel $top
7038
    label $top.title -text [mc "Write commit to file"]
7039
    grid $top.title - -pady 10
7040
    label $top.id -text [mc "ID:"]
7041 7042 7043 7044 7045 7046 7047 7048
    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
7049
    label $top.clab -text [mc "Command:"]
7050 7051
    entry $top.cmd -width 60 -textvariable wrcomcmd
    grid $top.clab $top.cmd -sticky w -pady 10
7052
    label $top.flab -text [mc "Output file:"]
7053 7054 7055 7056
    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
7057 7058
    button $top.buts.gen -text [mc "Write"] -command wrcomgo
    button $top.buts.can -text [mc "Cancel"] -command wrcomcan
7059 7060 7061 7062 7063 7064 7065 7066 7067 7068 7069 7070 7071 7072
    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]} {
7073
	error_popup "[mc "Error writing commit:"] $err"
7074 7075 7076 7077 7078 7079 7080 7081 7082 7083 7084 7085
    }
    catch {destroy $wrcomtop}
    unset wrcomtop
}

proc wrcomcan {} {
    global wrcomtop

    catch {destroy $wrcomtop}
    unset wrcomtop
}

7086 7087 7088 7089 7090 7091
proc mkbranch {} {
    global rowmenuid mkbrtop

    set top .makebranch
    catch {destroy $top}
    toplevel $top
7092
    label $top.title -text [mc "Create new branch"]
7093
    grid $top.title - -pady 10
7094
    label $top.id -text [mc "ID:"]
7095 7096 7097 7098
    entry $top.sha1 -width 40 -relief flat
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
7099
    label $top.nlab -text [mc "Name:"]
7100 7101 7102
    entry $top.name -width 40
    grid $top.nlab $top.name -sticky w
    frame $top.buts
7103 7104
    button $top.buts.go -text [mc "Create"] -command [list mkbrgo $top]
    button $top.buts.can -text [mc "Cancel"] -command "catch {destroy $top}"
7105 7106 7107 7108 7109 7110 7111 7112 7113 7114 7115 7116 7117
    grid $top.buts.go $top.buts.can
    grid columnconfigure $top.buts 0 -weight 1 -uniform a
    grid columnconfigure $top.buts 1 -weight 1 -uniform a
    grid $top.buts - -pady 10 -sticky ew
    focus $top.name
}

proc mkbrgo {top} {
    global headids idheads

    set name [$top.name get]
    set id [$top.sha1 get]
    if {$name eq {}} {
7118
	error_popup [mc "Please specify a name for the new branch"]
7119 7120 7121 7122 7123 7124 7125 7126 7127 7128 7129
	return
    }
    catch {destroy $top}
    nowbusy newbranch
    update
    if {[catch {
	exec git branch $name $id
    } err]} {
	notbusy newbranch
	error_popup $err
    } else {
7130 7131
	set headids($name) $id
	lappend idheads($id) $name
7132
	addedhead $id $name
7133 7134
	notbusy newbranch
	redrawtags $id
7135
	dispneartags 0
7136
	run refill_reflist
7137 7138 7139
    }
}

7140
proc cherrypick {} {
7141
    global rowmenuid curview
7142
    global mainhead mainheadid
7143

7144 7145 7146
    set oldhead [exec git rev-parse HEAD]
    set dheads [descheads $rowmenuid]
    if {$dheads ne {} && [lsearch -exact $dheads $oldhead] >= 0} {
7147 7148 7149
	set ok [confirm_popup [mc "Commit %s is already\
		included in branch %s -- really re-apply it?" \
				   [string range $rowmenuid 0 7] $mainhead]]
7150 7151
	if {!$ok} return
    }
7152
    nowbusy cherrypick [mc "Cherry-picking"]
7153 7154 7155 7156 7157 7158 7159 7160 7161 7162 7163
    update
    # Unfortunately git-cherry-pick writes stuff to stderr even when
    # no error occurs, and exec takes that as an indication of error...
    if {[catch {exec sh -c "git cherry-pick -r $rowmenuid 2>&1"} err]} {
	notbusy cherrypick
	error_popup $err
	return
    }
    set newhead [exec git rev-parse HEAD]
    if {$newhead eq $oldhead} {
	notbusy cherrypick
7164
	error_popup [mc "No changes committed"]
7165 7166
	return
    }
7167
    addnewchild $newhead $oldhead
7168 7169
    if {[commitinview $oldhead $curview]} {
	insertrow $newhead $oldhead $curview
7170
	if {$mainhead ne {}} {
7171
	    movehead $newhead $mainhead
7172
	    movedhead $newhead $mainhead
7173
	    set mainheadid $newhead
7174 7175 7176
	}
	redrawtags $oldhead
	redrawtags $newhead
7177
	selbyid $newhead
7178 7179 7180 7181
    }
    notbusy cherrypick
}

7182
proc resethead {} {
7183
    global mainhead rowmenuid confirm_ok resettype
7184 7185 7186 7187 7188

    set confirm_ok 0
    set w ".confirmreset"
    toplevel $w
    wm transient $w .
7189
    wm title $w [mc "Confirm reset"]
7190
    message $w.m -text \
7191
	[mc "Reset branch %s to %s?" $mainhead [string range $rowmenuid 0 7]] \
7192 7193 7194
	-justify center -aspect 1000
    pack $w.m -side top -fill x -padx 20 -pady 20
    frame $w.f -relief sunken -border 2
7195
    message $w.f.rt -text [mc "Reset type:"] -aspect 1000
7196 7197 7198
    grid $w.f.rt -sticky w
    set resettype mixed
    radiobutton $w.f.soft -value soft -variable resettype -justify left \
7199
	-text [mc "Soft: Leave working tree and index untouched"]
7200 7201
    grid $w.f.soft -sticky w
    radiobutton $w.f.mixed -value mixed -variable resettype -justify left \
7202
	-text [mc "Mixed: Leave working tree untouched, reset index"]
7203 7204
    grid $w.f.mixed -sticky w
    radiobutton $w.f.hard -value hard -variable resettype -justify left \
7205
	-text [mc "Hard: Reset working tree and index\n(discard ALL local changes)"]
7206 7207
    grid $w.f.hard -sticky w
    pack $w.f -side top -fill x
7208
    button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w"
7209
    pack $w.ok -side left -fill x -padx 20 -pady 20
7210
    button $w.cancel -text [mc Cancel] -command "destroy $w"
7211 7212 7213 7214
    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
7215 7216
    if {[catch {set fd [open \
	    [list | sh -c "git reset --$resettype $rowmenuid 2>&1"] r]} err]} {
7217 7218
	error_popup $err
    } else {
7219
	dohidelocalchanges
7220
	filerun $fd [list readresetstat $fd]
7221
	nowbusy reset [mc "Resetting"]
7222
	selbyid $rowmenuid
7223 7224 7225
    }
}

7226 7227
proc readresetstat {fd} {
    global mainhead mainheadid showlocalchanges rprogcoord
7228 7229 7230

    if {[gets $fd line] >= 0} {
	if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
7231 7232
	    set rprogcoord [expr {1.0 * $m / $n}]
	    adjustprogress
7233 7234 7235
	}
	return 1
    }
7236 7237
    set rprogcoord 0
    adjustprogress
7238 7239 7240 7241 7242 7243 7244 7245 7246 7247
    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
7248
	redrawtags $oldhead
7249
	redrawtags $newhead
7250 7251 7252 7253
    }
    if {$showlocalchanges} {
	doshowlocalchanges
    }
7254
    return 0
7255 7256
}

7257 7258
# context menu for a head
proc headmenu {x y id head} {
7259
    global headmenuid headmenuhead headctxmenu mainhead
7260

7261
    stopfinding
7262 7263
    set headmenuid $id
    set headmenuhead $head
7264 7265 7266 7267 7268 7269
    set state normal
    if {$head eq $mainhead} {
	set state disabled
    }
    $headctxmenu entryconfigure 0 -state $state
    $headctxmenu entryconfigure 1 -state $state
7270 7271 7272 7273 7274
    tk_popup $headctxmenu $x $y
}

proc cobranch {} {
    global headmenuid headmenuhead mainhead headids
7275
    global showlocalchanges mainheadid
7276 7277 7278

    # check the tree is clean first??
    set oldmainhead $mainhead
7279
    nowbusy checkout [mc "Checking out"]
7280
    update
7281
    dohidelocalchanges
7282
    if {[catch {
7283
	exec git checkout -q $headmenuhead
7284 7285 7286 7287 7288
    } err]} {
	notbusy checkout
	error_popup $err
    } else {
	notbusy checkout
7289
	set mainhead $headmenuhead
7290
	set mainheadid $headmenuid
7291 7292 7293 7294
	if {[info exists headids($oldmainhead)]} {
	    redrawtags $headids($oldmainhead)
	}
	redrawtags $headmenuid
7295
	selbyid $headmenuid
7296 7297 7298
    }
    if {$showlocalchanges} {
	dodiffindex
7299 7300 7301 7302
    }
}

proc rmbranch {} {
7303
    global headmenuid headmenuhead mainhead
7304
    global idheads
7305 7306 7307

    set head $headmenuhead
    set id $headmenuid
7308
    # this check shouldn't be needed any more...
7309
    if {$head eq $mainhead} {
7310
	error_popup [mc "Cannot delete the currently checked-out branch"]
7311 7312
	return
    }
7313
    set dheads [descheads $id]
7314
    if {[llength $dheads] == 1 && $idheads($dheads) eq $head} {
7315
	# the stuff on this branch isn't on any other branch
7316 7317
	if {![confirm_popup [mc "The commits on branch %s aren't on any other\
			branch.\nReally delete branch %s?" $head $head]]} return
7318 7319 7320 7321 7322 7323 7324 7325
    }
    nowbusy rmbranch
    update
    if {[catch {exec git branch -D $head} err]} {
	notbusy rmbranch
	error_popup $err
	return
    }
7326
    removehead $id $head
7327
    removedhead $id $head
7328 7329
    redrawtags $id
    notbusy rmbranch
7330
    dispneartags 0
7331 7332 7333 7334 7335
    run refill_reflist
}

# Display a list of tags and heads
proc showrefs {} {
7336 7337
    global showrefstop bgcolor fgcolor selectbgcolor
    global bglist fglist reflistfilter reflist maincursor
7338 7339 7340 7341 7342 7343 7344 7345 7346

    set top .showrefs
    set showrefstop $top
    if {[winfo exists $top]} {
	raise $top
	refill_reflist
	return
    }
    toplevel $top
7347
    wm title $top [mc "Tags and heads: %s" [file tail [pwd]]]
7348
    text $top.list -background $bgcolor -foreground $fgcolor \
7349
	-selectbackground $selectbgcolor -font mainfont \
7350 7351 7352 7353 7354 7355 7356 7357 7358 7359 7360
	-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
7361 7362
    label $top.f.l -text "[mc "Filter"]: "
    entry $top.f.e -width 20 -textvariable reflistfilter
7363 7364 7365 7366 7367
    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
7368
    button $top.close -command [list destroy $top] -text [mc "Close"]
7369 7370 7371 7372 7373 7374 7375 7376 7377 7378 7379 7380 7381 7382 7383 7384 7385 7386 7387 7388 7389 7390 7391 7392 7393 7394 7395 7396 7397 7398 7399 7400 7401 7402 7403 7404 7405 7406 7407 7408 7409
    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
7410
    global curview commitinterest
7411 7412 7413 7414 7415

    if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
    set refs {}
    foreach n [array names headids] {
	if {[string match $reflistfilter $n]} {
7416
	    if {[commitinview $headids($n) $curview]} {
7417 7418 7419 7420 7421 7422 7423 7424
		lappend refs [list $n H]
	    } else {
		set commitinterest($headids($n)) {run refill_reflist}
	    }
	}
    }
    foreach n [array names tagids] {
	if {[string match $reflistfilter $n]} {
7425
	    if {[commitinview $tagids($n) $curview]} {
7426 7427 7428 7429 7430 7431 7432 7433
		lappend refs [list $n T]
	    } else {
		set commitinterest($tagids($n)) {run refill_reflist}
	    }
	}
    }
    foreach n [array names otherrefids] {
	if {[string match $reflistfilter $n]} {
7434
	    if {[commitinview $otherrefids($n) $curview]} {
7435 7436 7437 7438 7439 7440 7441 7442 7443 7444 7445 7446 7447 7448 7449 7450 7451 7452 7453 7454 7455 7456 7457 7458 7459 7460 7461 7462 7463 7464 7465 7466 7467 7468 7469 7470 7471 7472 7473 7474 7475 7476 7477 7478 7479 7480 7481 7482 7483 7484 7485 7486
		lappend refs [list $n o]
	    } else {
		set commitinterest($otherrefids($n)) {run refill_reflist}
	    }
	}
    }
    set refs [lsort -index 0 $refs]
    if {$refs eq $reflist} return

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

P
Paul Mackerras 已提交
7489 7490
# Stuff for finding nearby tags
proc getallcommits {} {
7491 7492
    global allcommits nextarc seeds allccache allcwait cachedarcs allcupdate
    global idheads idtags idotherrefs allparents tagobjid
7493

7494 7495 7496 7497
    if {![info exists allcommits]} {
	set nextarc 0
	set allcommits 0
	set seeds {}
7498 7499 7500 7501 7502 7503 7504 7505
	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
7506
    }
7507

7508 7509 7510 7511 7512 7513 7514 7515 7516 7517 7518 7519 7520 7521 7522 7523 7524 7525 7526 7527 7528 7529 7530 7531 7532 7533 7534 7535 7536 7537 7538 7539 7540 7541 7542
    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
7543
    }
7544 7545 7546 7547 7548 7549 7550 7551 7552 7553 7554 7555 7556 7557 7558 7559 7560 7561
}

# 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} {
7562
    global allparents allchildren idtags idheads nextarc
7563
    global arcnos arcids arctags arcout arcend arcstart archeads growing
7564 7565
    global seeds allcommits cachedarcs allcupdate
    
7566
    set nid 0
7567
    while {[incr nid] <= 1000 && [gets $fd line] >= 0} {
7568 7569 7570 7571 7572
	set id [lindex $line 0]
	if {[info exists allparents($id)]} {
	    # seen it already
	    continue
	}
7573
	set cachedarcs 0
7574 7575 7576 7577 7578 7579 7580 7581 7582 7583 7584 7585
	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 已提交
7586
		}
7587 7588 7589 7590 7591 7592 7593 7594 7595 7596 7597 7598 7599 7600 7601 7602 7603 7604 7605 7606 7607 7608 7609 7610 7611 7612 7613 7614 7615 7616 7617 7618 7619 7620 7621 7622 7623 7624 7625 7626 7627 7628 7629 7630 7631 7632
		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
7633
    }
7634 7635 7636 7637 7638 7639
    if {$nid > 0} {
	global cached_dheads cached_dtags cached_atags
	catch {unset cached_dheads}
	catch {unset cached_dtags}
	catch {unset cached_atags}
    }
7640 7641 7642
    if {![eof $fd]} {
	return [expr {$nid >= 1000? 2: 1}]
    }
7643 7644 7645 7646 7647 7648 7649 7650 7651 7652 7653 7654
    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
	}
7655
	error_popup "[mc "Error reading commit topology information;\
7656
		branch and preceding/following tag information\
7657
	        will be incomplete."]\n($err)"
7658 7659
	set cacheok 0
    }
7660 7661
    if {[incr allcommits -1] == 0} {
	notbusy allcommits
7662 7663 7664
	if {$cacheok} {
	    run savecache
	}
7665 7666
    }
    dispneartags 0
7667
    return 0
P
Paul Mackerras 已提交
7668 7669
}

7670 7671
proc recalcarc {a} {
    global arctags archeads arcids idtags idheads
P
Paul Mackerras 已提交
7672

7673 7674 7675 7676 7677 7678 7679 7680
    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 已提交
7681
	}
7682
    }
7683 7684
    set arctags($a) $at
    set archeads($a) $ah
P
Paul Mackerras 已提交
7685 7686
}

7687
proc splitarc {p} {
7688
    global arcnos arcids nextarc arctags archeads idtags idheads
7689
    global arcstart arcend arcout allparents growing
7690

7691 7692 7693 7694 7695 7696 7697 7698 7699 7700 7701 7702 7703 7704 7705 7706 7707 7708 7709 7710 7711 7712 7713 7714 7715 7716 7717 7718 7719 7720 7721 7722 7723
    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
7724
	} else {
7725 7726
	    set j [lsearch -exact $arcnos($id) $a]
	    set arcnos($id) [lreplace $arcnos($id) $j $j $na]
7727
	}
7728 7729 7730 7731 7732 7733 7734 7735 7736 7737 7738 7739 7740 7741 7742
    }

    # 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} {
7743
    global allparents allchildren idtags nextarc
7744
    global arcnos arcids arctags arcout arcend arcstart archeads growing
7745
    global seeds allcommits
7746

7747
    if {![info exists allcommits] || ![info exists arcnos($p)]} return
7748 7749 7750 7751 7752 7753 7754 7755 7756 7757 7758 7759 7760 7761 7762 7763 7764 7765
    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]
}

7766 7767 7768 7769 7770 7771 7772 7773 7774 7775 7776 7777 7778 7779 7780 7781 7782 7783 7784 7785 7786 7787 7788 7789 7790 7791 7792 7793 7794 7795 7796 7797 7798 7799 7800 7801 7802 7803 7804 7805 7806 7807 7808 7809 7810 7811 7812 7813 7814 7815 7816 7817 7818 7819 7820 7821 7822 7823 7824 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 7864 7865 7866 7867 7868 7869 7870 7871 7872 7873 7874 7875 7876 7877 7878 7879 7880 7881 7882 7883 7884 7885 7886 7887 7888 7889 7890 7891 7892 7893 7894 7895 7896 7897 7898 7899 7900 7901 7902 7903 7904 7905 7906 7907 7908 7909 7910 7911 7912 7913 7914 7915 7916 7917 7918 7919 7920 7921 7922 7923 7924 7925 7926 7927 7928 7929 7930 7931
# 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
    }
}

7932 7933 7934 7935 7936 7937 7938 7939 7940
# 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).
7941 7942
	# Or both can be BMPs with no incoming arcs.
	if {$a eq $b || $arcnos($a) eq {}} {
7943
	    return 0
7944
	}
7945 7946 7947 7948 7949 7950 7951 7952
	# 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
7953 7954
	}
    }
7955 7956 7957 7958 7959 7960 7961

    if {![info exists arcout($a)]} {
	set arc [lindex $arcnos($a) 0]
	if {[info exists arcend($arc)]} {
	    set aend $arcend($arc)
	} else {
	    set aend {}
7962
	}
7963 7964 7965 7966 7967 7968 7969 7970 7971 7972
	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 {}
7973
	}
7974 7975 7976
	set b $arcstart($arc)
    } else {
	set bend $b
7977
    }
7978 7979 7980 7981 7982 7983 7984 7985 7986 7987 7988 7989 7990 7991 7992 7993 7994 7995
    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
	}
7996 7997
    }

7998 7999 8000 8001 8002 8003 8004 8005 8006 8007 8008 8009 8010 8011 8012 8013 8014 8015 8016 8017 8018 8019 8020 8021 8022 8023 8024 8025 8026 8027 8028
    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 已提交
8029

8030 8031 8032 8033 8034 8035 8036 8037 8038 8039 8040 8041 8042 8043 8044 8045 8046 8047 8048
# 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 已提交
8049
	}
8050 8051 8052 8053
	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 已提交
8054
	}
8055 8056 8057 8058 8059 8060 8061 8062 8063 8064 8065 8066 8067 8068 8069 8070 8071 8072 8073 8074 8075 8076 8077 8078 8079 8080 8081 8082 8083 8084 8085 8086 8087 8088 8089 8090 8091 8092 8093 8094 8095 8096 8097 8098 8099 8100 8101 8102 8103 8104 8105 8106 8107 8108 8109 8110 8111 8112 8113 8114 8115 8116 8117 8118 8119 8120 8121 8122
    }
    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 已提交
8123 8124
	}
    }
8125 8126 8127
    foreach x [array names growanc] {
	if {$dl($x)} {
	    return 0
P
Paul Mackerras 已提交
8128
	}
8129
	return 0
P
Paul Mackerras 已提交
8130
    }
8131
    return 1
P
Paul Mackerras 已提交
8132 8133
}

8134 8135
proc validate_arctags {a} {
    global arctags idtags
P
Paul Mackerras 已提交
8136

8137 8138 8139 8140 8141 8142 8143 8144 8145 8146 8147 8148 8149 8150 8151 8152 8153 8154 8155 8156 8157 8158 8159 8160 8161 8162 8163 8164 8165 8166 8167 8168 8169 8170 8171 8172 8173 8174 8175 8176 8177 8178 8179 8180 8181 8182 8183 8184 8185
    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 已提交
8186
	    }
8187 8188
	    if {$tid ne {}} {
		return $tid
P
Paul Mackerras 已提交
8189 8190
	    }
	}
8191 8192 8193 8194 8195 8196 8197 8198 8199 8200 8201 8202 8203 8204 8205 8206 8207 8208 8209 8210 8211 8212 8213 8214 8215 8216 8217 8218 8219 8220 8221 8222 8223 8224 8225 8226 8227 8228 8229 8230 8231 8232 8233 8234 8235 8236 8237 8238 8239 8240 8241 8242 8243 8244 8245 8246 8247 8248 8249 8250 8251 8252 8253 8254
	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 已提交
8255
	}
8256
    }
8257 8258 8259 8260 8261 8262 8263 8264 8265 8266 8267 8268
    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
8269

8270 8271 8272 8273 8274 8275 8276 8277 8278 8279 8280 8281 8282 8283
    # 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
8284 8285 8286 8287
	    }
	}
    }

8288 8289 8290 8291 8292 8293 8294 8295 8296
    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
	    }
8297
	}
8298 8299 8300 8301
	if {$tags eq $ctags} {
	    set cached_dtags($origid) $tags
	} else {
	    set tags $ctags
8302
	}
8303 8304 8305 8306 8307 8308 8309
    } 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"
8310
    }
8311 8312
    return $tags
}
8313

8314 8315 8316 8317 8318 8319 8320 8321 8322 8323 8324 8325 8326 8327 8328 8329 8330 8331 8332 8333 8334
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
		}
	    }
8335
	}
8336 8337 8338 8339 8340 8341 8342 8343 8344 8345 8346 8347 8348 8349 8350 8351 8352 8353 8354 8355 8356 8357 8358 8359 8360 8361 8362 8363 8364 8365 8366 8367 8368 8369 8370 8371 8372 8373 8374 8375 8376 8377 8378 8379 8380 8381 8382 8383 8384 8385 8386 8387 8388 8389 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
	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
		}
	    }
8419 8420 8421
	}
    }

8422 8423 8424 8425 8426 8427 8428 8429 8430 8431 8432 8433 8434 8435 8436 8437 8438 8439 8440 8441 8442 8443 8444 8445 8446 8447 8448 8449 8450 8451 8452 8453
    # 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
8454
	}
8455 8456 8457 8458 8459 8460 8461
    } 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"
8462
    }
8463
    return $tags
8464 8465
}

8466 8467 8468 8469 8470
# 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
8471

8472 8473 8474
    if {![info exists allparents($id)]} {
	return {}
    }
8475
    set aret {}
8476 8477 8478 8479 8480 8481 8482 8483 8484
    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
8485
		lappend aret $t
8486
	    }
8487
	}
8488
	set id $arcstart($a)
8489
    }
8490 8491 8492
    set origid $id
    set todo [list $id]
    set seen($id) 1
8493
    set ret {}
8494 8495 8496 8497 8498 8499 8500 8501 8502 8503
    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 {}} {
8504 8505 8506 8507
		    validate_archeads $a
		    if {$archeads($a) ne {}} {
			set ret [concat $ret $archeads($a)]
		    }
8508 8509 8510 8511 8512 8513 8514
		}
		set d $arcstart($a)
		if {![info exists seen($d)]} {
		    lappend todo $d
		    set seen($d) 1
		}
	    }
8515 8516
	}
    }
8517 8518
    set ret [lsort -unique $ret]
    set cached_dheads($origid) $ret
8519
    return [concat $ret $aret]
8520 8521
}

8522 8523
proc addedtag {id} {
    global arcnos arcout cached_dtags cached_atags
8524

8525 8526 8527
    if {![info exists arcnos($id)]} return
    if {![info exists arcout($id)]} {
	recalcarc [lindex $arcnos($id) 0]
8528
    }
8529 8530
    catch {unset cached_dtags}
    catch {unset cached_atags}
8531 8532
}

8533 8534 8535 8536 8537 8538 8539 8540 8541 8542 8543 8544 8545 8546 8547 8548 8549 8550
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
8551

8552 8553 8554
    if {![info exists arcnos($hid)]} return
    if {![info exists arcout($hid)]} {
	recalcarc [lindex $arcnos($hid) 0]
8555
    }
8556 8557 8558 8559 8560 8561 8562 8563 8564 8565 8566 8567 8568 8569
    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
	    }
8570 8571
	}
    }
8572 8573 8574
    catch {unset cached_dtags}
    catch {unset cached_atags}
    catch {unset cached_dheads}
8575 8576
}

8577
proc rereadrefs {} {
8578
    global idtags idheads idotherrefs mainheadid
8579 8580 8581 8582 8583 8584 8585 8586

    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]
	}
    }
8587
    set oldmainhead $mainheadid
8588
    readrefs
8589
    changedrefs
8590 8591 8592 8593
    set refids [lsort -unique [concat $refids [array names idtags] \
			[array names idheads] [array names idotherrefs]]]
    foreach id $refids {
	set v [listrefs $id]
8594
	if {![info exists ref($id)] || $ref($id) != $v ||
8595 8596
	    ($id eq $oldmainhead && $id ne $mainheadid) ||
	    ($id eq $mainheadid && $id ne $oldmainhead)} {
8597 8598 8599
	    redrawtags $id
	}
    }
8600
    run refill_reflist
8601 8602
}

8603 8604 8605 8606 8607 8608 8609 8610 8611 8612 8613 8614 8615 8616 8617 8618 8619 8620
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]
}

8621
proc showtag {tag isnew} {
8622
    global ctext tagcontents tagids linknum tagobjid
8623 8624 8625 8626 8627

    if {$isnew} {
	addtohistory [list showtag $tag 0]
    }
    $ctext conf -state normal
8628
    clear_ctext
8629
    settabs 0
8630
    set linknum 0
8631 8632 8633 8634 8635
    if {![info exists tagcontents($tag)]} {
	catch {
	    set tagcontents($tag) [exec git cat-file tag $tagobjid($tag)]
	}
    }
8636 8637 8638
    if {[info exists tagcontents($tag)]} {
	set text $tagcontents($tag)
    } else {
8639
	set text "[mc "Tag"]: $tag\n[mc "Id"]:  $tagids($tag)"
8640
    }
8641
    appendwithlinks $text {}
8642
    $ctext conf -state disabled
8643
    init_flist {}
8644 8645
}

8646 8647 8648
proc doquit {} {
    global stopped
    set stopped 100
8649
    savestuff .
8650 8651
    destroy .
}
8652

P
Paul Mackerras 已提交
8653 8654 8655 8656 8657 8658 8659 8660 8661 8662 8663 8664 8665 8666 8667 8668 8669 8670 8671 8672 8673 8674 8675 8676 8677 8678
proc mkfontdisp {font top which} {
    global fontattr fontpref $font

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

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

    set fontparam(which) $which
    set fontparam(font) $font
    set fontparam(family) [font actual $font -family]
    set fontparam(size) $fontattr($font,size)
    set fontparam(weight) $fontattr($font,weight)
    set fontparam(slant) $fontattr($font,slant)
    set top .gitkfont
    set fonttop $top
    if {![winfo exists $top]} {
	font create sample
	eval font config sample [font actual $font]
	toplevel $top
8679
	wm title $top [mc "Gitk font chooser"]
8680
	label $top.l -textvariable fontparam(which)
P
Paul Mackerras 已提交
8681 8682 8683 8684 8685 8686 8687 8688 8689 8690 8691 8692 8693 8694 8695
	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 \
8696
	    -font {{Times New Roman} 12 bold} -text [mc "B"] -indicatoron 0 \
P
Paul Mackerras 已提交
8697 8698
	    -variable fontparam(weight) -onvalue bold -offvalue normal
	checkbutton $top.g.ital -padx 5 \
8699
	    -font {{Times New Roman} 12 italic} -text [mc "I"] -indicatoron 0  \
P
Paul Mackerras 已提交
8700 8701 8702 8703 8704 8705 8706 8707 8708 8709
	    -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
8710 8711
	button $top.buts.ok -text [mc "OK"] -command fontok -default active
	button $top.buts.can -text [mc "Cancel"] -command fontcan -default normal
P
Paul Mackerras 已提交
8712 8713 8714 8715 8716 8717 8718 8719 8720 8721 8722 8723 8724 8725 8726 8727 8728 8729 8730 8731 8732 8733 8734 8735 8736 8737 8738 8739 8740 8741 8742 8743 8744 8745 8746 8747 8748 8749 8750 8751 8752 8753 8754 8755 8756 8757 8758 8759 8760 8761 8762 8763 8764 8765 8766 8767 8768 8769 8770 8771 8772 8773 8774
	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)
}

8775
proc doprefs {} {
8776
    global maxwidth maxgraphpct
8777
    global oldprefs prefstop showneartags showlocalchanges
8778
    global bgcolor fgcolor ctext diffcolors selectbgcolor
8779
    global tabstop limitdiffs autoselect
P
Paul Mackerras 已提交
8780

8781 8782 8783 8784 8785
    set top .gitkprefs
    set prefstop $top
    if {[winfo exists $top]} {
	raise $top
	return
8786
    }
P
Paul Mackerras 已提交
8787
    foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
8788
		   limitdiffs tabstop} {
8789
	set oldprefs($v) [set $v]
P
Paul Mackerras 已提交
8790
    }
8791
    toplevel $top
8792 8793
    wm title $top [mc "Gitk preferences"]
    label $top.ldisp -text [mc "Commit list display options"]
8794 8795
    grid $top.ldisp - -sticky w -pady 10
    label $top.spacer -text " "
8796
    label $top.maxwidthl -text [mc "Maximum graph width (lines)"] \
8797 8798 8799
	-font optionfont
    spinbox $top.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
    grid $top.spacer $top.maxwidthl $top.maxwidth -sticky w
8800
    label $top.maxpctl -text [mc "Maximum graph width (% of pane)"] \
8801 8802 8803
	-font optionfont
    spinbox $top.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
    grid x $top.maxpctl $top.maxpct -sticky w
8804
    frame $top.showlocal
8805
    label $top.showlocal.l -text [mc "Show local changes"] -font optionfont
8806 8807 8808
    checkbutton $top.showlocal.b -variable showlocalchanges
    pack $top.showlocal.b $top.showlocal.l -side left
    grid x $top.showlocal -sticky w
8809 8810 8811 8812 8813
    frame $top.autoselect
    label $top.autoselect.l -text [mc "Auto-select SHA1"] -font optionfont
    checkbutton $top.autoselect.b -variable autoselect
    pack $top.autoselect.b $top.autoselect.l -side left
    grid x $top.autoselect -sticky w
8814

8815
    label $top.ddisp -text [mc "Diff display options"]
8816
    grid $top.ddisp - -sticky w -pady 10
8817
    label $top.tabstopl -text [mc "Tab spacing"] -font optionfont
8818 8819
    spinbox $top.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
    grid x $top.tabstopl $top.tabstop -sticky w
P
Paul Mackerras 已提交
8820
    frame $top.ntag
8821
    label $top.ntag.l -text [mc "Display nearby tags"] -font optionfont
P
Paul Mackerras 已提交
8822 8823 8824
    checkbutton $top.ntag.b -variable showneartags
    pack $top.ntag.b $top.ntag.l -side left
    grid x $top.ntag -sticky w
8825
    frame $top.ldiff
8826
    label $top.ldiff.l -text [mc "Limit diffs to listed paths"] -font optionfont
8827 8828 8829
    checkbutton $top.ldiff.b -variable limitdiffs
    pack $top.ldiff.b $top.ldiff.l -side left
    grid x $top.ldiff -sticky w
8830

8831
    label $top.cdisp -text [mc "Colors: press to choose"]
8832 8833
    grid $top.cdisp - -sticky w -pady 10
    label $top.bg -padx 40 -relief sunk -background $bgcolor
8834
    button $top.bgbut -text [mc "Background"] -font optionfont \
8835 8836 8837
	-command [list choosecolor bgcolor 0 $top.bg background setbg]
    grid x $top.bgbut $top.bg -sticky w
    label $top.fg -padx 40 -relief sunk -background $fgcolor
8838
    button $top.fgbut -text [mc "Foreground"] -font optionfont \
8839 8840 8841
	-command [list choosecolor fgcolor 0 $top.fg foreground setfg]
    grid x $top.fgbut $top.fg -sticky w
    label $top.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]
8842
    button $top.diffoldbut -text [mc "Diff: old lines"] -font optionfont \
8843 8844 8845 8846
	-command [list choosecolor diffcolors 0 $top.diffold "diff old lines" \
		      [list $ctext tag conf d0 -foreground]]
    grid x $top.diffoldbut $top.diffold -sticky w
    label $top.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1]
8847
    button $top.diffnewbut -text [mc "Diff: new lines"] -font optionfont \
8848 8849 8850 8851
	-command [list choosecolor diffcolors 1 $top.diffnew "diff new lines" \
		      [list $ctext tag conf d1 -foreground]]
    grid x $top.diffnewbut $top.diffnew -sticky w
    label $top.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2]
8852
    button $top.hunksepbut -text [mc "Diff: hunk header"] -font optionfont \
8853 8854 8855 8856
	-command [list choosecolor diffcolors 2 $top.hunksep \
		      "diff hunk header" \
		      [list $ctext tag conf hunksep -foreground]]
    grid x $top.hunksepbut $top.hunksep -sticky w
8857
    label $top.selbgsep -padx 40 -relief sunk -background $selectbgcolor
8858
    button $top.selbgbut -text [mc "Select bg"] -font optionfont \
8859
	-command [list choosecolor selectbgcolor 0 $top.selbgsep background setselbg]
8860
    grid x $top.selbgbut $top.selbgsep -sticky w
8861

8862
    label $top.cfont -text [mc "Fonts: press to choose"]
P
Paul Mackerras 已提交
8863
    grid $top.cfont - -sticky w -pady 10
8864 8865 8866
    mkfontdisp mainfont $top [mc "Main font"]
    mkfontdisp textfont $top [mc "Diff display font"]
    mkfontdisp uifont $top [mc "User interface font"]
P
Paul Mackerras 已提交
8867

8868
    frame $top.buts
8869 8870
    button $top.buts.ok -text [mc "OK"] -command prefsok -default active
    button $top.buts.can -text [mc "Cancel"] -command prefscan -default normal
8871 8872 8873 8874
    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
8875
    bind $top <Visibility> "focus $top.buts.ok"
8876 8877
}

8878 8879 8880 8881
proc choosecolor {v vi w x cmd} {
    global $v

    set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \
8882
	       -title [mc "Gitk: choose color for %s" $x]]
8883 8884 8885 8886 8887 8888
    if {$c eq {}} return
    $w conf -background $c
    lset $v $vi $c
    eval $cmd $c
}

8889 8890 8891 8892 8893 8894 8895 8896 8897 8898
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
}

8899 8900 8901 8902 8903 8904 8905 8906 8907 8908 8909 8910 8911 8912 8913 8914 8915 8916
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
}

8917
proc prefscan {} {
8918
    global oldprefs prefstop
8919

P
Paul Mackerras 已提交
8920
    foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
8921 8922
		   limitdiffs tabstop} {
	global $v
8923 8924 8925 8926
	set $v $oldprefs($v)
    }
    catch {destroy $prefstop}
    unset prefstop
P
Paul Mackerras 已提交
8927
    fontcan
8928 8929 8930 8931
}

proc prefsok {} {
    global maxwidth maxgraphpct
8932
    global oldprefs prefstop showneartags showlocalchanges
P
Paul Mackerras 已提交
8933
    global fontpref mainfont textfont uifont
P
Paul Mackerras 已提交
8934
    global limitdiffs treediffs
8935 8936 8937

    catch {destroy $prefstop}
    unset prefstop
P
Paul Mackerras 已提交
8938 8939 8940 8941 8942 8943 8944 8945 8946 8947 8948 8949 8950 8951 8952 8953 8954 8955 8956 8957 8958
    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]
    }
8959
    settabs
8960 8961 8962 8963 8964 8965 8966
    if {$showlocalchanges != $oldprefs(showlocalchanges)} {
	if {$showlocalchanges} {
	    doshowlocalchanges
	} else {
	    dohidelocalchanges
	}
    }
8967 8968 8969 8970
    if {$limitdiffs != $oldprefs(limitdiffs)} {
	# treediffs elements are limited by path
	catch {unset treediffs}
    }
P
Paul Mackerras 已提交
8971
    if {$fontchanged || $maxwidth != $oldprefs(maxwidth)
8972 8973
	|| $maxgraphpct != $oldprefs(maxgraphpct)} {
	redisplay
8974 8975
    } elseif {$showneartags != $oldprefs(showneartags) ||
	  $limitdiffs != $oldprefs(limitdiffs)} {
P
Paul Mackerras 已提交
8976
	reselectline
8977 8978 8979 8980
    }
}

proc formatdate {d} {
8981
    global datetimeformat
8982
    if {$d ne {}} {
8983
	set d [clock format $d -format $datetimeformat]
8984 8985
    }
    return $d
P
Paul Mackerras 已提交
8986 8987
}

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

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

9261 9262
# First check that Tcl/Tk is recent enough
if {[catch {package require Tk 8.4} err]} {
9263 9264
    show_error {} . [mc "Sorry, gitk cannot run with this version of Tcl/Tk.\n\
		     Gitk requires at least Tcl/Tk 8.4."]
9265 9266 9267
    exit 1
}

9268 9269
# defaults...
set datemode 0
9270
set wrcomcmd "git diff-tree --stdin -p --pretty"
9271

9272
set gitencoding {}
9273
catch {
9274
    set gitencoding [exec git config --get i18n.commitencoding]
9275 9276
}
if {$gitencoding == ""} {
9277 9278 9279 9280 9281
    set gitencoding "utf-8"
}
set tclencoding [tcl_encoding $gitencoding]
if {$tclencoding == {}} {
    puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
9282
}
9283

9284 9285
set mainfont {Helvetica 9}
set textfont {Courier 9}
9286
set uifont {Helvetica 9 bold}
9287
set tabstop 8
9288
set findmergefiles 0
9289
set maxgraphpct 50
9290
set maxwidth 16
P
Paul Mackerras 已提交
9291
set revlistorder 0
9292
set fastdate 0
9293 9294 9295
set uparrowlen 5
set downarrowlen 5
set mingaplen 100
P
Paul Mackerras 已提交
9296
set cmitmode "patch"
9297
set wrapcomment "none"
P
Paul Mackerras 已提交
9298
set showneartags 1
9299
set maxrefs 20
9300
set maxlinelen 200
9301
set showlocalchanges 1
9302
set limitdiffs 1
9303
set datetimeformat "%Y-%m-%d %H:%M:%S"
9304
set autoselect 1
9305 9306

set colors {green red blue magenta darkgrey brown orange}
9307 9308 9309
set bgcolor white
set fgcolor black
set diffcolors {red "#00a000" blue}
9310
set diffcontext 3
9311
set ignorespace 0
9312
set selectbgcolor gray85
9313

9314 9315 9316 9317 9318 9319 9320 9321 9322 9323 9324 9325 9326 9327 9328 9329 9330 9331 9332
## 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

9333 9334
catch {source ~/.gitk}

9335
font create optionfont -family sans-serif -size -12
9336

9337 9338 9339 9340 9341 9342 9343 9344 9345 9346
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]
9347

9348 9349
setoptions

9350
# check that we can find a .git directory somewhere...
9351
if {[catch {set gitdir [gitdir]}]} {
9352
    show_error {} . [mc "Cannot find a git repository here."]
9353 9354
    exit 1
}
9355
if {![file isdirectory $gitdir]} {
9356
    show_error {} . [mc "Cannot find the git directory \"%s\"." $gitdir]
9357 9358 9359
    exit 1
}

9360
set mergeonly 0
9361
set revtreeargs {}
9362 9363
set cmdline_files {}
set i 0
9364
set revtreeargscmd {}
9365
foreach arg $argv {
9366
    switch -glob -- $arg {
9367 9368
	"" { }
	"-d" { set datemode 1 }
9369 9370 9371 9372
	"--merge" {
	    set mergeonly 1
	    lappend revtreeargs $arg
	}
9373 9374 9375 9376
	"--" {
	    set cmdline_files [lrange $argv [expr {$i + 1}] end]
	    break
	}
9377 9378 9379
	"--argscmd=*" {
	    set revtreeargscmd [string range $arg 10 end]
	}
9380 9381 9382 9383
	default {
	    lappend revtreeargs $arg
	}
    }
9384
    incr i
9385
}
9386

9387 9388
if {$i >= [llength $argv] && $revtreeargs ne {}} {
    # no -- on command line, but some arguments (other than -d)
9389
    if {[catch {
9390
	set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs]
9391 9392 9393
	set cmdline_files [split $f "\n"]
	set n [llength $cmdline_files]
	set revtreeargs [lrange $revtreeargs 0 end-$n]
9394 9395 9396 9397 9398
	# 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]} {
9399 9400
		show_error {} . [mc "Ambiguous argument '%s': both revision\
				 and filename" $arg]
9401 9402 9403
		exit 1
	    }
	}
9404 9405 9406 9407 9408
    } 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 已提交
9409
	    set err [string range $err [expr {$i + 6}] end]
9410
	}
9411
	show_error {} . "[mc "Bad arguments to gitk:"]\n$err"
9412 9413 9414 9415
	exit 1
    }
}

9416 9417 9418 9419 9420 9421 9422
if {$mergeonly} {
    # find the list of unmerged files
    set mlist {}
    set nr_unmerged 0
    if {[catch {
	set fd [open "| git ls-files -u" r]
    } err]} {
9423
	show_error {} . "[mc "Couldn't get list of unmerged files:"] $err"
9424 9425 9426 9427 9428 9429 9430 9431 9432 9433 9434 9435 9436 9437 9438
	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 {$cmdline_files eq {} || [path_filter $cmdline_files $fname]} {
	    lappend mlist $fname
	}
    }
    catch {close $fd}
    if {$mlist eq {}} {
	if {$nr_unmerged == 0} {
9439 9440
	    show_error {} . [mc "No files selected: --merge specified but\
			     no files are unmerged."]
9441
	} else {
9442 9443
	    show_error {} . [mc "No files selected: --merge specified but\
			     no unmerged files are within file limit."]
9444 9445 9446 9447 9448 9449
	}
	exit 1
    }
    set cmdline_files $mlist
}

9450
set nullid "0000000000000000000000000000000000000000"
9451 9452
set nullid2 "0000000000000000000000000000000000000001"

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

9455
set runq {}
9456 9457
set history {}
set historyindex 0
9458 9459
set fh_serial 0
set nhl_names {}
9460
set highlight_paths {}
9461
set findpattern {}
9462
set searchdirn -forwards
9463 9464
set boldrows {}
set boldnamerows {}
9465
set diffelide {0 0}
9466
set markingmatches 0
9467
set linkentercount 0
9468 9469
set need_redisplay 0
set nrows_drawn 0
9470
set firsttabstop 0
P
Paul Mackerras 已提交
9471

P
Paul Mackerras 已提交
9472 9473
set nextviewnum 1
set curview 0
9474
set selectedview 0
9475 9476
set selectedhlview [mc "None"]
set highlight_related [mc "None"]
9477
set highlight_files {}
P
Paul Mackerras 已提交
9478
set viewfiles(0) {}
9479
set viewperm(0) 0
9480
set viewargs(0) {}
9481
set viewargscmd(0) {}
P
Paul Mackerras 已提交
9482

9483
set loginstance 0
9484
set cmdlineok 0
9485
set stopped 0
9486
set stuffsaved 0
9487
set patchnum 0
9488
set lserial 0
9489
set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}]
9490
setcoords
9491
makewindow
9492 9493
# wait for the window to become visible
tkwait visibility .
9494
wm title . "[file tail $argv0]: [file tail [pwd]]"
9495
readrefs
9496

9497
if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} {
P
Paul Mackerras 已提交
9498 9499
    # create a view for the files/dirs specified on the command line
    set curview 1
9500
    set selectedview 1
P
Paul Mackerras 已提交
9501
    set nextviewnum 2
9502
    set viewname(1) [mc "Command line"]
P
Paul Mackerras 已提交
9503
    set viewfiles(1) $cmdline_files
9504
    set viewargs(1) $revtreeargs
9505
    set viewargscmd(1) $revtreeargscmd
9506
    set viewperm(1) 0
9507
    addviewmenu 1
9508 9509
    .bar.view entryconf [mc "Edit view..."] -state normal
    .bar.view entryconf [mc "Delete view"] -state normal
P
Paul Mackerras 已提交
9510
}
9511 9512 9513 9514 9515 9516 9517

if {[info exists permviews]} {
    foreach v $permviews {
	set n $nextviewnum
	incr nextviewnum
	set viewname($n) [lindex $v 0]
	set viewfiles($n) [lindex $v 1]
9518
	set viewargs($n) [lindex $v 2]
9519
	set viewargscmd($n) [lindex $v 3]
9520
	set viewperm($n) 1
9521
	addviewmenu $n
9522 9523
    }
}
9524
getcommits