gitk 235.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 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81
# 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]
}

proc dorunq {} {
    global isonrunq runq

    set tstart [clock clicks -milliseconds]
    set t0 $tstart
    while {$runq ne {}} {
	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
    }
}

# Start off a git rev-list process and arrange to read its output
82
proc start_rev_list {view} {
83
    global startmsecs
P
Paul Mackerras 已提交
84
    global commfd leftover tclencoding datemode
85
    global viewargs viewargscmd viewfiles commitidx viewcomplete vnextroot
86
    global showlocalchanges commitinterest mainheadid
87
    global progressdirn progresscoords proglastnc curview
88 89

    set startmsecs [clock clicks -milliseconds]
90
    set commitidx($view) 0
91
    set viewcomplete($view) 0
92
    set vnextroot($view) 0
93 94 95 96 97 98 99 100 101 102
    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"]]
    }
P
Paul Mackerras 已提交
103 104 105 106
    set order "--topo-order"
    if {$datemode} {
	set order "--date-order"
    }
107
    if {[catch {
108
	set fd [open [concat | git log --no-color -z --pretty=raw $order --parents \
109
			 --boundary $args "--" $viewfiles($view)] r]
110
    } err]} {
111
	error_popup "[mc "Error executing git rev-list:"] $err"
112 113
	exit 1
    }
114 115
    set commfd($view) $fd
    set leftover($view) {}
116 117 118
    if {$showlocalchanges} {
	lappend commitinterest($mainheadid) {dodiffindex}
    }
119
    fconfigure $fd -blocking 0 -translation lf -eofchar {}
120
    if {$tclencoding != {}} {
121
	fconfigure $fd -encoding $tclencoding
122
    }
123
    filerun $fd [list getcommitlines $fd $view]
124
    nowbusy $view [mc "Reading"]
125 126 127 128 129
    if {$view == $curview} {
	set progressdirn 1
	set progresscoords {0 0}
	set proglastnc 0
    }
130 131
}

132
proc stop_rev_list {} {
133
    global commfd curview
134

135 136
    if {![info exists commfd($curview)]} return
    set fd $commfd($curview)
137
    catch {
138
	set pid [pid $fd]
139 140
	exec kill $pid
    }
141 142
    catch {close $fd}
    unset commfd($curview)
143 144
}

145
proc getcommits {} {
146
    global phase canv curview
147 148

    set phase getcommits
149 150
    initlayout
    start_rev_list $curview
151
    show_status [mc "Reading commits..."]
152 153
}

154 155 156 157 158 159 160 161 162 163 164 165 166
# 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]
}

167
proc getcommitlines {fd view}  {
168
    global commitlisted commitinterest
169
    global leftover commfd
170
    global displayorder commitidx viewcomplete commitrow commitdata
171 172
    global parentlist children curview hlview
    global vparentlist vdisporder vcmitlisted
P
Paul Mackerras 已提交
173
    global ordertok vnextroot idpending
174

175
    set stuff [read $fd 500000]
176 177 178 179
    # git log doesn't terminate the last commit with a null...
    if {$stuff == {} && $leftover($view) ne {} && [eof $fd]} {
	set stuff "\0"
    }
P
Paul Mackerras 已提交
180
    if {$stuff == {}} {
181 182 183
	if {![eof $fd]} {
	    return 1
	}
P
Paul Mackerras 已提交
184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200
	# Check if we have seen any ids listed as parents that haven't
	# appeared in the list
	foreach vid [array names idpending "$view,*"] {
	    # should only get here if git log is buggy
	    set id [lindex [split $vid ","] 1]
	    set commitrow($vid) $commitidx($view)
	    incr commitidx($view)
	    if {$view == $curview} {
		lappend parentlist {}
		lappend displayorder $id
		lappend commitlisted 0
	    } else {
		lappend vparentlist($view) {}
		lappend vdisporder($view) $id
		lappend vcmitlisted($view) 0
	    }
	}
201
	set viewcomplete($view) 1
202
	global viewname progresscoords
203
	unset commfd($view)
204
	notbusy $view
205 206
	set progresscoords {0 0}
	adjustprogress
207
	# set it blocking so we wait for the process to terminate
208
	fconfigure $fd -blocking 1
209 210 211 212
	if {[catch {close $fd} err]} {
	    set fv {}
	    if {$view != $curview} {
		set fv " for the \"$viewname($view)\" view"
213
	    }
214 215
	    if {[string range $err 0 4] == "usage"} {
		set err "Gitk: error reading commits$fv:\
216
			bad arguments to git rev-list."
217 218
		if {$viewname($view) eq "Command line"} {
		    append err \
219
			"  (Note: arguments to gitk are passed to git rev-list\
220 221 222 223 224 225
			 to allow selection of commits to be displayed.)"
		}
	    } else {
		set err "Error reading commits$fv: $err"
	    }
	    error_popup $err
226
	}
227
	if {$view == $curview} {
228
	    run chewcommits $view
229
	}
230
	return 0
231
    }
P
Paul Mackerras 已提交
232
    set start 0
233
    set gotsome 0
P
Paul Mackerras 已提交
234 235 236
    while 1 {
	set i [string first "\0" $stuff $start]
	if {$i < 0} {
237
	    append leftover($view) [string range $stuff $start end]
P
Paul Mackerras 已提交
238
	    break
239
	}
P
Paul Mackerras 已提交
240
	if {$start == 0} {
241
	    set cmit $leftover($view)
242
	    append cmit [string range $stuff 0 [expr {$i - 1}]]
243
	    set leftover($view) {}
244 245
	} else {
	    set cmit [string range $stuff $start [expr {$i - 1}]]
P
Paul Mackerras 已提交
246 247
	}
	set start [expr {$i + 1}]
248 249
	set j [string first "\n" $cmit]
	set ok 0
250
	set listed 1
251 252
	if {$j >= 0 && [string match "commit *" $cmit]} {
	    set ids [string range $cmit 7 [expr {$j - 1}]]
253
	    if {[string match {[-^<>]*} $ids]} {
254 255
		switch -- [string index $ids 0] {
		    "-" {set listed 0}
256 257 258
		    "^" {set listed 2}
		    "<" {set listed 3}
		    ">" {set listed 4}
259
		}
260 261
		set ids [string range $ids 1 end]
	    }
262 263
	    set ok 1
	    foreach id $ids {
264
		if {[string length $id] != 40} {
265 266 267 268 269 270
		    set ok 0
		    break
		}
	    }
	}
	if {!$ok} {
271 272 273 274
	    set shortcmit $cmit
	    if {[string length $shortcmit] > 80} {
		set shortcmit "[string range $shortcmit 0 80]..."
	    }
275
	    error_popup "[mc "Can't parse git log output:"] {$shortcmit}"
P
Paul Mackerras 已提交
276 277
	    exit 1
	}
278
	set id [lindex $ids 0]
279 280 281 282 283 284
	if {![info exists ordertok($view,$id)]} {
	    set otok "o[strrep $vnextroot($view)]"
	    incr vnextroot($view)
	    set ordertok($view,$id) $otok
	} else {
	    set otok $ordertok($view,$id)
P
Paul Mackerras 已提交
285
	    unset idpending($view,$id)
286
	}
287 288
	if {$listed} {
	    set olds [lrange $ids 1 end]
289 290 291 292 293
	    if {[llength $olds] == 1} {
		set p [lindex $olds 0]
		lappend children($view,$p) $id
		if {![info exists ordertok($view,$p)]} {
		    set ordertok($view,$p) $ordertok($view,$id)
P
Paul Mackerras 已提交
294
		    set idpending($view,$p) 1
295 296 297 298 299 300 301 302 303
		}
	    } else {
		set i 0
		foreach p $olds {
		    if {$i == 0 || [lsearch -exact $olds $p] >= $i} {
			lappend children($view,$p) $id
		    }
		    if {![info exists ordertok($view,$p)]} {
			set ordertok($view,$p) "$otok[strrep $i]]"
P
Paul Mackerras 已提交
304
			set idpending($view,$p) 1
305 306
		    }
		    incr i
P
Paul Mackerras 已提交
307
		}
308
	    }
309 310 311
	} else {
	    set olds {}
	}
312 313
	if {![info exists children($view,$id)]} {
	    set children($view,$id) {}
314
	}
315
	set commitdata($id) [string range $cmit [expr {$j + 1}] end]
316 317 318 319 320 321 322 323 324 325 326
	set commitrow($view,$id) $commitidx($view)
	incr commitidx($view)
	if {$view == $curview} {
	    lappend parentlist $olds
	    lappend displayorder $id
	    lappend commitlisted $listed
	} else {
	    lappend vparentlist($view) $olds
	    lappend vdisporder($view) $id
	    lappend vcmitlisted($view) $listed
	}
327 328 329 330 331 332
	if {[info exists commitinterest($id)]} {
	    foreach script $commitinterest($id) {
		eval [string map [list "%I" $id] $script]
	    }
	    unset commitinterest($id)
	}
333 334 335
	set gotsome 1
    }
    if {$gotsome} {
336
	run chewcommits $view
337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363
	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
	}
364
    }
365
    return 2
366 367
}

368
proc chewcommits {view} {
369
    global curview hlview viewcomplete
370 371 372
    global selectedline pending_select

    if {$view == $curview} {
373 374
	layoutmore
	if {$viewcomplete($view)} {
375
	    global displayorder commitidx phase
376
	    global numcommits startmsecs
377

378
	    if {[info exists pending_select]} {
379
		set row [first_real_row]
380 381 382 383 384 385
		selectline $row 1
	    }
	    if {$commitidx($curview) > 0} {
		#set ms [expr {[clock clicks -milliseconds] - $startmsecs}]
		#puts "overall $ms ms for $numcommits commits"
	    } else {
386
		show_status [mc "No commits selected"]
387 388 389 390
	    }
	    notbusy layout
	    set phase {}
	}
391
    }
392 393
    if {[info exists hlview] && $view == $hlview} {
	vhighlightmore
394
    }
395
    return 0
396 397 398
}

proc readcommit {id} {
399
    if {[catch {set contents [exec git cat-file commit $id]}]} return
400
    parsecommit $id $contents 0
P
Paul Mackerras 已提交
401 402
}

P
Paul Mackerras 已提交
403
proc updatecommits {} {
P
Paul Mackerras 已提交
404
    global viewdata curview phase displayorder ordertok idpending
405
    global children commitrow selectedline thickerline showneartags
406 407 408
    global isworktree

    set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}]
P
Paul Mackerras 已提交
409

410 411 412
    if {$phase ne {}} {
	stop_rev_list
	set phase {}
413
    }
414
    set n $curview
415 416 417
    foreach id $displayorder {
	catch {unset children($n,$id)}
	catch {unset commitrow($n,$id)}
P
Paul Mackerras 已提交
418 419 420 421
	catch {unset ordertok($n,$id)}
    }
    foreach vid [array names idpending "$n,*"] {
	unset idpending($vid)
422
    }
423
    set curview -1
424 425
    catch {unset selectedline}
    catch {unset thickerline}
426
    catch {unset viewdata($n)}
427
    readrefs
428
    changedrefs
429 430 431
    if {$showneartags} {
	getallcommits
    }
432
    showview $n
433 434
}

435
proc parsecommit {id contents listed} {
436 437 438 439 440 441 442 443 444
    global commitinfo cdate

    set inhdr 1
    set comment {}
    set headline {}
    set auname {}
    set audate {}
    set comname {}
    set comdate {}
P
Paul Mackerras 已提交
445 446 447 448 449 450 451 452 453 454 455 456 457 458 459
    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]
460 461
	}
    }
P
Paul Mackerras 已提交
462
    set headline {}
463 464 465
    # 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 已提交
466
    if {$i >= 0} {
467 468 469 470 471 472
	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 已提交
473 474
    }
    if {!$listed} {
475 476
	# git rev-list indents the comment by 4 spaces;
	# if we got this via git cat-file, add the indentation
P
Paul Mackerras 已提交
477 478 479 480
	set newcomment {}
	foreach line [split $comment "\n"] {
	    append newcomment "    "
	    append newcomment $line
481
	    append newcomment "\n"
P
Paul Mackerras 已提交
482 483
	}
	set comment $newcomment
484 485
    }
    if {$comdate != {}} {
486
	set cdate($id) $comdate
487
    }
488 489
    set commitinfo($id) [list $headline $auname $audate \
			     $comname $comdate $comment]
490 491
}

492
proc getcommit {id} {
493
    global commitdata commitinfo
P
Paul Mackerras 已提交
494

495 496
    if {[info exists commitdata($id)]} {
	parsecommit $id $commitdata($id) 1
P
Paul Mackerras 已提交
497 498 499
    } else {
	readcommit $id
	if {![info exists commitinfo($id)]} {
500
	    set commitinfo($id) [list [mc "No commit information available"]]
P
Paul Mackerras 已提交
501 502 503 504 505
	}
    }
    return 1
}

506
proc readrefs {} {
507
    global tagids idtags headids idheads tagobjid
508
    global otherrefids idotherrefs mainhead mainheadid
509

510 511 512
    foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
	catch {unset $v}
    }
513 514 515 516 517 518 519 520 521 522 523
    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
524
	    }
525 526
	} elseif {[string match "heads/*" $name]} {
	    set name [string range $name 6 end]
527 528
	    set headids($name) $id
	    lappend idheads($id) $name
529 530 531 532 533 534 535 536 537 538 539
	} 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
540 541 542
	} else {
	    set otherrefids($name) $id
	    lappend idotherrefs($id) $name
543 544
	}
    }
545
    catch {close $refd}
546
    set mainhead {}
547
    set mainheadid {}
548 549 550 551
    catch {
	set thehead [exec git symbolic-ref HEAD]
	if {[string match "refs/heads/*" $thehead]} {
	    set mainhead [string range $thehead 11 end]
552 553 554
	    if {[info exists headids($mainhead)]} {
		set mainheadid $headids($mainhead)
	    }
555 556
	}
    }
557 558
}

559 560 561 562 563 564 565 566 567 568 569 570 571
# skip over fake commits
proc first_real_row {} {
    global nullid nullid2 displayorder numcommits

    for {set row 0} {$row < $numcommits} {incr row} {
	set id [lindex $displayorder $row]
	if {$id ne $nullid && $id ne $nullid2} {
	    break
	}
    }
    return $row
}

572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595
# 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 已提交
596
proc show_error {w top msg} {
597 598
    message $w.m -text $msg -justify center -aspect 400
    pack $w.m -side top -fill x -padx 20 -pady 20
599
    button $w.ok -text [mc OK] -command "destroy $top"
600
    pack $w.ok -side bottom -fill x
P
Paul Mackerras 已提交
601 602 603
    bind $top <Visibility> "grab $top; focus $top"
    bind $top <Key-Return> "destroy $top"
    tkwait window $top
604 605
}

606 607 608 609
proc error_popup msg {
    set w .error
    toplevel $w
    wm transient $w .
P
Paul Mackerras 已提交
610
    show_error $w $w $msg
611 612
}

613 614 615 616 617 618 619 620
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
621
    button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w"
622
    pack $w.ok -side left -fill x
623
    button $w.cancel -text [mc Cancel] -command "destroy $w"
624 625 626 627 628 629
    pack $w.cancel -side right -fill x
    bind $w <Visibility> "grab $w; focus $w"
    tkwait window $w
    return $confirm_ok
}

630 631 632 633 634 635 636 637 638 639 640 641 642
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
}

643
proc makewindow {} {
644
    global canv canv2 canv3 linespc charspc ctext cflist
645
    global tabstop
646
    global findtype findtypemenu findloc findstring fstring geometry
647
    global entries sha1entry sha1string sha1but
648
    global diffcontextstring diffcontext
649
    global ignorespace
650
    global maincursor textcursor curtextcursor
651
    global rowctxmenu fakerowmenu mergemax wrapcomment
652
    global highlight_files gdttype
653
    global searchstring sstring
654
    global bgcolor fgcolor bglist fglist diffcolors selectbgcolor
655 656
    global headctxmenu progresscanv progressitem progresscoords statusw
    global fprogitem fprogcoord lastprogupdate progupdatepending
657
    global rprogitem rprogcoord
658
    global have_tk85
659 660

    menu .bar
661
    .bar add cascade -label [mc "File"] -menu .bar.file
662
    menu .bar.file
663 664 665 666
    .bar.file add command -label [mc "Update"] -command updatecommits
    .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
667
    menu .bar.edit
668 669
    .bar add cascade -label [mc "Edit"] -menu .bar.edit
    .bar.edit add command -label [mc "Preferences"] -command doprefs
670

671
    menu .bar.view
672 673 674
    .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 \
675
	-state disabled
676
    .bar.view add command -label [mc "Delete view"] -command delview -state disabled
P
Paul Mackerras 已提交
677
    .bar.view add separator
678
    .bar.view add radiobutton -label [mc "All files"] -command {showview 0} \
679
	-variable selectedview -value 0
680

681
    menu .bar.help
682 683 684
    .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
685
    .bar.help configure
686 687
    . configure -menu .bar

688
    # the gui has upper and lower half, parts of a paned window.
P
Paul Mackerras 已提交
689
    panedwindow .ctop -orient vertical
690 691

    # possibly use assumed geometry
692
    if {![info exists geometry(pwsash0)]} {
693 694 695 696
        set geometry(topheight) [expr {15 * $linespc}]
        set geometry(topwidth) [expr {80 * $charspc}]
        set geometry(botheight) [expr {15 * $linespc}]
        set geometry(botwidth) [expr {50 * $charspc}]
697 698
        set geometry(pwsash0) "[expr {40 * $charspc}] 2"
        set geometry(pwsash1) "[expr {60 * $charspc}] 2"
699 700 701 702 703 704 705 706 707 708
    }

    # 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
709
    canvas $canv \
710
	-selectbackground $selectbgcolor \
711
	-background $bgcolor -bd 0 \
P
Paul Mackerras 已提交
712
	-yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
713 714
    .tf.histframe.pwclist add $canv
    set canv2 .tf.histframe.pwclist.canv2
715
    canvas $canv2 \
716
	-selectbackground $selectbgcolor \
717
	-background $bgcolor -bd 0 -yscrollincr $linespc
718 719
    .tf.histframe.pwclist add $canv2
    set canv3 .tf.histframe.pwclist.canv3
720
    canvas $canv3 \
721
	-selectbackground $selectbgcolor \
722
	-background $bgcolor -bd 0 -yscrollincr $linespc
723
    .tf.histframe.pwclist add $canv3
724 725
    eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0)
    eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1)
726 727 728 729 730

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

734 735 736 737 738
    # 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
739
    set entries $sha1entry
740
    set sha1but .tf.bar.sha1label
741
    button $sha1but -text [mc "SHA1 ID: "] -state disabled -relief flat \
742
	-command gotocommit -width 8
743
    $sha1but conf -disabledforeground [$sha1but cget -foreground]
744
    pack .tf.bar.sha1label -side left
745
    entry $sha1entry -width 40 -font textfont -textvariable sha1string
746
    trace add variable sha1string write sha1change
747
    pack $sha1entry -side left -pady 2
748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764

    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};
    }
765
    button .tf.bar.leftbut -image bm-left -command goback \
766
	-state disabled -width 26
767 768
    pack .tf.bar.leftbut -side left -fill y
    button .tf.bar.rightbut -image bm-right -command goforw \
769
	-state disabled -width 26
770
    pack .tf.bar.rightbut -side left -fill y
771

772 773
    # Status label and progress bar
    set statusw .tf.bar.status
774
    label $statusw -width 15 -relief sunken
775
    pack $statusw -side left -padx 5
776
    set h [expr {[font metrics uifont -linespace] + 2}]
777 778 779 780
    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]
781
    set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
782 783 784
    pack $progresscanv -side right -expand 1 -fill x
    set progresscoords {0 0}
    set fprogcoord 0
785
    set rprogcoord 0
786 787 788 789
    bind $progresscanv <Configure> adjustprogress
    set lastprogupdate [clock clicks -milliseconds]
    set progupdatepending 0

790
    # build up the bottom bar of upper window
791 792 793 794
    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"] "
795 796
    pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \
	-side left -fill y
797
    set gdttype [mc "containing:"]
798
    set gm [tk_optionMenu .tf.lbar.gdttype gdttype \
799 800 801
		[mc "containing:"] \
		[mc "touching paths:"] \
		[mc "adding/removing string:"]]
802 803 804
    trace add variable gdttype write gdttype_change
    pack .tf.lbar.gdttype -side left -fill y

805
    set findstring {}
806
    set fstring .tf.lbar.findstring
807
    lappend entries $fstring
808
    entry $fstring -width 30 -font textfont -textvariable findstring
809
    trace add variable findstring write find_change
810
    set findtype [mc "Exact"]
811
    set findtypemenu [tk_optionMenu .tf.lbar.findtype \
812
		      findtype [mc "Exact"] [mc "IgnCase"] [mc "Regexp"]]
813
    trace add variable findtype write findcom_change
814 815 816
    set findloc [mc "All fields"]
    tk_optionMenu .tf.lbar.findloc findloc [mc "All fields"] [mc "Headline"] \
	[mc "Comments"] [mc "Author"] [mc "Committer"]
817
    trace add variable findloc write find_change
818 819 820
    pack .tf.lbar.findloc -side right
    pack .tf.lbar.findtype -side right
    pack $fstring -side left -expand 1 -fill x
821 822 823 824 825 826

    # 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
827 828
    .ctop paneconfigure .tf -height $geometry(topheight)
    .ctop paneconfigure .tf -width $geometry(topwidth)
829 830 831 832 833 834 835 836 837 838 839 840 841

    # 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
842
    frame .bleft.mid
843
    frame .bleft.bottom
844

845
    button .bleft.top.search -text [mc "Search"] -command dosearch
846 847
    pack .bleft.top.search -side left -padx 5
    set sstring .bleft.top.sstring
848
    entry $sstring -width 20 -font textfont -textvariable searchstring
849 850 851
    lappend entries $sstring
    trace add variable searchstring write incrsearch
    pack $sstring -side left -expand 1 -fill x
852
    radiobutton .bleft.mid.diff -text [mc "Diff"] \
853
	-command changediffdisp -variable diffelide -value {0 0}
854
    radiobutton .bleft.mid.old -text [mc "Old version"] \
855
	-command changediffdisp -variable diffelide -value {0 1}
856
    radiobutton .bleft.mid.new -text [mc "New version"] \
857
	-command changediffdisp -variable diffelide -value {1 0}
858
    label .bleft.mid.labeldiffcontext -text "      [mc "Lines of context"]: "
859
    pack .bleft.mid.diff .bleft.mid.old .bleft.mid.new -side left
860
    spinbox .bleft.mid.diffcontext -width 5 -font textfont \
861 862 863 864 865 866 867
	-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
868 869 870
    checkbutton .bleft.mid.ignspace -text [mc "Ignore space change"] \
	-command changeignorespace -variable ignorespace
    pack .bleft.mid.ignspace -side left -padx 5
871
    set ctext .bleft.bottom.ctext
872
    text $ctext -background $bgcolor -foreground $fgcolor \
873
	-state disabled -font textfont \
874 875
	-yscrollcommand scrolltext -wrap none \
	-xscrollcommand ".bleft.bottom.sbhorizontal set"
876 877 878
    if {$have_tk85} {
	$ctext conf -tabstyle wordprocessor
    }
879 880 881
    scrollbar .bleft.bottom.sb -command "$ctext yview"
    scrollbar .bleft.bottom.sbhorizontal -command "$ctext xview" -orient h \
	-width 10
882
    pack .bleft.top -side top -fill x
883
    pack .bleft.mid -side top -fill x
884 885 886 887 888 889
    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
890 891
    lappend bglist $ctext
    lappend fglist $ctext
892

893
    $ctext tag conf comment -wrap $wrapcomment
894
    $ctext tag conf filesep -font textfontbold -back "#aaaaaa"
895 896 897
    $ctext tag conf hunksep -fore [lindex $diffcolors 2]
    $ctext tag conf d0 -fore [lindex $diffcolors 0]
    $ctext tag conf d1 -fore [lindex $diffcolors 1]
898 899 900 901 902
    $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
903 904 905 906 907 908 909 910 911 912 913
    $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"
914
    $ctext tag conf mmax -fore darkgrey
915
    set mergemax 16
916 917
    $ctext tag conf mresult -font textfontbold
    $ctext tag conf msep -font textfontbold
918
    $ctext tag conf found -back yellow
919

920
    .pwbottom add .bleft
921
    .pwbottom paneconfigure .bleft -width $geometry(botwidth)
922 923 924 925

    # lower right
    frame .bright
    frame .bright.mode
926
    radiobutton .bright.mode.patch -text [mc "Patch"] \
P
Paul Mackerras 已提交
927
	-command reselectline -variable cmitmode -value "patch"
928
    radiobutton .bright.mode.tree -text [mc "Tree"] \
P
Paul Mackerras 已提交
929
	-command reselectline -variable cmitmode -value "tree"
930 931 932
    grid .bright.mode.patch .bright.mode.tree -sticky ew
    pack .bright.mode -side top -fill x
    set cflist .bright.cfiles
933
    set indent [font measure mainfont "nn"]
934
    text $cflist \
935
	-selectbackground $selectbgcolor \
936
	-background $bgcolor -foreground $fgcolor \
937
	-font mainfont \
938
	-tabs [list $indent [expr {2 * $indent}]] \
939
	-yscrollcommand ".bright.sb set" \
940 941
	-cursor [. cget -cursor] \
	-spacing1 1 -spacing3 1
942 943
    lappend bglist $cflist
    lappend fglist $cflist
944 945
    scrollbar .bright.sb -command "$cflist yview"
    pack .bright.sb -side right -fill y
946
    pack $cflist -side left -fill both -expand 1
947 948
    $cflist tag configure highlight \
	-background [$cflist cget -selectbackground]
949
    $cflist tag configure bold -font mainfontbold
950

951 952
    .pwbottom add .bright
    .ctop add .pwbottom
953

954
    # restore window width & height if known
955
    if {[info exists geometry(main)]} {
956 957 958 959 960 961 962 963 964
	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"
	}
965 966
    }

967 968 969 970 971 972
    if {[tk windowingsystem] eq {aqua}} {
        set M1B M1
    } else {
        set M1B Control
    }

973 974
    bind .pwbottom <Configure> {resizecdetpanes %W %w}
    pack .ctop -fill both -expand 1
975 976
    bindall <1> {selcanvline %W %x %y}
    #bindall <B1-Motion> {selcanvline %W %x %y}
977 978 979 980 981 982
    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"
983 984 985 986 987 988
        if {[tk windowingsystem] eq "aqua"} {
            bindall <MouseWheel> {
                set delta [expr {- (%D)}]
                allcanvs yview scroll $delta units
            }
        }
989
    }
990 991
    bindall <2> "canvscan mark %W %x %y"
    bindall <B2-Motion> "canvscan dragto %W %x %y"
992 993
    bindkey <Home> selfirstline
    bindkey <End> sellastline
994 995
    bind . <Key-Up> "selnextline -1"
    bind . <Key-Down> "selnextline 1"
996 997
    bind . <Shift-Key-Up> "dofind -1 0"
    bind . <Shift-Key-Down> "dofind 1 0"
998 999 1000 1001
    bindkey <Key-Right> "goforw"
    bindkey <Key-Left> "goback"
    bind . <Key-Prior> "selnextpage -1"
    bind . <Key-Next> "selnextpage 1"
1002 1003 1004 1005 1006 1007
    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"
1008 1009 1010
    bindkey <Key-Delete> "$ctext yview scroll -1 pages"
    bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
    bindkey <Key-space> "$ctext yview scroll 1 pages"
1011 1012
    bindkey p "selnextline -1"
    bindkey n "selnextline 1"
R
Robert Suetterlin 已提交
1013 1014 1015 1016 1017 1018
    bindkey z "goback"
    bindkey x "goforw"
    bindkey i "selnextline -1"
    bindkey k "selnextline 1"
    bindkey j "goback"
    bindkey l "goforw"
1019 1020 1021
    bindkey b "$ctext yview scroll -1 pages"
    bindkey d "$ctext yview scroll 18 units"
    bindkey u "$ctext yview scroll -18 units"
1022 1023 1024
    bindkey / {dofind 1 1}
    bindkey <Key-Return> {dofind 1 1}
    bindkey ? {dofind -1 1}
1025
    bindkey f nextfile
1026
    bindkey <F5> updatecommits
1027
    bind . <$M1B-q> doquit
1028 1029
    bind . <$M1B-f> {dofind 1 1}
    bind . <$M1B-g> {dofind 1 0}
1030 1031 1032
    bind . <$M1B-r> dosearchback
    bind . <$M1B-s> dosearch
    bind . <$M1B-equal> {incrfont 1}
1033
    bind . <$M1B-plus> {incrfont 1}
1034 1035 1036
    bind . <$M1B-KP_Add> {incrfont 1}
    bind . <$M1B-minus> {incrfont -1}
    bind . <$M1B-KP_Subtract> {incrfont -1}
1037
    wm protocol . WM_DELETE_WINDOW doquit
1038
    bind . <Button-1> "click %W"
1039
    bind $fstring <Key-Return> {dofind 1 1}
1040
    bind $sha1entry <Key-Return> gotocommit
1041
    bind $sha1entry <<PasteSelection>> clearsha1
1042 1043
    bind $cflist <1> {sel_flist %W %x %y; break}
    bind $cflist <B1-Motion> {sel_flist %W %x %y; break}
P
Paul Mackerras 已提交
1044
    bind $cflist <ButtonRelease-1> {treeclick %W %x %y}
1045
    bind $cflist <Button-3> {pop_flist_menu %W %X %Y %x %y}
1046 1047 1048

    set maincursor [. cget -cursor]
    set textcursor [$ctext cget -cursor]
1049
    set curtextcursor $textcursor
1050

1051 1052
    set rowctxmenu .rowctxmenu
    menu $rowctxmenu -tearoff 0
1053
    $rowctxmenu add command -label [mc "Diff this -> selected"] \
1054
	-command {diffvssel 0}
1055
    $rowctxmenu add command -label [mc "Diff selected -> this"] \
1056
	-command {diffvssel 1}
1057 1058 1059 1060 1061
    $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"] \
1062
	-command cherrypick
1063
    $rowctxmenu add command -label [mc "Reset HEAD branch to here"] \
1064
	-command resethead
1065

1066 1067
    set fakerowmenu .fakerowmenu
    menu $fakerowmenu -tearoff 0
1068
    $fakerowmenu add command -label [mc "Diff this -> selected"] \
1069
	-command {diffvssel 0}
1070
    $fakerowmenu add command -label [mc "Diff selected -> this"] \
1071
	-command {diffvssel 1}
1072 1073 1074 1075
    $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
1076

1077 1078
    set headctxmenu .headctxmenu
    menu $headctxmenu -tearoff 0
1079
    $headctxmenu add command -label [mc "Check out this branch"] \
1080
	-command cobranch
1081
    $headctxmenu add command -label [mc "Remove this branch"] \
1082
	-command rmbranch
1083 1084 1085 1086

    global flist_menu
    set flist_menu .flistctxmenu
    menu $flist_menu -tearoff 0
1087
    $flist_menu add command -label [mc "Highlight this too"] \
1088
	-command {flist_hl 0}
1089
    $flist_menu add command -label [mc "Highlight this only"] \
1090
	-command {flist_hl 1}
1091 1092
}

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

1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123
# 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 已提交
1124 1125 1126
proc scrollcanv {cscroll f0 f1} {
    $cscroll set $f0 $f1
    drawfrac $f0 $f1
1127
    flushhighlights
P
Paul Mackerras 已提交
1128 1129
}

1130 1131 1132 1133
# 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} {
1134
    global entries
1135 1136 1137 1138 1139
    bind . $ev $script
    set escript [bind Entry $ev]
    if {$escript == {}} {
	set escript [bind Entry <Key>]
    }
1140 1141 1142
    foreach e $entries {
	bind $e $ev "$escript; break"
    }
1143 1144 1145
}

# set the focus back to the toplevel for any click outside
1146
# the entry widgets
1147
proc click {w} {
1148 1149
    global ctext entries
    foreach e [concat $entries $ctext] {
1150
	if {$w == $e} return
1151
    }
1152
    focus .
1153 1154
}

1155 1156 1157 1158
# Adjust the progress bar for a change in requested extent or canvas size
proc adjustprogress {} {
    global progresscanv progressitem progresscoords
    global fprogitem fprogcoord lastprogupdate progupdatepending
1159
    global rprogitem rprogcoord
1160 1161 1162 1163 1164 1165 1166

    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
1167
    $progresscanv coords $rprogitem 0 0 [expr {$w * $rprogcoord}] $h
1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187
    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
    }
}

1188
proc savestuff {w} {
1189
    global canv canv2 canv3 mainfont textfont uifont tabstop
1190
    global stuffsaved findmergefiles maxgraphpct
1191
    global maxwidth showneartags showlocalchanges
1192
    global viewname viewfiles viewargs viewargscmd viewperm nextviewnum
1193
    global cmitmode wrapcomment datetimeformat limitdiffs
1194
    global colors bgcolor fgcolor diffcolors diffcontext selectbgcolor
1195
    global autoselect
1196

1197
    if {$stuffsaved} return
1198
    if {![winfo viewable .]} return
1199 1200
    catch {
	set f [open "~/.gitk-new" w]
1201 1202
	puts $f [list set mainfont $mainfont]
	puts $f [list set textfont $textfont]
1203
	puts $f [list set uifont $uifont]
1204
	puts $f [list set tabstop $tabstop]
1205
	puts $f [list set findmergefiles $findmergefiles]
1206
	puts $f [list set maxgraphpct $maxgraphpct]
1207
	puts $f [list set maxwidth $maxwidth]
P
Paul Mackerras 已提交
1208
	puts $f [list set cmitmode $cmitmode]
1209
	puts $f [list set wrapcomment $wrapcomment]
1210
	puts $f [list set autoselect $autoselect]
P
Paul Mackerras 已提交
1211
	puts $f [list set showneartags $showneartags]
1212
	puts $f [list set showlocalchanges $showlocalchanges]
1213
	puts $f [list set datetimeformat $datetimeformat]
1214
	puts $f [list set limitdiffs $limitdiffs]
1215 1216 1217 1218
	puts $f [list set bgcolor $bgcolor]
	puts $f [list set fgcolor $fgcolor]
	puts $f [list set colors $colors]
	puts $f [list set diffcolors $diffcolors]
1219
	puts $f [list set diffcontext $diffcontext]
1220
	puts $f [list set selectbgcolor $selectbgcolor]
1221

1222
	puts $f "set geometry(main) [wm geometry .]"
1223 1224
	puts $f "set geometry(topwidth) [winfo width .tf]"
	puts $f "set geometry(topheight) [winfo height .tf]"
1225 1226
        puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\""
        puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\""
1227 1228 1229
	puts $f "set geometry(botwidth) [winfo width .bleft]"
	puts $f "set geometry(botheight) [winfo height .bleft]"

1230 1231 1232
	puts -nonewline $f "set permviews {"
	for {set v 0} {$v < $nextviewnum} {incr v} {
	    if {$viewperm($v)} {
1233
		puts $f "{[list $viewname($v) $viewfiles($v) $viewargs($v) $viewargscmd($v)]}"
1234 1235 1236
	    }
	}
	puts $f "}"
1237 1238 1239 1240
	close $f
	file rename -force "~/.gitk-new" "~/.gitk"
    }
    set stuffsaved 1
1241 1242
}

1243 1244
proc resizeclistpanes {win w} {
    global oldwidth
1245
    if {[info exists oldwidth($win)]} {
1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258
	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 已提交
1259
		set sash1 [expr {$sash0 + 20}]
1260 1261
	    }
	    if {$sash1 > $w - 10} {
J
Jeff Hobbs 已提交
1262
		set sash1 [expr {$w - 10}]
1263
		if {$sash0 > $sash1 - 20} {
J
Jeff Hobbs 已提交
1264
		    set sash0 [expr {$sash1 - 20}]
1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275
		}
	    }
	}
	$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
1276
    if {[info exists oldwidth($win)]} {
1277 1278 1279 1280 1281 1282 1283 1284 1285 1286
	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 已提交
1287
		set sash0 [expr {$w - 15}]
1288 1289 1290 1291 1292 1293 1294
	    }
	}
	$win sash place 0 $sash0 [lindex $s0 1]
    }
    set oldwidth($win) $w
}

1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308
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
}

1309
proc about {} {
1310
    global uifont
1311 1312 1313 1314 1315 1316
    set w .about
    if {[winfo exists $w]} {
	raise $w
	return
    }
    toplevel $w
1317 1318
    wm title $w [mc "About gitk"]
    message $w.m -text [mc "
P
Paul Mackerras 已提交
1319
Gitk - a commit viewer for git
1320

1321
Copyright © 2005-2006 Paul Mackerras
1322

1323
Use and redistribute under the terms of the GNU General Public License"] \
1324 1325
	    -justify center -aspect 400 -border 2 -bg white -relief groove
    pack $w.m -side top -fill x -padx 2 -pady 2
1326
    button $w.ok -text [mc "Close"] -command "destroy $w" -default active
1327
    pack $w.ok -side bottom
1328 1329 1330
    bind $w <Visibility> "focus $w.ok"
    bind $w <Key-Escape> "destroy $w"
    bind $w <Key-Return> "destroy $w"
1331 1332
}

1333 1334 1335 1336 1337 1338
proc keys {} {
    set w .keys
    if {[winfo exists $w]} {
	raise $w
	return
    }
1339 1340 1341 1342 1343
    if {[tk windowingsystem] eq {aqua}} {
	set M1T Cmd
    } else {
	set M1T Ctrl
    }
1344
    toplevel $w
1345
    wm title $w [mc "Gitk key bindings"]
1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384
    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"]
" \
1385 1386
	    -justify left -bg white -border 2 -relief groove
    pack $w.m -side top -fill both -padx 2 -pady 2
1387
    button $w.ok -text [mc "Close"] -command "destroy $w" -default active
1388
    pack $w.ok -side bottom
1389 1390 1391
    bind $w <Visibility> "focus $w.ok"
    bind $w <Key-Escape> "destroy $w"
    bind $w <Key-Return> "destroy $w"
1392 1393
}

1394 1395
# Procedures for manipulating the file list window at the
# bottom right of the overall window.
P
Paul Mackerras 已提交
1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448

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
1449
		$w insert end $d [highlight_tag $prefix]
P
Paul Mackerras 已提交
1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460
		$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
1461
		$w insert end $tail [highlight_tag $f]
P
Paul Mackerras 已提交
1462 1463 1464 1465 1466 1467 1468 1469
	    }
	    lappend treecontents($prefix) $tail
	}
    }
    while {$htstack ne {}} {
	set treeheight($prefix) $ht
	incr ht [lindex $htstack end]
	set htstack [lreplace $htstack end end]
1470 1471 1472
	set prefixend [lindex $prefendstack end]
	set prefendstack [lreplace $prefendstack end end]
	set prefix [string range $prefix 0 $prefixend]
P
Paul Mackerras 已提交
1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500
    }
    $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
	}
    }
}

1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516
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 已提交
1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549
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) {
1550
	set de $dir$e
P
Paul Mackerras 已提交
1551 1552 1553 1554 1555 1556 1557 1558
	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
1559
	    $w insert e:$ix $e [highlight_tag $de]
P
Paul Mackerras 已提交
1560 1561 1562 1563 1564
	    $w mark set s:$iy e:$ix
	    $w mark gravity s:$iy left
	    set treeheight($de) 1
	} else {
	    $w insert e:$ix $str
1565
	    $w insert e:$ix $e [highlight_tag $de]
P
Paul Mackerras 已提交
1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644
	}
    }
    $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};
}

1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676
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

1677
proc init_flist {first} {
1678
    global cflist cflist_top selectedline difffilestart
1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692

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

1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704
proc highlight_tag {f} {
    global highlight_paths

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

proc highlight_filelist {} {
1705
    global cmitmode cflist
1706

1707 1708
    $cflist conf -state normal
    if {$cmitmode ne "tree"} {
1709 1710 1711 1712 1713 1714 1715
	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"
	    }
	}
1716 1717
    } else {
	highlight_tree 2 {}
1718
    }
1719
    $cflist conf -state disabled
1720 1721 1722
}

proc unhighlight_filelist {} {
1723
    global cflist
1724

1725 1726 1727
    $cflist conf -state normal
    $cflist tag remove bold 1.0 end
    $cflist conf -state disabled
1728 1729
}

P
Paul Mackerras 已提交
1730
proc add_flist {fl} {
1731
    global cflist
1732

1733 1734 1735 1736
    $cflist conf -state normal
    foreach f $fl {
	$cflist insert end "\n"
	$cflist insert end $f [highlight_tag $f]
1737
    }
1738
    $cflist conf -state disabled
1739 1740 1741
}

proc sel_flist {w x y} {
1742
    global ctext difffilestart cflist cflist_top cmitmode
1743

P
Paul Mackerras 已提交
1744
    if {$cmitmode eq "tree"} return
1745 1746
    if {![info exists cflist_top]} return
    set l [lindex [split [$w index "@$x,$y"] "."] 0]
1747 1748 1749
    $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 已提交
1750 1751 1752 1753
    if {$l == 1} {
	$ctext yview 1.0
    } else {
	catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
1754 1755 1756
    }
}

1757 1758 1759 1760
proc pop_flist_menu {w X Y x y} {
    global ctext cflist cmitmode flist_menu flist_menu_file
    global treediffs diffids

1761
    stopfinding
1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774
    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} {
1775
    global flist_menu_file findstring gdttype
1776 1777

    set x [shellquote $flist_menu_file]
1778
    if {$only || $findstring eq {} || $gdttype ne [mc "touching paths:"]} {
1779
	set findstring $x
1780
    } else {
1781
	append findstring " " $x
1782
    }
1783
    set gdttype [mc "touching paths:"]
1784 1785
}

1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879
# 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
}

1880 1881
# Code to implement multiple views

1882
proc newview {ishighlight} {
1883
    global nextviewnum newviewname newviewperm newishighlight
1884
    global newviewargs revtreeargs viewargscmd newviewargscmd curview
P
Paul Mackerras 已提交
1885

1886
    set newishighlight $ishighlight
P
Paul Mackerras 已提交
1887 1888 1889 1890 1891
    set top .gitkview
    if {[winfo exists $top]} {
	raise $top
	return
    }
1892
    set newviewname($nextviewnum) "[mc "View"] $nextviewnum"
1893
    set newviewperm($nextviewnum) 0
1894
    set newviewargs($nextviewnum) [shellarglist $revtreeargs]
1895
    set newviewargscmd($nextviewnum) $viewargscmd($curview)
1896
    vieweditor $top $nextviewnum [mc "Gitk view definition"]
1897 1898 1899 1900 1901
}

proc editview {} {
    global curview
    global viewname viewperm newviewname newviewperm
1902
    global viewargs newviewargs viewargscmd newviewargscmd
1903 1904 1905 1906 1907 1908 1909 1910

    set top .gitkvedit-$curview
    if {[winfo exists $top]} {
	raise $top
	return
    }
    set newviewname($curview) $viewname($curview)
    set newviewperm($curview) $viewperm($curview)
1911
    set newviewargs($curview) [shellarglist $viewargs($curview)]
1912
    set newviewargscmd($curview) $viewargscmd($curview)
1913 1914 1915 1916
    vieweditor $top $curview "Gitk: edit view $viewname($curview)"
}

proc vieweditor {top n title} {
1917
    global newviewname newviewperm viewfiles bgcolor
1918

P
Paul Mackerras 已提交
1919
    toplevel $top
1920
    wm title $top $title
1921 1922
    label $top.nl -text [mc "Name"]
    entry $top.name -width 20 -textvariable newviewname($n)
1923
    grid $top.nl $top.name -sticky w -pady 5
1924 1925
    checkbutton $top.perm -text [mc "Remember this view"] \
	-variable newviewperm($n)
1926
    grid $top.perm - -pady 5 -sticky w
1927
    message $top.al -aspect 1000 \
1928
	-text [mc "Commits to include (arguments to git rev-list):"]
1929 1930
    grid $top.al - -sticky w -pady 5
    entry $top.args -width 50 -textvariable newviewargs($n) \
1931
	-background $bgcolor
1932
    grid $top.args - -sticky ew -padx 5
1933 1934 1935 1936 1937 1938 1939 1940

    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

1941
    message $top.l -aspect 1000 \
1942
	-text [mc "Enter files and directories to include, one per line:"]
1943
    grid $top.l - -sticky w
1944
    text $top.t -width 40 -height 10 -background $bgcolor -font uifont
1945 1946 1947 1948 1949 1950 1951 1952
    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
    }
1953
    grid $top.t - -sticky ew -padx 5
P
Paul Mackerras 已提交
1954
    frame $top.buts
1955 1956
    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 已提交
1957 1958 1959 1960 1961 1962 1963
    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
}

1964
proc doviewmenu {m first cmd op argv} {
1965 1966 1967
    set nmenu [$m index end]
    for {set i $first} {$i <= $nmenu} {incr i} {
	if {[$m entrycget $i -command] eq $cmd} {
1968
	    eval $m $op $i $argv
1969
	    break
1970 1971
	}
    }
1972 1973 1974
}

proc allviewmenus {n op args} {
1975
    # global viewhlmenu
1976

1977
    doviewmenu .bar.view 5 [list showview $n] $op $args
1978
    # doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
1979 1980 1981
}

proc newviewok {top n} {
1982
    global nextviewnum newviewperm newviewname newishighlight
1983
    global viewname viewfiles viewperm selectedview curview
1984
    global viewargs newviewargs viewargscmd newviewargscmd viewhlmenu
P
Paul Mackerras 已提交
1985

1986 1987 1988
    if {[catch {
	set newargs [shellsplit $newviewargs($n)]
    } err]} {
1989
	error_popup "[mc "Error in commit selection arguments:"] $err"
1990 1991 1992 1993
	wm raise $top
	focus $top
	return
    }
P
Paul Mackerras 已提交
1994
    set files {}
1995
    foreach f [split [$top.t get 0.0 end] "\n"] {
P
Paul Mackerras 已提交
1996 1997 1998 1999 2000
	set ft [string trim $f]
	if {$ft ne {}} {
	    lappend files $ft
	}
    }
2001 2002 2003 2004 2005 2006
    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
2007
	set viewargs($n) $newargs
2008
	set viewargscmd($n) $newviewargscmd($n)
2009 2010
	addviewmenu $n
	if {!$newishighlight} {
2011
	    run showview $n
2012
	} else {
2013
	    run addvhighlight $n
2014
	}
2015 2016 2017 2018 2019
    } else {
	# editing an existing view
	set viewperm($n) $newviewperm($n)
	if {$newviewname($n) ne $viewname($n)} {
	    set viewname($n) $newviewname($n)
2020
	    doviewmenu .bar.view 5 [list showview $n] \
2021
		entryconf [list -label $viewname($n)]
2022 2023
	    # doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
		# entryconf [list -label $viewname($n) -value $viewname($n)]
2024
	}
2025 2026
	if {$files ne $viewfiles($n) || $newargs ne $viewargs($n) || \
		$newviewargscmd($n) ne $viewargscmd($n)} {
2027
	    set viewfiles($n) $files
2028
	    set viewargs($n) $newargs
2029
	    set viewargscmd($n) $newviewargscmd($n)
2030
	    if {$curview == $n} {
2031
		run updatecommits
2032 2033 2034 2035
	    }
	}
    }
    catch {destroy $top}
P
Paul Mackerras 已提交
2036 2037 2038
}

proc delview {} {
2039
    global curview viewdata viewperm hlview selectedhlview
P
Paul Mackerras 已提交
2040 2041

    if {$curview == 0} return
2042
    if {[info exists hlview] && $hlview == $curview} {
2043
	set selectedhlview [mc "None"]
2044 2045
	unset hlview
    }
2046
    allviewmenus $curview delete
P
Paul Mackerras 已提交
2047
    set viewdata($curview) {}
2048
    set viewperm($curview) 0
P
Paul Mackerras 已提交
2049 2050 2051
    showview 0
}

2052
proc addviewmenu {n} {
2053
    global viewname viewhlmenu
2054 2055 2056

    .bar.view add radiobutton -label $viewname($n) \
	-command [list showview $n] -variable selectedview -value $n
2057 2058
    #$viewhlmenu add radiobutton -label $viewname($n) \
    #	-command [list addvhighlight $n] -variable selectedhlview
2059 2060
}

2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079
proc flatten {var} {
    global $var

    set ret {}
    foreach i [array names $var] {
	lappend ret $i [set $var\($i\)]
    }
    return $ret
}

proc unflatten {var l} {
    global $var

    catch {unset $var}
    foreach {i v} $l {
	set $var\($i\) $v
    }
}

P
Paul Mackerras 已提交
2080 2081
proc showview {n} {
    global curview viewdata viewfiles
2082
    global displayorder parentlist rowidlist rowisopt rowfinal
2083
    global colormap rowtextx commitrow nextcolor canvxmax
2084
    global numcommits commitlisted
P
Paul Mackerras 已提交
2085
    global selectedline currentid canv canvy0
2086
    global treediffs
2087
    global pending_select phase
2088
    global commitidx
2089
    global commfd
2090
    global selectedview selectfirst
2091
    global vparentlist vdisporder vcmitlisted
2092
    global hlview selectedhlview commitinterest
P
Paul Mackerras 已提交
2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105

    if {$n == $curview} return
    set selid {}
    if {[info exists selectedline]} {
	set selid $currentid
	set y [yc $selectedline]
	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}]
	if {$ytop < $y && $y < $ybot} {
	    set yscreen [expr {$y - $ytop}]
	}
2106 2107 2108
    } elseif {[info exists pending_select]} {
	set selid $pending_select
	unset pending_select
P
Paul Mackerras 已提交
2109 2110
    }
    unselectline
2111
    normalline
2112
    if {$curview >= 0} {
2113 2114 2115
	set vparentlist($curview) $parentlist
	set vdisporder($curview) $displayorder
	set vcmitlisted($curview) $commitlisted
2116 2117 2118
	if {$phase ne {} ||
	    ![info exists viewdata($curview)] ||
	    [lindex $viewdata($curview) 0] ne {}} {
2119
	    set viewdata($curview) \
2120
		[list $phase $rowidlist $rowisopt $rowfinal]
2121
	}
P
Paul Mackerras 已提交
2122 2123 2124
    }
    catch {unset treediffs}
    clear_display
2125 2126
    if {[info exists hlview] && $hlview == $n} {
	unset hlview
2127
	set selectedhlview [mc "None"]
2128
    }
2129
    catch {unset commitinterest}
P
Paul Mackerras 已提交
2130 2131

    set curview $n
2132
    set selectedview $n
2133 2134
    .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 已提交
2135

2136
    run refill_reflist
P
Paul Mackerras 已提交
2137
    if {![info exists viewdata($n)]} {
2138 2139 2140
	if {$selid ne {}} {
	    set pending_select $selid
	}
2141
	getcommits
P
Paul Mackerras 已提交
2142 2143 2144
	return
    }

2145 2146
    set v $viewdata($n)
    set phase [lindex $v 0]
2147 2148 2149 2150
    set displayorder $vdisporder($n)
    set parentlist $vparentlist($n)
    set commitlisted $vcmitlisted($n)
    set rowidlist [lindex $v 1]
2151
    set rowisopt [lindex $v 2]
2152 2153
    set rowfinal [lindex $v 3]
    set numcommits $commitidx($n)
2154

P
Paul Mackerras 已提交
2155 2156
    catch {unset colormap}
    catch {unset rowtextx}
2157 2158
    set nextcolor 0
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
2159 2160 2161 2162
    set curview $n
    set row 0
    setcanvscroll
    set yf 0
2163 2164
    set row {}
    set selectfirst 0
2165
    if {[info exists yscreen] && [info exists commitrow($n,$selid)]} {
2166
	set row $commitrow($n,$selid)
P
Paul Mackerras 已提交
2167 2168 2169 2170 2171 2172 2173 2174 2175 2176
	# 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
2177 2178 2179 2180 2181
    if {$row ne {}} {
	selectline $row 0
    } elseif {$selid ne {}} {
	set pending_select $selid
    } else {
2182
	set row [first_real_row]
2183 2184
	if {$row < $numcommits} {
	    selectline $row 0
2185 2186 2187 2188
	} else {
	    set selectfirst 1
	}
    }
2189
    if {$phase ne {}} {
2190
	if {$phase eq "getcommits"} {
2191
	    show_status [mc "Reading commits..."]
2192
	}
2193
	run chewcommits $n
2194
    } elseif {$numcommits == 0} {
2195
	show_status [mc "No commits selected"]
2196
    }
P
Paul Mackerras 已提交
2197 2198
}

2199 2200 2201
# Stuff relating to the highlighting facility

proc ishighlighted {row} {
2202
    global vhighlights fhighlights nhighlights rhighlights
2203 2204 2205 2206 2207 2208 2209 2210 2211 2212

    if {[info exists nhighlights($row)] && $nhighlights($row) > 0} {
	return $nhighlights($row)
    }
    if {[info exists vhighlights($row)] && $vhighlights($row) > 0} {
	return $vhighlights($row)
    }
    if {[info exists fhighlights($row)] && $fhighlights($row) > 0} {
	return $fhighlights($row)
    }
2213 2214 2215
    if {[info exists rhighlights($row)] && $rhighlights($row) > 0} {
	return $rhighlights($row)
    }
2216 2217 2218 2219
    return 0
}

proc bolden {row font} {
2220
    global canv linehtag selectedline boldrows
2221

2222
    lappend boldrows $row
2223
    $canv itemconf $linehtag($row) -font $font
2224
    if {[info exists selectedline] && $row == $selectedline} {
2225 2226 2227 2228 2229 2230 2231 2232 2233
	$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} {
2234
    global canv2 linentag selectedline boldnamerows
2235

2236
    lappend boldnamerows $row
2237
    $canv2 itemconf $linentag($row) -font $font
2238
    if {[info exists selectedline] && $row == $selectedline} {
2239 2240 2241 2242 2243 2244 2245 2246
	$canv2 delete secsel
	set t [eval $canv2 create rect [$canv2 bbox $linentag($row)] \
		   -outline {{}} -tags secsel \
		   -fill [$canv2 cget -selectbackground]]
	$canv2 lower $t
    }
}

2247
proc unbolden {} {
2248
    global boldrows
2249

2250 2251
    set stillbold {}
    foreach row $boldrows {
2252
	if {![ishighlighted $row]} {
2253
	    bolden $row mainfont
2254 2255
	} else {
	    lappend stillbold $row
2256 2257
	}
    }
2258
    set boldrows $stillbold
2259 2260 2261 2262
}

proc addvhighlight {n} {
    global hlview curview viewdata vhl_done vhighlights commitidx
2263 2264

    if {[info exists hlview]} {
2265
	delvhighlight
2266 2267 2268
    }
    set hlview $n
    if {$n != $curview && ![info exists viewdata($n)]} {
P
Paul Mackerras 已提交
2269
	set viewdata($n) [list getcommits {{}} 0 0 0]
2270 2271 2272 2273
	set vparentlist($n) {}
	set vdisporder($n) {}
	set vcmitlisted($n) {}
	start_rev_list $n
2274 2275 2276 2277
    }
    set vhl_done $commitidx($hlview)
    if {$vhl_done > 0} {
	drawvisible
2278 2279 2280
    }
}

2281 2282
proc delvhighlight {} {
    global hlview vhighlights
2283 2284 2285

    if {![info exists hlview]} return
    unset hlview
2286 2287
    catch {unset vhighlights}
    unbolden
2288 2289
}

2290 2291
proc vhighlightmore {} {
    global hlview vhl_done commitidx vhighlights
2292
    global displayorder vdisporder curview
2293 2294 2295 2296 2297 2298 2299

    set max $commitidx($hlview)
    if {$hlview == $curview} {
	set disp $displayorder
    } else {
	set disp $vdisporder($hlview)
    }
2300 2301 2302 2303
    set vr [visiblerows]
    set r0 [lindex $vr 0]
    set r1 [lindex $vr 1]
    for {set i $vhl_done} {$i < $max} {incr i} {
2304 2305 2306
	set id [lindex $disp $i]
	if {[info exists commitrow($curview,$id)]} {
	    set row $commitrow($curview,$id)
2307 2308
	    if {$r0 <= $row && $row <= $r1} {
		if {![highlighted $row]} {
2309
		    bolden $row mainfontbold
2310
		}
2311
		set vhighlights($row) 1
2312 2313 2314
	    }
	}
    }
2315 2316 2317 2318
    set vhl_done $max
}

proc askvhighlight {row id} {
2319
    global hlview vhighlights commitrow iddrawn
2320 2321 2322

    if {[info exists commitrow($hlview,$id)]} {
	if {[info exists iddrawn($id)] && ![ishighlighted $row]} {
2323
	    bolden $row mainfontbold
2324 2325 2326 2327 2328 2329 2330
	}
	set vhighlights($row) 1
    } else {
	set vhighlights($row) 0
    }
}

2331
proc hfiles_change {} {
2332
    global highlight_files filehighlight fhighlights fh_serial
2333
    global highlight_paths gdttype
2334 2335 2336 2337 2338

    if {[info exists filehighlight]} {
	# delete previous highlights
	catch {close $filehighlight}
	unset filehighlight
2339 2340
	catch {unset fhighlights}
	unbolden
2341
	unhighlight_filelist
2342
    }
2343
    set highlight_paths {}
2344 2345 2346 2347 2348 2349 2350
    after cancel do_file_hl $fh_serial
    incr fh_serial
    if {$highlight_files ne {}} {
	after 300 do_file_hl $fh_serial
    }
}

2351 2352 2353
proc gdttype_change {name ix op} {
    global gdttype highlight_files findstring findpattern

2354
    stopfinding
2355
    if {$findstring ne {}} {
2356
	if {$gdttype eq [mc "containing:"]} {
2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377
	    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

2378
    stopfinding
2379
    if {$gdttype eq [mc "containing:"]} {
2380 2381 2382 2383 2384 2385 2386 2387 2388 2389
	findcom_change
    } else {
	if {$highlight_files ne $findstring} {
	    set highlight_files $findstring
	    hfiles_change
	}
    }
    drawvisible
}

2390
proc findcom_change args {
2391
    global nhighlights boldnamerows
2392 2393
    global findpattern findtype findstring gdttype

2394
    stopfinding
2395 2396
    # delete previous highlights, if any
    foreach row $boldnamerows {
2397
	bolden_name $row mainfont
2398 2399 2400 2401 2402
    }
    set boldnamerows {}
    catch {unset nhighlights}
    unbolden
    unmarkmatches
2403
    if {$gdttype ne [mc "containing:"] || $findstring eq {}} {
2404
	set findpattern {}
2405
    } elseif {$findtype eq [mc "Regexp"]} {
2406 2407 2408 2409 2410 2411 2412 2413
	set findpattern $findstring
    } else {
	set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
		   $findstring]
	set findpattern "*$e*"
    }
}

2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427
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
}

2428
proc do_file_hl {serial} {
2429
    global highlight_files filehighlight highlight_paths gdttype fhl_list
2430

2431
    if {$gdttype eq [mc "touching paths:"]} {
2432 2433 2434 2435
	if {[catch {set paths [shellsplit $highlight_files]}]} return
	set highlight_paths [makepatterns $paths]
	highlight_filelist
	set gdtargs [concat -- $paths]
2436
    } elseif {$gdttype eq [mc "adding/removing string:"]} {
2437
	set gdtargs [list "-S$highlight_files"]
2438 2439 2440
    } else {
	# must be "containing:", i.e. we're searching commit info
	return
2441
    }
2442
    set cmd [concat | git diff-tree -r -s --stdin $gdtargs]
2443 2444
    set filehighlight [open $cmd r+]
    fconfigure $filehighlight -blocking 0
2445
    filerun $filehighlight readfhighlight
2446
    set fhl_list {}
2447 2448 2449 2450 2451
    drawvisible
    flushhighlights
}

proc flushhighlights {} {
2452
    global filehighlight fhl_list
2453 2454

    if {[info exists filehighlight]} {
2455
	lappend fhl_list {}
2456 2457 2458 2459 2460 2461
	puts $filehighlight ""
	flush $filehighlight
    }
}

proc askfilehighlight {row id} {
2462
    global filehighlight fhighlights fhl_list
2463

2464 2465
    lappend fhl_list $id
    set fhighlights($row) -1
2466 2467 2468 2469
    puts $filehighlight $id
}

proc readfhighlight {} {
2470
    global filehighlight fhighlights commitrow curview iddrawn
2471
    global fhl_list find_dirn
2472

2473 2474 2475 2476 2477
    if {![info exists filehighlight]} {
	return 0
    }
    set nr 0
    while {[incr nr] <= 100 && [gets $filehighlight line] >= 0} {
2478 2479 2480 2481 2482 2483 2484 2485
	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]
	    if {[info exists commitrow($curview,$id)]} {
		set fhighlights($commitrow($curview,$id)) 0
	    }
2486
	}
2487 2488 2489 2490 2491
	set fhl_list [lrange $fhl_list [expr {$i+1}] end]
	if {$line eq {}} continue
	if {![info exists commitrow($curview,$line)]} continue
	set row $commitrow($curview,$line)
	if {[info exists iddrawn($line)] && ![ishighlighted $row]} {
2492
	    bolden $row mainfontbold
2493 2494
	}
	set fhighlights($row) 1
2495
    }
2496 2497
    if {[eof $filehighlight]} {
	# strange...
2498
	puts "oops, git diff-tree died"
2499 2500
	catch {close $filehighlight}
	unset filehighlight
2501
	return 0
2502
    }
2503
    if {[info exists find_dirn]} {
2504
	run findmore
2505
    }
2506
    return 1
2507 2508
}

2509
proc doesmatch {f} {
2510
    global findtype findpattern
2511

2512
    if {$findtype eq [mc "Regexp"]} {
2513
	return [regexp $findpattern $f]
2514
    } elseif {$findtype eq [mc "IgnCase"]} {
2515 2516 2517 2518 2519 2520
	return [string match -nocase $findpattern $f]
    } else {
	return [string match $findpattern $f]
    }
}

2521
proc askfindhighlight {row id} {
2522
    global nhighlights commitinfo iddrawn
2523 2524
    global findloc
    global markingmatches
2525 2526 2527 2528

    if {![info exists commitinfo($id)]} {
	getcommit $id
    }
2529
    set info $commitinfo($id)
2530
    set isbold 0
2531
    set fldtypes [list [mc Headline] [mc Author] [mc Date] [mc Committer] [mc CDate] [mc Comments]]
2532
    foreach f $info ty $fldtypes {
2533
	if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
2534
	    [doesmatch $f]} {
2535
	    if {$ty eq [mc "Author"]} {
2536
		set isbold 2
2537
		break
2538
	    }
2539
	    set isbold 1
2540 2541
	}
    }
2542 2543
    if {$isbold && [info exists iddrawn($id)]} {
	if {![ishighlighted $row]} {
2544
	    bolden $row mainfontbold
2545
	    if {$isbold > 1} {
2546
		bolden_name $row mainfontbold
2547
	    }
2548
	}
2549
	if {$markingmatches} {
2550
	    markrowmatches $row $id
2551 2552 2553
	}
    }
    set nhighlights($row) $isbold
2554 2555
}

2556 2557
proc markrowmatches {row id} {
    global canv canv2 linehtag linentag commitinfo findloc
2558

2559 2560
    set headline [lindex $commitinfo($id) 0]
    set author [lindex $commitinfo($id) 1]
2561 2562
    $canv delete match$row
    $canv2 delete match$row
2563
    if {$findloc eq [mc "All fields"] || $findloc eq [mc "Headline"]} {
2564 2565 2566 2567 2568
	set m [findmatches $headline]
	if {$m ne {}} {
	    markmatches $canv $row $headline $linehtag($row) $m \
		[$canv itemcget $linehtag($row) -font] $row
	}
2569
    }
2570
    if {$findloc eq [mc "All fields"] || $findloc eq [mc "Author"]} {
2571 2572 2573 2574 2575
	set m [findmatches $author]
	if {$m ne {}} {
	    markmatches $canv2 $row $author $linentag($row) $m \
		[$canv2 itemcget $linentag($row) -font] $row
	}
2576 2577 2578
    }
}

2579 2580 2581 2582
proc vrel_change {name ix op} {
    global highlight_related

    rhighlight_none
2583
    if {$highlight_related ne [mc "None"]} {
2584
	run drawvisible
2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596
    }
}

# prepare for testing whether commits are descendents or ancestors of a
proc rhighlight_sel {a} {
    global descendent desc_todo ancestor anc_todo
    global highlight_related rhighlights

    catch {unset descendent}
    set desc_todo [list $a]
    catch {unset ancestor}
    set anc_todo [list $a]
2597
    if {$highlight_related ne [mc "None"]} {
2598
	rhighlight_none
2599
	run drawvisible
2600 2601 2602 2603 2604 2605
    }
}

proc rhighlight_none {} {
    global rhighlights

2606 2607
    catch {unset rhighlights}
    unbolden
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
}

proc is_descendent {a} {
    global curview children commitrow descendent desc_todo

    set v $curview
    set la $commitrow($v,$a)
    set todo $desc_todo
    set leftover {}
    set done 0
    for {set i 0} {$i < [llength $todo]} {incr i} {
	set do [lindex $todo $i]
	if {$commitrow($v,$do) < $la} {
	    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} {
    global curview parentlist commitrow ancestor anc_todo

    set v $curview
    set la $commitrow($v,$a)
    set todo $anc_todo
    set leftover {}
    set done 0
    for {set i 0} {$i < [llength $todo]} {incr i} {
	set do [lindex $todo $i]
	if {![info exists commitrow($v,$do)] || $commitrow($v,$do) > $la} {
	    lappend leftover $do
	    continue
	}
	foreach np [lindex $parentlist $commitrow($v,$do)] {
	    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} {
2675
    global descendent highlight_related iddrawn rhighlights
2676 2677 2678 2679
    global selectedline ancestor

    if {![info exists selectedline]} return
    set isbold 0
2680 2681
    if {$highlight_related eq [mc "Descendant"] ||
	$highlight_related eq [mc "Not descendant"]} {
2682 2683 2684
	if {![info exists descendent($id)]} {
	    is_descendent $id
	}
2685
	if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} {
2686 2687
	    set isbold 1
	}
2688 2689
    } elseif {$highlight_related eq [mc "Ancestor"] ||
	      $highlight_related eq [mc "Not ancestor"]} {
2690 2691 2692
	if {![info exists ancestor($id)]} {
	    is_ancestor $id
	}
2693
	if {$ancestor($id) == ($highlight_related eq [mc "Ancestor"])} {
2694 2695 2696 2697 2698
	    set isbold 1
	}
    }
    if {[info exists iddrawn($id)]} {
	if {$isbold && ![ishighlighted $row]} {
2699
	    bolden $row mainfontbold
2700 2701 2702 2703 2704
	}
    }
    set rhighlights($row) $isbold
}

2705 2706
# Graph layout functions

P
Paul Mackerras 已提交
2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722
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 {}
2723 2724 2725 2726
    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 已提交
2727
	}
2728
	set o [concat $o $o]
P
Paul Mackerras 已提交
2729
    }
2730
    return $ret
P
Paul Mackerras 已提交
2731 2732
}

2733 2734 2735 2736
# Work out where id should go in idlist so that order-token
# values increase from left to right
proc idcol {idlist id {i 0}} {
    global ordertok curview
P
Paul Mackerras 已提交
2737

2738 2739 2740 2741 2742
    set t $ordertok($curview,$id)
    if {$i >= [llength $idlist] ||
	$t < $ordertok($curview,[lindex $idlist $i])} {
	if {$i > [llength $idlist]} {
	    set i [llength $idlist]
P
Paul Mackerras 已提交
2743
	}
2744 2745 2746 2747 2748 2749 2750
	while {[incr i -1] >= 0 &&
	       $t < $ordertok($curview,[lindex $idlist $i])} {}
	incr i
    } else {
	if {$t > $ordertok($curview,[lindex $idlist $i])} {
	    while {[incr i] < [llength $idlist] &&
		   $t >= $ordertok($curview,[lindex $idlist $i])} {}
P
Paul Mackerras 已提交
2751 2752
	}
    }
2753
    return $i
P
Paul Mackerras 已提交
2754 2755 2756
}

proc initlayout {} {
2757
    global rowidlist rowisopt rowfinal displayorder commitlisted
2758
    global numcommits canvxmax canv
2759
    global nextcolor
2760
    global parentlist
2761
    global colormap rowtextx
2762
    global selectfirst
P
Paul Mackerras 已提交
2763

2764 2765
    set numcommits 0
    set displayorder {}
2766 2767
    set commitlisted {}
    set parentlist {}
2768
    set nextcolor 0
2769 2770
    set rowidlist {}
    set rowisopt {}
2771
    set rowfinal {}
2772
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
2773 2774
    catch {unset colormap}
    catch {unset rowtextx}
2775
    set selectfirst 1
2776 2777 2778 2779 2780 2781 2782 2783 2784
}

proc setcanvscroll {} {
    global canv canv2 canv3 numcommits linespc canvxmax canvy0

    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]
P
Paul Mackerras 已提交
2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805
}

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

2806 2807
proc layoutmore {} {
    global commitidx viewcomplete numcommits
2808
    global uparrowlen downarrowlen mingaplen curview
P
Paul Mackerras 已提交
2809

2810
    set show $commitidx($curview)
2811
    if {$show > $numcommits || $viewcomplete($curview)} {
2812
	showstuff $show $viewcomplete($curview)
P
Paul Mackerras 已提交
2813 2814 2815
    }
}

2816
proc showstuff {canshow last} {
2817
    global numcommits commitrow pending_select selectedline curview
2818
    global mainheadid displayorder selectfirst
2819
    global lastscrollset commitinterest
P
Paul Mackerras 已提交
2820

2821 2822 2823 2824 2825
    if {$numcommits == 0} {
	global phase
	set phase "incrdraw"
	allcanvs delete all
    }
2826
    set r0 $numcommits
2827
    set prev $numcommits
P
Paul Mackerras 已提交
2828
    set numcommits $canshow
2829 2830 2831 2832 2833
    set t [clock clicks -milliseconds]
    if {$prev < 100 || $last || $t - $lastscrollset > 500} {
	set lastscrollset $t
	setcanvscroll
    }
P
Paul Mackerras 已提交
2834 2835
    set rows [visiblerows]
    set r1 [lindex $rows 1]
2836 2837
    if {$r1 >= $canshow} {
	set r1 [expr {$canshow - 1}]
P
Paul Mackerras 已提交
2838
    }
2839 2840
    if {$r0 <= $r1} {
	drawcommits $r0 $r1
P
Paul Mackerras 已提交
2841
    }
2842
    if {[info exists pending_select] &&
2843 2844 2845
	[info exists commitrow($curview,$pending_select)] &&
	$commitrow($curview,$pending_select) < $numcommits} {
	selectline $commitrow($curview,$pending_select) 1
2846
    }
2847 2848 2849 2850
    if {$selectfirst} {
	if {[info exists selectedline] || [info exists pending_select]} {
	    set selectfirst 0
	} else {
2851
	    set l [first_real_row]
2852
	    selectline $l 1
2853 2854
	    set selectfirst 0
	}
2855
    }
2856 2857 2858
}

proc doshowlocalchanges {} {
2859
    global curview mainheadid phase commitrow
2860 2861 2862 2863 2864

    if {[info exists commitrow($curview,$mainheadid)] &&
	($phase eq {} || $commitrow($curview,$mainheadid) < $numcommits - 1)} {
	dodiffindex
    } elseif {$phase ne {}} {
2865
	lappend commitinterest($mainheadid) {}
2866 2867 2868 2869
    }
}

proc dohidelocalchanges {} {
2870
    global localfrow localirow lserial
2871

2872 2873 2874 2875 2876 2877 2878 2879 2880 2881
    if {$localfrow >= 0} {
	removerow $localfrow
	set localfrow -1
	if {$localirow > 0} {
	    incr localirow -1
	}
    }
    if {$localirow >= 0} {
	removerow $localirow
	set localirow -1
2882 2883 2884 2885
    }
    incr lserial
}

2886
# spawn off a process to do git diff-index --cached HEAD
2887
proc dodiffindex {} {
2888
    global localirow localfrow lserial showlocalchanges
2889
    global isworktree
2890

2891
    if {!$showlocalchanges || !$isworktree} return
2892
    incr lserial
2893 2894 2895
    set localfrow -1
    set localirow -1
    set fd [open "|git diff-index --cached HEAD" r]
2896 2897 2898 2899 2900
    fconfigure $fd -blocking 0
    filerun $fd [list readdiffindex $fd $lserial]
}

proc readdiffindex {fd serial} {
2901
    global localirow commitrow mainheadid nullid2 curview
2902 2903
    global commitinfo commitdata lserial

2904
    set isdiff 1
2905
    if {[gets $fd line] < 0} {
2906 2907
	if {![eof $fd]} {
	    return 1
2908
	}
2909
	set isdiff 0
2910 2911 2912 2913
    }
    # we only need to see one line and we don't really care what it says...
    close $fd

2914 2915 2916 2917 2918 2919 2920 2921 2922 2923
    # now see if there are any local changes not checked in to the index
    if {$serial == $lserial} {
	set fd [open "|git diff-files" r]
	fconfigure $fd -blocking 0
	filerun $fd [list readdifffiles $fd $serial]
    }

    if {$isdiff && $serial == $lserial && $localirow == -1} {
	# add the line for the changes in the index to the graph
	set localirow $commitrow($curview,$mainheadid)
2924
	set hl [mc "Local changes checked in to index but not committed"]
2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946
	set commitinfo($nullid2) [list  $hl {} {} {} {} "    $hl\n"]
	set commitdata($nullid2) "\n    $hl\n"
	insertrow $localirow $nullid2
    }
    return 0
}

proc readdifffiles {fd serial} {
    global localirow localfrow commitrow mainheadid nullid curview
    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

    if {$isdiff && $serial == $lserial && $localfrow == -1} {
2947
	# add the line for the local diff to the graph
2948 2949 2950 2951 2952 2953
	if {$localirow >= 0} {
	    set localfrow $localirow
	    incr localirow
	} else {
	    set localfrow $commitrow($curview,$mainheadid)
	}
2954
	set hl [mc "Local uncommitted changes, not checked in to index"]
2955 2956
	set commitinfo($nullid) [list  $hl {} {} {} {} "    $hl\n"]
	set commitdata($nullid) "\n    $hl\n"
2957
	insertrow $localfrow $nullid
2958 2959
    }
    return 0
P
Paul Mackerras 已提交
2960 2961
}

2962 2963
proc nextuse {id row} {
    global commitrow curview children
P
Paul Mackerras 已提交
2964

2965 2966
    if {[info exists children($curview,$id)]} {
	foreach kid $children($curview,$id) {
2967 2968 2969 2970
	    if {![info exists commitrow($curview,$kid)]} {
		return -1
	    }
	    if {$commitrow($curview,$kid) > $row} {
2971
		return $commitrow($curview,$kid)
P
Paul Mackerras 已提交
2972 2973
	    }
	}
2974 2975 2976 2977 2978 2979 2980
    }
    if {[info exists commitrow($curview,$id)]} {
	return $commitrow($curview,$id)
    }
    return -1
}

2981 2982 2983 2984 2985 2986 2987 2988 2989
proc prevuse {id row} {
    global commitrow curview children

    set ret -1
    if {[info exists children($curview,$id)]} {
	foreach kid $children($curview,$id) {
	    if {![info exists commitrow($curview,$kid)]} break
	    if {$commitrow($curview,$kid) < $row} {
		set ret $commitrow($curview,$kid)
2990 2991
	    }
	}
2992 2993 2994 2995
    }
    return $ret
}

2996 2997 2998
proc make_idlist {row} {
    global displayorder parentlist uparrowlen downarrowlen mingaplen
    global commitidx curview ordertok children commitrow
P
Paul Mackerras 已提交
2999

3000 3001 3002
    set r [expr {$row - $mingaplen - $downarrowlen - 1}]
    if {$r < 0} {
	set r 0
3003
    }
3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020
    set ra [expr {$row - $downarrowlen}]
    if {$ra < 0} {
	set ra 0
    }
    set rb [expr {$row + $uparrowlen}]
    if {$rb > $commitidx($curview)} {
	set rb $commitidx($curview)
    }
    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} {
		lappend ids [list $ordertok($curview,$p) $p]
P
Paul Mackerras 已提交
3021 3022
	    }
	}
3023 3024 3025 3026 3027 3028 3029 3030
    }
    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} {
		lappend ids [list $ordertok($curview,$p) $p]
P
Paul Mackerras 已提交
3031 3032
	    }
	}
3033 3034 3035 3036 3037 3038 3039 3040
    }
    set id [lindex $displayorder $row]
    lappend ids [list $ordertok($curview,$id) $id]
    while {$r < $rb} {
	foreach p [lindex $parentlist $r] {
	    set firstkid [lindex $children($curview,$p) 0]
	    if {$commitrow($curview,$firstkid) < $row} {
		lappend ids [list $ordertok($curview,$p) $p]
P
Paul Mackerras 已提交
3041 3042
	    }
	}
3043 3044 3045 3046 3047 3048 3049
	incr r
	set id [lindex $displayorder $r]
	if {$id ne {}} {
	    set firstkid [lindex $children($curview,$id) 0]
	    if {$firstkid ne {} && $commitrow($curview,$firstkid) < $row} {
		lappend ids [list $ordertok($curview,$id) $id]
	    }
P
Paul Mackerras 已提交
3050 3051
	}
    }
3052 3053 3054 3055 3056
    set idlist {}
    foreach idx [lsort -unique $ids] {
	lappend idlist [lindex $idx 1]
    }
    return $idlist
P
Paul Mackerras 已提交
3057 3058
}

3059 3060 3061 3062 3063 3064 3065 3066
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 已提交
3067 3068
}

3069 3070
proc makeupline {id row rend col} {
    global rowidlist uparrowlen downarrowlen mingaplen
P
Paul Mackerras 已提交
3071

3072 3073 3074 3075 3076 3077 3078
    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}]
3079
    }
3080 3081 3082 3083 3084 3085 3086
    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 已提交
3087 3088 3089
    }
}

3090
proc layoutrows {row endrow} {
3091
    global rowidlist rowisopt rowfinal displayorder
3092 3093
    global uparrowlen downarrowlen maxwidth mingaplen
    global children parentlist
3094
    global commitidx viewcomplete curview commitrow
P
Paul Mackerras 已提交
3095

3096 3097
    set idlist {}
    if {$row > 0} {
3098 3099
	set rm1 [expr {$row - 1}]
	foreach id [lindex $rowidlist $rm1] {
3100 3101 3102 3103
	    if {$id ne {}} {
		lappend idlist $id
	    }
	}
3104
	set final [lindex $rowfinal $rm1]
3105
    }
3106 3107
    for {} {$row < $endrow} {incr row} {
	set rm1 [expr {$row - 1}]
3108
	if {$rm1 < 0 || $idlist eq {}} {
3109
	    set idlist [make_idlist $row]
3110
	    set final 1
3111 3112 3113 3114 3115 3116 3117 3118
	} 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]
3119 3120 3121 3122
		    # 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
		    }
3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140
		}
	    }
	    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]
3141 3142 3143
		if {$children($curview,$id) ne {}} {
		    makeupline $id $rm1 $row $col
		}
3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167
	    }
	    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]
		    if {$commitrow($curview,$fk) < $row} {
			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]
			if {$fk ne {} && $commitrow($curview,$fk) < $row} {
			    set x [idcol $idlist $p $x]
			    set idlist [linsert $idlist $x $p]
			}
		    }
		}
	    }
	}
3168 3169 3170 3171 3172
	if {$final && !$viewcomplete($curview) &&
	    $row + $uparrowlen + $mingaplen + $downarrowlen
		>= $commitidx($curview)} {
	    set final 0
	}
3173 3174 3175 3176
	set l [llength $rowidlist]
	if {$row == $l} {
	    lappend rowidlist $idlist
	    lappend rowisopt 0
3177
	    lappend rowfinal $final
3178
	} elseif {$row < $l} {
3179
	    if {![rowsequal $idlist [lindex $rowidlist $row]]} {
3180 3181 3182
		lset rowidlist $row $idlist
		changedrow $row
	    }
3183
	    lset rowfinal $row $final
3184
	} else {
3185 3186
	    set pad [ntimes [expr {$row - $l}] {}]
	    set rowidlist [concat $rowidlist $pad]
3187
	    lappend rowidlist $idlist
3188 3189
	    set rowfinal [concat $rowfinal $pad]
	    lappend rowfinal $final
3190 3191
	    set rowisopt [concat $rowisopt [ntimes [expr {$row - $l + 1}] 0]]
	}
P
Paul Mackerras 已提交
3192
    }
3193
    return $row
P
Paul Mackerras 已提交
3194 3195
}

3196 3197
proc changedrow {row} {
    global displayorder iddrawn rowisopt need_redisplay
P
Paul Mackerras 已提交
3198

3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211
    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 已提交
3212 3213 3214 3215
    }
}

proc insert_pad {row col npad} {
3216
    global rowidlist
P
Paul Mackerras 已提交
3217 3218

    set pad [ntimes $npad {}]
P
Paul Mackerras 已提交
3219 3220 3221 3222 3223 3224 3225 3226
    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]
3227
    changedrow $row
P
Paul Mackerras 已提交
3228 3229 3230
}

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

3233 3234 3235
    if {$row < 1} {
	set row 1
    }
3236 3237
    for {} {$row < $endrow} {incr row; set col 0} {
	if {[lindex $rowisopt $row]} continue
P
Paul Mackerras 已提交
3238
	set haspad 0
3239 3240
	set y0 [expr {$row - 1}]
	set ym [expr {$row - 2}]
3241 3242 3243 3244 3245 3246 3247 3248 3249
	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 {}
	}
3250 3251 3252 3253 3254 3255
	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 已提交
3256 3257 3258
		set haspad 1
		continue
	    }
3259 3260 3261
	    set x0 [lsearch -exact $previdlist $id]
	    if {$x0 < 0} continue
	    set z [expr {$x0 - $col}]
P
Paul Mackerras 已提交
3262
	    set isarrow 0
3263 3264 3265 3266 3267 3268 3269
	    set z0 {}
	    if {$ym >= 0} {
		set xm [lsearch -exact $pprevidlist $id]
		if {$xm >= 0} {
		    set z0 [expr {$xm - $x0}]
		}
	    }
P
Paul Mackerras 已提交
3270
	    if {$z0 eq {}} {
3271 3272 3273
		# 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 已提交
3274 3275 3276
		    set isarrow 1
		}
	    }
P
Paul Mackerras 已提交
3277 3278 3279 3280
	    if {!$isarrow && $id ne [lindex $displayorder $row] &&
		[lsearch -exact [lindex $rowidlist [expr {$row+1}]] $id] < 0} {
		set isarrow 1
	    }
3281 3282 3283 3284
	    # 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 已提交
3285
	    if {$z < -1 || ($z < 0 && $isarrow)} {
3286 3287
		# Line currently goes left too much;
		# insert pads in the previous row, then optimize it
P
Paul Mackerras 已提交
3288 3289 3290 3291 3292
		set npad [expr {-1 - $z + $isarrow}]
		insert_pad $y0 $x0 $npad
		if {$y0 > 0} {
		    optimize_rows $y0 $x0 $row
		}
3293 3294 3295 3296 3297 3298 3299 3300
		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 已提交
3301
	    } elseif {$z > 1 || ($z > 0 && $isarrow)} {
3302
		# Line currently goes right too much;
3303
		# insert pads in this line
P
Paul Mackerras 已提交
3304
		set npad [expr {$z - 1 + $isarrow}]
P
Paul Mackerras 已提交
3305 3306
		insert_pad $row $col $npad
		set idlist [lindex $rowidlist $row]
P
Paul Mackerras 已提交
3307
		incr col $npad
3308
		set z [expr {$x0 - $col}]
P
Paul Mackerras 已提交
3309 3310
		set haspad 1
	    }
3311
	    if {$z0 eq {} && !$isarrow && $ym >= 0} {
3312
		# this line links to its first child on row $row-2
3313 3314
		set id [lindex $displayorder $ym]
		set xc [lsearch -exact $pprevidlist $id]
3315 3316 3317 3318
		if {$xc >= 0} {
		    set z0 [expr {$xc - $x0}]
		}
	    }
3319
	    # avoid lines jigging left then immediately right
P
Paul Mackerras 已提交
3320 3321
	    if {$z0 ne {} && $z < 0 && $z0 > 0} {
		insert_pad $y0 $x0 1
3322 3323 3324
		incr x0
		optimize_rows $y0 $x0 $row
		set previdlist [lindex $rowidlist $y0]
P
Paul Mackerras 已提交
3325 3326 3327
	    }
	}
	if {!$haspad} {
3328
	    # Find the first column that doesn't have a line going right
P
Paul Mackerras 已提交
3329
	    for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
3330 3331 3332 3333
		set id [lindex $idlist $col]
		if {$id eq {}} break
		set x0 [lsearch -exact $previdlist $id]
		if {$x0 < 0} {
3334
		    # check if this is the link to the first child
3335 3336
		    set kid [lindex $displayorder $y0]
		    if {[lindex $children($curview,$id) 0] eq $kid} {
3337
			# it is, work out offset to child
3338
			set x0 [lsearch -exact $previdlist $kid]
3339 3340
		    }
		}
3341
		if {$x0 <= $col} break
P
Paul Mackerras 已提交
3342
	    }
3343
	    # Insert a pad at that column as long as it has a line and
3344 3345
	    # isn't the last column
	    if {$x0 >= 0 && [incr col] < [llength $idlist]} {
P
Paul Mackerras 已提交
3346
		set idlist [linsert $idlist $col {}]
3347 3348
		lset rowidlist $row $idlist
		changedrow $row
P
Paul Mackerras 已提交
3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363
	    }
	}
    }
}

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

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

3364 3365 3366 3367 3368 3369 3370 3371 3372 3373
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 已提交
3374
proc rowranges {id} {
3375 3376
    global commitrow curview children uparrowlen downarrowlen
    global rowidlist
P
Paul Mackerras 已提交
3377

3378 3379 3380
    set kids $children($curview,$id)
    if {$kids eq {}} {
	return {}
3381
    }
3382 3383 3384 3385 3386 3387 3388
    set ret {}
    lappend kids $id
    foreach child $kids {
	if {![info exists commitrow($curview,$child)]} break
	set row $commitrow($curview,$child)
	if {![info exists prev]} {
	    lappend ret [expr {$row + 1}]
3389
	} else {
3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422
	    if {$row <= $prevrow} {
		puts "oops children out of order [shortids $id] $row < [shortids $prev] $prevrow"
	    }
	    # 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
3423
	}
3424 3425
	set prev $id
	set prevrow $row
P
Paul Mackerras 已提交
3426
    }
3427
    return $ret
3428 3429 3430 3431
}

proc drawlineseg {id row endrow arrowlow} {
    global rowidlist displayorder iddrawn linesegs
P
Paul Mackerras 已提交
3432
    global canv colormap linespc curview maxlinelen parentlist
3433 3434 3435 3436

    set cols [list [lsearch -exact [lindex $rowidlist $row] $id]]
    set le [expr {$row + 1}]
    set arrowhigh 1
P
Paul Mackerras 已提交
3437
    while {1} {
3438 3439 3440 3441 3442 3443 3444 3445 3446 3447
	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 已提交
3448
	}
3449 3450 3451 3452 3453 3454 3455 3456 3457
	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 已提交
3458
    }
3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506
    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 已提交
3507 3508 3509 3510 3511
    } elseif {$arrowlow} {
	if {[lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0 ||
	    [lsearch -exact [lindex $parentlist [expr {$row-1}]] $id] >= 0} {
	    set arrowlow 0
	}
3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529
    }
    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 已提交
3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542
	    } 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} {
3543 3544 3545 3546 3547
		    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
3548
	    }
3549 3550 3551 3552
	    lappend coords [xc $row $x] [yc $row]
	} else {
	    set xn [xc $row $xp]
	    set yn [yc $row]
P
Paul Mackerras 已提交
3553
	    lappend coords $xn $yn
3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588
	}
	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
3589 3590
	}
    }
3591 3592 3593

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

3596 3597
proc drawparentlinks {id row} {
    global rowidlist canv colormap curview parentlist
3598
    global idpos linespc
P
Paul Mackerras 已提交
3599

3600 3601 3602 3603
    set rowids [lindex $rowidlist $row]
    set col [lsearch -exact $rowids $id]
    if {$col < 0} return
    set olds [lindex $parentlist $row]
P
Paul Mackerras 已提交
3604 3605 3606 3607
    set row2 [expr {$row + 1}]
    set x [xc $row $col]
    set y [yc $row]
    set y2 [yc $row2]
P
Paul Mackerras 已提交
3608
    set d [expr {int(0.5 * $linespc)}]
3609
    set ymid [expr {$y + $d}]
3610
    set ids [lindex $rowidlist $row2]
P
Paul Mackerras 已提交
3611 3612 3613
    # rmx = right-most X coord used
    set rmx 0
    foreach p $olds {
3614 3615 3616 3617 3618 3619 3620 3621 3622
	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
	}
3623 3624
	set j [lsearch -exact $rowids $p]
	if {$j < 0} {
3625 3626 3627
	    # drawlineseg will do this one for us
	    continue
	}
P
Paul Mackerras 已提交
3628 3629 3630
	assigncolor $p
	# should handle duplicated parents here...
	set coords [list $x $y]
3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652
	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 已提交
3653
	}
3654
	set t [$canv create line $coords -width [linewidth $p] \
P
Paul Mackerras 已提交
3655 3656 3657 3658
		   -fill $colormap($p) -tags lines.$p]
	$canv lower $t
	bindline $t $p
    }
3659 3660 3661 3662
    if {$rmx > [lindex $idpos($id) 1]} {
	lset idpos($id) 1 $rmx
	redrawtags $id
    }
P
Paul Mackerras 已提交
3663 3664
}

3665
proc drawlines {id} {
3666
    global canv
P
Paul Mackerras 已提交
3667

3668
    $canv itemconf lines.$id -width [linewidth $id]
P
Paul Mackerras 已提交
3669 3670
}

3671
proc drawcmittext {id row col} {
3672
    global linespc canv canv2 canv3 canvy0 fgcolor curview
3673
    global commitlisted commitinfo rowidlist parentlist
P
Paul Mackerras 已提交
3674
    global rowtextx idpos idtags idheads idotherrefs
3675
    global linehtag linentag linedtag selectedline
3676
    global canvxmax boldrows boldnamerows fgcolor nullid nullid2
P
Paul Mackerras 已提交
3677

3678
    # listed is 0 for boundary, 1 for normal, 2 for negative, 3 for left, 4 for right
3679
    set listed [lindex $commitlisted $row]
3680 3681
    if {$id eq $nullid} {
	set ofill red
3682
    } elseif {$id eq $nullid2} {
3683
	set ofill green
3684
    } else {
3685
	set ofill [expr {$listed != 0 ? $listed == 2 ? "gray" : "blue" : "white"}]
3686
    }
P
Paul Mackerras 已提交
3687 3688 3689
    set x [xc $row $col]
    set y [yc $row]
    set orad [expr {$linespc / 3}]
3690
    if {$listed <= 2} {
3691 3692 3693
	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]
3694
    } elseif {$listed == 3} {
3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708
	# 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 已提交
3709 3710
    $canv raise $t
    $canv bind $t <1> {selcanvline {} %x %y}
3711 3712 3713 3714 3715 3716 3717 3718 3719 3720
    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 已提交
3721
    }
3722
    set xt [xc $row $rmx]
P
Paul Mackerras 已提交
3723 3724 3725 3726 3727 3728 3729 3730 3731 3732
    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]
3733 3734
    set font mainfont
    set nfont mainfont
3735 3736
    set isbold [ishighlighted $row]
    if {$isbold > 0} {
3737
	lappend boldrows $row
3738
	set font mainfontbold
3739
	if {$isbold > 1} {
3740
	    lappend boldnamerows $row
3741
	    set nfont mainfontbold
3742
	}
3743
    }
3744 3745
    set linehtag($row) [$canv create text $xt $y -anchor w -fill $fgcolor \
			    -text $headline -font $font -tags text]
P
Paul Mackerras 已提交
3746
    $canv bind $linehtag($row) <Button-3> "rowmenu %X %Y $id"
3747 3748 3749
    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 \
3750
			    -text $date -font mainfont -tags text]
3751 3752 3753
    if {[info exists selectedline] && $selectedline == $row} {
	make_secsel $row
    }
3754
    set xr [expr {$xt + [font measure $font $headline]}]
3755 3756 3757 3758
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
P
Paul Mackerras 已提交
3759 3760 3761
}

proc drawcmitrow {row} {
3762
    global displayorder rowidlist nrows_drawn
3763
    global iddrawn markingmatches
3764
    global commitinfo parentlist numcommits
3765
    global filehighlight fhighlights findpattern nhighlights
3766
    global hlview vhighlights
3767
    global highlight_related rhighlights
P
Paul Mackerras 已提交
3768

3769
    if {$row >= $numcommits} return
P
Paul Mackerras 已提交
3770 3771

    set id [lindex $displayorder $row]
3772 3773 3774 3775 3776 3777
    if {[info exists hlview] && ![info exists vhighlights($row)]} {
	askvhighlight $row $id
    }
    if {[info exists filehighlight] && ![info exists fhighlights($row)]} {
	askfilehighlight $row $id
    }
3778
    if {$findpattern ne {} && ![info exists nhighlights($row)]} {
3779
	askfindhighlight $row $id
3780
    }
3781
    if {$highlight_related ne [mc "None"] && ![info exists rhighlights($row)]} {
3782 3783
	askrelhighlight $row $id
    }
3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795
    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
3796
	incr nrows_drawn
P
Paul Mackerras 已提交
3797
    }
3798 3799
    if {$markingmatches} {
	markrowmatches $row $id
P
Paul Mackerras 已提交
3800 3801 3802
    }
}

3803
proc drawcommits {row {endrow {}}} {
3804
    global numcommits iddrawn displayorder curview need_redisplay
3805
    global parentlist rowidlist rowfinal uparrowlen downarrowlen nrows_drawn
P
Paul Mackerras 已提交
3806 3807 3808 3809

    if {$row < 0} {
	set row 0
    }
3810 3811 3812
    if {$endrow eq {}} {
	set endrow $row
    }
P
Paul Mackerras 已提交
3813 3814 3815
    if {$endrow >= $numcommits} {
	set endrow [expr {$numcommits - 1}]
    }
3816

3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829
    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} {
3830
	if {[lindex $rowidlist $r] ne {} && [lindex $rowfinal $r]} {
3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845
	    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
    }

3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858
    # 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)]
3859
	drawcmitrow $r
3860 3861
	if {$r == $er} break
	set nextid [lindex $displayorder [expr {$r + 1}]]
3862
	if {$wasdrawn && [info exists iddrawn($nextid)]} continue
3863 3864 3865 3866 3867
	drawparentlinks $id $r

	set rowids [lindex $rowidlist $r]
	foreach lid $rowids {
	    if {$lid eq {}} continue
3868
	    if {[info exists lineend($lid)] && $lineend($lid) > $r} continue
3869 3870 3871 3872 3873
	    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
3874
			set lineend($p) [drawlineseg $p $r $er 0]
3875 3876
		    }
		}
3877 3878
	    } else {
		set lineend($lid) [drawlineseg $lid $r $er 1]
3879 3880
	    }
	}
P
Paul Mackerras 已提交
3881 3882 3883
    }
}

3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895
proc drawfrac {f0 f1} {
    global canv linespc

    set ymax [lindex [$canv cget -scrollregion] 3]
    if {$ymax eq {} || $ymax == 0} return
    set y0 [expr {int($f0 * $ymax)}]
    set row [expr {int(($y0 - 3) / $linespc) - 1}]
    set y1 [expr {int($f1 * $ymax)}]
    set endrow [expr {int(($y1 - 3) / $linespc) + 1}]
    drawcommits $row $endrow
}

P
Paul Mackerras 已提交
3896 3897 3898 3899 3900 3901
proc drawvisible {} {
    global canv
    eval drawfrac [$canv yview]
}

proc clear_display {} {
3902
    global iddrawn linesegs need_redisplay nrows_drawn
3903
    global vhighlights fhighlights nhighlights rhighlights
P
Paul Mackerras 已提交
3904 3905 3906

    allcanvs delete all
    catch {unset iddrawn}
3907
    catch {unset linesegs}
3908 3909 3910
    catch {unset vhighlights}
    catch {unset fhighlights}
    catch {unset nhighlights}
3911
    catch {unset rhighlights}
3912 3913
    set need_redisplay 0
    set nrows_drawn 0
P
Paul Mackerras 已提交
3914 3915
}

P
Paul Mackerras 已提交
3916
proc findcrossings {id} {
3917
    global rowidlist parentlist numcommits displayorder
P
Paul Mackerras 已提交
3918 3919 3920 3921 3922 3923 3924

    set cross {}
    set ccross {}
    foreach {s e} [rowranges $id] {
	if {$e >= $numcommits} {
	    set e [expr {$numcommits - 1}]
	}
3925
	if {$e <= $s} continue
P
Paul Mackerras 已提交
3926
	for {set row $e} {[incr row -1] >= $s} {} {
3927 3928
	    set x [lsearch -exact [lindex $rowidlist $row] $id]
	    if {$x < 0} break
P
Paul Mackerras 已提交
3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950
	    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]
}

3951
proc assigncolor {id} {
P
Paul Mackerras 已提交
3952
    global colormap colors nextcolor
3953
    global commitrow parentlist children children curview
3954

3955
    if {[info exists colormap($id)]} return
3956
    set ncolors [llength $colors]
3957 3958
    if {[info exists children($curview,$id)]} {
	set kids $children($curview,$id)
3959 3960 3961 3962 3963
    } else {
	set kids {}
    }
    if {[llength $kids] == 1} {
	set child [lindex $kids 0]
3964
	if {[info exists colormap($child)]
3965
	    && [llength [lindex $parentlist $commitrow($curview,$child)]] == 1} {
3966 3967
	    set colormap($id) $colormap($child)
	    return
3968
	}
3969 3970
    }
    set badcolors {}
P
Paul Mackerras 已提交
3971 3972 3973 3974 3975 3976
    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
3977
	}
P
Paul Mackerras 已提交
3978 3979 3980
	if {[info exists colormap($x)]
	    && [lsearch -exact $badcolors $colormap($x)] < 0} {
	    lappend badcolors $colormap($x)
3981 3982
	}
    }
P
Paul Mackerras 已提交
3983 3984
    if {[llength $badcolors] >= $ncolors} {
	set badcolors $origbad
3985
    }
P
Paul Mackerras 已提交
3986
    set origbad $badcolors
3987
    if {[llength $badcolors] < $ncolors - 1} {
3988
	foreach child $kids {
3989 3990 3991 3992
	    if {[info exists colormap($child)]
		&& [lsearch -exact $badcolors $colormap($child)] < 0} {
		lappend badcolors $colormap($child)
	    }
3993
	    foreach p [lindex $parentlist $commitrow($curview,$child)] {
3994 3995 3996
		if {[info exists colormap($p)]
		    && [lsearch -exact $badcolors $colormap($p)] < 0} {
		    lappend badcolors $colormap($p)
3997 3998 3999 4000 4001 4002
		}
	    }
	}
	if {[llength $badcolors] >= $ncolors} {
	    set badcolors $origbad
	}
4003 4004 4005 4006 4007
    }
    for {set i 0} {$i <= $ncolors} {incr i} {
	set c [lindex $colors $nextcolor]
	if {[incr nextcolor] >= $ncolors} {
	    set nextcolor 0
4008
	}
4009
	if {[lsearch -exact $badcolors $c]} break
4010
    }
4011
    set colormap($id) $c
4012 4013
}

4014 4015 4016 4017 4018 4019
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"
4020
    $canv bind $t <Button-1> "lineclick %x %y $id 1"
4021 4022
}

4023
proc drawtags {id x xt y1} {
4024
    global idtags idheads idotherrefs mainhead
4025
    global linespc lthickness
4026
    global canv commitrow rowtextx curview fgcolor bgcolor
4027 4028 4029

    set marks {}
    set ntags 0
4030
    set nheads 0
4031 4032 4033 4034 4035 4036
    if {[info exists idtags($id)]} {
	set marks $idtags($id)
	set ntags [llength $marks]
    }
    if {[info exists idheads($id)]} {
	set marks [concat $marks $idheads($id)]
4037 4038 4039 4040
	set nheads [llength $idheads($id)]
    }
    if {[info exists idotherrefs($id)]} {
	set marks [concat $marks $idotherrefs($id)]
4041 4042 4043 4044 4045 4046
    }
    if {$marks eq {}} {
	return $xt
    }

    set delta [expr {int(0.5 * ($linespc - $lthickness))}]
J
Jeff Hobbs 已提交
4047 4048
    set yt [expr {$y1 - 0.5 * $linespc}]
    set yb [expr {$yt + $linespc - 1}]
4049 4050
    set xvals {}
    set wvals {}
4051
    set i -1
4052
    foreach tag $marks {
4053 4054
	incr i
	if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} {
4055
	    set wid [font measure mainfontbold $tag]
4056
	} else {
4057
	    set wid [font measure mainfont $tag]
4058
	}
4059 4060 4061 4062 4063 4064 4065 4066
	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 已提交
4067 4068
	set xl [expr {$x + $delta}]
	set xr [expr {$x + $delta + $wid + $lthickness}]
4069
	set font mainfont
4070 4071
	if {[incr ntags -1] >= 0} {
	    # draw a tag
J
Jeff Hobbs 已提交
4072 4073
	    set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
		       $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
4074 4075
		       -width 1 -outline black -fill yellow -tags tag.$id]
	    $canv bind $t <1> [list showtag $tag 1]
4076
	    set rowtextx($commitrow($curview,$id)) [expr {$xr + $linespc}]
4077
	} else {
4078 4079 4080
	    # draw a head or other ref
	    if {[incr nheads -1] >= 0} {
		set col green
4081
		if {$tag eq $mainhead} {
4082
		    set font mainfontbold
4083
		}
4084 4085 4086
	    } else {
		set col "#ddddff"
	    }
J
Jeff Hobbs 已提交
4087
	    set xl [expr {$xl - $delta/2}]
4088
	    $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
4089
		-width 1 -outline black -fill $col -tags tag.$id
4090
	    if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
4091
	        set rwid [font measure mainfont $remoteprefix]
4092 4093 4094 4095 4096 4097
		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
	    }
4098
	}
4099
	set t [$canv create text $xl $y1 -anchor w -text $tag -fill $fgcolor \
4100
		   -font $font -tags [list tag.$id text]]
4101 4102
	if {$ntags >= 0} {
	    $canv bind $t <1> [list showtag $tag 1]
4103 4104
	} elseif {$nheads >= 0} {
	    $canv bind $t <Button-3> [list headmenu %X %Y $id $tag]
4105
	}
4106 4107 4108 4109
    }
    return $xt
}

4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120
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
}
4121

4122
proc show_status {msg} {
4123
    global canv fgcolor
4124 4125

    clear_display
4126
    $canv create text 3 3 -anchor nw -text $msg -font mainfont \
4127
	-tags text -fill $fgcolor
4128 4129
}

4130
# Insert a new commit as the child of the commit on row $row.
4131 4132 4133
# The new commit will be displayed on row $row and the commits
# on that row and below will move down one row.
proc insertrow {row newcmit} {
4134
    global displayorder parentlist commitlisted children
4135
    global commitrow curview rowidlist rowisopt rowfinal numcommits
4136 4137
    global numcommits
    global selectedline commitidx ordertok
4138 4139 4140 4141 4142 4143 4144 4145

    if {$row >= $numcommits} {
	puts "oops, inserting new row $row but only have $numcommits rows"
	return
    }
    set p [lindex $displayorder $row]
    set displayorder [linsert $displayorder $row $newcmit]
    set parentlist [linsert $parentlist $row $p]
4146
    set kids $children($curview,$p)
4147
    lappend kids $newcmit
4148
    set children($curview,$p) $kids
4149
    set children($curview,$newcmit) {}
4150
    set commitlisted [linsert $commitlisted $row 1]
4151 4152 4153 4154 4155
    set l [llength $displayorder]
    for {set r $row} {$r < $l} {incr r} {
	set id [lindex $displayorder $r]
	set commitrow($curview,$id) $r
    }
4156
    incr commitidx($curview)
4157
    set ordertok($curview,$newcmit) $ordertok($curview,$p)
4158

P
Paul Mackerras 已提交
4159 4160 4161 4162 4163 4164 4165 4166 4167 4168
    if {$row < [llength $rowidlist]} {
	set idlist [lindex $rowidlist $row]
	if {$idlist ne {}} {
	    if {[llength $kids] == 1} {
		set col [lsearch -exact $idlist $p]
		lset idlist $col $newcmit
	    } else {
		set col [llength $idlist]
		lappend idlist $newcmit
	    }
4169
	}
P
Paul Mackerras 已提交
4170 4171 4172
	set rowidlist [linsert $rowidlist $row $idlist]
	set rowisopt [linsert $rowisopt $row 0]
	set rowfinal [linsert $rowfinal $row [lindex $rowfinal $row]]
4173 4174 4175 4176
    }

    incr numcommits

4177 4178 4179
    if {[info exists selectedline] && $selectedline >= $row} {
	incr selectedline
    }
4180 4181 4182
    redisplay
}

4183 4184
# Remove a commit that was inserted with insertrow on row $row.
proc removerow {row} {
4185
    global displayorder parentlist commitlisted children
4186
    global commitrow curview rowidlist rowisopt rowfinal numcommits
4187
    global numcommits
4188
    global linesegends selectedline commitidx
4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199

    if {$row >= $numcommits} {
	puts "oops, removing row $row but only have $numcommits rows"
	return
    }
    set rp1 [expr {$row + 1}]
    set id [lindex $displayorder $row]
    set p [lindex $parentlist $row]
    set displayorder [lreplace $displayorder $row $row]
    set parentlist [lreplace $parentlist $row $row]
    set commitlisted [lreplace $commitlisted $row $row]
4200
    set kids $children($curview,$p)
4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212
    set i [lsearch -exact $kids $id]
    if {$i >= 0} {
	set kids [lreplace $kids $i $i]
	set children($curview,$p) $kids
    }
    set l [llength $displayorder]
    for {set r $row} {$r < $l} {incr r} {
	set id [lindex $displayorder $r]
	set commitrow($curview,$id) $r
    }
    incr commitidx($curview) -1

P
Paul Mackerras 已提交
4213 4214 4215 4216
    if {$row < [llength $rowidlist]} {
	set rowidlist [lreplace $rowidlist $row $row]
	set rowisopt [lreplace $rowisopt $row $row]
	set rowfinal [lreplace $rowfinal $row $row]
4217 4218 4219 4220 4221 4222 4223 4224 4225 4226
    }

    incr numcommits -1

    if {[info exists selectedline] && $selectedline > $row} {
	incr selectedline -1
    }
    redisplay
}

4227 4228 4229 4230 4231 4232 4233 4234 4235
# 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
4236 4237
}

4238 4239
proc nowbusy {what {name {}}} {
    global isbusy busyname statusw
4240 4241 4242 4243 4244 4245

    if {[array names isbusy] eq {}} {
	. config -cursor watch
	settextcursor watch
    }
    set isbusy($what) 1
4246 4247 4248 4249
    set busyname($what) $name
    if {$name ne {}} {
	$statusw conf -text $name
    }
4250 4251 4252
}

proc notbusy {what} {
4253
    global isbusy maincursor textcursor busyname statusw
4254

4255 4256 4257 4258 4259 4260 4261
    catch {
	unset isbusy($what)
	if {$busyname($what) ne {} &&
	    [$statusw cget -text] eq $busyname($what)} {
	    $statusw conf -text {}
	}
    }
4262 4263 4264 4265 4266 4267
    if {[array names isbusy] eq {}} {
	. config -cursor $maincursor
	settextcursor $textcursor
    }
}

4268
proc findmatches {f} {
4269
    global findtype findstring
4270
    if {$findtype == [mc "Regexp"]} {
4271
	set matches [regexp -indices -all -inline $findstring $f]
4272
    } else {
4273
	set fs $findstring
4274
	if {$findtype == [mc "IgnCase"]} {
4275 4276
	    set f [string tolower $f]
	    set fs [string tolower $fs]
4277 4278 4279
	}
	set matches {}
	set i 0
4280 4281 4282 4283
	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}]
4284 4285 4286 4287 4288
	}
    }
    return $matches
}

4289
proc dofind {{dirn 1} {wrap 1}} {
4290
    global findstring findstartline findcurline selectedline numcommits
4291
    global gdttype filehighlight fh_serial find_dirn findallowwrap
4292

4293 4294 4295 4296
    if {[info exists find_dirn]} {
	if {$find_dirn == $dirn} return
	stopfinding
    }
4297
    focus .
4298 4299
    if {$findstring eq {} || $numcommits == 0} return
    if {![info exists selectedline]} {
4300
	set findstartline [lindex [visiblerows] [expr {$dirn < 0}]]
4301
    } else {
4302
	set findstartline $selectedline
4303
    }
4304
    set findcurline $findstartline
4305 4306
    nowbusy finding [mc "Searching"]
    if {$gdttype ne [mc "containing:"] && ![info exists filehighlight]} {
4307 4308
	after cancel do_file_hl $fh_serial
	do_file_hl $fh_serial
4309
    }
4310 4311 4312
    set find_dirn $dirn
    set findallowwrap $wrap
    run findmore
4313 4314
}

4315 4316
proc stopfinding {} {
    global find_dirn findcurline fprogcoord
4317

4318 4319 4320 4321 4322 4323
    if {[info exists find_dirn]} {
	unset find_dirn
	unset findcurline
	notbusy finding
	set fprogcoord 0
	adjustprogress
4324 4325 4326 4327
    }
}

proc findmore {} {
4328
    global commitdata commitinfo numcommits findpattern findloc
4329
    global findstartline findcurline displayorder
4330
    global find_dirn gdttype fhighlights fprogcoord
4331
    global findallowwrap
4332

4333
    if {![info exists find_dirn]} {
4334 4335
	return 0
    }
4336
    set fldtypes [list [mc "Headline"] [mc "Author"] [mc "Date"] [mc "Committer"] [mc "CDate"] [mc "Comments"]]
4337
    set l $findcurline
4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348
    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 已提交
4349
	}
4350
    } else {
4351 4352
	if {$l == 0} {
	    set l $numcommits
4353
	}
4354 4355 4356
	incr l -1
	if {$l >= $findstartline} {
	    set lim [expr {$findstartline - 1}]
4357
	} else {
4358 4359
	    set lim -1
	    set moretodo $findallowwrap
4360
	}
4361
    }
4362 4363 4364 4365
    set n [expr {($lim - $l) * $find_dirn}]
    if {$n > 500} {
	set n 500
	set moretodo 1
4366
    }
4367 4368
    set found 0
    set domore 1
4369
    if {$gdttype eq [mc "containing:"]} {
4370
	for {} {$n > 0} {incr n -1; incr l $find_dirn} {
4371
	    set id [lindex $displayorder $l]
4372
	    # shouldn't happen unless git log doesn't give all the commits...
4373 4374 4375 4376 4377 4378 4379
	    if {![info exists commitdata($id)]} continue
	    if {![doesmatch $commitdata($id)]} continue
	    if {![info exists commitinfo($id)]} {
		getcommit $id
	    }
	    set info $commitinfo($id)
	    foreach f $info ty $fldtypes {
4380
		if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
4381 4382 4383 4384 4385 4386
		    [doesmatch $f]} {
		    set found 1
		    break
		}
	    }
	    if {$found} break
4387
	}
4388
    } else {
4389
	for {} {$n > 0} {incr n -1; incr l $find_dirn} {
4390 4391 4392 4393 4394
	    set id [lindex $displayorder $l]
	    if {![info exists fhighlights($l)]} {
		askfilehighlight $l $id
		if {$domore} {
		    set domore 0
4395
		    set findcurline [expr {$l - $find_dirn}]
4396 4397 4398 4399
		}
	    } elseif {$fhighlights($l)} {
		set found $domore
		break
4400 4401 4402
	    }
	}
    }
4403
    if {$found || ($domore && !$moretodo)} {
4404
	unset findcurline
4405
	unset find_dirn
4406
	notbusy finding
4407 4408 4409 4410 4411 4412 4413
	set fprogcoord 0
	adjustprogress
	if {$found} {
	    findselectline $l
	} else {
	    bell
	}
4414
	return 0
4415
    }
4416 4417
    if {!$domore} {
	flushhighlights
4418
    } else {
4419
	set findcurline [expr {$l - $find_dirn}]
4420
    }
4421
    set n [expr {($findcurline - $findstartline) * $find_dirn - 1}]
4422 4423
    if {$n < 0} {
	incr n $numcommits
4424
    }
4425 4426 4427
    set fprogcoord [expr {$n * 1.0 / $numcommits}]
    adjustprogress
    return $domore
4428 4429 4430
}

proc findselectline {l} {
4431
    global findloc commentend ctext findcurline markingmatches gdttype
4432 4433 4434

    set markingmatches 1
    set findcurline $l
4435
    selectline $l 1
4436
    if {$findloc == [mc "All fields"] || $findloc == [mc "Comments"]} {
4437 4438 4439 4440 4441
	# 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 已提交
4442
	    set end [expr {[lindex $match 1] + 1}]
4443 4444
	    $ctext tag add found "1.0 + $start c" "1.0 + $end c"
	}
4445
    }
4446
    drawvisible
4447 4448
}

4449
# mark the bits of a headline or author that match a find string
4450 4451 4452
proc markmatches {canv l str tag matches font row} {
    global selectedline

4453 4454 4455 4456 4457 4458 4459 4460
    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 已提交
4461 4462 4463 4464
	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 \
4465
		   -outline {} -tags [list match$l matches] -fill yellow]
4466
	$canv lower $t
4467 4468 4469
	if {[info exists selectedline] && $row == $selectedline} {
	    $canv raise $t secsel
	}
4470 4471 4472 4473
    }
}

proc unmarkmatches {} {
4474
    global markingmatches
4475

4476
    allcanvs delete matches
4477
    set markingmatches 0
4478
    stopfinding
4479 4480
}

4481
proc selcanvline {w x y} {
4482
    global canv canvy0 ctext linespc
P
Paul Mackerras 已提交
4483
    global rowtextx
4484
    set ymax [lindex [$canv cget -scrollregion] 3]
4485
    if {$ymax == {}} return
4486 4487 4488 4489 4490 4491
    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
    }
4492 4493 4494
    if {$w eq $canv} {
	if {![info exists rowtextx($l)] || $x < $rowtextx($l)} return
    }
4495
    unmarkmatches
4496
    selectline $l 1
4497 4498
}

4499 4500
proc commit_descriptor {p} {
    global commitinfo
4501 4502 4503
    if {![info exists commitinfo($p)]} {
	getcommit $p
    }
4504
    set l "..."
4505
    if {[llength $commitinfo($p)] > 1} {
4506 4507
	set l [lindex $commitinfo($p) 0]
    }
P
Paul Mackerras 已提交
4508
    return "$p ($l)\n"
4509 4510
}

4511 4512
# append some text to the ctext widget, and make any SHA1 ID
# that we know about be a clickable link.
4513
proc appendwithlinks {text tags} {
4514
    global ctext commitrow linknum curview pendinglinks
4515 4516

    set start [$ctext index "end - 1c"]
4517
    $ctext insert end $text $tags
4518 4519 4520 4521 4522 4523
    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 已提交
4524
	$ctext tag delete link$linknum
4525
	$ctext tag add link$linknum "$start + $s c" "$start + $e c"
4526
	setlink $linkid link$linknum
4527 4528
	incr linknum
    }
4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565
}

proc setlink {id lk} {
    global curview commitrow ctext pendinglinks commitinterest

    if {[info exists commitrow($curview,$id)]} {
	$ctext tag conf $lk -foreground blue -underline 1
	$ctext tag bind $lk <1> [list selectline $commitrow($curview,$id) 1]
	$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
	}
    }
4566 4567
}

4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583
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}]
}

4584 4585
# add a list of tag or branch names at position pos
# returns the number of names inserted
4586
proc appendrefs {pos ids var} {
4587
    global ctext commitrow linknum curview $var maxrefs
P
Paul Mackerras 已提交
4588

4589 4590 4591
    if {[catch {$ctext index $pos}]} {
	return 0
    }
4592 4593 4594 4595 4596 4597 4598 4599
    $ctext conf -state normal
    $ctext delete $pos "$pos lineend"
    set tags {}
    foreach id $ids {
	foreach tag [set $var\($id\)] {
	    lappend tags [list $tag $id]
	}
    }
4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611
    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
4612
	    setlink $id $lk
4613
	    set sep ", "
P
Paul Mackerras 已提交
4614 4615
	}
    }
4616
    $ctext conf -state disabled
4617
    return [llength $tags]
P
Paul Mackerras 已提交
4618 4619
}

4620 4621 4622
# called when we have finished computing the nearby tags
proc dispneartags {delay} {
    global selectedline currentid showneartags tagphase
4623

4624 4625 4626 4627 4628 4629 4630 4631
    if {![info exists selectedline] || !$showneartags} return
    after cancel dispnexttag
    if {$delay} {
	after 200 dispnexttag
	set tagphase -1
    } else {
	after idle dispnexttag
	set tagphase 0
4632 4633 4634
    }
}

4635 4636
proc dispnexttag {} {
    global selectedline currentid showneartags tagphase ctext
P
Paul Mackerras 已提交
4637 4638

    if {![info exists selectedline] || !$showneartags} return
4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662
    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
		}
	    }
4663 4664
	}
    }
4665 4666
    if {[incr tagphase] <= 2} {
	after idle dispnexttag
P
Paul Mackerras 已提交
4667 4668 4669
    }
}

4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687
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
}

4688
proc selectline {l isnew} {
4689 4690
    global canv ctext commitinfo selectedline
    global displayorder
4691
    global canvy0 linespc parentlist children curview
4692
    global currentid sha1entry
P
Paul Mackerras 已提交
4693
    global commentend idtags linknum
4694
    global mergemax numcommits pending_select
4695
    global cmitmode showneartags allcommits
4696
    global autoselect
4697

4698
    catch {unset pending_select}
4699
    $canv delete hover
4700
    normalline
4701
    unsel_reflist
4702
    stopfinding
4703
    if {$l < 0 || $l >= $numcommits} return
4704
    set y [expr {$canvy0 + $l * $linespc}]
4705
    set ymax [lindex [$canv cget -scrollregion] 3]
4706 4707
    set ytop [expr {$y - $linespc - 1}]
    set ybot [expr {$y + $linespc + 1}]
4708
    set wnow [$canv yview]
J
Jeff Hobbs 已提交
4709 4710
    set wtop [expr {[lindex $wnow 0] * $ymax}]
    set wbot [expr {[lindex $wnow 1] * $ymax}]
4711 4712
    set wh [expr {$wbot - $wtop}]
    set newtop $wtop
4713
    if {$ytop < $wtop} {
4714 4715 4716 4717 4718 4719 4720
	if {$ybot < $wtop} {
	    set newtop [expr {$y - $wh / 2.0}]
	} else {
	    set newtop $ytop
	    if {$newtop > $wtop - $linespc} {
		set newtop [expr {$wtop - $linespc}]
	    }
4721
	}
4722 4723 4724 4725 4726 4727 4728 4729
    } 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}]
	    }
4730
	}
4731 4732 4733 4734 4735
    }
    if {$newtop != $wtop} {
	if {$newtop < 0} {
	    set newtop 0
	}
J
Jeff Hobbs 已提交
4736
	allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
P
Paul Mackerras 已提交
4737
	drawvisible
4738
    }
4739

4740
    make_secsel $l
P
Paul Mackerras 已提交
4741

4742 4743
    if {$isnew} {
	addtohistory [list selectline $l 0]
4744 4745
    }

4746 4747
    set selectedline $l

4748
    set id [lindex $displayorder $l]
4749
    set currentid $id
4750 4751
    $sha1entry delete 0 end
    $sha1entry insert 0 $id
4752 4753 4754 4755
    if {$autoselect} {
	$sha1entry selection from 0
	$sha1entry selection to end
    }
4756
    rhighlight_sel $id
4757

4758
    $ctext conf -state normal
4759
    clear_ctext
4760
    set linknum 0
4761
    set info $commitinfo($id)
P
Paul Mackerras 已提交
4762
    set date [formatdate [lindex $info 2]]
4763
    $ctext insert end "[mc "Author"]: [lindex $info 1]  $date\n"
P
Paul Mackerras 已提交
4764
    set date [formatdate [lindex $info 4]]
4765
    $ctext insert end "[mc "Committer"]: [lindex $info 3]  $date\n"
4766
    if {[info exists idtags($id)]} {
4767
	$ctext insert end [mc "Tags:"]
4768 4769 4770 4771 4772
	foreach tag $idtags($id) {
	    $ctext insert end " $tag"
	}
	$ctext insert end "\n"
    }
4773

4774
    set headers {}
4775 4776
    set olds [lindex $parentlist $l]
    if {[llength $olds] > 1} {
4777
	set np 0
4778
	foreach p $olds {
4779 4780 4781 4782 4783
	    if {$np >= $mergemax} {
		set tag mmax
	    } else {
		set tag m$np
	    }
4784
	    $ctext insert end "[mc "Parent"]: " $tag
4785
	    appendwithlinks [commit_descriptor $p] {}
4786 4787 4788
	    incr np
	}
    } else {
4789
	foreach p $olds {
4790
	    append headers "[mc "Parent"]: [commit_descriptor $p]"
4791 4792
	}
    }
4793

4794
    foreach c $children($curview,$id) {
4795
	append headers "[mc "Child"]:  [commit_descriptor $c]"
4796
    }
4797 4798

    # make anything that looks like a SHA1 ID be a clickable link
4799
    appendwithlinks $headers {}
P
Paul Mackerras 已提交
4800 4801 4802 4803
    if {$showneartags} {
	if {![info exists allcommits]} {
	    getallcommits
	}
4804
	$ctext insert end "[mc "Branch"]: "
4805 4806
	$ctext mark set branch "end -1c"
	$ctext mark gravity branch left
4807
	$ctext insert end "\n[mc "Follows"]: "
P
Paul Mackerras 已提交
4808 4809
	$ctext mark set follows "end -1c"
	$ctext mark gravity follows left
4810
	$ctext insert end "\n[mc "Precedes"]: "
P
Paul Mackerras 已提交
4811 4812 4813
	$ctext mark set precedes "end -1c"
	$ctext mark gravity precedes left
	$ctext insert end "\n"
4814
	dispneartags 1
P
Paul Mackerras 已提交
4815 4816
    }
    $ctext insert end "\n"
4817 4818 4819 4820 4821
    set comment [lindex $info 5]
    if {[string first "\r" $comment] >= 0} {
	set comment [string map {"\r" "\n    "} $comment]
    }
    appendwithlinks $comment {comment}
4822

4823
    $ctext tag remove found 1.0 end
4824
    $ctext conf -state disabled
4825
    set commentend [$ctext index "end - 1c"]
4826

4827
    init_flist [mc "Comments"]
P
Paul Mackerras 已提交
4828 4829 4830
    if {$cmitmode eq "tree"} {
	gettree $id
    } elseif {[llength $olds] <= 1} {
4831
	startdiff $id
4832
    } else {
4833
	mergediff $id $l
4834 4835 4836
    }
}

4837 4838 4839 4840 4841 4842 4843 4844 4845 4846 4847 4848
proc selfirstline {} {
    unmarkmatches
    selectline 0 1
}

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

4849 4850
proc selnextline {dir} {
    global selectedline
4851
    focus .
4852
    if {![info exists selectedline]} return
J
Jeff Hobbs 已提交
4853
    set l [expr {$selectedline + $dir}]
4854
    unmarkmatches
4855 4856 4857
    selectline $l 1
}

4858 4859 4860 4861 4862 4863 4864 4865
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
4866
    drawvisible
4867 4868 4869 4870 4871 4872 4873 4874
    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
4875
    selectline $l 1
4876 4877
}

4878
proc unselectline {} {
P
Paul Mackerras 已提交
4879
    global selectedline currentid
4880 4881

    catch {unset selectedline}
P
Paul Mackerras 已提交
4882
    catch {unset currentid}
4883
    allcanvs delete secsel
4884
    rhighlight_none
4885 4886
}

P
Paul Mackerras 已提交
4887 4888 4889 4890 4891 4892 4893 4894
proc reselectline {} {
    global selectedline

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

4895
proc addtohistory {cmd} {
4896
    global history historyindex curview
4897

4898
    set elt [list $curview $cmd]
4899
    if {$historyindex > 0
4900
	&& [lindex $history [expr {$historyindex - 1}]] == $elt} {
4901 4902 4903 4904
	return
    }

    if {$historyindex < [llength $history]} {
4905
	set history [lreplace $history $historyindex end $elt]
4906
    } else {
4907
	lappend history $elt
4908 4909 4910
    }
    incr historyindex
    if {$historyindex > 1} {
4911
	.tf.bar.leftbut conf -state normal
4912
    } else {
4913
	.tf.bar.leftbut conf -state disabled
4914
    }
4915
    .tf.bar.rightbut conf -state disabled
4916 4917
}

4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928
proc godo {elt} {
    global curview

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

4929 4930
proc goback {} {
    global history historyindex
4931
    focus .
4932 4933 4934

    if {$historyindex > 1} {
	incr historyindex -1
4935
	godo [lindex $history [expr {$historyindex - 1}]]
4936
	.tf.bar.rightbut conf -state normal
4937 4938
    }
    if {$historyindex <= 1} {
4939
	.tf.bar.leftbut conf -state disabled
4940 4941 4942 4943 4944
    }
}

proc goforw {} {
    global history historyindex
4945
    focus .
4946 4947

    if {$historyindex < [llength $history]} {
4948
	set cmd [lindex $history $historyindex]
4949
	incr historyindex
4950
	godo $cmd
4951
	.tf.bar.leftbut conf -state normal
4952 4953
    }
    if {$historyindex >= [llength $history]} {
4954
	.tf.bar.rightbut conf -state disabled
4955
    }
4956 4957
}

P
Paul Mackerras 已提交
4958
proc gettree {id} {
4959 4960
    global treefilelist treeidlist diffids diffmergeid treepending
    global nullid nullid2
P
Paul Mackerras 已提交
4961 4962 4963 4964 4965

    set diffids $id
    catch {unset diffmergeid}
    if {![info exists treefilelist($id)]} {
	if {![info exists treepending]} {
4966 4967 4968 4969
	    if {$id eq $nullid} {
		set cmd [list | git ls-files]
	    } elseif {$id eq $nullid2} {
		set cmd [list | git ls-files --stage -t]
4970
	    } else {
4971
		set cmd [list | git ls-tree -r $id]
4972 4973
	    }
	    if {[catch {set gtf [open $cmd r]}]} {
P
Paul Mackerras 已提交
4974 4975 4976 4977 4978 4979
		return
	    }
	    set treepending $id
	    set treefilelist($id) {}
	    set treeidlist($id) {}
	    fconfigure $gtf -blocking 0
4980
	    filerun $gtf [list gettreeline $gtf $id]
P
Paul Mackerras 已提交
4981 4982 4983 4984 4985 4986 4987
	}
    } else {
	setfilelist $id
    }
}

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

4990 4991
    set nl 0
    while {[incr nl] <= 1000 && [gets $gtf line] >= 0} {
4992 4993 4994
	if {$diffids eq $nullid} {
	    set fname $line
	} else {
4995 4996 4997
	    set i [string first "\t" $line]
	    if {$i < 0} continue
	    set fname [string range $line [expr {$i+1}] end]
4998 4999 5000
	    set line [string range $line 0 [expr {$i-1}]]
	    if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue
	    set sha1 [lindex $line 2]
5001 5002 5003 5004 5005
	    if {[string index $fname 0] eq "\""} {
		set fname [lindex $fname 0]
	    }
	    lappend treeidlist($id) $sha1
	}
5006 5007 5008 5009
	lappend treefilelist($id) $fname
    }
    if {![eof $gtf]} {
	return [expr {$nl >= 1000? 2: 1}]
P
Paul Mackerras 已提交
5010 5011 5012 5013 5014 5015 5016 5017 5018 5019 5020 5021
    }
    close $gtf
    unset treepending
    if {$cmitmode ne "tree"} {
	if {![info exists diffmergeid]} {
	    gettreediffs $diffids
	}
    } elseif {$id ne $diffids} {
	gettree $diffids
    } else {
	setfilelist $id
    }
5022
    return 0
P
Paul Mackerras 已提交
5023 5024 5025
}

proc showfile {f} {
5026
    global treefilelist treeidlist diffids nullid nullid2
P
Paul Mackerras 已提交
5027 5028 5029 5030 5031 5032 5033
    global ctext commentend

    set i [lsearch -exact $treefilelist($diffids) $f]
    if {$i < 0} {
	puts "oops, $f not in list for id $diffids"
	return
    }
5034 5035 5036
    if {$diffids eq $nullid} {
	if {[catch {set bf [open $f r]} err]} {
	    puts "oops, can't read $f: $err"
5037 5038 5039
	    return
	}
    } else {
5040 5041 5042
	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"
5043 5044
	    return
	}
P
Paul Mackerras 已提交
5045 5046
    }
    fconfigure $bf -blocking 0
5047
    filerun $bf [list getblobline $bf $diffids]
P
Paul Mackerras 已提交
5048
    $ctext config -state normal
5049
    clear_ctext $commentend
P
Paul Mackerras 已提交
5050 5051 5052 5053
    $ctext insert end "\n"
    $ctext insert end "$f\n" filesep
    $ctext config -state disabled
    $ctext yview $commentend
5054
    settabs 0
P
Paul Mackerras 已提交
5055 5056 5057 5058 5059 5060 5061
}

proc getblobline {bf id} {
    global diffids cmitmode ctext

    if {$id ne $diffids || $cmitmode ne "tree"} {
	catch {close $bf}
5062
	return 0
P
Paul Mackerras 已提交
5063 5064
    }
    $ctext config -state normal
5065 5066
    set nl 0
    while {[incr nl] <= 1000 && [gets $bf line] >= 0} {
P
Paul Mackerras 已提交
5067 5068 5069 5070 5071 5072
	$ctext insert end "$line\n"
    }
    if {[eof $bf]} {
	# delete last newline
	$ctext delete "end - 2c" "end - 1c"
	close $bf
5073
	return 0
P
Paul Mackerras 已提交
5074 5075
    }
    $ctext config -state disabled
5076
    return [expr {$nl >= 1000? 2: 1}]
P
Paul Mackerras 已提交
5077 5078
}

5079
proc mergediff {id l} {
5080
    global diffmergeid mdifffd
5081
    global diffids
5082
    global diffcontext
5083
    global parentlist
5084
    global limitdiffs viewfiles curview
5085

5086
    set diffmergeid $id
5087
    set diffids $id
5088
    # this doesn't seem to actually affect anything...
5089
    set cmd [concat | git diff-tree --no-commit-id --cc -U$diffcontext $id]
5090 5091 5092
    if {$limitdiffs && $viewfiles($curview) ne {}} {
	set cmd [concat $cmd -- $viewfiles($curview)]
    }
5093
    if {[catch {set mdf [open $cmd r]} err]} {
5094
	error_popup "[mc "Error getting merge diffs:"] $err"
5095
	return
5096
    }
5097 5098
    fconfigure $mdf -blocking 0
    set mdifffd($id) $mdf
5099
    set np [llength [lindex $parentlist $l]]
5100
    settabs $np
5101
    filerun $mdf [list getmergediffline $mdf $id $np]
5102 5103
}

5104
proc getmergediffline {mdf id np} {
5105
    global diffmergeid ctext cflist mergemax
5106
    global difffilestart mdifffd
5107

5108 5109 5110 5111 5112
    $ctext conf -state normal
    set nr 0
    while {[incr nr] <= 1000 && [gets $mdf line] >= 0} {
	if {![info exists diffmergeid] || $id != $diffmergeid
	    || $mdf != $mdifffd($id)} {
5113
	    close $mdf
5114
	    return 0
5115
	}
5116 5117 5118 5119 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 5143 5144 5145 5146
	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
		}
5147
	    }
5148 5149 5150 5151 5152 5153 5154 5155 5156
	    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]
5157
	    }
5158 5159 5160 5161 5162 5163 5164
	    if {$num ne {}} {
		if {$num >= $mergemax} {
		    set num "max"
		}
		lappend tags m$num
	    }
	    $ctext insert end "$line\n" $tags
5165
	}
5166 5167
    }
    $ctext conf -state disabled
5168 5169 5170
    if {[eof $mdf]} {
	close $mdf
	return 0
5171
    }
5172
    return [expr {$nr >= 1000? 2: 1}]
5173 5174
}

5175
proc startdiff {ids} {
5176
    global treediffs diffids treepending diffmergeid nullid nullid2
5177

5178
    settabs 1
5179
    set diffids $ids
5180
    catch {unset diffmergeid}
5181 5182 5183
    if {![info exists treediffs($ids)] ||
	[lsearch -exact $ids $nullid] >= 0 ||
	[lsearch -exact $ids $nullid2] >= 0} {
5184
	if {![info exists treepending]} {
5185
	    gettreediffs $ids
5186 5187
	}
    } else {
5188
	addtocflist $ids
5189 5190 5191
    }
}

5192 5193 5194
proc path_filter {filter name} {
    foreach p $filter {
	set l [string length $p]
5195 5196 5197 5198 5199 5200 5201 5202 5203 5204
	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
	    }
5205 5206 5207 5208 5209
	}
    }
    return 0
}

5210
proc addtocflist {ids} {
5211
    global treediffs
5212

5213
    add_flist $treediffs($ids)
5214
    getblobdiffs $ids
5215 5216
}

5217
proc diffcmd {ids flags} {
5218
    global nullid nullid2
5219 5220

    set i [lsearch -exact $ids $nullid]
5221
    set j [lsearch -exact $ids $nullid2]
5222
    if {$i >= 0} {
5223 5224 5225 5226 5227 5228 5229 5230 5231 5232 5233 5234 5235 5236 5237 5238 5239
	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]
5240
	if {[llength $ids] > 1} {
5241
	    # comparing index with specific revision
5242 5243 5244 5245 5246 5247
	    if {$i == 0} {
		lappend cmd -R [lindex $ids 1]
	    } else {
		lappend cmd [lindex $ids 0]
	    }
	} else {
5248
	    # comparing index with HEAD
5249 5250 5251
	    lappend cmd HEAD
	}
    } else {
5252
	set cmd [concat | git diff-tree -r $flags $ids]
5253 5254 5255 5256
    }
    return $cmd
}

5257
proc gettreediffs {ids} {
5258
    global treediff treepending
5259

5260
    set treepending $ids
5261
    set treediff {}
5262
    if {[catch {set gdtf [open [diffcmd $ids {--no-commit-id}] r]}]} return
5263
    fconfigure $gdtf -blocking 0
5264
    filerun $gdtf [list gettreediffline $gdtf $ids]
5265 5266
}

5267
proc gettreediffline {gdtf ids} {
5268
    global treediff treediffs treepending diffids diffmergeid
5269
    global cmitmode viewfiles curview limitdiffs
5270

5271 5272
    set nr 0
    while {[incr nr] <= 1000 && [gets $gdtf line] >= 0} {
5273 5274 5275 5276 5277 5278 5279 5280
	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
	}
5281 5282 5283 5284 5285
    }
    if {![eof $gdtf]} {
	return [expr {$nr >= 1000? 2: 1}]
    }
    close $gdtf
5286 5287 5288 5289 5290 5291 5292 5293 5294 5295 5296
    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
    }
5297 5298 5299 5300 5301 5302
    unset treepending
    if {$cmitmode eq "tree"} {
	gettree $diffids
    } elseif {$ids != $diffids} {
	if {![info exists diffmergeid]} {
	    gettreediffs $diffids
5303
	}
5304 5305
    } else {
	addtocflist $ids
5306
    }
5307
    return 0
5308 5309
}

5310 5311 5312 5313 5314 5315 5316 5317 5318 5319 5320 5321 5322 5323 5324 5325
# 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
	}
    }
}

5326 5327 5328 5329
proc changeignorespace {} {
    reselectline
}

5330
proc getblobdiffs {ids} {
5331
    global blobdifffd diffids env
5332
    global diffinhdr treediffs
5333
    global diffcontext
5334
    global ignorespace
5335
    global limitdiffs viewfiles curview
5336

5337
    set cmd [diffcmd $ids "-p -C --no-commit-id -U$diffcontext"]
5338 5339 5340
    if {$ignorespace} {
	append cmd " -w"
    }
5341
    if {$limitdiffs && $viewfiles($curview) ne {}} {
5342
	set cmd [concat $cmd -- $viewfiles($curview)]
5343 5344
    }
    if {[catch {set bdf [open $cmd r]} err]} {
5345 5346 5347
	puts "error getting diffs: $err"
	return
    }
5348
    set diffinhdr 0
5349
    fconfigure $bdf -blocking 0
5350
    set blobdifffd($ids) $bdf
5351
    filerun $bdf [list getblobdiffline $bdf $diffids]
5352 5353
}

5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364 5365 5366
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
    }
}

5367 5368 5369 5370 5371 5372 5373 5374 5375 5376 5377 5378
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
}

5379
proc getblobdiffline {bdf ids} {
5380
    global diffids blobdifffd ctext curdiffstart
5381
    global diffnexthead diffnextnote difffilestart
5382
    global diffinhdr treediffs
5383

5384
    set nr 0
5385
    $ctext conf -state normal
5386 5387 5388 5389
    while {[incr nr] <= 1000 && [gets $bdf line] >= 0} {
	if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
	    close $bdf
	    return 0
5390
	}
5391 5392 5393 5394
	if {![string compare -length 11 "diff --git " $line]} {
	    # trim off "diff --git "
	    set line [string range $line 11 end]
	    set diffinhdr 1
5395 5396
	    # start of a new file
	    $ctext insert end "\n"
5397 5398 5399 5400 5401 5402
	    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
5403 5404
	    # "rename to" or "copy from" and "copy to" lines following this,
	    # and we'll use them to get the filenames.
5405 5406 5407 5408 5409 5410 5411 5412
	    # 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
5413
	    }
5414 5415 5416 5417 5418
	    # 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}]]
5419
	    }
5420 5421 5422
	    makediffhdr $fname $ids

	} elseif {[regexp {^@@ -([0-9]+)(,[0-9]+)? \+([0-9]+)(,[0-9]+)? @@(.*)} \
5423 5424 5425
		       $line match f1l f1c f2l f2c rest]} {
	    $ctext insert end "$line\n" hunksep
	    set diffinhdr 0
5426 5427

	} elseif {$diffinhdr} {
5428
	    if {![string compare -length 12 "rename from " $line]} {
5429
		set fname [string range $line [expr 6 + [string first " from " $line] ] end]
5430 5431 5432 5433 5434 5435 5436
		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
		}
5437 5438 5439
	    } 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]
5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450 5451 5452
		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

5453
	} else {
5454 5455 5456 5457 5458 5459 5460
	    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 {
5461 5462 5463
		# "\ No newline at end of file",
		# or something else we don't recognize
		$ctext insert end "$line\n" hunksep
5464 5465 5466 5467
	    }
	}
    }
    $ctext conf -state disabled
5468 5469 5470
    if {[eof $bdf]} {
	close $bdf
	return 0
5471
    }
5472
    return [expr {$nr >= 1000? 2: 1}]
5473 5474
}

5475 5476 5477 5478 5479 5480 5481
proc changediffdisp {} {
    global ctext diffelide

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

5482 5483 5484 5485 5486 5487 5488 5489 5490 5491 5492 5493 5494 5495
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
}

5496 5497 5498
proc nextfile {} {
    global difffilestart ctext
    set here [$ctext index @0,0]
5499 5500 5501
    foreach loc $difffilestart {
	if {[$ctext compare $loc > $here]} {
	    $ctext yview $loc
5502
	    return
5503 5504
	}
    }
5505 5506
}

5507 5508
proc clear_ctext {{first 1.0}} {
    global ctext smarktop smarkbot
5509
    global pendinglinks
5510

5511 5512 5513
    set l [lindex [split $first .] 0]
    if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} {
	set smarktop $l
5514
    }
5515 5516
    if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} {
	set smarkbot $l
5517 5518
    }
    $ctext delete $first end
5519 5520 5521
    if {$first eq "1.0"} {
	catch {unset pendinglinks}
    }
5522 5523
}

5524
proc settabs {{firstab {}}} {
5525
    global firsttabstop tabstop ctext have_tk85
5526 5527 5528 5529

    if {$firstab ne {} && $have_tk85} {
	set firsttabstop $firstab
    }
5530
    set w [font measure textfont "0"]
5531
    if {$firsttabstop != 0} {
5532 5533
	$ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \
			       [expr {($firsttabstop + 2 * $tabstop) * $w}]]
5534 5535 5536 5537 5538
    } elseif {$have_tk85 || $tabstop != 8} {
	$ctext conf -tabs [expr {$tabstop * $w}]
    } else {
	$ctext conf -tabs {}
    }
5539 5540 5541
}

proc incrsearch {name ix op} {
5542
    global ctext searchstring searchdirn
5543 5544

    $ctext tag remove found 1.0 end
5545 5546 5547 5548 5549 5550 5551 5552 5553 5554 5555
    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]
	}
    }
5556
    if {$searchstring ne {}} {
5557 5558 5559 5560
	set here [$ctext search $searchdirn -- $searchstring anchor]
	if {$here ne {}} {
	    $ctext see $here
	}
5561 5562 5563 5564 5565
	searchmarkvisible 1
    }
}

proc dosearch {} {
5566
    global sstring ctext searchstring searchdirn
5567 5568 5569

    focus $sstring
    $sstring icursor end
5570 5571 5572 5573 5574 5575 5576 5577 5578 5579 5580 5581 5582 5583 5584 5585 5586 5587 5588 5589 5590 5591 5592 5593 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 5604 5605 5606 5607 5608 5609 5610 5611 5612 5613
    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
5614 5615 5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 5628 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638 5639 5640 5641 5642 5643 5644 5645 5646 5647 5648 5649 5650 5651
    }
}

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} {
5652
    global searchstring
5653

5654
    .bleft.bottom.sb set $f0 $f1
5655 5656 5657 5658 5659
    if {$searchstring ne {}} {
	searchmarkvisible 0
    }
}

5660
proc setcoords {} {
5661
    global linespc charspc canvx0 canvy0
5662
    global xspc1 xspc2 lthickness
5663

5664 5665
    set linespc [font metrics mainfont -linespace]
    set charspc [font measure mainfont "m"]
P
Paul Mackerras 已提交
5666 5667
    set canvy0 [expr {int(3 + 0.5 * $linespc)}]
    set canvx0 [expr {int(3 + 0.5 * $linespc)}]
5668
    set lthickness [expr {int($linespc / 9) + 1}]
5669 5670
    set xspc1(0) $linespc
    set xspc2 $linespc
5671
}
5672

5673
proc redisplay {} {
5674
    global canv
P
Paul Mackerras 已提交
5675 5676 5677 5678 5679 5680
    global selectedline

    set ymax [lindex [$canv cget -scrollregion] 3]
    if {$ymax eq {} || $ymax == 0} return
    set span [$canv yview]
    clear_display
5681
    setcanvscroll
P
Paul Mackerras 已提交
5682 5683 5684 5685
    allcanvs yview moveto [lindex $span 0]
    drawvisible
    if {[info exists selectedline]} {
	selectline $selectedline 0
5686
	allcanvs yview moveto [lindex $span 0]
5687 5688 5689
    }
}

5690 5691 5692 5693 5694 5695 5696 5697 5698
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)}]
5699
    }
5700 5701 5702 5703 5704 5705 5706 5707 5708 5709
    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}
	}
5710
    }
5711 5712 5713 5714 5715 5716 5717 5718 5719 5720 5721 5722 5723 5724 5725 5726
}

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"
5727
    }
5728 5729
    if {$fontattr($f,slant) eq "italic"} {
	lappend n "italic"
5730
    }
5731
    return $n
5732 5733
}

5734
proc incrfont {inc} {
5735
    global mainfont textfont ctext canv phase cflist showrefstop
5736 5737
    global stopped entries fontattr

5738
    unmarkmatches
5739
    set s $fontattr(mainfont,size)
5740 5741 5742 5743
    incr s $inc
    if {$s < 1} {
	set s 1
    }
5744
    set fontattr(mainfont,size) $s
5745 5746
    font config mainfont -size $s
    font config mainfontbold -size $s
5747 5748
    set mainfont [fontname mainfont]
    set s $fontattr(textfont,size)
5749 5750 5751 5752
    incr s $inc
    if {$s < 1} {
	set s 1
    }
5753
    set fontattr(textfont,size) $s
5754 5755
    font config textfont -size $s
    font config textfontbold -size $s
5756
    set textfont [fontname textfont]
5757
    setcoords
5758
    settabs
5759 5760
    redisplay
}
5761

5762 5763 5764 5765 5766 5767 5768
proc clearsha1 {} {
    global sha1entry sha1string
    if {[string length $sha1string] == 40} {
	$sha1entry delete 0 end
    }
}

5769 5770 5771 5772 5773 5774 5775 5776 5777 5778
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"} {
5779
	$sha1but conf -state normal -relief raised -text "[mc "Goto:"] "
5780
    } else {
5781
	$sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] "
5782 5783 5784 5785
    }
}

proc gotocommit {} {
5786
    global sha1string currentid commitrow tagids headids
5787
    global displayorder numcommits curview
5788

5789 5790 5791 5792
    if {$sha1string == {}
	|| ([info exists currentid] && $sha1string == $currentid)} return
    if {[info exists tagids($sha1string)]} {
	set id $tagids($sha1string)
5793 5794
    } elseif {[info exists headids($sha1string)]} {
	set id $headids($sha1string)
5795 5796
    } else {
	set id [string tolower $sha1string]
5797 5798
	if {[regexp {^[0-9a-f]{4,39}$} $id]} {
	    set matches {}
P
Paul Mackerras 已提交
5799 5800 5801
	    foreach i $displayorder {
		if {[string match $id* $i]} {
		    lappend matches $i
5802 5803 5804 5805
		}
	    }
	    if {$matches ne {}} {
		if {[llength $matches] > 1} {
5806
		    error_popup [mc "Short SHA1 id %s is ambiguous" $id]
5807 5808 5809 5810 5811
		    return
		}
		set id [lindex $matches 0]
	    }
	}
5812
    }
5813 5814
    if {[info exists commitrow($curview,$id)]} {
	selectline $commitrow($curview,$id) 1
5815 5816
	return
    }
5817
    if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
5818
	set msg [mc "SHA1 id %s is not known" $sha1string]
5819
    } else {
5820
	set msg [mc "Tag/Head %s is not known" $sha1string]
5821
    }
5822
    error_popup $msg
5823 5824
}

5825 5826 5827 5828
proc lineenter {x y id} {
    global hoverx hovery hoverid hovertimer
    global commitinfo canv

P
Paul Mackerras 已提交
5829
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
5830 5831 5832 5833 5834 5835 5836 5837 5838 5839 5840 5841 5842 5843 5844 5845 5846 5847 5848 5849 5850 5851 5852 5853 5854 5855 5856 5857 5858 5859 5860 5861 5862 5863 5864 5865 5866 5867 5868
    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
5869
    global commitinfo
5870 5871 5872 5873 5874 5875 5876 5877 5878

    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}]
5879
    set x1 [expr {$x + [font measure mainfont $text] + 2 * $lthickness}]
5880 5881 5882 5883
    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
5884
    set t [$canv create text $x $y -anchor nw -text $text -tags hover \
5885
	       -font mainfont]
5886 5887 5888
    $canv raise $t
}

5889
proc clickisonarrow {id y} {
P
Paul Mackerras 已提交
5890
    global lthickness
5891

P
Paul Mackerras 已提交
5892
    set ranges [rowranges $id]
5893
    set thresh [expr {2 * $lthickness + 6}]
P
Paul Mackerras 已提交
5894
    set n [expr {[llength $ranges] - 1}]
5895
    for {set i 1} {$i < $n} {incr i} {
P
Paul Mackerras 已提交
5896
	set row [lindex $ranges $i]
5897 5898
	if {abs([yc $row] - $y) < $thresh} {
	    return $i
5899 5900 5901 5902 5903
	}
    }
    return {}
}

5904
proc arrowjump {id n y} {
P
Paul Mackerras 已提交
5905
    global canv
5906

5907 5908
    # 1 <-> 2, 3 <-> 4, etc...
    set n [expr {(($n - 1) ^ 1) + 1}]
P
Paul Mackerras 已提交
5909
    set row [lindex [rowranges $id] $n]
5910
    set yt [yc $row]
5911 5912 5913 5914 5915 5916 5917 5918
    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
    }
5919
    allcanvs yview moveto $yfrac
5920 5921
}

5922
proc lineclick {x y id isnew} {
5923
    global ctext commitinfo children canv thickerline curview commitrow
5924

P
Paul Mackerras 已提交
5925
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
5926
    unmarkmatches
5927
    unselectline
5928 5929 5930 5931
    normalline
    $canv delete hover
    # draw this line thicker than normal
    set thickerline $id
5932
    drawlines $id
5933
    if {$isnew} {
5934 5935 5936 5937 5938 5939 5940 5941 5942 5943 5944 5945 5946
	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]
5947
    }
5948 5949
    # fill the details pane with info about this line
    $ctext conf -state normal
5950
    clear_ctext
5951
    settabs 0
5952
    $ctext insert end "[mc "Parent"]:\t"
5953 5954
    $ctext insert end $id link0
    setlink $id link0
5955
    set info $commitinfo($id)
5956
    $ctext insert end "\n\t[lindex $info 0]\n"
5957
    $ctext insert end "\t[mc "Author"]:\t[lindex $info 1]\n"
P
Paul Mackerras 已提交
5958
    set date [formatdate [lindex $info 2]]
5959
    $ctext insert end "\t[mc "Date"]:\t$date\n"
5960
    set kids $children($curview,$id)
5961
    if {$kids ne {}} {
5962
	$ctext insert end "\n[mc "Children"]:"
5963
	set i 0
5964
	foreach child $kids {
5965
	    incr i
P
Paul Mackerras 已提交
5966
	    if {![info exists commitinfo($child)] && ![getcommit $child]} continue
5967
	    set info $commitinfo($child)
5968
	    $ctext insert end "\n\t"
5969 5970
	    $ctext insert end $child link$i
	    setlink $child link$i
5971
	    $ctext insert end "\n\t[lindex $info 0]"
5972
	    $ctext insert end "\n\t[mc "Author"]:\t[lindex $info 1]"
P
Paul Mackerras 已提交
5973
	    set date [formatdate [lindex $info 2]]
5974
	    $ctext insert end "\n\t[mc "Date"]:\t$date\n"
5975 5976 5977
	}
    }
    $ctext conf -state disabled
5978
    init_flist {}
5979 5980
}

5981 5982 5983
proc normalline {} {
    global thickerline
    if {[info exists thickerline]} {
5984
	set id $thickerline
5985
	unset thickerline
5986
	drawlines $id
5987 5988 5989
    }
}

5990
proc selbyid {id} {
5991 5992 5993
    global commitrow curview
    if {[info exists commitrow($curview,$id)]} {
	selectline $commitrow($curview,$id) 1
5994 5995 5996 5997 5998 5999 6000 6001 6002 6003 6004 6005
    }
}

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} {
6006
    global rowctxmenu commitrow selectedline rowmenuid curview
6007
    global nullid nullid2 fakerowmenu mainhead
6008

6009
    stopfinding
6010
    set rowmenuid $id
6011 6012
    if {![info exists selectedline]
	|| $commitrow($curview,$id) eq $selectedline} {
6013 6014 6015 6016
	set state disabled
    } else {
	set state normal
    }
6017
    if {$id ne $nullid && $id ne $nullid2} {
6018
	set menu $rowctxmenu
6019 6020 6021 6022 6023
	if {$mainhead ne {}} {
	    $menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead]
	} else {
	    $menu entryconfigure 7 -label [mc "Detached head: can't reset" $mainhead] -state disabled
	}
6024 6025 6026
    } else {
	set menu $fakerowmenu
    }
6027 6028 6029
    $menu entryconfigure [mc "Diff this -> selected"] -state $state
    $menu entryconfigure [mc "Diff selected -> this"] -state $state
    $menu entryconfigure [mc "Make patch"] -state $state
6030
    tk_popup $menu $x $y
6031 6032 6033
}

proc diffvssel {dirn} {
6034
    global rowmenuid selectedline displayorder
6035 6036 6037

    if {![info exists selectedline]} return
    if {$dirn} {
6038
	set oldid [lindex $displayorder $selectedline]
6039 6040 6041
	set newid $rowmenuid
    } else {
	set oldid $rowmenuid
6042
	set newid [lindex $displayorder $selectedline]
6043
    }
6044 6045 6046 6047 6048
    addtohistory [list doseldiff $oldid $newid]
    doseldiff $oldid $newid
}

proc doseldiff {oldid newid} {
6049
    global ctext
6050 6051
    global commitinfo

6052
    $ctext conf -state normal
6053
    clear_ctext
6054 6055
    init_flist [mc "Top"]
    $ctext insert end "[mc "From"] "
6056 6057
    $ctext insert end $oldid link0
    setlink $oldid link0
6058
    $ctext insert end "\n     "
6059
    $ctext insert end [lindex $commitinfo($oldid) 0]
6060
    $ctext insert end "\n\n[mc "To"]   "
6061 6062
    $ctext insert end $newid link1
    setlink $newid link1
6063
    $ctext insert end "\n     "
6064 6065 6066 6067
    $ctext insert end [lindex $commitinfo($newid) 0]
    $ctext insert end "\n"
    $ctext conf -state disabled
    $ctext tag remove found 1.0 end
6068
    startdiff [list $oldid $newid]
6069 6070
}

6071 6072 6073 6074 6075 6076 6077 6078 6079 6080 6081 6082
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
6083
    label $top.title -text [mc "Generate patch"]
6084
    grid $top.title - -pady 10
6085
    label $top.from -text [mc "From:"]
6086
    entry $top.fromsha1 -width 40 -relief flat
6087 6088 6089
    $top.fromsha1 insert 0 $oldid
    $top.fromsha1 conf -state readonly
    grid $top.from $top.fromsha1 -sticky w
6090
    entry $top.fromhead -width 60 -relief flat
6091 6092 6093
    $top.fromhead insert 0 $oldhead
    $top.fromhead conf -state readonly
    grid x $top.fromhead -sticky w
6094
    label $top.to -text [mc "To:"]
6095
    entry $top.tosha1 -width 40 -relief flat
6096 6097 6098
    $top.tosha1 insert 0 $newid
    $top.tosha1 conf -state readonly
    grid $top.to $top.tosha1 -sticky w
6099
    entry $top.tohead -width 60 -relief flat
6100 6101 6102
    $top.tohead insert 0 $newhead
    $top.tohead conf -state readonly
    grid x $top.tohead -sticky w
6103
    button $top.rev -text [mc "Reverse"] -command mkpatchrev -padx 5
6104
    grid $top.rev x -pady 10
6105
    label $top.flab -text [mc "Output file:"]
6106 6107 6108
    entry $top.fname -width 60
    $top.fname insert 0 [file normalize "patch$patchnum.patch"]
    incr patchnum
6109
    grid $top.flab $top.fname -sticky w
6110
    frame $top.buts
6111 6112
    button $top.buts.gen -text [mc "Generate"] -command mkpatchgo
    button $top.buts.can -text [mc "Cancel"] -command mkpatchcan
6113 6114 6115 6116
    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
6117
    focus $top.fname
6118 6119 6120 6121 6122 6123 6124 6125 6126 6127 6128 6129 6130 6131 6132 6133 6134 6135 6136
}

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 {} {
6137
    global patchtop nullid nullid2
6138 6139 6140 6141

    set oldid [$patchtop.fromsha1 get]
    set newid [$patchtop.tosha1 get]
    set fname [$patchtop.fname get]
6142
    set cmd [diffcmd [list $oldid $newid] -p]
6143 6144
    # trim off the initial "|"
    set cmd [lrange $cmd 1 end]
6145 6146
    lappend cmd >$fname &
    if {[catch {eval exec $cmd} err]} {
6147
	error_popup "[mc "Error creating patch:"] $err"
6148 6149 6150 6151 6152 6153 6154 6155 6156 6157 6158 6159
    }
    catch {destroy $patchtop}
    unset patchtop
}

proc mkpatchcan {} {
    global patchtop

    catch {destroy $patchtop}
    unset patchtop
}

6160 6161 6162 6163 6164 6165 6166
proc mktag {} {
    global rowmenuid mktagtop commitinfo

    set top .maketag
    set mktagtop $top
    catch {destroy $top}
    toplevel $top
6167
    label $top.title -text [mc "Create tag"]
6168
    grid $top.title - -pady 10
6169
    label $top.id -text [mc "ID:"]
6170
    entry $top.sha1 -width 40 -relief flat
6171 6172 6173
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
6174
    entry $top.head -width 60 -relief flat
6175 6176 6177
    $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
    $top.head conf -state readonly
    grid x $top.head -sticky w
6178
    label $top.tlab -text [mc "Tag name:"]
6179
    entry $top.tag -width 60
6180 6181
    grid $top.tlab $top.tag -sticky w
    frame $top.buts
6182 6183
    button $top.buts.gen -text [mc "Create"] -command mktaggo
    button $top.buts.can -text [mc "Cancel"] -command mktagcan
6184 6185 6186 6187 6188 6189 6190 6191 6192 6193 6194 6195 6196
    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 == {}} {
6197
	error_popup [mc "No tag name specified"]
6198 6199 6200
	return
    }
    if {[info exists tagids($tag)]} {
6201
	error_popup [mc "Tag \"%s\" already exists" $tag]
6202 6203 6204
	return
    }
    if {[catch {
6205
	exec git tag $tag $id
6206
    } err]} {
6207
	error_popup "[mc "Error creating tag:"] $err"
6208 6209 6210 6211 6212
	return
    }

    set tagids($tag) $id
    lappend idtags($id) $tag
6213
    redrawtags $id
6214
    addedtag $id
6215 6216
    dispneartags 0
    run refill_reflist
6217 6218 6219
}

proc redrawtags {id} {
6220
    global canv linehtag commitrow idpos selectedline curview
6221
    global canvxmax iddrawn
6222

6223
    if {![info exists commitrow($curview,$id)]} return
6224 6225
    if {![info exists iddrawn($id)]} return
    drawcommits $commitrow($curview,$id)
6226 6227
    $canv delete tag.$id
    set xt [eval drawtags $id $idpos($id)]
6228
    $canv coords $linehtag($commitrow($curview,$id)) $xt [lindex $idpos($id) 2]
P
Paul Mackerras 已提交
6229
    set text [$canv itemcget $linehtag($commitrow($curview,$id)) -text]
6230
    set xr [expr {$xt + [font measure mainfont $text]}]
P
Paul Mackerras 已提交
6231 6232 6233 6234
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
6235 6236
    if {[info exists selectedline]
	&& $selectedline == $commitrow($curview,$id)} {
6237
	selectline $selectedline 0
6238 6239 6240 6241 6242 6243 6244 6245 6246 6247 6248 6249 6250 6251 6252
    }
}

proc mktagcan {} {
    global mktagtop

    catch {destroy $mktagtop}
    unset mktagtop
}

proc mktaggo {} {
    domktag
    mktagcan
}

6253 6254 6255 6256 6257 6258 6259
proc writecommit {} {
    global rowmenuid wrcomtop commitinfo wrcomcmd

    set top .writecommit
    set wrcomtop $top
    catch {destroy $top}
    toplevel $top
6260
    label $top.title -text [mc "Write commit to file"]
6261
    grid $top.title - -pady 10
6262
    label $top.id -text [mc "ID:"]
6263 6264 6265 6266 6267 6268 6269 6270
    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
6271
    label $top.clab -text [mc "Command:"]
6272 6273
    entry $top.cmd -width 60 -textvariable wrcomcmd
    grid $top.clab $top.cmd -sticky w -pady 10
6274
    label $top.flab -text [mc "Output file:"]
6275 6276 6277 6278
    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
6279 6280
    button $top.buts.gen -text [mc "Write"] -command wrcomgo
    button $top.buts.can -text [mc "Cancel"] -command wrcomcan
6281 6282 6283 6284 6285 6286 6287 6288 6289 6290 6291 6292 6293 6294
    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]} {
6295
	error_popup "[mc "Error writing commit:"] $err"
6296 6297 6298 6299 6300 6301 6302 6303 6304 6305 6306 6307
    }
    catch {destroy $wrcomtop}
    unset wrcomtop
}

proc wrcomcan {} {
    global wrcomtop

    catch {destroy $wrcomtop}
    unset wrcomtop
}

6308 6309 6310 6311 6312 6313
proc mkbranch {} {
    global rowmenuid mkbrtop

    set top .makebranch
    catch {destroy $top}
    toplevel $top
6314
    label $top.title -text [mc "Create new branch"]
6315
    grid $top.title - -pady 10
6316
    label $top.id -text [mc "ID:"]
6317 6318 6319 6320
    entry $top.sha1 -width 40 -relief flat
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
6321
    label $top.nlab -text [mc "Name:"]
6322 6323 6324
    entry $top.name -width 40
    grid $top.nlab $top.name -sticky w
    frame $top.buts
6325 6326
    button $top.buts.go -text [mc "Create"] -command [list mkbrgo $top]
    button $top.buts.can -text [mc "Cancel"] -command "catch {destroy $top}"
6327 6328 6329 6330 6331 6332 6333 6334 6335 6336 6337 6338 6339
    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 {}} {
6340
	error_popup [mc "Please specify a name for the new branch"]
6341 6342 6343 6344 6345 6346 6347 6348 6349 6350 6351
	return
    }
    catch {destroy $top}
    nowbusy newbranch
    update
    if {[catch {
	exec git branch $name $id
    } err]} {
	notbusy newbranch
	error_popup $err
    } else {
6352 6353
	set headids($name) $id
	lappend idheads($id) $name
6354
	addedhead $id $name
6355 6356
	notbusy newbranch
	redrawtags $id
6357
	dispneartags 0
6358
	run refill_reflist
6359 6360 6361
    }
}

6362 6363
proc cherrypick {} {
    global rowmenuid curview commitrow
6364
    global mainhead
6365

6366 6367 6368
    set oldhead [exec git rev-parse HEAD]
    set dheads [descheads $rowmenuid]
    if {$dheads ne {} && [lsearch -exact $dheads $oldhead] >= 0} {
6369 6370 6371
	set ok [confirm_popup [mc "Commit %s is already\
		included in branch %s -- really re-apply it?" \
				   [string range $rowmenuid 0 7] $mainhead]]
6372 6373
	if {!$ok} return
    }
6374
    nowbusy cherrypick [mc "Cherry-picking"]
6375 6376 6377 6378 6379 6380 6381 6382 6383 6384 6385
    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
6386
	error_popup [mc "No changes committed"]
6387 6388
	return
    }
6389
    addnewchild $newhead $oldhead
6390 6391 6392
    if {[info exists commitrow($curview,$oldhead)]} {
	insertrow $commitrow($curview,$oldhead) $newhead
	if {$mainhead ne {}} {
6393
	    movehead $newhead $mainhead
6394 6395 6396 6397 6398 6399 6400 6401
	    movedhead $newhead $mainhead
	}
	redrawtags $oldhead
	redrawtags $newhead
    }
    notbusy cherrypick
}

6402 6403 6404 6405 6406 6407 6408
proc resethead {} {
    global mainheadid mainhead rowmenuid confirm_ok resettype

    set confirm_ok 0
    set w ".confirmreset"
    toplevel $w
    wm transient $w .
6409
    wm title $w [mc "Confirm reset"]
6410
    message $w.m -text \
6411
	[mc "Reset branch %s to %s?" $mainhead [string range $rowmenuid 0 7]] \
6412 6413 6414
	-justify center -aspect 1000
    pack $w.m -side top -fill x -padx 20 -pady 20
    frame $w.f -relief sunken -border 2
6415
    message $w.f.rt -text [mc "Reset type:"] -aspect 1000
6416 6417 6418
    grid $w.f.rt -sticky w
    set resettype mixed
    radiobutton $w.f.soft -value soft -variable resettype -justify left \
6419
	-text [mc "Soft: Leave working tree and index untouched"]
6420 6421
    grid $w.f.soft -sticky w
    radiobutton $w.f.mixed -value mixed -variable resettype -justify left \
6422
	-text [mc "Mixed: Leave working tree untouched, reset index"]
6423 6424
    grid $w.f.mixed -sticky w
    radiobutton $w.f.hard -value hard -variable resettype -justify left \
6425
	-text [mc "Hard: Reset working tree and index\n(discard ALL local changes)"]
6426 6427
    grid $w.f.hard -sticky w
    pack $w.f -side top -fill x
6428
    button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w"
6429
    pack $w.ok -side left -fill x -padx 20 -pady 20
6430
    button $w.cancel -text [mc Cancel] -command "destroy $w"
6431 6432 6433 6434
    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
6435 6436
    if {[catch {set fd [open \
	    [list | sh -c "git reset --$resettype $rowmenuid 2>&1"] r]} err]} {
6437 6438
	error_popup $err
    } else {
6439
	dohidelocalchanges
6440
	filerun $fd [list readresetstat $fd]
6441
	nowbusy reset [mc "Resetting"]
6442 6443 6444
    }
}

6445 6446
proc readresetstat {fd} {
    global mainhead mainheadid showlocalchanges rprogcoord
6447 6448 6449

    if {[gets $fd line] >= 0} {
	if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
6450 6451
	    set rprogcoord [expr {1.0 * $m / $n}]
	    adjustprogress
6452 6453 6454
	}
	return 1
    }
6455 6456
    set rprogcoord 0
    adjustprogress
6457 6458 6459 6460 6461 6462 6463 6464 6465 6466
    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
6467
	redrawtags $oldhead
6468
	redrawtags $newhead
6469 6470 6471 6472
    }
    if {$showlocalchanges} {
	doshowlocalchanges
    }
6473
    return 0
6474 6475
}

6476 6477
# context menu for a head
proc headmenu {x y id head} {
6478
    global headmenuid headmenuhead headctxmenu mainhead
6479

6480
    stopfinding
6481 6482
    set headmenuid $id
    set headmenuhead $head
6483 6484 6485 6486 6487 6488
    set state normal
    if {$head eq $mainhead} {
	set state disabled
    }
    $headctxmenu entryconfigure 0 -state $state
    $headctxmenu entryconfigure 1 -state $state
6489 6490 6491 6492 6493
    tk_popup $headctxmenu $x $y
}

proc cobranch {} {
    global headmenuid headmenuhead mainhead headids
6494
    global showlocalchanges mainheadid
6495 6496 6497

    # check the tree is clean first??
    set oldmainhead $mainhead
6498
    nowbusy checkout [mc "Checking out"]
6499
    update
6500
    dohidelocalchanges
6501
    if {[catch {
6502
	exec git checkout -q $headmenuhead
6503 6504 6505 6506 6507
    } err]} {
	notbusy checkout
	error_popup $err
    } else {
	notbusy checkout
6508
	set mainhead $headmenuhead
6509
	set mainheadid $headmenuid
6510 6511 6512 6513
	if {[info exists headids($oldmainhead)]} {
	    redrawtags $headids($oldmainhead)
	}
	redrawtags $headmenuid
6514 6515 6516
    }
    if {$showlocalchanges} {
	dodiffindex
6517 6518 6519 6520
    }
}

proc rmbranch {} {
6521
    global headmenuid headmenuhead mainhead
6522
    global idheads
6523 6524 6525

    set head $headmenuhead
    set id $headmenuid
6526
    # this check shouldn't be needed any more...
6527
    if {$head eq $mainhead} {
6528
	error_popup [mc "Cannot delete the currently checked-out branch"]
6529 6530
	return
    }
6531
    set dheads [descheads $id]
6532
    if {[llength $dheads] == 1 && $idheads($dheads) eq $head} {
6533
	# the stuff on this branch isn't on any other branch
6534 6535
	if {![confirm_popup [mc "The commits on branch %s aren't on any other\
			branch.\nReally delete branch %s?" $head $head]]} return
6536 6537 6538 6539 6540 6541 6542 6543
    }
    nowbusy rmbranch
    update
    if {[catch {exec git branch -D $head} err]} {
	notbusy rmbranch
	error_popup $err
	return
    }
6544
    removehead $id $head
6545
    removedhead $id $head
6546 6547
    redrawtags $id
    notbusy rmbranch
6548
    dispneartags 0
6549 6550 6551 6552 6553
    run refill_reflist
}

# Display a list of tags and heads
proc showrefs {} {
6554 6555
    global showrefstop bgcolor fgcolor selectbgcolor
    global bglist fglist reflistfilter reflist maincursor
6556 6557 6558 6559 6560 6561 6562 6563 6564

    set top .showrefs
    set showrefstop $top
    if {[winfo exists $top]} {
	raise $top
	refill_reflist
	return
    }
    toplevel $top
6565
    wm title $top [mc "Tags and heads: %s" [file tail [pwd]]]
6566
    text $top.list -background $bgcolor -foreground $fgcolor \
6567
	-selectbackground $selectbgcolor -font mainfont \
6568 6569 6570 6571 6572 6573 6574 6575 6576 6577 6578
	-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
6579 6580
    label $top.f.l -text "[mc "Filter"]: "
    entry $top.f.e -width 20 -textvariable reflistfilter
6581 6582 6583 6584 6585
    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
6586
    button $top.close -command [list destroy $top] -text [mc "Close"]
6587 6588 6589 6590 6591 6592 6593 6594 6595 6596 6597 6598 6599 6600 6601 6602 6603 6604 6605 6606 6607 6608 6609 6610 6611 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 6651 6652 6653 6654 6655 6656 6657 6658 6659 6660 6661 6662 6663 6664 6665 6666 6667 6668 6669 6670 6671 6672 6673 6674 6675 6676 6677 6678 6679 6680 6681 6682 6683 6684 6685 6686 6687 6688 6689 6690 6691 6692 6693 6694 6695 6696 6697 6698 6699 6700 6701 6702 6703 6704
    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
    global commitrow curview commitinterest

    if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
    set refs {}
    foreach n [array names headids] {
	if {[string match $reflistfilter $n]} {
	    if {[info exists commitrow($curview,$headids($n))]} {
		lappend refs [list $n H]
	    } else {
		set commitinterest($headids($n)) {run refill_reflist}
	    }
	}
    }
    foreach n [array names tagids] {
	if {[string match $reflistfilter $n]} {
	    if {[info exists commitrow($curview,$tagids($n))]} {
		lappend refs [list $n T]
	    } else {
		set commitinterest($tagids($n)) {run refill_reflist}
	    }
	}
    }
    foreach n [array names otherrefids] {
	if {[string match $reflistfilter $n]} {
	    if {[info exists commitrow($curview,$otherrefids($n))]} {
		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
6705 6706
}

P
Paul Mackerras 已提交
6707 6708
# Stuff for finding nearby tags
proc getallcommits {} {
6709 6710
    global allcommits nextarc seeds allccache allcwait cachedarcs allcupdate
    global idheads idtags idotherrefs allparents tagobjid
6711

6712 6713 6714 6715
    if {![info exists allcommits]} {
	set nextarc 0
	set allcommits 0
	set seeds {}
6716 6717 6718 6719 6720 6721 6722 6723
	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
6724
    }
6725

6726 6727 6728 6729 6730 6731 6732 6733 6734 6735 6736 6737 6738 6739 6740 6741 6742 6743 6744 6745 6746 6747 6748 6749 6750 6751 6752 6753 6754 6755 6756 6757 6758 6759 6760
    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
6761
    }
6762 6763 6764 6765 6766 6767 6768 6769 6770 6771 6772 6773 6774 6775 6776 6777 6778 6779
}

# 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} {
6780
    global allparents allchildren idtags idheads nextarc
6781
    global arcnos arcids arctags arcout arcend arcstart archeads growing
6782 6783
    global seeds allcommits cachedarcs allcupdate
    
6784
    set nid 0
6785
    while {[incr nid] <= 1000 && [gets $fd line] >= 0} {
6786 6787 6788 6789 6790
	set id [lindex $line 0]
	if {[info exists allparents($id)]} {
	    # seen it already
	    continue
	}
6791
	set cachedarcs 0
6792 6793 6794 6795 6796 6797 6798 6799 6800 6801 6802 6803
	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 已提交
6804
		}
6805 6806 6807 6808 6809 6810 6811 6812 6813 6814 6815 6816 6817 6818 6819 6820 6821 6822 6823 6824 6825 6826 6827 6828 6829 6830 6831 6832 6833 6834 6835 6836 6837 6838 6839 6840 6841 6842 6843 6844 6845 6846 6847 6848 6849 6850
		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
6851
    }
6852 6853 6854 6855 6856 6857
    if {$nid > 0} {
	global cached_dheads cached_dtags cached_atags
	catch {unset cached_dheads}
	catch {unset cached_dtags}
	catch {unset cached_atags}
    }
6858 6859 6860
    if {![eof $fd]} {
	return [expr {$nid >= 1000? 2: 1}]
    }
6861 6862 6863 6864 6865 6866 6867 6868 6869 6870 6871 6872
    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
	}
6873
	error_popup "[mc "Error reading commit topology information;\
6874
		branch and preceding/following tag information\
6875
	        will be incomplete."]\n($err)"
6876 6877
	set cacheok 0
    }
6878 6879
    if {[incr allcommits -1] == 0} {
	notbusy allcommits
6880 6881 6882
	if {$cacheok} {
	    run savecache
	}
6883 6884
    }
    dispneartags 0
6885
    return 0
P
Paul Mackerras 已提交
6886 6887
}

6888 6889
proc recalcarc {a} {
    global arctags archeads arcids idtags idheads
P
Paul Mackerras 已提交
6890

6891 6892 6893 6894 6895 6896 6897 6898
    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 已提交
6899
	}
6900
    }
6901 6902
    set arctags($a) $at
    set archeads($a) $ah
P
Paul Mackerras 已提交
6903 6904
}

6905
proc splitarc {p} {
6906
    global arcnos arcids nextarc arctags archeads idtags idheads
6907
    global arcstart arcend arcout allparents growing
6908

6909 6910 6911 6912 6913 6914 6915 6916 6917 6918 6919 6920 6921 6922 6923 6924 6925 6926 6927 6928 6929 6930 6931 6932 6933 6934 6935 6936 6937 6938 6939 6940 6941
    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
6942
	} else {
6943 6944
	    set j [lsearch -exact $arcnos($id) $a]
	    set arcnos($id) [lreplace $arcnos($id) $j $j $na]
6945
	}
6946 6947 6948 6949 6950 6951 6952 6953 6954 6955 6956 6957 6958 6959 6960
    }

    # 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} {
6961
    global allparents allchildren idtags nextarc
6962
    global arcnos arcids arctags arcout arcend arcstart archeads growing
6963
    global seeds allcommits
6964

6965
    if {![info exists allcommits] || ![info exists arcnos($p)]} return
6966 6967 6968 6969 6970 6971 6972 6973 6974 6975 6976 6977 6978 6979 6980 6981 6982 6983
    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]
}

6984 6985 6986 6987 6988 6989 6990 6991 6992 6993 6994 6995 6996 6997 6998 6999 7000 7001 7002 7003 7004 7005 7006 7007 7008 7009 7010 7011 7012 7013 7014 7015 7016 7017 7018 7019 7020 7021 7022 7023 7024 7025 7026 7027 7028 7029 7030 7031 7032 7033 7034 7035 7036 7037 7038 7039 7040 7041 7042 7043 7044 7045 7046 7047 7048 7049 7050 7051 7052 7053 7054 7055 7056 7057 7058 7059 7060 7061 7062 7063 7064 7065 7066 7067 7068 7069 7070 7071 7072 7073 7074 7075 7076 7077 7078 7079 7080 7081 7082 7083 7084 7085 7086 7087 7088 7089 7090 7091 7092 7093 7094 7095 7096 7097 7098 7099 7100 7101 7102 7103 7104 7105 7106 7107 7108 7109 7110 7111 7112 7113 7114 7115 7116 7117 7118 7119 7120 7121 7122 7123 7124 7125 7126 7127 7128 7129 7130 7131 7132 7133 7134 7135 7136 7137 7138 7139 7140 7141 7142 7143 7144 7145 7146 7147 7148 7149
# 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
    }
}

7150 7151 7152 7153 7154 7155 7156 7157 7158
# 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).
7159 7160
	# Or both can be BMPs with no incoming arcs.
	if {$a eq $b || $arcnos($a) eq {}} {
7161
	    return 0
7162
	}
7163 7164 7165 7166 7167 7168 7169 7170
	# 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
7171 7172
	}
    }
7173 7174 7175 7176 7177 7178 7179

    if {![info exists arcout($a)]} {
	set arc [lindex $arcnos($a) 0]
	if {[info exists arcend($arc)]} {
	    set aend $arcend($arc)
	} else {
	    set aend {}
7180
	}
7181 7182 7183 7184 7185 7186 7187 7188 7189 7190
	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 {}
7191
	}
7192 7193 7194
	set b $arcstart($arc)
    } else {
	set bend $b
7195
    }
7196 7197 7198 7199 7200 7201 7202 7203 7204 7205 7206 7207 7208 7209 7210 7211 7212 7213
    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
	}
7214 7215
    }

7216 7217 7218 7219 7220 7221 7222 7223 7224 7225 7226 7227 7228 7229 7230 7231 7232 7233 7234 7235 7236 7237 7238 7239 7240 7241 7242 7243 7244 7245 7246
    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 已提交
7247

7248 7249 7250 7251 7252 7253 7254 7255 7256 7257 7258 7259 7260 7261 7262 7263 7264 7265 7266
# 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 已提交
7267
	}
7268 7269 7270 7271
	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 已提交
7272
	}
7273 7274 7275 7276 7277 7278 7279 7280 7281 7282 7283 7284 7285 7286 7287 7288 7289 7290 7291 7292 7293 7294 7295 7296 7297 7298 7299 7300 7301 7302 7303 7304 7305 7306 7307 7308 7309 7310 7311 7312 7313 7314 7315 7316 7317 7318 7319 7320 7321 7322 7323 7324 7325 7326 7327 7328 7329 7330 7331 7332 7333 7334 7335 7336 7337 7338 7339 7340
    }
    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 已提交
7341 7342
	}
    }
7343 7344 7345
    foreach x [array names growanc] {
	if {$dl($x)} {
	    return 0
P
Paul Mackerras 已提交
7346
	}
7347
	return 0
P
Paul Mackerras 已提交
7348
    }
7349
    return 1
P
Paul Mackerras 已提交
7350 7351
}

7352 7353
proc validate_arctags {a} {
    global arctags idtags
P
Paul Mackerras 已提交
7354

7355 7356 7357 7358 7359 7360 7361 7362 7363 7364 7365 7366 7367 7368 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
    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 已提交
7404
	    }
7405 7406
	    if {$tid ne {}} {
		return $tid
P
Paul Mackerras 已提交
7407 7408
	    }
	}
7409 7410 7411 7412 7413 7414 7415 7416 7417 7418 7419 7420 7421 7422 7423 7424 7425 7426 7427 7428 7429 7430 7431 7432 7433 7434 7435 7436 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
	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 已提交
7473
	}
7474
    }
7475 7476 7477 7478 7479 7480 7481 7482 7483 7484 7485 7486
    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
7487

7488 7489 7490 7491 7492 7493 7494 7495 7496 7497 7498 7499 7500 7501
    # 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
7502 7503 7504 7505
	    }
	}
    }

7506 7507 7508 7509 7510 7511 7512 7513 7514
    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
	    }
7515
	}
7516 7517 7518 7519
	if {$tags eq $ctags} {
	    set cached_dtags($origid) $tags
	} else {
	    set tags $ctags
7520
	}
7521 7522 7523 7524 7525 7526 7527
    } 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"
7528
    }
7529 7530
    return $tags
}
7531

7532 7533 7534 7535 7536 7537 7538 7539 7540 7541 7542 7543 7544 7545 7546 7547 7548 7549 7550 7551 7552
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
		}
	    }
7553
	}
7554 7555 7556 7557 7558 7559 7560 7561 7562 7563 7564 7565 7566 7567 7568 7569 7570 7571 7572 7573 7574 7575 7576 7577 7578 7579 7580 7581 7582 7583 7584 7585 7586 7587 7588 7589 7590 7591 7592 7593 7594 7595 7596 7597 7598 7599 7600 7601 7602 7603 7604 7605 7606 7607 7608 7609 7610 7611 7612 7613 7614 7615 7616 7617 7618 7619 7620 7621 7622 7623 7624 7625 7626 7627 7628 7629 7630 7631 7632 7633 7634 7635 7636
	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
		}
	    }
7637 7638 7639
	}
    }

7640 7641 7642 7643 7644 7645 7646 7647 7648 7649 7650 7651 7652 7653 7654 7655 7656 7657 7658 7659 7660 7661 7662 7663 7664 7665 7666 7667 7668 7669 7670 7671
    # 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
7672
	}
7673 7674 7675 7676 7677 7678 7679
    } 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"
7680
    }
7681
    return $tags
7682 7683
}

7684 7685 7686 7687 7688
# 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
7689

7690 7691 7692
    if {![info exists allparents($id)]} {
	return {}
    }
7693
    set aret {}
7694 7695 7696 7697 7698 7699 7700 7701 7702
    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
7703
		lappend aret $t
7704
	    }
7705
	}
7706
	set id $arcstart($a)
7707
    }
7708 7709 7710
    set origid $id
    set todo [list $id]
    set seen($id) 1
7711
    set ret {}
7712 7713 7714 7715 7716 7717 7718 7719 7720 7721
    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 {}} {
7722 7723 7724 7725
		    validate_archeads $a
		    if {$archeads($a) ne {}} {
			set ret [concat $ret $archeads($a)]
		    }
7726 7727 7728 7729 7730 7731 7732
		}
		set d $arcstart($a)
		if {![info exists seen($d)]} {
		    lappend todo $d
		    set seen($d) 1
		}
	    }
7733 7734
	}
    }
7735 7736
    set ret [lsort -unique $ret]
    set cached_dheads($origid) $ret
7737
    return [concat $ret $aret]
7738 7739
}

7740 7741
proc addedtag {id} {
    global arcnos arcout cached_dtags cached_atags
7742

7743 7744 7745
    if {![info exists arcnos($id)]} return
    if {![info exists arcout($id)]} {
	recalcarc [lindex $arcnos($id) 0]
7746
    }
7747 7748
    catch {unset cached_dtags}
    catch {unset cached_atags}
7749 7750
}

7751 7752 7753 7754 7755 7756 7757 7758 7759 7760 7761 7762 7763 7764 7765 7766 7767 7768
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
7769

7770 7771 7772
    if {![info exists arcnos($hid)]} return
    if {![info exists arcout($hid)]} {
	recalcarc [lindex $arcnos($hid) 0]
7773
    }
7774 7775 7776 7777 7778 7779 7780 7781 7782 7783 7784 7785 7786 7787
    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
	    }
7788 7789
	}
    }
7790 7791 7792
    catch {unset cached_dtags}
    catch {unset cached_atags}
    catch {unset cached_dheads}
7793 7794
}

7795
proc rereadrefs {} {
7796
    global idtags idheads idotherrefs mainhead
7797 7798 7799 7800 7801 7802 7803 7804

    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]
	}
    }
7805
    set oldmainhead $mainhead
7806
    readrefs
7807
    changedrefs
7808 7809 7810 7811
    set refids [lsort -unique [concat $refids [array names idtags] \
			[array names idheads] [array names idotherrefs]]]
    foreach id $refids {
	set v [listrefs $id]
7812 7813 7814
	if {![info exists ref($id)] || $ref($id) != $v ||
	    ($id eq $oldmainhead && $id ne $mainhead) ||
	    ($id eq $mainhead && $id ne $oldmainhead)} {
7815 7816 7817
	    redrawtags $id
	}
    }
7818
    run refill_reflist
7819 7820
}

7821 7822 7823 7824 7825 7826 7827 7828 7829 7830 7831 7832 7833 7834 7835 7836 7837 7838
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]
}

7839
proc showtag {tag isnew} {
7840
    global ctext tagcontents tagids linknum tagobjid
7841 7842 7843 7844 7845

    if {$isnew} {
	addtohistory [list showtag $tag 0]
    }
    $ctext conf -state normal
7846
    clear_ctext
7847
    settabs 0
7848
    set linknum 0
7849 7850 7851 7852 7853
    if {![info exists tagcontents($tag)]} {
	catch {
	    set tagcontents($tag) [exec git cat-file tag $tagobjid($tag)]
	}
    }
7854 7855 7856
    if {[info exists tagcontents($tag)]} {
	set text $tagcontents($tag)
    } else {
7857
	set text "[mc "Tag"]: $tag\n[mc "Id"]:  $tagids($tag)"
7858
    }
7859
    appendwithlinks $text {}
7860
    $ctext conf -state disabled
7861
    init_flist {}
7862 7863
}

7864 7865 7866
proc doquit {} {
    global stopped
    set stopped 100
7867
    savestuff .
7868 7869
    destroy .
}
7870

P
Paul Mackerras 已提交
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
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
7897
	wm title $top [mc "Gitk font chooser"]
7898
	label $top.l -textvariable fontparam(which)
P
Paul Mackerras 已提交
7899 7900 7901 7902 7903 7904 7905 7906 7907 7908 7909 7910 7911 7912 7913
	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 \
7914
	    -font {{Times New Roman} 12 bold} -text [mc "B"] -indicatoron 0 \
P
Paul Mackerras 已提交
7915 7916
	    -variable fontparam(weight) -onvalue bold -offvalue normal
	checkbutton $top.g.ital -padx 5 \
7917
	    -font {{Times New Roman} 12 italic} -text [mc "I"] -indicatoron 0  \
P
Paul Mackerras 已提交
7918 7919 7920 7921 7922 7923 7924 7925 7926 7927
	    -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
7928 7929
	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 已提交
7930 7931 7932 7933 7934 7935 7936 7937 7938 7939 7940 7941 7942 7943 7944 7945 7946 7947 7948 7949 7950 7951 7952 7953 7954 7955 7956 7957 7958 7959 7960 7961 7962 7963 7964 7965 7966 7967 7968 7969 7970 7971 7972 7973 7974 7975 7976 7977 7978 7979 7980 7981 7982 7983 7984 7985 7986 7987 7988 7989 7990 7991 7992
	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)
}

7993
proc doprefs {} {
7994
    global maxwidth maxgraphpct
7995
    global oldprefs prefstop showneartags showlocalchanges
7996
    global bgcolor fgcolor ctext diffcolors selectbgcolor
7997
    global tabstop limitdiffs autoselect
P
Paul Mackerras 已提交
7998

7999 8000 8001 8002 8003
    set top .gitkprefs
    set prefstop $top
    if {[winfo exists $top]} {
	raise $top
	return
8004
    }
P
Paul Mackerras 已提交
8005
    foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
8006
		   limitdiffs tabstop} {
8007
	set oldprefs($v) [set $v]
P
Paul Mackerras 已提交
8008
    }
8009
    toplevel $top
8010 8011
    wm title $top [mc "Gitk preferences"]
    label $top.ldisp -text [mc "Commit list display options"]
8012 8013
    grid $top.ldisp - -sticky w -pady 10
    label $top.spacer -text " "
8014
    label $top.maxwidthl -text [mc "Maximum graph width (lines)"] \
8015 8016 8017
	-font optionfont
    spinbox $top.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
    grid $top.spacer $top.maxwidthl $top.maxwidth -sticky w
8018
    label $top.maxpctl -text [mc "Maximum graph width (% of pane)"] \
8019 8020 8021
	-font optionfont
    spinbox $top.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
    grid x $top.maxpctl $top.maxpct -sticky w
8022
    frame $top.showlocal
8023
    label $top.showlocal.l -text [mc "Show local changes"] -font optionfont
8024 8025 8026
    checkbutton $top.showlocal.b -variable showlocalchanges
    pack $top.showlocal.b $top.showlocal.l -side left
    grid x $top.showlocal -sticky w
8027 8028 8029 8030 8031
    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
8032

8033
    label $top.ddisp -text [mc "Diff display options"]
8034
    grid $top.ddisp - -sticky w -pady 10
8035
    label $top.tabstopl -text [mc "Tab spacing"] -font optionfont
8036 8037
    spinbox $top.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
    grid x $top.tabstopl $top.tabstop -sticky w
P
Paul Mackerras 已提交
8038
    frame $top.ntag
8039
    label $top.ntag.l -text [mc "Display nearby tags"] -font optionfont
P
Paul Mackerras 已提交
8040 8041 8042
    checkbutton $top.ntag.b -variable showneartags
    pack $top.ntag.b $top.ntag.l -side left
    grid x $top.ntag -sticky w
8043
    frame $top.ldiff
8044
    label $top.ldiff.l -text [mc "Limit diffs to listed paths"] -font optionfont
8045 8046 8047
    checkbutton $top.ldiff.b -variable limitdiffs
    pack $top.ldiff.b $top.ldiff.l -side left
    grid x $top.ldiff -sticky w
8048

8049
    label $top.cdisp -text [mc "Colors: press to choose"]
8050 8051
    grid $top.cdisp - -sticky w -pady 10
    label $top.bg -padx 40 -relief sunk -background $bgcolor
8052
    button $top.bgbut -text [mc "Background"] -font optionfont \
8053
	-command [list choosecolor bgcolor {} $top.bg background setbg]
8054 8055
    grid x $top.bgbut $top.bg -sticky w
    label $top.fg -padx 40 -relief sunk -background $fgcolor
8056
    button $top.fgbut -text [mc "Foreground"] -font optionfont \
8057
	-command [list choosecolor fgcolor {} $top.fg foreground setfg]
8058 8059
    grid x $top.fgbut $top.fg -sticky w
    label $top.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]
8060
    button $top.diffoldbut -text [mc "Diff: old lines"] -font optionfont \
8061 8062 8063 8064
	-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]
8065
    button $top.diffnewbut -text [mc "Diff: new lines"] -font optionfont \
8066 8067 8068 8069
	-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]
8070
    button $top.hunksepbut -text [mc "Diff: hunk header"] -font optionfont \
8071 8072 8073 8074
	-command [list choosecolor diffcolors 2 $top.hunksep \
		      "diff hunk header" \
		      [list $ctext tag conf hunksep -foreground]]
    grid x $top.hunksepbut $top.hunksep -sticky w
8075
    label $top.selbgsep -padx 40 -relief sunk -background $selectbgcolor
8076
    button $top.selbgbut -text [mc "Select bg"] -font optionfont \
8077
	-command [list choosecolor selectbgcolor {} $top.selbgsep background setselbg]
8078
    grid x $top.selbgbut $top.selbgsep -sticky w
8079

8080
    label $top.cfont -text [mc "Fonts: press to choose"]
P
Paul Mackerras 已提交
8081
    grid $top.cfont - -sticky w -pady 10
8082 8083 8084
    mkfontdisp mainfont $top [mc "Main font"]
    mkfontdisp textfont $top [mc "Diff display font"]
    mkfontdisp uifont $top [mc "User interface font"]
P
Paul Mackerras 已提交
8085

8086
    frame $top.buts
8087 8088
    button $top.buts.ok -text [mc "OK"] -command prefsok -default active
    button $top.buts.can -text [mc "Cancel"] -command prefscan -default normal
8089 8090 8091 8092
    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
8093
    bind $top <Visibility> "focus $top.buts.ok"
8094 8095
}

8096 8097 8098 8099
proc choosecolor {v vi w x cmd} {
    global $v

    set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \
8100
	       -title [mc "Gitk: choose color for %s" $x]]
8101 8102 8103 8104 8105 8106
    if {$c eq {}} return
    $w conf -background $c
    lset $v $vi $c
    eval $cmd $c
}

8107 8108 8109 8110 8111 8112 8113 8114 8115 8116
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
}

8117 8118 8119 8120 8121 8122 8123 8124 8125 8126 8127 8128 8129 8130 8131 8132 8133 8134
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
}

8135
proc prefscan {} {
8136
    global oldprefs prefstop
8137

P
Paul Mackerras 已提交
8138
    foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
8139 8140
		   limitdiffs tabstop} {
	global $v
8141 8142 8143 8144
	set $v $oldprefs($v)
    }
    catch {destroy $prefstop}
    unset prefstop
P
Paul Mackerras 已提交
8145
    fontcan
8146 8147 8148 8149
}

proc prefsok {} {
    global maxwidth maxgraphpct
8150
    global oldprefs prefstop showneartags showlocalchanges
P
Paul Mackerras 已提交
8151
    global fontpref mainfont textfont uifont
P
Paul Mackerras 已提交
8152
    global limitdiffs treediffs
8153 8154 8155

    catch {destroy $prefstop}
    unset prefstop
P
Paul Mackerras 已提交
8156 8157 8158 8159 8160 8161 8162 8163 8164 8165 8166 8167 8168 8169 8170 8171 8172 8173 8174 8175 8176
    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]
    }
8177
    settabs
8178 8179 8180 8181 8182 8183 8184
    if {$showlocalchanges != $oldprefs(showlocalchanges)} {
	if {$showlocalchanges} {
	    doshowlocalchanges
	} else {
	    dohidelocalchanges
	}
    }
8185 8186 8187 8188
    if {$limitdiffs != $oldprefs(limitdiffs)} {
	# treediffs elements are limited by path
	catch {unset treediffs}
    }
P
Paul Mackerras 已提交
8189
    if {$fontchanged || $maxwidth != $oldprefs(maxwidth)
8190 8191
	|| $maxgraphpct != $oldprefs(maxgraphpct)} {
	redisplay
8192 8193
    } elseif {$showneartags != $oldprefs(showneartags) ||
	  $limitdiffs != $oldprefs(limitdiffs)} {
P
Paul Mackerras 已提交
8194
	reselectline
8195 8196 8197 8198
    }
}

proc formatdate {d} {
8199
    global datetimeformat
8200
    if {$d ne {}} {
8201
	set d [clock format $d -format $datetimeformat]
8202 8203
    }
    return $d
P
Paul Mackerras 已提交
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 8255 8256 8257 8258 8259 8260 8261 8262 8263 8264 8265 8266 8267 8268 8269 8270 8271 8272 8273 8274 8275 8276 8277 8278 8279 8280 8281 8282 8283 8284 8285 8286 8287 8288 8289 8290 8291 8292 8293 8294 8295 8296 8297 8298 8299 8300 8301 8302 8303 8304 8305 8306 8307 8308 8309 8310 8311 8312 8313 8314 8315 8316 8317 8318 8319 8320 8321 8322 8323 8324 8325 8326 8327 8328 8329 8330 8331 8332 8333 8334 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 8419 8420 8421 8422 8423 8424 8425 8426 8427 8428 8429 8430 8431 8432 8433 8434 8435 8436 8437 8438 8439 8440 8441 8442 8443 8444 8445 8446 8447 8448 8449 8450 8451 8452 8453 8454 8455 8456 8457 8458 8459 8460 8461 8462 8463 8464 8465 8466 8467 8468 8469 8470 8471 8472 8473 8474 8475 8476 8477 8478
# 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 {}
}

8479 8480
# First check that Tcl/Tk is recent enough
if {[catch {package require Tk 8.4} err]} {
8481 8482
    show_error {} . [mc "Sorry, gitk cannot run with this version of Tcl/Tk.\n\
		     Gitk requires at least Tcl/Tk 8.4."]
8483 8484 8485
    exit 1
}

8486 8487
# defaults...
set datemode 0
8488
set wrcomcmd "git diff-tree --stdin -p --pretty"
8489

8490
set gitencoding {}
8491
catch {
8492
    set gitencoding [exec git config --get i18n.commitencoding]
8493 8494
}
if {$gitencoding == ""} {
8495 8496 8497 8498 8499
    set gitencoding "utf-8"
}
set tclencoding [tcl_encoding $gitencoding]
if {$tclencoding == {}} {
    puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
8500
}
8501

8502 8503
set mainfont {Helvetica 9}
set textfont {Courier 9}
8504
set uifont {Helvetica 9 bold}
8505
set tabstop 8
8506
set findmergefiles 0
8507
set maxgraphpct 50
8508
set maxwidth 16
P
Paul Mackerras 已提交
8509
set revlistorder 0
8510
set fastdate 0
8511 8512 8513
set uparrowlen 5
set downarrowlen 5
set mingaplen 100
P
Paul Mackerras 已提交
8514
set cmitmode "patch"
8515
set wrapcomment "none"
P
Paul Mackerras 已提交
8516
set showneartags 1
8517
set maxrefs 20
8518
set maxlinelen 200
8519
set showlocalchanges 1
8520
set limitdiffs 1
8521
set datetimeformat "%Y-%m-%d %H:%M:%S"
8522
set autoselect 1
8523 8524

set colors {green red blue magenta darkgrey brown orange}
8525 8526 8527
set bgcolor white
set fgcolor black
set diffcolors {red "#00a000" blue}
8528
set diffcontext 3
8529
set ignorespace 0
8530
set selectbgcolor gray85
8531

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

8551 8552
catch {source ~/.gitk}

8553
font create optionfont -family sans-serif -size -12
8554

8555 8556 8557 8558 8559 8560 8561 8562 8563 8564
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]
8565

8566 8567
setoptions

8568
# check that we can find a .git directory somewhere...
8569
if {[catch {set gitdir [gitdir]}]} {
8570
    show_error {} . [mc "Cannot find a git repository here."]
8571 8572
    exit 1
}
8573
if {![file isdirectory $gitdir]} {
8574
    show_error {} . [mc "Cannot find the git directory \"%s\"." $gitdir]
8575 8576 8577
    exit 1
}

8578
set mergeonly 0
8579
set revtreeargs {}
8580 8581
set cmdline_files {}
set i 0
8582
set revtreeargscmd {}
8583
foreach arg $argv {
8584
    switch -glob -- $arg {
8585 8586
	"" { }
	"-d" { set datemode 1 }
8587 8588 8589 8590
	"--merge" {
	    set mergeonly 1
	    lappend revtreeargs $arg
	}
8591 8592 8593 8594
	"--" {
	    set cmdline_files [lrange $argv [expr {$i + 1}] end]
	    break
	}
8595 8596 8597
	"--argscmd=*" {
	    set revtreeargscmd [string range $arg 10 end]
	}
8598 8599 8600 8601
	default {
	    lappend revtreeargs $arg
	}
    }
8602
    incr i
8603
}
8604

8605 8606
if {$i >= [llength $argv] && $revtreeargs ne {}} {
    # no -- on command line, but some arguments (other than -d)
8607
    if {[catch {
8608
	set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs]
8609 8610 8611
	set cmdline_files [split $f "\n"]
	set n [llength $cmdline_files]
	set revtreeargs [lrange $revtreeargs 0 end-$n]
8612 8613 8614 8615 8616
	# 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]} {
8617 8618
		show_error {} . [mc "Ambiguous argument '%s': both revision\
				 and filename" $arg]
8619 8620 8621
		exit 1
	    }
	}
8622 8623 8624 8625 8626
    } 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 已提交
8627
	    set err [string range $err [expr {$i + 6}] end]
8628
	}
8629
	show_error {} . "[mc "Bad arguments to gitk:"]\n$err"
8630 8631 8632 8633
	exit 1
    }
}

8634 8635 8636 8637 8638 8639 8640
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]} {
8641
	show_error {} . "[mc "Couldn't get list of unmerged files:"] $err"
8642 8643 8644 8645 8646 8647 8648 8649 8650 8651 8652 8653 8654 8655 8656
	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} {
8657 8658
	    show_error {} . [mc "No files selected: --merge specified but\
			     no files are unmerged."]
8659
	} else {
8660 8661
	    show_error {} . [mc "No files selected: --merge specified but\
			     no unmerged files are within file limit."]
8662 8663 8664 8665 8666 8667
	}
	exit 1
    }
    set cmdline_files $mlist
}

8668
set nullid "0000000000000000000000000000000000000000"
8669 8670
set nullid2 "0000000000000000000000000000000000000001"

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

8673
set runq {}
8674 8675
set history {}
set historyindex 0
8676 8677
set fh_serial 0
set nhl_names {}
8678
set highlight_paths {}
8679
set findpattern {}
8680
set searchdirn -forwards
8681 8682
set boldrows {}
set boldnamerows {}
8683
set diffelide {0 0}
8684
set markingmatches 0
8685
set linkentercount 0
8686 8687
set need_redisplay 0
set nrows_drawn 0
8688
set firsttabstop 0
P
Paul Mackerras 已提交
8689

P
Paul Mackerras 已提交
8690 8691
set nextviewnum 1
set curview 0
8692
set selectedview 0
8693 8694
set selectedhlview [mc "None"]
set highlight_related [mc "None"]
8695
set highlight_files {}
P
Paul Mackerras 已提交
8696
set viewfiles(0) {}
8697
set viewperm(0) 0
8698
set viewargs(0) {}
8699
set viewargscmd(0) {}
P
Paul Mackerras 已提交
8700

8701
set cmdlineok 0
8702
set stopped 0
8703
set stuffsaved 0
8704
set patchnum 0
8705 8706
set localirow -1
set localfrow -1
8707
set lserial 0
8708
set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}]
8709
setcoords
8710
makewindow
8711 8712
# wait for the window to become visible
tkwait visibility .
8713
wm title . "[file tail $argv0]: [file tail [pwd]]"
8714
readrefs
8715

8716
if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} {
P
Paul Mackerras 已提交
8717 8718
    # create a view for the files/dirs specified on the command line
    set curview 1
8719
    set selectedview 1
P
Paul Mackerras 已提交
8720
    set nextviewnum 2
8721
    set viewname(1) [mc "Command line"]
P
Paul Mackerras 已提交
8722
    set viewfiles(1) $cmdline_files
8723
    set viewargs(1) $revtreeargs
8724
    set viewargscmd(1) $revtreeargscmd
8725
    set viewperm(1) 0
8726
    addviewmenu 1
8727 8728
    .bar.view entryconf [mc "Edit view..."] -state normal
    .bar.view entryconf [mc "Delete view"] -state normal
P
Paul Mackerras 已提交
8729
}
8730 8731 8732 8733 8734 8735 8736

if {[info exists permviews]} {
    foreach v $permviews {
	set n $nextviewnum
	incr nextviewnum
	set viewname($n) [lindex $v 0]
	set viewfiles($n) [lindex $v 1]
8737
	set viewargs($n) [lindex $v 2]
8738
	set viewargscmd($n) [lindex $v 3]
8739
	set viewperm($n) 1
8740
	addviewmenu $n
8741 8742
    }
}
8743
getcommits