gitk 197.0 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 viewfiles commitidx
86
    global lookingforhead showlocalchanges
87 88

    set startmsecs [clock clicks -milliseconds]
89
    set commitidx($view) 0
90
    set args $viewargs($view)
91 92
    if {$viewfiles($view) ne {}} {
	set args [concat $args "--" $viewfiles($view)]
93
    }
P
Paul Mackerras 已提交
94 95 96 97
    set order "--topo-order"
    if {$datemode} {
	set order "--date-order"
    }
98
    if {[catch {
99
	set fd [open [concat | git rev-list --header $order \
100
			  --parents --boundary --default HEAD $args] r]
101
    } err]} {
102
	puts stderr "Error executing git rev-list: $err"
103 104
	exit 1
    }
105 106
    set commfd($view) $fd
    set leftover($view) {}
107
    set lookingforhead $showlocalchanges
108
    fconfigure $fd -blocking 0 -translation lf
109
    if {$tclencoding != {}} {
110
	fconfigure $fd -encoding $tclencoding
111
    }
112
    filerun $fd [list getcommitlines $fd $view]
113
    nowbusy $view
114 115
}

116
proc stop_rev_list {} {
117
    global commfd curview
118

119 120
    if {![info exists commfd($curview)]} return
    set fd $commfd($curview)
121
    catch {
122
	set pid [pid $fd]
123 124
	exec kill $pid
    }
125 126
    catch {close $fd}
    unset commfd($curview)
127 128
}

129
proc getcommits {} {
130
    global phase canv mainfont curview
131 132

    set phase getcommits
133 134
    initlayout
    start_rev_list $curview
135
    show_status "Reading commits..."
136 137
}

138
proc getcommitlines {fd view}  {
139
    global commitlisted
140
    global leftover commfd
P
Paul Mackerras 已提交
141
    global displayorder commitidx commitrow commitdata
142 143
    global parentlist children curview hlview
    global vparentlist vdisporder vcmitlisted
144

145
    set stuff [read $fd 500000]
P
Paul Mackerras 已提交
146
    if {$stuff == {}} {
147 148 149
	if {![eof $fd]} {
	    return 1
	}
150
	global viewname
151
	unset commfd($view)
152
	notbusy $view
153
	# set it blocking so we wait for the process to terminate
154
	fconfigure $fd -blocking 1
155 156 157 158
	if {[catch {close $fd} err]} {
	    set fv {}
	    if {$view != $curview} {
		set fv " for the \"$viewname($view)\" view"
159
	    }
160 161
	    if {[string range $err 0 4] == "usage"} {
		set err "Gitk: error reading commits$fv:\
162
			bad arguments to git rev-list."
163 164
		if {$viewname($view) eq "Command line"} {
		    append err \
165
			"  (Note: arguments to gitk are passed to git rev-list\
166 167 168 169 170 171
			 to allow selection of commits to be displayed.)"
		}
	    } else {
		set err "Error reading commits$fv: $err"
	    }
	    error_popup $err
172
	}
173
	if {$view == $curview} {
174
	    run chewcommits $view
175
	}
176
	return 0
177
    }
P
Paul Mackerras 已提交
178
    set start 0
179
    set gotsome 0
P
Paul Mackerras 已提交
180 181 182
    while 1 {
	set i [string first "\0" $stuff $start]
	if {$i < 0} {
183
	    append leftover($view) [string range $stuff $start end]
P
Paul Mackerras 已提交
184
	    break
185
	}
P
Paul Mackerras 已提交
186
	if {$start == 0} {
187
	    set cmit $leftover($view)
188
	    append cmit [string range $stuff 0 [expr {$i - 1}]]
189
	    set leftover($view) {}
190 191
	} else {
	    set cmit [string range $stuff $start [expr {$i - 1}]]
P
Paul Mackerras 已提交
192 193
	}
	set start [expr {$i + 1}]
194 195
	set j [string first "\n" $cmit]
	set ok 0
196
	set listed 1
197 198
	if {$j >= 0} {
	    set ids [string range $cmit 0 [expr {$j - 1}]]
199 200 201 202
	    if {[string range $ids 0 0] == "-"} {
		set listed 0
		set ids [string range $ids 1 end]
	    }
203 204
	    set ok 1
	    foreach id $ids {
205
		if {[string length $id] != 40} {
206 207 208 209 210 211
		    set ok 0
		    break
		}
	    }
	}
	if {!$ok} {
212 213 214 215
	    set shortcmit $cmit
	    if {[string length $shortcmit] > 80} {
		set shortcmit "[string range $shortcmit 0 80]..."
	    }
216
	    error_popup "Can't parse git rev-list output: {$shortcmit}"
P
Paul Mackerras 已提交
217 218
	    exit 1
	}
219
	set id [lindex $ids 0]
220 221
	if {$listed} {
	    set olds [lrange $ids 1 end]
P
Paul Mackerras 已提交
222
	    set i 0
223
	    foreach p $olds {
P
Paul Mackerras 已提交
224
		if {$i == 0 || [lsearch -exact $olds $p] >= $i} {
225
		    lappend children($view,$p) $id
P
Paul Mackerras 已提交
226 227
		}
		incr i
228
	    }
229 230 231
	} else {
	    set olds {}
	}
232 233
	if {![info exists children($view,$id)]} {
	    set children($view,$id) {}
234
	}
235
	set commitdata($id) [string range $cmit [expr {$j + 1}] end]
236 237 238 239 240 241 242 243 244 245 246
	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
	}
247 248 249
	set gotsome 1
    }
    if {$gotsome} {
250
	run chewcommits $view
251
    }
252
    return 2
253 254
}

255 256 257 258 259 260 261 262 263 264
proc chewcommits {view} {
    global curview hlview commfd
    global selectedline pending_select

    set more 0
    if {$view == $curview} {
	set allread [expr {![info exists commfd($view)]}]
	set tlimit [expr {[clock clicks -milliseconds] + 50}]
	set more [layoutmore $tlimit $allread]
	if {$allread && !$more} {
265
	    global displayorder nullid commitidx phase
266
	    global numcommits startmsecs
267

268 269 270 271 272 273 274 275 276 277 278 279 280
	    if {[info exists pending_select]} {
		set row [expr {[lindex $displayorder 0] eq $nullid}]
		selectline $row 1
	    }
	    if {$commitidx($curview) > 0} {
		#set ms [expr {[clock clicks -milliseconds] - $startmsecs}]
		#puts "overall $ms ms for $numcommits commits"
	    } else {
		show_status "No commits selected"
	    }
	    notbusy layout
	    set phase {}
	}
281
    }
282 283
    if {[info exists hlview] && $view == $hlview} {
	vhighlightmore
284
    }
285
    return $more
286 287 288
}

proc readcommit {id} {
289
    if {[catch {set contents [exec git cat-file commit $id]}]} return
290
    parsecommit $id $contents 0
P
Paul Mackerras 已提交
291 292
}

P
Paul Mackerras 已提交
293
proc updatecommits {} {
294
    global viewdata curview phase displayorder
295
    global children commitrow selectedline thickerline
P
Paul Mackerras 已提交
296

297 298 299
    if {$phase ne {}} {
	stop_rev_list
	set phase {}
300
    }
301
    set n $curview
302 303 304 305
    foreach id $displayorder {
	catch {unset children($n,$id)}
	catch {unset commitrow($n,$id)}
    }
306
    set curview -1
307 308
    catch {unset selectedline}
    catch {unset thickerline}
309
    catch {unset viewdata($n)}
310
    readrefs
311 312
    changedrefs
    regetallcommits
313
    showview $n
314 315
}

316
proc parsecommit {id contents listed} {
317 318 319 320 321 322 323 324 325
    global commitinfo cdate

    set inhdr 1
    set comment {}
    set headline {}
    set auname {}
    set audate {}
    set comname {}
    set comdate {}
P
Paul Mackerras 已提交
326 327 328 329 330 331 332 333 334 335 336 337 338 339 340
    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]
341 342
	}
    }
P
Paul Mackerras 已提交
343
    set headline {}
344 345 346
    # 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 已提交
347
    if {$i >= 0} {
348 349 350 351 352 353
	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 已提交
354 355
    }
    if {!$listed} {
356 357
	# git rev-list indents the comment by 4 spaces;
	# if we got this via git cat-file, add the indentation
P
Paul Mackerras 已提交
358 359 360 361
	set newcomment {}
	foreach line [split $comment "\n"] {
	    append newcomment "    "
	    append newcomment $line
362
	    append newcomment "\n"
P
Paul Mackerras 已提交
363 364
	}
	set comment $newcomment
365 366
    }
    if {$comdate != {}} {
367
	set cdate($id) $comdate
368
    }
369 370
    set commitinfo($id) [list $headline $auname $audate \
			     $comname $comdate $comment]
371 372
}

373
proc getcommit {id} {
374
    global commitdata commitinfo
P
Paul Mackerras 已提交
375

376 377
    if {[info exists commitdata($id)]} {
	parsecommit $id $commitdata($id) 1
P
Paul Mackerras 已提交
378 379 380 381 382 383 384 385 386
    } else {
	readcommit $id
	if {![info exists commitinfo($id)]} {
	    set commitinfo($id) {"No commit information available"}
	}
    }
    return 1
}

387
proc readrefs {} {
388
    global tagids idtags headids idheads tagobjid
389
    global otherrefids idotherrefs mainhead mainheadid
390

391 392 393
    foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
	catch {unset $v}
    }
394 395 396 397 398 399 400 401 402 403 404
    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
405
	    }
406 407
	} elseif {[string match "heads/*" $name]} {
	    set name [string range $name 6 end]
408 409
	    set headids($name) $id
	    lappend idheads($id) $name
410 411 412 413 414 415 416 417 418 419 420
	} 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
421 422 423
	} else {
	    set otherrefids($name) $id
	    lappend idotherrefs($id) $name
424 425
	}
    }
426
    close $refd
427
    set mainhead {}
428
    set mainheadid {}
429 430 431 432
    catch {
	set thehead [exec git symbolic-ref HEAD]
	if {[string match "refs/heads/*" $thehead]} {
	    set mainhead [string range $thehead 11 end]
433 434 435
	    if {[info exists headids($mainhead)]} {
		set mainheadid $headids($mainhead)
	    }
436 437
	}
    }
438 439
}

440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463
# 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 已提交
464
proc show_error {w top msg} {
465 466
    message $w.m -text $msg -justify center -aspect 400
    pack $w.m -side top -fill x -padx 20 -pady 20
P
Paul Mackerras 已提交
467
    button $w.ok -text OK -command "destroy $top"
468
    pack $w.ok -side bottom -fill x
P
Paul Mackerras 已提交
469 470 471
    bind $top <Visibility> "grab $top; focus $top"
    bind $top <Key-Return> "destroy $top"
    tkwait window $top
472 473
}

474 475 476 477
proc error_popup msg {
    set w .error
    toplevel $w
    wm transient $w .
P
Paul Mackerras 已提交
478
    show_error $w $w $msg
479 480
}

481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497
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
    button $w.ok -text OK -command "set confirm_ok 1; destroy $w"
    pack $w.ok -side left -fill x
    button $w.cancel -text Cancel -command "destroy $w"
    pack $w.cancel -side right -fill x
    bind $w <Visibility> "grab $w; focus $w"
    tkwait window $w
    return $confirm_ok
}

498
proc makewindow {} {
499
    global canv canv2 canv3 linespc charspc ctext cflist
500
    global textfont mainfont uifont tabstop
501
    global findtype findtypemenu findloc findstring fstring geometry
502
    global entries sha1entry sha1string sha1but
503
    global maincursor textcursor curtextcursor
504
    global rowctxmenu fakerowmenu mergemax wrapcomment
505
    global highlight_files gdttype
506
    global searchstring sstring
507
    global bgcolor fgcolor bglist fglist diffcolors selectbgcolor
508
    global headctxmenu
509 510 511

    menu .bar
    .bar add cascade -label "File" -menu .bar.file
512
    .bar configure -font $uifont
513
    menu .bar.file
P
Paul Mackerras 已提交
514
    .bar.file add command -label "Update" -command updatecommits
515
    .bar.file add command -label "Reread references" -command rereadrefs
516
    .bar.file add command -label "Quit" -command doquit
517
    .bar.file configure -font $uifont
518 519 520
    menu .bar.edit
    .bar add cascade -label "Edit" -menu .bar.edit
    .bar.edit add command -label "Preferences" -command doprefs
521
    .bar.edit configure -font $uifont
522

523
    menu .bar.view -font $uifont
P
Paul Mackerras 已提交
524
    .bar add cascade -label "View" -menu .bar.view
525 526 527
    .bar.view add command -label "New view..." -command {newview 0}
    .bar.view add command -label "Edit view..." -command editview \
	-state disabled
P
Paul Mackerras 已提交
528 529
    .bar.view add command -label "Delete view" -command delview -state disabled
    .bar.view add separator
530 531
    .bar.view add radiobutton -label "All files" -command {showview 0} \
	-variable selectedview -value 0
532

533 534 535
    menu .bar.help
    .bar add cascade -label "Help" -menu .bar.help
    .bar.help add command -label "About gitk" -command about
536
    .bar.help add command -label "Key bindings" -command keys
537
    .bar.help configure -font $uifont
538 539
    . configure -menu .bar

540
    # the gui has upper and lower half, parts of a paned window.
P
Paul Mackerras 已提交
541
    panedwindow .ctop -orient vertical
542 543

    # possibly use assumed geometry
544
    if {![info exists geometry(pwsash0)]} {
545 546 547 548
        set geometry(topheight) [expr {15 * $linespc}]
        set geometry(topwidth) [expr {80 * $charspc}]
        set geometry(botheight) [expr {15 * $linespc}]
        set geometry(botwidth) [expr {50 * $charspc}]
549 550
        set geometry(pwsash0) "[expr {40 * $charspc}] 2"
        set geometry(pwsash1) "[expr {60 * $charspc}] 2"
551 552 553 554 555 556 557 558 559 560
    }

    # 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
561
    canvas $canv \
562
	-selectbackground $selectbgcolor \
563
	-background $bgcolor -bd 0 \
P
Paul Mackerras 已提交
564
	-yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
565 566
    .tf.histframe.pwclist add $canv
    set canv2 .tf.histframe.pwclist.canv2
567
    canvas $canv2 \
568
	-selectbackground $selectbgcolor \
569
	-background $bgcolor -bd 0 -yscrollincr $linespc
570 571
    .tf.histframe.pwclist add $canv2
    set canv3 .tf.histframe.pwclist.canv3
572
    canvas $canv3 \
573
	-selectbackground $selectbgcolor \
574
	-background $bgcolor -bd 0 -yscrollincr $linespc
575
    .tf.histframe.pwclist add $canv3
576 577
    eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0)
    eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1)
578 579 580 581 582

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

586 587 588 589 590
    # 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
591
    set entries $sha1entry
592
    set sha1but .tf.bar.sha1label
593
    button $sha1but -text "SHA1 ID: " -state disabled -relief flat \
594
	-command gotocommit -width 8 -font $uifont
595
    $sha1but conf -disabledforeground [$sha1but cget -foreground]
596
    pack .tf.bar.sha1label -side left
597 598
    entry $sha1entry -width 40 -font $textfont -textvariable sha1string
    trace add variable sha1string write sha1change
599
    pack $sha1entry -side left -pady 2
600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616

    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};
    }
617
    button .tf.bar.leftbut -image bm-left -command goback \
618
	-state disabled -width 26
619 620
    pack .tf.bar.leftbut -side left -fill y
    button .tf.bar.rightbut -image bm-right -command goforw \
621
	-state disabled -width 26
622
    pack .tf.bar.rightbut -side left -fill y
623

624 625
    button .tf.bar.findbut -text "Find" -command dofind -font $uifont
    pack .tf.bar.findbut -side left
626
    set findstring {}
627
    set fstring .tf.bar.findstring
628
    lappend entries $fstring
629
    entry $fstring -width 30 -font $textfont -textvariable findstring
630
    trace add variable findstring write find_change
631
    pack $fstring -side left -expand 1 -fill x -in .tf.bar
632
    set findtype Exact
633 634
    set findtypemenu [tk_optionMenu .tf.bar.findtype \
		      findtype Exact IgnCase Regexp]
635
    trace add variable findtype write find_change
636 637
    .tf.bar.findtype configure -font $uifont
    .tf.bar.findtype.menu configure -font $uifont
638
    set findloc "All fields"
639
    tk_optionMenu .tf.bar.findloc findloc "All fields" Headline \
640 641
	Comments Author Committer
    trace add variable findloc write find_change
642 643 644 645 646 647 648 649 650
    .tf.bar.findloc configure -font $uifont
    .tf.bar.findloc.menu configure -font $uifont
    pack .tf.bar.findloc -side right
    pack .tf.bar.findtype -side right

    # build up the bottom bar of upper window
    label .tf.lbar.flabel -text "Highlight:  Commits " \
    -font $uifont
    pack .tf.lbar.flabel -side left -fill y
651
    set gdttype "touching paths:"
652 653
    set gm [tk_optionMenu .tf.lbar.gdttype gdttype "touching paths:" \
	"adding/removing string:"]
654 655
    trace add variable gdttype write hfiles_change
    $gm conf -font $uifont
656 657 658
    .tf.lbar.gdttype conf -font $uifont
    pack .tf.lbar.gdttype -side left -fill y
    entry .tf.lbar.fent -width 25 -font $textfont \
659 660
	-textvariable highlight_files
    trace add variable highlight_files write hfiles_change
661 662 663 664
    lappend entries .tf.lbar.fent
    pack .tf.lbar.fent -side left -fill x -expand 1
    label .tf.lbar.vlabel -text " OR in view" -font $uifont
    pack .tf.lbar.vlabel -side left -fill y
665
    global viewhlmenu selectedhlview
666
    set viewhlmenu [tk_optionMenu .tf.lbar.vhl selectedhlview None]
667
    $viewhlmenu entryconf None -command delvhighlight
668
    $viewhlmenu conf -font $uifont
669 670 671 672
    .tf.lbar.vhl conf -font $uifont
    pack .tf.lbar.vhl -side left -fill y
    label .tf.lbar.rlabel -text " OR " -font $uifont
    pack .tf.lbar.rlabel -side left -fill y
673
    global highlight_related
674 675
    set m [tk_optionMenu .tf.lbar.relm highlight_related None \
	"Descendent" "Not descendent" "Ancestor" "Not ancestor"]
676
    $m conf -font $uifont
677
    .tf.lbar.relm conf -font $uifont
678
    trace add variable highlight_related write vrel_change
679 680 681 682 683 684 685
    pack .tf.lbar.relm -side left -fill y

    # 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
686 687
    .ctop paneconfigure .tf -height $geometry(topheight)
    .ctop paneconfigure .tf -width $geometry(topwidth)
688 689 690 691 692 693 694 695 696 697 698 699 700

    # 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
701
    frame .bleft.mid
702 703

    button .bleft.top.search -text "Search" -command dosearch \
704
	-font $uifont
705 706
    pack .bleft.top.search -side left -padx 5
    set sstring .bleft.top.sstring
707 708 709 710
    entry $sstring -width 20 -font $textfont -textvariable searchstring
    lappend entries $sstring
    trace add variable searchstring write incrsearch
    pack $sstring -side left -expand 1 -fill x
711 712 713 714 715 716 717
    radiobutton .bleft.mid.diff -text "Diff" \
	-command changediffdisp -variable diffelide -value {0 0}
    radiobutton .bleft.mid.old -text "Old version" \
	-command changediffdisp -variable diffelide -value {0 1}
    radiobutton .bleft.mid.new -text "New version" \
	-command changediffdisp -variable diffelide -value {1 0}
    pack .bleft.mid.diff .bleft.mid.old .bleft.mid.new -side left
718
    set ctext .bleft.ctext
719
    text $ctext -background $bgcolor -foreground $fgcolor \
720
	-tabs "[expr {$tabstop * $charspc}]" \
721
	-state disabled -font $textfont \
722
	-yscrollcommand scrolltext -wrap none
723 724
    scrollbar .bleft.sb -command "$ctext yview"
    pack .bleft.top -side top -fill x
725
    pack .bleft.mid -side top -fill x
726
    pack .bleft.sb -side right -fill y
727
    pack $ctext -side left -fill both -expand 1
728 729
    lappend bglist $ctext
    lappend fglist $ctext
730

731
    $ctext tag conf comment -wrap $wrapcomment
732
    $ctext tag conf filesep -font [concat $textfont bold] -back "#aaaaaa"
733 734 735
    $ctext tag conf hunksep -fore [lindex $diffcolors 2]
    $ctext tag conf d0 -fore [lindex $diffcolors 0]
    $ctext tag conf d1 -fore [lindex $diffcolors 1]
736 737 738 739 740
    $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
741 742 743 744 745 746 747 748 749 750 751
    $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"
752
    $ctext tag conf mmax -fore darkgrey
753
    set mergemax 16
754 755 756
    $ctext tag conf mresult -font [concat $textfont bold]
    $ctext tag conf msep -font [concat $textfont bold]
    $ctext tag conf found -back yellow
757

758
    .pwbottom add .bleft
759
    .pwbottom paneconfigure .bleft -width $geometry(botwidth)
760 761 762 763 764

    # lower right
    frame .bright
    frame .bright.mode
    radiobutton .bright.mode.patch -text "Patch" \
P
Paul Mackerras 已提交
765
	-command reselectline -variable cmitmode -value "patch"
766
    .bright.mode.patch configure -font $uifont
767
    radiobutton .bright.mode.tree -text "Tree" \
P
Paul Mackerras 已提交
768
	-command reselectline -variable cmitmode -value "tree"
769
    .bright.mode.tree configure -font $uifont
770 771 772
    grid .bright.mode.patch .bright.mode.tree -sticky ew
    pack .bright.mode -side top -fill x
    set cflist .bright.cfiles
773
    set indent [font measure $mainfont "nn"]
774
    text $cflist \
775
	-selectbackground $selectbgcolor \
776 777
	-background $bgcolor -foreground $fgcolor \
	-font $mainfont \
778
	-tabs [list $indent [expr {2 * $indent}]] \
779
	-yscrollcommand ".bright.sb set" \
780 781
	-cursor [. cget -cursor] \
	-spacing1 1 -spacing3 1
782 783
    lappend bglist $cflist
    lappend fglist $cflist
784 785
    scrollbar .bright.sb -command "$cflist yview"
    pack .bright.sb -side right -fill y
786
    pack $cflist -side left -fill both -expand 1
787 788
    $cflist tag configure highlight \
	-background [$cflist cget -selectbackground]
789
    $cflist tag configure bold -font [concat $mainfont bold]
790

791 792
    .pwbottom add .bright
    .ctop add .pwbottom
793

794 795 796 797 798 799 800
    # restore window position if known
    if {[info exists geometry(main)]} {
        wm geometry . "$geometry(main)"
    }

    bind .pwbottom <Configure> {resizecdetpanes %W %w}
    pack .ctop -fill both -expand 1
801 802
    bindall <1> {selcanvline %W %x %y}
    #bindall <B1-Motion> {selcanvline %W %x %y}
803 804
    bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
    bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
805 806
    bindall <2> "canvscan mark %W %x %y"
    bindall <B2-Motion> "canvscan dragto %W %x %y"
807 808
    bindkey <Home> selfirstline
    bindkey <End> sellastline
809 810
    bind . <Key-Up> "selnextline -1"
    bind . <Key-Down> "selnextline 1"
811 812
    bind . <Shift-Key-Up> "next_highlight -1"
    bind . <Shift-Key-Down> "next_highlight 1"
813 814 815 816 817 818 819 820 821 822
    bindkey <Key-Right> "goforw"
    bindkey <Key-Left> "goback"
    bind . <Key-Prior> "selnextpage -1"
    bind . <Key-Next> "selnextpage 1"
    bind . <Control-Home> "allcanvs yview moveto 0.0"
    bind . <Control-End> "allcanvs yview moveto 1.0"
    bind . <Control-Key-Up> "allcanvs yview scroll -1 units"
    bind . <Control-Key-Down> "allcanvs yview scroll 1 units"
    bind . <Control-Key-Prior> "allcanvs yview scroll -1 pages"
    bind . <Control-Key-Next> "allcanvs yview scroll 1 pages"
823 824 825
    bindkey <Key-Delete> "$ctext yview scroll -1 pages"
    bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
    bindkey <Key-space> "$ctext yview scroll 1 pages"
826 827
    bindkey p "selnextline -1"
    bindkey n "selnextline 1"
R
Robert Suetterlin 已提交
828 829 830 831 832 833
    bindkey z "goback"
    bindkey x "goforw"
    bindkey i "selnextline -1"
    bindkey k "selnextline 1"
    bindkey j "goback"
    bindkey l "goforw"
834 835 836
    bindkey b "$ctext yview scroll -1 pages"
    bindkey d "$ctext yview scroll 18 units"
    bindkey u "$ctext yview scroll -18 units"
837 838
    bindkey / {findnext 1}
    bindkey <Key-Return> {findnext 0}
839
    bindkey ? findprev
840
    bindkey f nextfile
841
    bindkey <F5> updatecommits
842
    bind . <Control-q> doquit
843
    bind . <Control-f> dofind
844
    bind . <Control-g> {findnext 0}
845
    bind . <Control-r> dosearchback
846
    bind . <Control-s> dosearch
847 848 849 850
    bind . <Control-equal> {incrfont 1}
    bind . <Control-KP_Add> {incrfont 1}
    bind . <Control-minus> {incrfont -1}
    bind . <Control-KP_Subtract> {incrfont -1}
851
    wm protocol . WM_DELETE_WINDOW doquit
852
    bind . <Button-1> "click %W"
853
    bind $fstring <Key-Return> dofind
854
    bind $sha1entry <Key-Return> gotocommit
855
    bind $sha1entry <<PasteSelection>> clearsha1
856 857
    bind $cflist <1> {sel_flist %W %x %y; break}
    bind $cflist <B1-Motion> {sel_flist %W %x %y; break}
P
Paul Mackerras 已提交
858
    bind $cflist <ButtonRelease-1> {treeclick %W %x %y}
859 860 861

    set maincursor [. cget -cursor]
    set textcursor [$ctext cget -cursor]
862
    set curtextcursor $textcursor
863

864 865 866 867 868 869
    set rowctxmenu .rowctxmenu
    menu $rowctxmenu -tearoff 0
    $rowctxmenu add command -label "Diff this -> selected" \
	-command {diffvssel 0}
    $rowctxmenu add command -label "Diff selected -> this" \
	-command {diffvssel 1}
870
    $rowctxmenu add command -label "Make patch" -command mkpatch
871
    $rowctxmenu add command -label "Create tag" -command mktag
872
    $rowctxmenu add command -label "Write commit to file" -command writecommit
873
    $rowctxmenu add command -label "Create new branch" -command mkbranch
874 875
    $rowctxmenu add command -label "Cherry-pick this commit" \
	-command cherrypick
876

877 878 879 880 881 882 883 884 885 886 887
    set fakerowmenu .fakerowmenu
    menu $fakerowmenu -tearoff 0
    $fakerowmenu add command -label "Diff this -> selected" \
	-command {diffvssel 0}
    $fakerowmenu add command -label "Diff selected -> this" \
	-command {diffvssel 1}
    $fakerowmenu add command -label "Make patch" -command mkpatch
#    $fakerowmenu add command -label "Commit" -command {mkcommit 0}
#    $fakerowmenu add command -label "Commit all" -command {mkcommit 1}
#    $fakerowmenu add command -label "Revert local changes" -command revertlocal

888 889 890 891 892 893
    set headctxmenu .headctxmenu
    menu $headctxmenu -tearoff 0
    $headctxmenu add command -label "Check out this branch" \
	-command cobranch
    $headctxmenu add command -label "Remove this branch" \
	-command rmbranch
894 895
}

896 897 898 899 900 901 902 903 904 905 906 907 908
# 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 已提交
909 910 911
proc scrollcanv {cscroll f0 f1} {
    $cscroll set $f0 $f1
    drawfrac $f0 $f1
912
    flushhighlights
P
Paul Mackerras 已提交
913 914
}

915 916 917 918
# 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} {
919
    global entries
920 921 922 923 924
    bind . $ev $script
    set escript [bind Entry $ev]
    if {$escript == {}} {
	set escript [bind Entry <Key>]
    }
925 926 927
    foreach e $entries {
	bind $e $ev "$escript; break"
    }
928 929 930
}

# set the focus back to the toplevel for any click outside
931
# the entry widgets
932
proc click {w} {
933 934 935
    global entries
    foreach e $entries {
	if {$w == $e} return
936
    }
937
    focus .
938 939 940
}

proc savestuff {w} {
941
    global canv canv2 canv3 ctext cflist mainfont textfont uifont tabstop
942
    global stuffsaved findmergefiles maxgraphpct
943
    global maxwidth showneartags showlocalchanges
944
    global viewname viewfiles viewargs viewperm nextviewnum
945
    global cmitmode wrapcomment
946
    global colors bgcolor fgcolor diffcolors selectbgcolor
947

948
    if {$stuffsaved} return
949
    if {![winfo viewable .]} return
950 951
    catch {
	set f [open "~/.gitk-new" w]
952 953
	puts $f [list set mainfont $mainfont]
	puts $f [list set textfont $textfont]
954
	puts $f [list set uifont $uifont]
955
	puts $f [list set tabstop $tabstop]
956
	puts $f [list set findmergefiles $findmergefiles]
957
	puts $f [list set maxgraphpct $maxgraphpct]
958
	puts $f [list set maxwidth $maxwidth]
P
Paul Mackerras 已提交
959
	puts $f [list set cmitmode $cmitmode]
960
	puts $f [list set wrapcomment $wrapcomment]
P
Paul Mackerras 已提交
961
	puts $f [list set showneartags $showneartags]
962
	puts $f [list set showlocalchanges $showlocalchanges]
963 964 965 966
	puts $f [list set bgcolor $bgcolor]
	puts $f [list set fgcolor $fgcolor]
	puts $f [list set colors $colors]
	puts $f [list set diffcolors $diffcolors]
967
	puts $f [list set selectbgcolor $selectbgcolor]
968

969
	puts $f "set geometry(main) [wm geometry .]"
970 971
	puts $f "set geometry(topwidth) [winfo width .tf]"
	puts $f "set geometry(topheight) [winfo height .tf]"
972 973
        puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\""
        puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\""
974 975 976
	puts $f "set geometry(botwidth) [winfo width .bleft]"
	puts $f "set geometry(botheight) [winfo height .bleft]"

977 978 979
	puts -nonewline $f "set permviews {"
	for {set v 0} {$v < $nextviewnum} {incr v} {
	    if {$viewperm($v)} {
980
		puts $f "{[list $viewname($v) $viewfiles($v) $viewargs($v)]}"
981 982 983
	    }
	}
	puts $f "}"
984 985 986 987
	close $f
	file rename -force "~/.gitk-new" "~/.gitk"
    }
    set stuffsaved 1
988 989
}

990 991
proc resizeclistpanes {win w} {
    global oldwidth
992
    if {[info exists oldwidth($win)]} {
993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
	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 已提交
1006
		set sash1 [expr {$sash0 + 20}]
1007 1008
	    }
	    if {$sash1 > $w - 10} {
J
Jeff Hobbs 已提交
1009
		set sash1 [expr {$w - 10}]
1010
		if {$sash0 > $sash1 - 20} {
J
Jeff Hobbs 已提交
1011
		    set sash0 [expr {$sash1 - 20}]
1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022
		}
	    }
	}
	$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
1023
    if {[info exists oldwidth($win)]} {
1024 1025 1026 1027 1028 1029 1030 1031 1032 1033
	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 已提交
1034
		set sash0 [expr {$w - 15}]
1035 1036 1037 1038 1039 1040 1041
	    }
	}
	$win sash place 0 $sash0 [lindex $s0 1]
    }
    set oldwidth($win) $w
}

1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055
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
}

1056
proc about {} {
1057
    global uifont
1058 1059 1060 1061 1062 1063 1064 1065
    set w .about
    if {[winfo exists $w]} {
	raise $w
	return
    }
    toplevel $w
    wm title $w "About gitk"
    message $w.m -text {
P
Paul Mackerras 已提交
1066
Gitk - a commit viewer for git
1067

P
Paul Mackerras 已提交
1068
Copyright  2005-2006 Paul Mackerras
1069

1070
Use and redistribute under the terms of the GNU General Public License} \
1071 1072
	    -justify center -aspect 400 -border 2 -bg white -relief groove
    pack $w.m -side top -fill x -padx 2 -pady 2
1073
    $w.m configure -font $uifont
1074
    button $w.ok -text Close -command "destroy $w" -default active
1075
    pack $w.ok -side bottom
1076
    $w.ok configure -font $uifont
1077 1078 1079
    bind $w <Visibility> "focus $w.ok"
    bind $w <Key-Escape> "destroy $w"
    bind $w <Key-Return> "destroy $w"
1080 1081
}

1082
proc keys {} {
1083
    global uifont
1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094
    set w .keys
    if {[winfo exists $w]} {
	raise $w
	return
    }
    toplevel $w
    wm title $w "Gitk key bindings"
    message $w.m -text {
Gitk key bindings:

<Ctrl-Q>		Quit
1095 1096
<Home>		Move to first commit
<End>		Move to last commit
1097 1098 1099 1100
<Up>, p, i	Move up one commit
<Down>, n, k	Move down one commit
<Left>, z, j	Go back in history list
<Right>, x, l	Go forward in history list
1101 1102 1103 1104 1105 1106 1107 1108
<PageUp>	Move up one page in commit list
<PageDown>	Move down one page in commit list
<Ctrl-Home>	Scroll to top of commit list
<Ctrl-End>	Scroll to bottom of commit list
<Ctrl-Up>	Scroll commit list up one line
<Ctrl-Down>	Scroll commit list down one line
<Ctrl-PageUp>	Scroll commit list up one page
<Ctrl-PageDown>	Scroll commit list down one page
1109 1110
<Shift-Up>	Move to previous highlighted line
<Shift-Down>	Move to next highlighted line
1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121
<Delete>, b	Scroll diff view up one page
<Backspace>	Scroll diff view up one page
<Space>		Scroll diff view down one page
u		Scroll diff view up 18 lines
d		Scroll diff view down 18 lines
<Ctrl-F>		Find
<Ctrl-G>		Move to next find hit
<Return>	Move to next find hit
/		Move to next find hit, or redo find
?		Move to previous find hit
f		Scroll diff view to next file
1122 1123
<Ctrl-S>		Search for next hit in diff view
<Ctrl-R>		Search for previous hit in diff view
1124 1125 1126 1127
<Ctrl-KP+>	Increase font size
<Ctrl-plus>	Increase font size
<Ctrl-KP->	Decrease font size
<Ctrl-minus>	Decrease font size
1128
<F5>		Update
1129
} \
1130 1131
	    -justify left -bg white -border 2 -relief groove
    pack $w.m -side top -fill both -padx 2 -pady 2
1132
    $w.m configure -font $uifont
1133
    button $w.ok -text Close -command "destroy $w" -default active
1134
    pack $w.ok -side bottom
1135
    $w.ok configure -font $uifont
1136 1137 1138
    bind $w <Visibility> "focus $w.ok"
    bind $w <Key-Escape> "destroy $w"
    bind $w <Key-Return> "destroy $w"
1139 1140
}

1141 1142
# Procedures for manipulating the file list window at the
# bottom right of the overall window.
P
Paul Mackerras 已提交
1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195

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
1196
		$w insert end $d [highlight_tag $prefix]
P
Paul Mackerras 已提交
1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207
		$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
1208
		$w insert end $tail [highlight_tag $f]
P
Paul Mackerras 已提交
1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244
	    }
	    lappend treecontents($prefix) $tail
	}
    }
    while {$htstack ne {}} {
	set treeheight($prefix) $ht
	incr ht [lindex $htstack end]
	set htstack [lreplace $htstack end end]
    }
    $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
	}
    }
}

1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260
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 已提交
1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293
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) {
1294
	set de $dir$e
P
Paul Mackerras 已提交
1295 1296 1297 1298 1299 1300 1301 1302
	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
1303
	    $w insert e:$ix $e [highlight_tag $de]
P
Paul Mackerras 已提交
1304 1305 1306 1307 1308
	    $w mark set s:$iy e:$ix
	    $w mark gravity s:$iy left
	    set treeheight($de) 1
	} else {
	    $w insert e:$ix $str
1309
	    $w insert e:$ix $e [highlight_tag $de]
P
Paul Mackerras 已提交
1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 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 1385 1386 1387 1388
	}
    }
    $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};
}

1389
proc init_flist {first} {
1390
    global cflist cflist_top selectedline difffilestart
1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404

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

1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416
proc highlight_tag {f} {
    global highlight_paths

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

proc highlight_filelist {} {
1417
    global cmitmode cflist
1418

1419 1420
    $cflist conf -state normal
    if {$cmitmode ne "tree"} {
1421 1422 1423 1424 1425 1426 1427
	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"
	    }
	}
1428 1429
    } else {
	highlight_tree 2 {}
1430
    }
1431
    $cflist conf -state disabled
1432 1433 1434
}

proc unhighlight_filelist {} {
1435
    global cflist
1436

1437 1438 1439
    $cflist conf -state normal
    $cflist tag remove bold 1.0 end
    $cflist conf -state disabled
1440 1441
}

P
Paul Mackerras 已提交
1442
proc add_flist {fl} {
1443
    global cflist
1444

1445 1446 1447 1448
    $cflist conf -state normal
    foreach f $fl {
	$cflist insert end "\n"
	$cflist insert end $f [highlight_tag $f]
1449
    }
1450
    $cflist conf -state disabled
1451 1452 1453
}

proc sel_flist {w x y} {
1454
    global ctext difffilestart cflist cflist_top cmitmode
1455

P
Paul Mackerras 已提交
1456
    if {$cmitmode eq "tree"} return
1457 1458
    if {![info exists cflist_top]} return
    set l [lindex [split [$w index "@$x,$y"] "."] 0]
1459 1460 1461
    $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 已提交
1462 1463 1464 1465
    if {$l == 1} {
	$ctext yview 1.0
    } else {
	catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
1466 1467 1468
    }
}

1469 1470 1471 1472 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 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 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 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562
# 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
}

1563 1564
# Code to implement multiple views

1565 1566
proc newview {ishighlight} {
    global nextviewnum newviewname newviewperm uifont newishighlight
1567
    global newviewargs revtreeargs
P
Paul Mackerras 已提交
1568

1569
    set newishighlight $ishighlight
P
Paul Mackerras 已提交
1570 1571 1572 1573 1574
    set top .gitkview
    if {[winfo exists $top]} {
	raise $top
	return
    }
1575 1576
    set newviewname($nextviewnum) "View $nextviewnum"
    set newviewperm($nextviewnum) 0
1577
    set newviewargs($nextviewnum) [shellarglist $revtreeargs]
1578
    vieweditor $top $nextviewnum "Gitk view definition"
1579 1580 1581 1582 1583
}

proc editview {} {
    global curview
    global viewname viewperm newviewname newviewperm
1584
    global viewargs newviewargs
1585 1586 1587 1588 1589 1590 1591 1592

    set top .gitkvedit-$curview
    if {[winfo exists $top]} {
	raise $top
	return
    }
    set newviewname($curview) $viewname($curview)
    set newviewperm($curview) $viewperm($curview)
1593
    set newviewargs($curview) [shellarglist $viewargs($curview)]
1594 1595 1596 1597 1598 1599 1600
    vieweditor $top $curview "Gitk: edit view $viewname($curview)"
}

proc vieweditor {top n title} {
    global newviewname newviewperm viewfiles
    global uifont

P
Paul Mackerras 已提交
1601
    toplevel $top
1602
    wm title $top $title
1603
    label $top.nl -text "Name" -font $uifont
1604
    entry $top.name -width 20 -textvariable newviewname($n) -font $uifont
1605
    grid $top.nl $top.name -sticky w -pady 5
1606 1607
    checkbutton $top.perm -text "Remember this view" -variable newviewperm($n) \
	-font $uifont
1608
    grid $top.perm - -pady 5 -sticky w
1609
    message $top.al -aspect 1000 -font $uifont \
1610
	-text "Commits to include (arguments to git rev-list):"
1611 1612
    grid $top.al - -sticky w -pady 5
    entry $top.args -width 50 -textvariable newviewargs($n) \
1613
	-background white -font $uifont
1614 1615
    grid $top.args - -sticky ew -padx 5
    message $top.l -aspect 1000 -font $uifont \
1616 1617
	-text "Enter files and directories to include, one per line:"
    grid $top.l - -sticky w
1618
    text $top.t -width 40 -height 10 -background white -font $uifont
1619 1620 1621 1622 1623 1624 1625 1626
    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
    }
1627
    grid $top.t - -sticky ew -padx 5
P
Paul Mackerras 已提交
1628
    frame $top.buts
1629 1630 1631 1632
    button $top.buts.ok -text "OK" -command [list newviewok $top $n] \
	-font $uifont
    button $top.buts.can -text "Cancel" -command [list destroy $top] \
	-font $uifont
P
Paul Mackerras 已提交
1633 1634 1635 1636 1637 1638 1639
    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
}

1640
proc doviewmenu {m first cmd op argv} {
1641 1642 1643
    set nmenu [$m index end]
    for {set i $first} {$i <= $nmenu} {incr i} {
	if {[$m entrycget $i -command] eq $cmd} {
1644
	    eval $m $op $i $argv
1645
	    break
1646 1647
	}
    }
1648 1649 1650
}

proc allviewmenus {n op args} {
1651 1652
    global viewhlmenu

1653
    doviewmenu .bar.view 5 [list showview $n] $op $args
1654
    doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
1655 1656 1657
}

proc newviewok {top n} {
1658
    global nextviewnum newviewperm newviewname newishighlight
1659
    global viewname viewfiles viewperm selectedview curview
1660
    global viewargs newviewargs viewhlmenu
P
Paul Mackerras 已提交
1661

1662 1663 1664 1665 1666 1667 1668 1669
    if {[catch {
	set newargs [shellsplit $newviewargs($n)]
    } err]} {
	error_popup "Error in commit selection arguments: $err"
	wm raise $top
	focus $top
	return
    }
P
Paul Mackerras 已提交
1670
    set files {}
1671
    foreach f [split [$top.t get 0.0 end] "\n"] {
P
Paul Mackerras 已提交
1672 1673 1674 1675 1676
	set ft [string trim $f]
	if {$ft ne {}} {
	    lappend files $ft
	}
    }
1677 1678 1679 1680 1681 1682
    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
1683
	set viewargs($n) $newargs
1684 1685
	addviewmenu $n
	if {!$newishighlight} {
1686
	    run showview $n
1687
	} else {
1688
	    run addvhighlight $n
1689
	}
1690 1691 1692 1693 1694
    } else {
	# editing an existing view
	set viewperm($n) $newviewperm($n)
	if {$newviewname($n) ne $viewname($n)} {
	    set viewname($n) $newviewname($n)
1695
	    doviewmenu .bar.view 5 [list showview $n] \
1696 1697 1698
		entryconf [list -label $viewname($n)]
	    doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
		entryconf [list -label $viewname($n) -value $viewname($n)]
1699
	}
1700
	if {$files ne $viewfiles($n) || $newargs ne $viewargs($n)} {
1701
	    set viewfiles($n) $files
1702
	    set viewargs($n) $newargs
1703
	    if {$curview == $n} {
1704
		run updatecommits
1705 1706 1707 1708
	    }
	}
    }
    catch {destroy $top}
P
Paul Mackerras 已提交
1709 1710 1711
}

proc delview {} {
1712
    global curview viewdata viewperm hlview selectedhlview
P
Paul Mackerras 已提交
1713 1714

    if {$curview == 0} return
1715 1716 1717 1718
    if {[info exists hlview] && $hlview == $curview} {
	set selectedhlview None
	unset hlview
    }
1719
    allviewmenus $curview delete
P
Paul Mackerras 已提交
1720
    set viewdata($curview) {}
1721
    set viewperm($curview) 0
P
Paul Mackerras 已提交
1722 1723 1724
    showview 0
}

1725
proc addviewmenu {n} {
1726
    global viewname viewhlmenu
1727 1728 1729

    .bar.view add radiobutton -label $viewname($n) \
	-command [list showview $n] -variable selectedview -value $n
1730 1731
    $viewhlmenu add radiobutton -label $viewname($n) \
	-command [list addvhighlight $n] -variable selectedhlview
1732 1733
}

1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752
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 已提交
1753 1754
proc showview {n} {
    global curview viewdata viewfiles
1755
    global displayorder parentlist rowidlist rowoffsets
1756
    global colormap rowtextx commitrow nextcolor canvxmax
1757
    global numcommits rowrangelist commitlisted idrowranges rowchk
P
Paul Mackerras 已提交
1758 1759
    global selectedline currentid canv canvy0
    global matchinglines treediffs
1760
    global pending_select phase
1761
    global commitidx rowlaidout rowoptim
1762
    global commfd
1763
    global selectedview selectfirst
1764
    global vparentlist vdisporder vcmitlisted
1765
    global hlview selectedhlview
P
Paul Mackerras 已提交
1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780

    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}]
	} else {
	    set yscreen [expr {($ybot - $ytop) / 2}]
	}
1781 1782 1783
    } elseif {[info exists pending_select]} {
	set selid $pending_select
	unset pending_select
P
Paul Mackerras 已提交
1784 1785
    }
    unselectline
1786
    normalline
P
Paul Mackerras 已提交
1787
    stopfindproc
1788
    if {$curview >= 0} {
1789 1790 1791
	set vparentlist($curview) $parentlist
	set vdisporder($curview) $displayorder
	set vcmitlisted($curview) $commitlisted
1792 1793
	if {$phase ne {}} {
	    set viewdata($curview) \
1794 1795
		[list $phase $rowidlist $rowoffsets $rowrangelist \
		     [flatten idrowranges] [flatten idinlist] \
1796
		     $rowlaidout $rowoptim $numcommits]
1797 1798
	} elseif {![info exists viewdata($curview)]
		  || [lindex $viewdata($curview) 0] ne {}} {
1799
	    set viewdata($curview) \
1800
		[list {} $rowidlist $rowoffsets $rowrangelist]
1801
	}
P
Paul Mackerras 已提交
1802 1803 1804 1805
    }
    catch {unset matchinglines}
    catch {unset treediffs}
    clear_display
1806 1807 1808 1809
    if {[info exists hlview] && $hlview == $n} {
	unset hlview
	set selectedhlview None
    }
P
Paul Mackerras 已提交
1810 1811

    set curview $n
1812
    set selectedview $n
1813 1814
    .bar.view entryconf Edit* -state [expr {$n == 0? "disabled": "normal"}]
    .bar.view entryconf Delete* -state [expr {$n == 0? "disabled": "normal"}]
P
Paul Mackerras 已提交
1815 1816

    if {![info exists viewdata($n)]} {
1817 1818 1819
	if {$selid ne {}} {
	    set pending_select $selid
	}
1820
	getcommits
P
Paul Mackerras 已提交
1821 1822 1823
	return
    }

1824 1825
    set v $viewdata($n)
    set phase [lindex $v 0]
1826 1827 1828 1829 1830 1831
    set displayorder $vdisporder($n)
    set parentlist $vparentlist($n)
    set commitlisted $vcmitlisted($n)
    set rowidlist [lindex $v 1]
    set rowoffsets [lindex $v 2]
    set rowrangelist [lindex $v 3]
1832 1833 1834 1835
    if {$phase eq {}} {
	set numcommits [llength $displayorder]
	catch {unset idrowranges}
    } else {
1836 1837 1838 1839 1840
	unflatten idrowranges [lindex $v 4]
	unflatten idinlist [lindex $v 5]
	set rowlaidout [lindex $v 6]
	set rowoptim [lindex $v 7]
	set numcommits [lindex $v 8]
1841
	catch {unset rowchk}
1842 1843
    }

P
Paul Mackerras 已提交
1844 1845
    catch {unset colormap}
    catch {unset rowtextx}
1846 1847
    set nextcolor 0
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
1848 1849 1850 1851
    set curview $n
    set row 0
    setcanvscroll
    set yf 0
1852 1853
    set row {}
    set selectfirst 0
1854 1855
    if {$selid ne {} && [info exists commitrow($n,$selid)]} {
	set row $commitrow($n,$selid)
P
Paul Mackerras 已提交
1856 1857 1858 1859 1860 1861 1862 1863 1864 1865
	# 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
1866 1867 1868 1869 1870
    if {$row ne {}} {
	selectline $row 0
    } elseif {$selid ne {}} {
	set pending_select $selid
    } else {
1871 1872 1873
	set row [expr {[lindex $displayorder 0] eq $nullid}]
	if {$row < $numcommits} {
	    selectline $row 0
1874 1875 1876 1877
	} else {
	    set selectfirst 1
	}
    }
1878
    if {$phase ne {}} {
1879
	if {$phase eq "getcommits"} {
1880
	    show_status "Reading commits..."
1881
	}
1882
	run chewcommits $n
1883 1884
    } elseif {$numcommits == 0} {
	show_status "No commits selected"
1885
    }
P
Paul Mackerras 已提交
1886 1887
}

1888 1889 1890
# Stuff relating to the highlighting facility

proc ishighlighted {row} {
1891
    global vhighlights fhighlights nhighlights rhighlights
1892 1893 1894 1895 1896 1897 1898 1899 1900 1901

    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)
    }
1902 1903 1904
    if {[info exists rhighlights($row)] && $rhighlights($row) > 0} {
	return $rhighlights($row)
    }
1905 1906 1907 1908
    return 0
}

proc bolden {row font} {
1909
    global canv linehtag selectedline boldrows
1910

1911
    lappend boldrows $row
1912
    $canv itemconf $linehtag($row) -font $font
1913
    if {[info exists selectedline] && $row == $selectedline} {
1914 1915 1916 1917 1918 1919 1920 1921 1922
	$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} {
1923
    global canv2 linentag selectedline boldnamerows
1924

1925
    lappend boldnamerows $row
1926
    $canv2 itemconf $linentag($row) -font $font
1927
    if {[info exists selectedline] && $row == $selectedline} {
1928 1929 1930 1931 1932 1933 1934 1935
	$canv2 delete secsel
	set t [eval $canv2 create rect [$canv2 bbox $linentag($row)] \
		   -outline {{}} -tags secsel \
		   -fill [$canv2 cget -selectbackground]]
	$canv2 lower $t
    }
}

1936 1937
proc unbolden {} {
    global mainfont boldrows
1938

1939 1940
    set stillbold {}
    foreach row $boldrows {
1941 1942
	if {![ishighlighted $row]} {
	    bolden $row $mainfont
1943 1944
	} else {
	    lappend stillbold $row
1945 1946
	}
    }
1947
    set boldrows $stillbold
1948 1949 1950 1951
}

proc addvhighlight {n} {
    global hlview curview viewdata vhl_done vhighlights commitidx
1952 1953

    if {[info exists hlview]} {
1954
	delvhighlight
1955 1956 1957 1958 1959 1960 1961 1962
    }
    set hlview $n
    if {$n != $curview && ![info exists viewdata($n)]} {
	set viewdata($n) [list getcommits {{}} {{}} {} {} {} 0 0 0 {}]
	set vparentlist($n) {}
	set vdisporder($n) {}
	set vcmitlisted($n) {}
	start_rev_list $n
1963 1964 1965 1966
    }
    set vhl_done $commitidx($hlview)
    if {$vhl_done > 0} {
	drawvisible
1967 1968 1969
    }
}

1970 1971
proc delvhighlight {} {
    global hlview vhighlights
1972 1973 1974

    if {![info exists hlview]} return
    unset hlview
1975 1976
    catch {unset vhighlights}
    unbolden
1977 1978
}

1979 1980 1981
proc vhighlightmore {} {
    global hlview vhl_done commitidx vhighlights
    global displayorder vdisporder curview mainfont
1982 1983 1984 1985 1986 1987 1988 1989

    set font [concat $mainfont bold]
    set max $commitidx($hlview)
    if {$hlview == $curview} {
	set disp $displayorder
    } else {
	set disp $vdisporder($hlview)
    }
1990 1991 1992 1993
    set vr [visiblerows]
    set r0 [lindex $vr 0]
    set r1 [lindex $vr 1]
    for {set i $vhl_done} {$i < $max} {incr i} {
1994 1995 1996
	set id [lindex $disp $i]
	if {[info exists commitrow($curview,$id)]} {
	    set row $commitrow($curview,$id)
1997 1998 1999
	    if {$r0 <= $row && $row <= $r1} {
		if {![highlighted $row]} {
		    bolden $row $font
2000
		}
2001
		set vhighlights($row) 1
2002 2003 2004
	    }
	}
    }
2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022
    set vhl_done $max
}

proc askvhighlight {row id} {
    global hlview vhighlights commitrow iddrawn mainfont

    if {[info exists commitrow($hlview,$id)]} {
	if {[info exists iddrawn($id)] && ![ishighlighted $row]} {
	    bolden $row [concat $mainfont bold]
	}
	set vhighlights($row) 1
    } else {
	set vhighlights($row) 0
    }
}

proc hfiles_change {name ix op} {
    global highlight_files filehighlight fhighlights fh_serial
2023
    global mainfont highlight_paths
2024 2025 2026 2027 2028

    if {[info exists filehighlight]} {
	# delete previous highlights
	catch {close $filehighlight}
	unset filehighlight
2029 2030
	catch {unset fhighlights}
	unbolden
2031
	unhighlight_filelist
2032
    }
2033
    set highlight_paths {}
2034 2035 2036 2037 2038 2039 2040
    after cancel do_file_hl $fh_serial
    incr fh_serial
    if {$highlight_files ne {}} {
	after 300 do_file_hl $fh_serial
    }
}

2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054
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
}

2055
proc do_file_hl {serial} {
2056
    global highlight_files filehighlight highlight_paths gdttype fhl_list
2057

2058 2059 2060 2061 2062 2063 2064 2065
    if {$gdttype eq "touching paths:"} {
	if {[catch {set paths [shellsplit $highlight_files]}]} return
	set highlight_paths [makepatterns $paths]
	highlight_filelist
	set gdtargs [concat -- $paths]
    } else {
	set gdtargs [list "-S$highlight_files"]
    }
2066
    set cmd [concat | git diff-tree -r -s --stdin $gdtargs]
2067 2068
    set filehighlight [open $cmd r+]
    fconfigure $filehighlight -blocking 0
2069
    filerun $filehighlight readfhighlight
2070
    set fhl_list {}
2071 2072 2073 2074 2075
    drawvisible
    flushhighlights
}

proc flushhighlights {} {
2076
    global filehighlight fhl_list
2077 2078

    if {[info exists filehighlight]} {
2079
	lappend fhl_list {}
2080 2081 2082 2083 2084 2085
	puts $filehighlight ""
	flush $filehighlight
    }
}

proc askfilehighlight {row id} {
2086
    global filehighlight fhighlights fhl_list
2087

2088 2089
    lappend fhl_list $id
    set fhighlights($row) -1
2090 2091 2092 2093 2094
    puts $filehighlight $id
}

proc readfhighlight {} {
    global filehighlight fhighlights commitrow curview mainfont iddrawn
2095 2096
    global fhl_list

2097 2098 2099 2100 2101
    if {![info exists filehighlight]} {
	return 0
    }
    set nr 0
    while {[incr nr] <= 100 && [gets $filehighlight line] >= 0} {
2102 2103 2104 2105 2106 2107 2108 2109
	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
	    }
2110
	}
2111 2112 2113 2114 2115 2116 2117 2118
	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]} {
	    bolden $row [concat $mainfont bold]
	}
	set fhighlights($row) 1
2119
    }
2120 2121
    if {[eof $filehighlight]} {
	# strange...
2122
	puts "oops, git diff-tree died"
2123 2124
	catch {close $filehighlight}
	unset filehighlight
2125
	return 0
2126
    }
2127
    next_hlcont
2128
    return 1
2129 2130
}

2131
proc find_change {name ix op} {
2132
    global nhighlights mainfont boldnamerows
2133
    global findstring findpattern findtype
2134 2135

    # delete previous highlights, if any
2136 2137
    foreach row $boldnamerows {
	bolden_name $row $mainfont
2138
    }
2139 2140 2141
    set boldnamerows {}
    catch {unset nhighlights}
    unbolden
2142 2143 2144 2145
    if {$findtype ne "Regexp"} {
	set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
		   $findstring]
	set findpattern "*$e*"
2146 2147 2148 2149
    }
    drawvisible
}

2150 2151 2152
proc askfindhighlight {row id} {
    global nhighlights commitinfo iddrawn mainfont
    global findstring findtype findloc findpattern
2153 2154 2155 2156

    if {![info exists commitinfo($id)]} {
	getcommit $id
    }
2157
    set info $commitinfo($id)
2158
    set isbold 0
2159 2160 2161 2162
    set fldtypes {Headline Author Date Committer CDate Comments}
    foreach f $info ty $fldtypes {
	if {$findloc ne "All fields" && $findloc ne $ty} {
	    continue
2163
	}
2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176
	if {$findtype eq "Regexp"} {
	    set doesmatch [regexp $findstring $f]
	} elseif {$findtype eq "IgnCase"} {
	    set doesmatch [string match -nocase $findpattern $f]
	} else {
	    set doesmatch [string match $findpattern $f]
	}
	if {$doesmatch} {
	    if {$ty eq "Author"} {
		set isbold 2
	    } else {
		set isbold 1
	    }
2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187
	}
    }
    if {[info exists iddrawn($id)]} {
	if {$isbold && ![ishighlighted $row]} {
	    bolden $row [concat $mainfont bold]
	}
	if {$isbold >= 2} {
	    bolden_name $row [concat $mainfont bold]
	}
    }
    set nhighlights($row) $isbold
2188 2189
}

2190 2191 2192 2193 2194
proc vrel_change {name ix op} {
    global highlight_related

    rhighlight_none
    if {$highlight_related ne "None"} {
2195
	run drawvisible
2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209
    }
}

# 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]
    if {$highlight_related ne "None"} {
	rhighlight_none
2210
	run drawvisible
2211 2212 2213 2214 2215 2216
    }
}

proc rhighlight_none {} {
    global rhighlights

2217 2218
    catch {unset rhighlights}
    unbolden
2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315
}

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} {
    global descendent highlight_related iddrawn mainfont rhighlights
    global selectedline ancestor

    if {![info exists selectedline]} return
    set isbold 0
    if {$highlight_related eq "Descendent" ||
	$highlight_related eq "Not descendent"} {
	if {![info exists descendent($id)]} {
	    is_descendent $id
	}
	if {$descendent($id) == ($highlight_related eq "Descendent")} {
	    set isbold 1
	}
    } elseif {$highlight_related eq "Ancestor" ||
	      $highlight_related eq "Not ancestor"} {
	if {![info exists ancestor($id)]} {
	    is_ancestor $id
	}
	if {$ancestor($id) == ($highlight_related eq "Ancestor")} {
	    set isbold 1
	}
    }
    if {[info exists iddrawn($id)]} {
	if {$isbold && ![ishighlighted $row]} {
	    bolden $row [concat $mainfont bold]
	}
    }
    set rhighlights($row) $isbold
}

2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390
proc next_hlcont {} {
    global fhl_row fhl_dirn displayorder numcommits
    global vhighlights fhighlights nhighlights rhighlights
    global hlview filehighlight findstring highlight_related

    if {![info exists fhl_dirn] || $fhl_dirn == 0} return
    set row $fhl_row
    while {1} {
	if {$row < 0 || $row >= $numcommits} {
	    bell
	    set fhl_dirn 0
	    return
	}
	set id [lindex $displayorder $row]
	if {[info exists hlview]} {
	    if {![info exists vhighlights($row)]} {
		askvhighlight $row $id
	    }
	    if {$vhighlights($row) > 0} break
	}
	if {$findstring ne {}} {
	    if {![info exists nhighlights($row)]} {
		askfindhighlight $row $id
	    }
	    if {$nhighlights($row) > 0} break
	}
	if {$highlight_related ne "None"} {
	    if {![info exists rhighlights($row)]} {
		askrelhighlight $row $id
	    }
	    if {$rhighlights($row) > 0} break
	}
	if {[info exists filehighlight]} {
	    if {![info exists fhighlights($row)]} {
		# ask for a few more while we're at it...
		set r $row
		for {set n 0} {$n < 100} {incr n} {
		    if {![info exists fhighlights($r)]} {
			askfilehighlight $r [lindex $displayorder $r]
		    }
		    incr r $fhl_dirn
		    if {$r < 0 || $r >= $numcommits} break
		}
		flushhighlights
	    }
	    if {$fhighlights($row) < 0} {
		set fhl_row $row
		return
	    }
	    if {$fhighlights($row) > 0} break
	}
	incr row $fhl_dirn
    }
    set fhl_dirn 0
    selectline $row 1
}

proc next_highlight {dirn} {
    global selectedline fhl_row fhl_dirn
    global hlview filehighlight findstring highlight_related

    if {![info exists selectedline]} return
    if {!([info exists hlview] || $findstring ne {} ||
	  $highlight_related ne "None" || [info exists filehighlight])} return
    set fhl_row [expr {$selectedline + $dirn}]
    set fhl_dirn $dirn
    next_hlcont
}

proc cancel_next_highlight {} {
    global fhl_dirn

    set fhl_dirn 0
}

2391 2392
# Graph layout functions

P
Paul Mackerras 已提交
2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427
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 incrange {l x o} {
    set n [llength $l]
    while {$x < $n} {
	set e [lindex $l $x]
	if {$e ne {}} {
	    lset l $x [expr {$e + $o}]
	}
	incr x
    }
    return $l
}

proc ntimes {n o} {
    set ret {}
    for {} {$n > 0} {incr n -1} {
	lappend ret $o
    }
    return $ret
}

proc usedinrange {id l1 l2} {
2428
    global children commitrow curview
P
Paul Mackerras 已提交
2429

2430 2431
    if {[info exists commitrow($curview,$id)]} {
	set r $commitrow($curview,$id)
P
Paul Mackerras 已提交
2432 2433 2434 2435
	if {$l1 <= $r && $r <= $l2} {
	    return [expr {$r - $l1 + 1}]
	}
    }
2436
    set kids $children($curview,$id)
2437
    foreach c $kids {
2438
	set r $commitrow($curview,$c)
2439 2440
	if {$l1 <= $r && $r <= $l2} {
	    return [expr {$r - $l1 + 1}]
P
Paul Mackerras 已提交
2441 2442 2443 2444 2445 2446 2447 2448 2449
	}
    }
    return 0
}

proc sanity {row {full 0}} {
    global rowidlist rowoffsets

    set col -1
2450
    set ids [lindex $rowidlist $row]
P
Paul Mackerras 已提交
2451 2452 2453 2454 2455
    foreach id $ids {
	incr col
	if {$id eq {}} continue
	if {$col < [llength $ids] - 1 &&
	    [lsearch -exact -start [expr {$col+1}] $ids $id] >= 0} {
2456
	    puts "oops: [shortids $id] repeated in row $row col $col: {[shortids [lindex $rowidlist $row]]}"
P
Paul Mackerras 已提交
2457
	}
2458
	set o [lindex $rowoffsets $row $col]
P
Paul Mackerras 已提交
2459 2460 2461 2462 2463
	set y $row
	set x $col
	while {$o ne {}} {
	    incr y -1
	    incr x $o
2464
	    if {[lindex $rowidlist $y $x] != $id} {
P
Paul Mackerras 已提交
2465 2466 2467
		puts "oops: rowoffsets wrong at row [expr {$y+1}] col [expr {$x-$o}]"
		puts "  id=[shortids $id] check started at row $row"
		for {set i $row} {$i >= $y} {incr i -1} {
2468
		    puts "  row $i ids={[shortids [lindex $rowidlist $i]]} offs={[lindex $rowoffsets $i]}"
P
Paul Mackerras 已提交
2469 2470 2471 2472
		}
		break
	    }
	    if {!$full} break
2473
	    set o [lindex $rowoffsets $y $x]
P
Paul Mackerras 已提交
2474 2475 2476 2477 2478
	}
    }
}

proc makeuparrow {oid x y z} {
2479
    global rowidlist rowoffsets uparrowlen idrowranges displayorder
P
Paul Mackerras 已提交
2480 2481 2482 2483

    for {set i 1} {$i < $uparrowlen && $y > 1} {incr i} {
	incr y -1
	incr x $z
2484
	set off0 [lindex $rowoffsets $y]
P
Paul Mackerras 已提交
2485 2486
	for {set x0 $x} {1} {incr x0} {
	    if {$x0 >= [llength $off0]} {
2487
		set x0 [llength [lindex $rowoffsets [expr {$y-1}]]]
P
Paul Mackerras 已提交
2488 2489 2490 2491 2492 2493 2494 2495 2496
		break
	    }
	    set z [lindex $off0 $x0]
	    if {$z ne {}} {
		incr x0 $z
		break
	    }
	}
	set z [expr {$x0 - $x}]
2497 2498
	lset rowidlist $y [linsert [lindex $rowidlist $y] $x $oid]
	lset rowoffsets $y [linsert [lindex $rowoffsets $y] $x $z]
P
Paul Mackerras 已提交
2499
    }
2500 2501
    set tmp [lreplace [lindex $rowoffsets $y] $x $x {}]
    lset rowoffsets $y [incrange $tmp [expr {$x+1}] -1]
2502
    lappend idrowranges($oid) [lindex $displayorder $y]
P
Paul Mackerras 已提交
2503 2504 2505
}

proc initlayout {} {
2506
    global rowidlist rowoffsets displayorder commitlisted
P
Paul Mackerras 已提交
2507
    global rowlaidout rowoptim
P
Paul Mackerras 已提交
2508
    global idinlist rowchk rowrangelist idrowranges
2509
    global numcommits canvxmax canv
2510
    global nextcolor
2511
    global parentlist
2512
    global colormap rowtextx
2513
    global selectfirst
P
Paul Mackerras 已提交
2514

2515 2516
    set numcommits 0
    set displayorder {}
2517 2518
    set commitlisted {}
    set parentlist {}
2519
    set rowrangelist {}
2520 2521 2522
    set nextcolor 0
    set rowidlist {{}}
    set rowoffsets {{}}
P
Paul Mackerras 已提交
2523 2524 2525 2526
    catch {unset idinlist}
    catch {unset rowchk}
    set rowlaidout 0
    set rowoptim 0
2527
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
2528 2529 2530
    catch {unset colormap}
    catch {unset rowtextx}
    catch {unset idrowranges}
2531
    set selectfirst 1
2532 2533 2534 2535 2536 2537 2538 2539 2540
}

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 已提交
2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561
}

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

2562
proc layoutmore {tmax allread} {
P
Paul Mackerras 已提交
2563
    global rowlaidout rowoptim commitidx numcommits optim_delay
2564
    global uparrowlen curview rowidlist idinlist
P
Paul Mackerras 已提交
2565

2566
    set showlast 0
2567 2568
    set showdelay $optim_delay
    set optdelay [expr {$uparrowlen + 1}]
2569
    while {1} {
2570
	if {$rowoptim - $showdelay > $numcommits} {
2571
	    showstuff [expr {$rowoptim - $showdelay}] $showlast
2572 2573
	} elseif {$rowlaidout - $optdelay > $rowoptim} {
	    set nr [expr {$rowlaidout - $optdelay - $rowoptim}]
2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586
	    if {$nr > 100} {
		set nr 100
	    }
	    optimize_rows $rowoptim 0 [expr {$rowoptim + $nr}]
	    incr rowoptim $nr
	} elseif {$commitidx($curview) > $rowlaidout} {
	    set nr [expr {$commitidx($curview) - $rowlaidout}]
	    # may need to increase this threshold if uparrowlen or
	    # mingaplen are increased...
	    if {$nr > 150} {
		set nr 150
	    }
	    set row $rowlaidout
2587
	    set rowlaidout [layoutrows $row [expr {$row + $nr}] $allread]
2588 2589 2590
	    if {$rowlaidout == $row} {
		return 0
	    }
2591 2592 2593 2594 2595 2596 2597 2598 2599
	} elseif {$allread} {
	    set optdelay 0
	    set nrows $commitidx($curview)
	    if {[lindex $rowidlist $nrows] ne {} ||
		[array names idinlist] ne {}} {
		layouttail
		set rowlaidout $commitidx($curview)
	    } elseif {$rowoptim == $nrows} {
		set showdelay 0
2600
		set showlast 1
2601 2602 2603 2604
		if {$numcommits == $nrows} {
		    return 0
		}
	    }
2605 2606 2607 2608 2609 2610
	} else {
	    return 0
	}
	if {$tmax ne {} && [clock clicks -milliseconds] >= $tmax} {
	    return 1
	}
P
Paul Mackerras 已提交
2611 2612 2613
    }
}

2614
proc showstuff {canshow last} {
2615
    global numcommits commitrow pending_select selectedline curview
2616
    global lookingforhead mainheadid displayorder nullid selectfirst
P
Paul Mackerras 已提交
2617

2618 2619 2620 2621 2622
    if {$numcommits == 0} {
	global phase
	set phase "incrdraw"
	allcanvs delete all
    }
2623
    set r0 $numcommits
P
Paul Mackerras 已提交
2624
    set numcommits $canshow
2625
    setcanvscroll
P
Paul Mackerras 已提交
2626 2627
    set rows [visiblerows]
    set r1 [lindex $rows 1]
2628 2629
    if {$r1 >= $canshow} {
	set r1 [expr {$canshow - 1}]
P
Paul Mackerras 已提交
2630
    }
2631 2632
    if {$r0 <= $r1} {
	drawcommits $r0 $r1
P
Paul Mackerras 已提交
2633
    }
2634
    if {[info exists pending_select] &&
2635 2636 2637
	[info exists commitrow($curview,$pending_select)] &&
	$commitrow($curview,$pending_select) < $numcommits} {
	selectline $commitrow($curview,$pending_select) 1
2638
    }
2639 2640 2641 2642
    if {$selectfirst} {
	if {[info exists selectedline] || [info exists pending_select]} {
	    set selectfirst 0
	} else {
2643 2644
	    set l [expr {[lindex $displayorder 0] eq $nullid}]
	    selectline $l 1
2645 2646
	    set selectfirst 0
	}
2647
    }
2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710
    if {$lookingforhead && [info exists commitrow($curview,$mainheadid)]
	&& ($last || $commitrow($curview,$mainheadid) < $numcommits - 1)} {
	set lookingforhead 0
	dodiffindex
    }
}

proc doshowlocalchanges {} {
    global lookingforhead curview mainheadid phase commitrow

    if {[info exists commitrow($curview,$mainheadid)] &&
	($phase eq {} || $commitrow($curview,$mainheadid) < $numcommits - 1)} {
	dodiffindex
    } elseif {$phase ne {}} {
	set lookingforhead 1
    }
}

proc dohidelocalchanges {} {
    global lookingforhead localrow lserial

    set lookingforhead 0
    if {$localrow >= 0} {
	removerow $localrow
	set localrow -1
    }
    incr lserial
}

# spawn off a process to do git diff-index HEAD
proc dodiffindex {} {
    global localrow lserial

    incr lserial
    set localrow -1
    set fd [open "|git diff-index HEAD" r]
    fconfigure $fd -blocking 0
    filerun $fd [list readdiffindex $fd $lserial]
}

proc readdiffindex {fd serial} {
    global localrow commitrow mainheadid nullid curview
    global commitinfo commitdata lserial

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

    if {$serial == $lserial && $localrow == -1} {
	# add the line for the local diff to the graph
	set localrow $commitrow($curview,$mainheadid)
	set hl "Local uncommitted changes"
	set commitinfo($nullid) [list  $hl {} {} {} {} "    $hl\n"]
	set commitdata($nullid) "\n    $hl\n"
	insertrow $localrow $nullid
    }
    return 0
P
Paul Mackerras 已提交
2711 2712 2713 2714 2715
}

proc layoutrows {row endrow last} {
    global rowidlist rowoffsets displayorder
    global uparrowlen downarrowlen maxwidth mingaplen
2716
    global children parentlist
2717
    global idrowranges
2718
    global commitidx curview
P
Paul Mackerras 已提交
2719
    global idinlist rowchk rowrangelist
P
Paul Mackerras 已提交
2720

2721 2722
    set idlist [lindex $rowidlist $row]
    set offs [lindex $rowoffsets $row]
P
Paul Mackerras 已提交
2723 2724 2725 2726
    while {$row < $endrow} {
	set id [lindex $displayorder $row]
	set oldolds {}
	set newolds {}
2727
	foreach p [lindex $parentlist $row] {
P
Paul Mackerras 已提交
2728 2729 2730 2731 2732 2733 2734 2735 2736
	    if {![info exists idinlist($p)]} {
		lappend newolds $p
	    } elseif {!$idinlist($p)} {
		lappend oldolds $p
	    }
	}
	set nev [expr {[llength $idlist] + [llength $newolds]
		       + [llength $oldolds] - $maxwidth + 1}]
	if {$nev > 0} {
2737 2738
	    if {!$last &&
		$row + $uparrowlen + $mingaplen >= $commitidx($curview)} break
P
Paul Mackerras 已提交
2739 2740 2741 2742 2743 2744 2745 2746 2747 2748
	    for {set x [llength $idlist]} {[incr x -1] >= 0} {} {
		set i [lindex $idlist $x]
		if {![info exists rowchk($i)] || $row >= $rowchk($i)} {
		    set r [usedinrange $i [expr {$row - $downarrowlen}] \
			       [expr {$row + $uparrowlen + $mingaplen}]]
		    if {$r == 0} {
			set idlist [lreplace $idlist $x $x]
			set offs [lreplace $offs $x $x]
			set offs [incrange $offs $x 1]
			set idinlist($i) 0
2749
			set rm1 [expr {$row - 1}]
2750
			lappend idrowranges($i) [lindex $displayorder $rm1]
P
Paul Mackerras 已提交
2751 2752 2753 2754 2755 2756
			if {[incr nev -1] <= 0} break
			continue
		    }
		    set rowchk($id) [expr {$row + $r}]
		}
	    }
2757 2758
	    lset rowidlist $row $idlist
	    lset rowoffsets $row $offs
P
Paul Mackerras 已提交
2759 2760 2761 2762 2763
	}
	set col [lsearch -exact $idlist $id]
	if {$col < 0} {
	    set col [llength $idlist]
	    lappend idlist $id
2764
	    lset rowidlist $row $idlist
P
Paul Mackerras 已提交
2765
	    set z {}
2766
	    if {$children($curview,$id) ne {}} {
2767
		set z [expr {[llength [lindex $rowidlist [expr {$row-1}]]] - $col}]
P
Paul Mackerras 已提交
2768 2769 2770
		unset idinlist($id)
	    }
	    lappend offs $z
2771
	    lset rowoffsets $row $offs
P
Paul Mackerras 已提交
2772 2773 2774 2775 2776 2777
	    if {$z ne {}} {
		makeuparrow $id $col $row $z
	    }
	} else {
	    unset idinlist($id)
	}
2778
	set ranges {}
P
Paul Mackerras 已提交
2779
	if {[info exists idrowranges($id)]} {
2780
	    set ranges $idrowranges($id)
2781
	    lappend ranges $id
2782
	    unset idrowranges($id)
P
Paul Mackerras 已提交
2783
	}
2784
	lappend rowrangelist $ranges
P
Paul Mackerras 已提交
2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805
	incr row
	set offs [ntimes [llength $idlist] 0]
	set l [llength $newolds]
	set idlist [eval lreplace \$idlist $col $col $newolds]
	set o 0
	if {$l != 1} {
	    set offs [lrange $offs 0 [expr {$col - 1}]]
	    foreach x $newolds {
		lappend offs {}
		incr o -1
	    }
	    incr o
	    set tmp [expr {[llength $idlist] - [llength $offs]}]
	    if {$tmp > 0} {
		set offs [concat $offs [ntimes $tmp $o]]
	    }
	} else {
	    lset offs $col {}
	}
	foreach i $newolds {
	    set idinlist($i) 1
2806
	    set idrowranges($i) $id
P
Paul Mackerras 已提交
2807 2808 2809 2810 2811 2812 2813 2814 2815
	}
	incr col $l
	foreach oid $oldolds {
	    set idinlist($oid) 1
	    set idlist [linsert $idlist $col $oid]
	    set offs [linsert $offs $col $o]
	    makeuparrow $oid $col $row $o
	    incr col
	}
2816 2817
	lappend rowidlist $idlist
	lappend rowoffsets $offs
P
Paul Mackerras 已提交
2818 2819 2820 2821 2822
    }
    return $row
}

proc addextraid {id row} {
2823
    global displayorder commitrow commitinfo
2824
    global commitidx commitlisted
2825
    global parentlist children curview
P
Paul Mackerras 已提交
2826

2827
    incr commitidx($curview)
P
Paul Mackerras 已提交
2828
    lappend displayorder $id
2829
    lappend commitlisted 0
2830
    lappend parentlist {}
2831
    set commitrow($curview,$id) $row
P
Paul Mackerras 已提交
2832 2833 2834
    readcommit $id
    if {![info exists commitinfo($id)]} {
	set commitinfo($id) {"No commit information available"}
2835
    }
2836 2837
    if {![info exists children($curview,$id)]} {
	set children($curview,$id) {}
P
Paul Mackerras 已提交
2838 2839 2840 2841
    }
}

proc layouttail {} {
2842
    global rowidlist rowoffsets idinlist commitidx curview
P
Paul Mackerras 已提交
2843
    global idrowranges rowrangelist
P
Paul Mackerras 已提交
2844

2845
    set row $commitidx($curview)
2846
    set idlist [lindex $rowidlist $row]
P
Paul Mackerras 已提交
2847 2848 2849 2850 2851 2852
    while {$idlist ne {}} {
	set col [expr {[llength $idlist] - 1}]
	set id [lindex $idlist $col]
	addextraid $id $row
	unset idinlist($id)
	lappend idrowranges($id) $row
P
Paul Mackerras 已提交
2853
	lappend rowrangelist $idrowranges($id)
2854
	unset idrowranges($id)
P
Paul Mackerras 已提交
2855 2856 2857
	incr row
	set offs [ntimes $col 0]
	set idlist [lreplace $idlist $col $col]
2858 2859
	lappend rowidlist $idlist
	lappend rowoffsets $offs
P
Paul Mackerras 已提交
2860 2861 2862
    }

    foreach id [array names idinlist] {
2863
	unset idinlist($id)
P
Paul Mackerras 已提交
2864
	addextraid $id $row
2865 2866
	lset rowidlist $row [list $id]
	lset rowoffsets $row 0
P
Paul Mackerras 已提交
2867 2868
	makeuparrow $id 0 $row 0
	lappend idrowranges($id) $row
P
Paul Mackerras 已提交
2869
	lappend rowrangelist $idrowranges($id)
2870
	unset idrowranges($id)
P
Paul Mackerras 已提交
2871
	incr row
2872 2873
	lappend rowidlist {}
	lappend rowoffsets {}
P
Paul Mackerras 已提交
2874 2875 2876 2877 2878 2879 2880
    }
}

proc insert_pad {row col npad} {
    global rowidlist rowoffsets

    set pad [ntimes $npad {}]
2881 2882 2883
    lset rowidlist $row [eval linsert [list [lindex $rowidlist $row]] $col $pad]
    set tmp [eval linsert [list [lindex $rowoffsets $row]] $col $pad]
    lset rowoffsets $row [incrange $tmp [expr {$col + $npad}] [expr {-$npad}]]
P
Paul Mackerras 已提交
2884 2885 2886
}

proc optimize_rows {row col endrow} {
2887
    global rowidlist rowoffsets displayorder
P
Paul Mackerras 已提交
2888 2889

    for {} {$row < $endrow} {incr row} {
2890 2891
	set idlist [lindex $rowidlist $row]
	set offs [lindex $rowoffsets $row]
P
Paul Mackerras 已提交
2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902
	set haspad 0
	for {} {$col < [llength $offs]} {incr col} {
	    if {[lindex $idlist $col] eq {}} {
		set haspad 1
		continue
	    }
	    set z [lindex $offs $col]
	    if {$z eq {}} continue
	    set isarrow 0
	    set x0 [expr {$col + $z}]
	    set y0 [expr {$row - 1}]
2903
	    set z0 [lindex $rowoffsets $y0 $x0]
P
Paul Mackerras 已提交
2904 2905
	    if {$z0 eq {}} {
		set id [lindex $idlist $col]
2906 2907
		set ranges [rowranges $id]
		if {$ranges ne {} && $y0 > [lindex $ranges 0]} {
P
Paul Mackerras 已提交
2908 2909 2910
		    set isarrow 1
		}
	    }
2911 2912 2913 2914
	    # 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 已提交
2915
	    if {$z < -1 || ($z < 0 && $isarrow)} {
2916 2917
		# Line currently goes left too much;
		# insert pads in the previous row, then optimize it
P
Paul Mackerras 已提交
2918 2919 2920 2921 2922 2923 2924 2925
		set npad [expr {-1 - $z + $isarrow}]
		set offs [incrange $offs $col $npad]
		insert_pad $y0 $x0 $npad
		if {$y0 > 0} {
		    optimize_rows $y0 $x0 $row
		}
		set z [lindex $offs $col]
		set x0 [expr {$col + $z}]
2926
		set z0 [lindex $rowoffsets $y0 $x0]
P
Paul Mackerras 已提交
2927
	    } elseif {$z > 1 || ($z > 0 && $isarrow)} {
2928 2929
		# Line currently goes right too much;
		# insert pads in this line and adjust the next's rowoffsets
P
Paul Mackerras 已提交
2930 2931
		set npad [expr {$z - 1 + $isarrow}]
		set y1 [expr {$row + 1}]
2932
		set offs2 [lindex $rowoffsets $y1]
P
Paul Mackerras 已提交
2933 2934 2935 2936 2937 2938 2939
		set x1 -1
		foreach z $offs2 {
		    incr x1
		    if {$z eq {} || $x1 + $z < $col} continue
		    if {$x1 + $z > $col} {
			incr npad
		    }
2940
		    lset rowoffsets $y1 [incrange $offs2 $x1 $npad]
P
Paul Mackerras 已提交
2941 2942 2943 2944 2945 2946 2947 2948 2949 2950
		    break
		}
		set pad [ntimes $npad {}]
		set idlist [eval linsert \$idlist $col $pad]
		set tmp [eval linsert \$offs $col $pad]
		incr col $npad
		set offs [incrange $tmp $col [expr {-$npad}]]
		set z [lindex $offs $col]
		set haspad 1
	    }
2951 2952 2953 2954 2955 2956 2957 2958 2959
	    if {$z0 eq {} && !$isarrow} {
		# this line links to its first child on row $row-2
		set rm2 [expr {$row - 2}]
		set id [lindex $displayorder $rm2]
		set xc [lsearch -exact [lindex $rowidlist $rm2] $id]
		if {$xc >= 0} {
		    set z0 [expr {$xc - $x0}]
		}
	    }
2960
	    # avoid lines jigging left then immediately right
P
Paul Mackerras 已提交
2961 2962 2963 2964 2965 2966 2967
	    if {$z0 ne {} && $z < 0 && $z0 > 0} {
		insert_pad $y0 $x0 1
		set offs [incrange $offs $col 1]
		optimize_rows $y0 [expr {$x0 + 1}] $row
	    }
	}
	if {!$haspad} {
2968
	    set o {}
2969
	    # Find the first column that doesn't have a line going right
P
Paul Mackerras 已提交
2970 2971
	    for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
		set o [lindex $offs $col]
2972 2973 2974
		if {$o eq {}} {
		    # check if this is the link to the first child
		    set id [lindex $idlist $col]
2975 2976
		    set ranges [rowranges $id]
		    if {$ranges ne {} && $row == [lindex $ranges 0]} {
2977 2978 2979 2980 2981 2982 2983 2984 2985
			# it is, work out offset to child
			set y0 [expr {$row - 1}]
			set id [lindex $displayorder $y0]
			set x0 [lsearch -exact [lindex $rowidlist $y0] $id]
			if {$x0 >= 0} {
			    set o [expr {$x0 - $col}]
			}
		    }
		}
P
Paul Mackerras 已提交
2986 2987
		if {$o eq {} || $o <= 0} break
	    }
2988 2989
	    # Insert a pad at that column as long as it has a line and
	    # isn't the last column, and adjust the next row' offsets
2990
	    if {$o ne {} && [incr col] < [llength $idlist]} {
P
Paul Mackerras 已提交
2991
		set y1 [expr {$row + 1}]
2992
		set offs2 [lindex $rowoffsets $y1]
P
Paul Mackerras 已提交
2993 2994 2995 2996
		set x1 -1
		foreach z $offs2 {
		    incr x1
		    if {$z eq {} || $x1 + $z < $col} continue
2997
		    lset rowoffsets $y1 [incrange $offs2 $x1 1]
P
Paul Mackerras 已提交
2998 2999 3000 3001 3002 3003 3004 3005
		    break
		}
		set idlist [linsert $idlist $col {}]
		set tmp [linsert $offs $col {}]
		incr col
		set offs [incrange $tmp $col -1]
	    }
	}
3006 3007
	lset rowidlist $row $idlist
	lset rowoffsets $row $offs
P
Paul Mackerras 已提交
3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021
	set col 0
    }
}

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

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

3022 3023 3024 3025 3026 3027 3028 3029 3030 3031
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 已提交
3032
proc rowranges {id} {
3033
    global phase idrowranges commitrow rowlaidout rowrangelist curview
P
Paul Mackerras 已提交
3034 3035

    set ranges {}
3036
    if {$phase eq {} ||
3037 3038 3039
	([info exists commitrow($curview,$id)]
	 && $commitrow($curview,$id) < $rowlaidout)} {
	set ranges [lindex $rowrangelist $commitrow($curview,$id)]
P
Paul Mackerras 已提交
3040 3041 3042
    } elseif {[info exists idrowranges($id)]} {
	set ranges $idrowranges($id)
    }
3043 3044 3045 3046 3047 3048 3049 3050
    set linenos {}
    foreach rid $ranges {
	lappend linenos $commitrow($curview,$rid)
    }
    if {$linenos ne {}} {
	lset linenos 0 [expr {[lindex $linenos 0] + 1}]
    }
    return $linenos
P
Paul Mackerras 已提交
3051 3052
}

3053 3054 3055
# work around tk8.4 refusal to draw arrows on diagonal segments
proc adjarrowhigh {coords} {
    global linespc
P
Paul Mackerras 已提交
3056

3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070
    set x0 [lindex $coords 0]
    set x1 [lindex $coords 2]
    if {$x0 != $x1} {
	set y0 [lindex $coords 1]
	set y1 [lindex $coords 3]
	if {$y0 - $y1 <= 2 * $linespc && $x1 == [lindex $coords 4]} {
	    # we have a nearby vertical segment, just trim off the diag bit
	    set coords [lrange $coords 2 end]
	} else {
	    set slope [expr {($x0 - $x1) / ($y0 - $y1)}]
	    set xi [expr {$x0 - $slope * $linespc / 2}]
	    set yi [expr {$y0 - $linespc / 2}]
	    set coords [lreplace $coords 0 1 $xi $y0 $xi $yi]
	}
P
Paul Mackerras 已提交
3071
    }
3072 3073 3074 3075 3076 3077 3078 3079 3080 3081
    return $coords
}

proc drawlineseg {id row endrow arrowlow} {
    global rowidlist displayorder iddrawn linesegs
    global canv colormap linespc curview maxlinelen

    set cols [list [lsearch -exact [lindex $rowidlist $row] $id]]
    set le [expr {$row + 1}]
    set arrowhigh 1
P
Paul Mackerras 已提交
3082
    while {1} {
3083 3084 3085 3086 3087 3088 3089 3090 3091 3092
	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 已提交
3093
	}
3094 3095 3096 3097 3098 3099 3100 3101 3102
	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 已提交
3103
    }
3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179
    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"}]
    } elseif {$arrowlow &&
	      [lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0} {
	set arrowlow 0
    }
    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"
	    } else {
		if {$xc < $x - 1} {
		    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
3180
	    }
3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193
	    lappend coords [xc $row $x] [yc $row]
	} else {
	    set xn [xc $row $xp]
	    set yn [yc $row]
	    # work around tk8.4 refusal to draw arrows on diagonal segments
	    if {$arrowlow && $xn != [lindex $coords end-1]} {
		if {[llength $coords] < 4 ||
		    [lindex $coords end-3] != [lindex $coords end-1] ||
		    [lindex $coords end] - $yn > 2 * $linespc} {
		    set xn [xc $row [expr {$xp - 0.5 * $dir}]]
		    set yo [yc [expr {$row + 0.5}]]
		    lappend coords $xn $yo $xn $yn
		}
3194
	    } else {
3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226
		lappend coords $xn $yn
	    }
	}
	if {!$joinhigh} {
	    if {$arrowhigh} {
		set coords [adjarrowhigh $coords]
	    }
	    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
	    if {$arrowhigh} {
		set coords [adjarrowhigh $coords]
3227
	    }
3228 3229 3230 3231 3232 3233 3234 3235 3236 3237
	} 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
3238 3239
	}
    }
3240 3241 3242

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

3245 3246 3247
proc drawparentlinks {id row} {
    global rowidlist canv colormap curview parentlist
    global idpos
P
Paul Mackerras 已提交
3248

3249 3250 3251 3252
    set rowids [lindex $rowidlist $row]
    set col [lsearch -exact $rowids $id]
    if {$col < 0} return
    set olds [lindex $parentlist $row]
P
Paul Mackerras 已提交
3253 3254 3255 3256
    set row2 [expr {$row + 1}]
    set x [xc $row $col]
    set y [yc $row]
    set y2 [yc $row2]
3257
    set ids [lindex $rowidlist $row2]
P
Paul Mackerras 已提交
3258 3259 3260
    # rmx = right-most X coord used
    set rmx 0
    foreach p $olds {
3261 3262 3263 3264 3265 3266 3267 3268 3269
	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
	}
3270
	if {[lsearch -exact $rowids $p] < 0} {
3271 3272 3273
	    # drawlineseg will do this one for us
	    continue
	}
P
Paul Mackerras 已提交
3274 3275 3276 3277 3278 3279 3280 3281 3282
	assigncolor $p
	# should handle duplicated parents here...
	set coords [list $x $y]
	if {$i < $col - 1} {
	    lappend coords [xc $row [expr {$i + 1}]] $y
	} elseif {$i > $col + 1} {
	    lappend coords [xc $row [expr {$i - 1}]] $y
	}
	lappend coords $x2 $y2
3283
	set t [$canv create line $coords -width [linewidth $p] \
P
Paul Mackerras 已提交
3284 3285 3286 3287
		   -fill $colormap($p) -tags lines.$p]
	$canv lower $t
	bindline $t $p
    }
3288 3289 3290 3291
    if {$rmx > [lindex $idpos($id) 1]} {
	lset idpos($id) 1 $rmx
	redrawtags $id
    }
P
Paul Mackerras 已提交
3292 3293
}

3294
proc drawlines {id} {
3295
    global canv
P
Paul Mackerras 已提交
3296

3297
    $canv itemconf lines.$id -width [linewidth $id]
P
Paul Mackerras 已提交
3298 3299
}

3300
proc drawcmittext {id row col} {
3301
    global linespc canv canv2 canv3 canvy0 fgcolor
3302
    global commitlisted commitinfo rowidlist parentlist
P
Paul Mackerras 已提交
3303 3304
    global rowtextx idpos idtags idheads idotherrefs
    global linehtag linentag linedtag
3305
    global mainfont canvxmax boldrows boldnamerows fgcolor nullid
P
Paul Mackerras 已提交
3306

3307 3308 3309 3310 3311
    if {$id eq $nullid} {
	set ofill red
    } else {
	set ofill [expr {[lindex $commitlisted $row]? "blue": "white"}]
    }
P
Paul Mackerras 已提交
3312 3313 3314 3315 3316
    set x [xc $row $col]
    set y [yc $row]
    set orad [expr {$linespc / 3}]
    set t [$canv create oval [expr {$x - $orad}] [expr {$y - $orad}] \
	       [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
3317
	       -fill $ofill -outline $fgcolor -width 1 -tags circle]
P
Paul Mackerras 已提交
3318 3319
    $canv raise $t
    $canv bind $t <1> {selcanvline {} %x %y}
3320 3321 3322 3323 3324 3325 3326 3327 3328 3329
    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 已提交
3330
    }
3331
    set xt [xc $row $rmx]
P
Paul Mackerras 已提交
3332 3333 3334 3335 3336 3337 3338 3339 3340 3341
    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]
3342
    set font $mainfont
3343 3344 3345
    set nfont $mainfont
    set isbold [ishighlighted $row]
    if {$isbold > 0} {
3346
	lappend boldrows $row
3347
	lappend font bold
3348
	if {$isbold > 1} {
3349
	    lappend boldnamerows $row
3350 3351
	    lappend nfont bold
	}
3352
    }
3353 3354
    set linehtag($row) [$canv create text $xt $y -anchor w -fill $fgcolor \
			    -text $headline -font $font -tags text]
P
Paul Mackerras 已提交
3355
    $canv bind $linehtag($row) <Button-3> "rowmenu %X %Y $id"
3356 3357 3358 3359
    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 \
			    -text $date -font $mainfont -tags text]
3360 3361 3362 3363 3364
    set xr [expr {$xt + [font measure $mainfont $headline]}]
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
P
Paul Mackerras 已提交
3365 3366 3367
}

proc drawcmitrow {row} {
3368
    global displayorder rowidlist
3369
    global iddrawn
3370
    global commitinfo parentlist numcommits
3371
    global filehighlight fhighlights findstring nhighlights
3372
    global hlview vhighlights
3373
    global highlight_related rhighlights
P
Paul Mackerras 已提交
3374

3375
    if {$row >= $numcommits} return
P
Paul Mackerras 已提交
3376 3377

    set id [lindex $displayorder $row]
3378 3379 3380 3381 3382 3383
    if {[info exists hlview] && ![info exists vhighlights($row)]} {
	askvhighlight $row $id
    }
    if {[info exists filehighlight] && ![info exists fhighlights($row)]} {
	askfilehighlight $row $id
    }
3384 3385
    if {$findstring ne {} && ![info exists nhighlights($row)]} {
	askfindhighlight $row $id
3386
    }
3387 3388 3389
    if {$highlight_related ne "None" && ![info exists rhighlights($row)]} {
	askrelhighlight $row $id
    }
P
Paul Mackerras 已提交
3390
    if {[info exists iddrawn($id)]} return
3391
    set col [lsearch -exact [lindex $rowidlist $row] $id]
P
Paul Mackerras 已提交
3392 3393 3394 3395 3396
    if {$col < 0} {
	puts "oops, row $row id $id not in list"
	return
    }
    if {![info exists commitinfo($id)]} {
3397
	getcommit $id
P
Paul Mackerras 已提交
3398 3399
    }
    assigncolor $id
3400
    drawcmittext $id $row $col
P
Paul Mackerras 已提交
3401 3402 3403
    set iddrawn($id) 1
}

3404 3405 3406
proc drawcommits {row {endrow {}}} {
    global numcommits iddrawn displayorder curview
    global parentlist rowidlist
P
Paul Mackerras 已提交
3407 3408 3409 3410

    if {$row < 0} {
	set row 0
    }
3411 3412 3413
    if {$endrow eq {}} {
	set endrow $row
    }
P
Paul Mackerras 已提交
3414 3415 3416
    if {$endrow >= $numcommits} {
	set endrow [expr {$numcommits - 1}]
    }
3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465

    # 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)]
	if {!$wasdrawn} {
	    drawcmitrow $r
	}
	if {$r == $er} break
	set nextid [lindex $displayorder [expr {$r + 1}]]
	if {$wasdrawn && [info exists iddrawn($nextid)]} {
	    catch {unset prevlines}
	    continue
	}
	drawparentlinks $id $r

	if {[info exists lineends($r)]} {
	    foreach lid $lineends($r) {
		unset prevlines($lid)
	    }
	}
	set rowids [lindex $rowidlist $r]
	foreach lid $rowids {
	    if {$lid eq {}} continue
	    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
			set le [drawlineseg $p $r $er 0]
			lappend lineends($le) $p
			set prevlines($p) 1
		    }
		}
	    } elseif {![info exists prevlines($lid)]} {
		set le [drawlineseg $lid $r $er 1]
		lappend lineends($le) $lid
		set prevlines($lid) 1
	    }
	}
P
Paul Mackerras 已提交
3466 3467 3468
    }
}

3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480
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 已提交
3481 3482 3483 3484 3485 3486
proc drawvisible {} {
    global canv
    eval drawfrac [$canv yview]
}

proc clear_display {} {
3487
    global iddrawn linesegs
3488
    global vhighlights fhighlights nhighlights rhighlights
P
Paul Mackerras 已提交
3489 3490 3491

    allcanvs delete all
    catch {unset iddrawn}
3492
    catch {unset linesegs}
3493 3494 3495
    catch {unset vhighlights}
    catch {unset fhighlights}
    catch {unset nhighlights}
3496
    catch {unset rhighlights}
P
Paul Mackerras 已提交
3497 3498
}

P
Paul Mackerras 已提交
3499 3500 3501 3502 3503 3504 3505 3506 3507
proc findcrossings {id} {
    global rowidlist parentlist numcommits rowoffsets displayorder

    set cross {}
    set ccross {}
    foreach {s e} [rowranges $id] {
	if {$e >= $numcommits} {
	    set e [expr {$numcommits - 1}]
	}
3508
	if {$e <= $s} continue
P
Paul Mackerras 已提交
3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539
	set x [lsearch -exact [lindex $rowidlist $e] $id]
	if {$x < 0} {
	    puts "findcrossings: oops, no [shortids $id] in row $e"
	    continue
	}
	for {set row $e} {[incr row -1] >= $s} {} {
	    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
		    }
		}
	    }
	    set inc [lindex $rowoffsets $row $x]
	    if {$inc eq {}} break
	    incr x $inc
	}
    }
    return [concat $ccross {{}} $cross]
}

3540
proc assigncolor {id} {
P
Paul Mackerras 已提交
3541
    global colormap colors nextcolor
3542
    global commitrow parentlist children children curview
3543

3544
    if {[info exists colormap($id)]} return
3545
    set ncolors [llength $colors]
3546 3547
    if {[info exists children($curview,$id)]} {
	set kids $children($curview,$id)
3548 3549 3550 3551 3552
    } else {
	set kids {}
    }
    if {[llength $kids] == 1} {
	set child [lindex $kids 0]
3553
	if {[info exists colormap($child)]
3554
	    && [llength [lindex $parentlist $commitrow($curview,$child)]] == 1} {
3555 3556
	    set colormap($id) $colormap($child)
	    return
3557
	}
3558 3559
    }
    set badcolors {}
P
Paul Mackerras 已提交
3560 3561 3562 3563 3564 3565
    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
3566
	}
P
Paul Mackerras 已提交
3567 3568 3569
	if {[info exists colormap($x)]
	    && [lsearch -exact $badcolors $colormap($x)] < 0} {
	    lappend badcolors $colormap($x)
3570 3571
	}
    }
P
Paul Mackerras 已提交
3572 3573
    if {[llength $badcolors] >= $ncolors} {
	set badcolors $origbad
3574
    }
P
Paul Mackerras 已提交
3575
    set origbad $badcolors
3576
    if {[llength $badcolors] < $ncolors - 1} {
3577
	foreach child $kids {
3578 3579 3580 3581
	    if {[info exists colormap($child)]
		&& [lsearch -exact $badcolors $colormap($child)] < 0} {
		lappend badcolors $colormap($child)
	    }
3582
	    foreach p [lindex $parentlist $commitrow($curview,$child)] {
3583 3584 3585
		if {[info exists colormap($p)]
		    && [lsearch -exact $badcolors $colormap($p)] < 0} {
		    lappend badcolors $colormap($p)
3586 3587 3588 3589 3590 3591
		}
	    }
	}
	if {[llength $badcolors] >= $ncolors} {
	    set badcolors $origbad
	}
3592 3593 3594 3595 3596
    }
    for {set i 0} {$i <= $ncolors} {incr i} {
	set c [lindex $colors $nextcolor]
	if {[incr nextcolor] >= $ncolors} {
	    set nextcolor 0
3597
	}
3598
	if {[lsearch -exact $badcolors $c]} break
3599
    }
3600
    set colormap($id) $c
3601 3602
}

3603 3604 3605 3606 3607 3608
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"
3609
    $canv bind $t <Button-1> "lineclick %x %y $id 1"
3610 3611
}

3612
proc drawtags {id x xt y1} {
3613
    global idtags idheads idotherrefs mainhead
3614
    global linespc lthickness
3615
    global canv mainfont commitrow rowtextx curview fgcolor bgcolor
3616 3617 3618

    set marks {}
    set ntags 0
3619
    set nheads 0
3620 3621 3622 3623 3624 3625
    if {[info exists idtags($id)]} {
	set marks $idtags($id)
	set ntags [llength $marks]
    }
    if {[info exists idheads($id)]} {
	set marks [concat $marks $idheads($id)]
3626 3627 3628 3629
	set nheads [llength $idheads($id)]
    }
    if {[info exists idotherrefs($id)]} {
	set marks [concat $marks $idotherrefs($id)]
3630 3631 3632 3633 3634 3635
    }
    if {$marks eq {}} {
	return $xt
    }

    set delta [expr {int(0.5 * ($linespc - $lthickness))}]
J
Jeff Hobbs 已提交
3636 3637
    set yt [expr {$y1 - 0.5 * $linespc}]
    set yb [expr {$yt + $linespc - 1}]
3638 3639
    set xvals {}
    set wvals {}
3640
    set i -1
3641
    foreach tag $marks {
3642 3643 3644 3645 3646 3647
	incr i
	if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} {
	    set wid [font measure [concat $mainfont bold] $tag]
	} else {
	    set wid [font measure $mainfont $tag]
	}
3648 3649 3650 3651 3652 3653 3654 3655
	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 已提交
3656 3657
	set xl [expr {$x + $delta}]
	set xr [expr {$x + $delta + $wid + $lthickness}]
3658
	set font $mainfont
3659 3660
	if {[incr ntags -1] >= 0} {
	    # draw a tag
J
Jeff Hobbs 已提交
3661 3662
	    set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
		       $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
3663 3664
		       -width 1 -outline black -fill yellow -tags tag.$id]
	    $canv bind $t <1> [list showtag $tag 1]
3665
	    set rowtextx($commitrow($curview,$id)) [expr {$xr + $linespc}]
3666
	} else {
3667 3668 3669
	    # draw a head or other ref
	    if {[incr nheads -1] >= 0} {
		set col green
3670 3671 3672
		if {$tag eq $mainhead} {
		    lappend font bold
		}
3673 3674 3675
	    } else {
		set col "#ddddff"
	    }
J
Jeff Hobbs 已提交
3676
	    set xl [expr {$xl - $delta/2}]
3677
	    $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
3678
		-width 1 -outline black -fill $col -tags tag.$id
3679 3680 3681 3682 3683 3684 3685 3686
	    if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
	        set rwid [font measure $mainfont $remoteprefix]
		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
	    }
3687
	}
3688
	set t [$canv create text $xl $y1 -anchor w -text $tag -fill $fgcolor \
3689
		   -font $font -tags [list tag.$id text]]
3690 3691
	if {$ntags >= 0} {
	    $canv bind $t <1> [list showtag $tag 1]
3692 3693
	} elseif {$nheads >= 0} {
	    $canv bind $t <Button-3> [list headmenu %X %Y $id $tag]
3694
	}
3695 3696 3697 3698
    }
    return $xt
}

3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709
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
}
3710

3711
proc show_status {msg} {
3712
    global canv mainfont fgcolor
3713 3714

    clear_display
3715 3716
    $canv create text 3 3 -anchor nw -text $msg -font $mainfont \
	-tags text -fill $fgcolor
3717 3718
}

3719
# Insert a new commit as the child of the commit on row $row.
3720 3721 3722
# 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} {
3723
    global displayorder parentlist commitlisted children
3724
    global commitrow curview rowidlist rowoffsets numcommits
3725
    global rowrangelist rowlaidout rowoptim numcommits
3726
    global selectedline rowchk commitidx
3727 3728 3729 3730 3731 3732 3733 3734

    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]
3735
    set kids $children($curview,$p)
3736
    lappend kids $newcmit
3737
    set children($curview,$p) $kids
3738
    set children($curview,$newcmit) {}
3739
    set commitlisted [linsert $commitlisted $row 1]
3740 3741 3742 3743 3744
    set l [llength $displayorder]
    for {set r $row} {$r < $l} {incr r} {
	set id [lindex $displayorder $r]
	set commitrow($curview,$id) $r
    }
3745
    incr commitidx($curview)
3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773

    set idlist [lindex $rowidlist $row]
    set offs [lindex $rowoffsets $row]
    set newoffs {}
    foreach x $idlist {
	if {$x eq {} || ($x eq $p && [llength $kids] == 1)} {
	    lappend newoffs {}
	} else {
	    lappend newoffs 0
	}
    }
    if {[llength $kids] == 1} {
	set col [lsearch -exact $idlist $p]
	lset idlist $col $newcmit
    } else {
	set col [llength $idlist]
	lappend idlist $newcmit
	lappend offs {}
	lset rowoffsets $row $offs
    }
    set rowidlist [linsert $rowidlist $row $idlist]
    set rowoffsets [linsert $rowoffsets [expr {$row+1}] $newoffs]

    set rowrangelist [linsert $rowrangelist $row {}]
    if {[llength $kids] > 1} {
	set rp1 [expr {$row + 1}]
	set ranges [lindex $rowrangelist $rp1]
	if {$ranges eq {}} {
3774 3775 3776
	    set ranges [list $newcmit $p]
	} elseif {[lindex $ranges end-1] eq $p} {
	    lset ranges end-1 $newcmit
3777 3778 3779 3780
	}
	lset rowrangelist $rp1 $ranges
    }

3781 3782
    catch {unset rowchk}

3783 3784 3785 3786
    incr rowlaidout
    incr rowoptim
    incr numcommits

3787 3788 3789
    if {[info exists selectedline] && $selectedline >= $row} {
	incr selectedline
    }
3790 3791 3792
    redisplay
}

3793 3794
# Remove a commit that was inserted with insertrow on row $row.
proc removerow {row} {
3795
    global displayorder parentlist commitlisted children
3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809
    global commitrow curview rowidlist rowoffsets numcommits
    global rowrangelist idrowranges rowlaidout rowoptim numcommits
    global linesegends selectedline rowchk commitidx

    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]
3810
    set kids $children($curview,$p)
3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851
    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

    set rowidlist [lreplace $rowidlist $row $row]
    set rowoffsets [lreplace $rowoffsets $rp1 $rp1]
    if {$kids ne {}} {
	set offs [lindex $rowoffsets $row]
	set offs [lreplace $offs end end]
	lset rowoffsets $row $offs
    }

    set rowrangelist [lreplace $rowrangelist $row $row]
    if {[llength $kids] > 0} {
	set ranges [lindex $rowrangelist $row]
	if {[lindex $ranges end-1] eq $id} {
	    set ranges [lreplace $ranges end-1 end]
	    lset rowrangelist $row $ranges
	}
    }

    catch {unset rowchk}

    incr rowlaidout -1
    incr rowoptim -1
    incr numcommits -1

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

3852 3853 3854 3855 3856 3857 3858 3859 3860
# 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
3861 3862
}

3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882
proc nowbusy {what} {
    global isbusy

    if {[array names isbusy] eq {}} {
	. config -cursor watch
	settextcursor watch
    }
    set isbusy($what) 1
}

proc notbusy {what} {
    global isbusy maincursor textcursor

    catch {unset isbusy($what)}
    if {[array names isbusy] eq {}} {
	. config -cursor $maincursor
	settextcursor $textcursor
    }
}

3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895
proc findmatches {f} {
    global findtype foundstring foundstrlen
    if {$findtype == "Regexp"} {
	set matches [regexp -indices -all -inline $foundstring $f]
    } else {
	if {$findtype == "IgnCase"} {
	    set str [string tolower $f]
	} else {
	    set str $f
	}
	set matches {}
	set i 0
	while {[set j [string first $foundstring $str $i]] >= 0} {
J
Jeff Hobbs 已提交
3896 3897
	    lappend matches [list $j [expr {$j+$foundstrlen-1}]]
	    set i [expr {$j + $foundstrlen}]
3898 3899 3900 3901 3902
	}
    }
    return $matches
}

3903 3904
proc dofind {} {
    global findtype findloc findstring markedmatches commitinfo
3905
    global numcommits displayorder linehtag linentag linedtag
3906
    global mainfont canv canv2 canv3 selectedline
P
Paul Mackerras 已提交
3907 3908
    global matchinglines foundstring foundstrlen matchstring
    global commitdata
3909 3910

    stopfindproc
3911
    unmarkmatches
3912
    cancel_next_highlight
3913
    focus .
3914 3915
    set matchinglines {}
    if {$findtype == "IgnCase"} {
3916
	set foundstring [string tolower $findstring]
3917
    } else {
3918
	set foundstring $findstring
3919
    }
3920 3921
    set foundstrlen [string length $findstring]
    if {$foundstrlen == 0} return
P
Paul Mackerras 已提交
3922 3923
    regsub -all {[*?\[\\]} $foundstring {\\&} matchstring
    set matchstring "*$matchstring*"
3924 3925 3926 3927 3928 3929
    if {![info exists selectedline]} {
	set oldsel -1
    } else {
	set oldsel $selectedline
    }
    set didsel 0
3930
    set fldtypes {Headline Author Date Committer CDate Comments}
P
Paul Mackerras 已提交
3931
    set l -1
3932 3933
    foreach id $displayorder {
	set d $commitdata($id)
P
Paul Mackerras 已提交
3934 3935 3936 3937 3938 3939 3940 3941 3942 3943
	incr l
	if {$findtype == "Regexp"} {
	    set doesmatch [regexp $foundstring $d]
	} elseif {$findtype == "IgnCase"} {
	    set doesmatch [string match -nocase $matchstring $d]
	} else {
	    set doesmatch [string match $matchstring $d]
	}
	if {!$doesmatch} continue
	if {![info exists commitinfo($id)]} {
3944
	    getcommit $id
P
Paul Mackerras 已提交
3945
	}
3946 3947 3948 3949 3950 3951
	set info $commitinfo($id)
	set doesmatch 0
	foreach f $info ty $fldtypes {
	    if {$findloc != "All fields" && $findloc != $ty} {
		continue
	    }
3952
	    set matches [findmatches $f]
3953 3954 3955
	    if {$matches == {}} continue
	    set doesmatch 1
	    if {$ty == "Headline"} {
3956
		drawcommits $l
3957 3958
		markmatches $canv $l $f $linehtag($l) $matches $mainfont
	    } elseif {$ty == "Author"} {
3959
		drawcommits $l
3960
		markmatches $canv2 $l $f $linentag($l) $matches $mainfont
3961
	    } elseif {$ty == "Date"} {
3962
		drawcommits $l
3963 3964 3965 3966 3967 3968
		markmatches $canv3 $l $f $linedtag($l) $matches $mainfont
	    }
	}
	if {$doesmatch} {
	    lappend matchinglines $l
	    if {!$didsel && $l > $oldsel} {
3969
		findselectline $l
3970 3971 3972 3973 3974 3975 3976
		set didsel 1
	    }
	}
    }
    if {$matchinglines == {}} {
	bell
    } elseif {!$didsel} {
3977 3978 3979 3980 3981 3982
	findselectline [lindex $matchinglines 0]
    }
}

proc findselectline {l} {
    global findloc commentend ctext
3983
    selectline $l 1
3984 3985 3986 3987 3988 3989
    if {$findloc == "All fields" || $findloc == "Comments"} {
	# 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 已提交
3990
	    set end [expr {[lindex $match 1] + 1}]
3991 3992
	    $ctext tag add found "1.0 + $start c" "1.0 + $end c"
	}
3993 3994 3995
    }
}

3996
proc findnext {restart} {
3997 3998
    global matchinglines selectedline
    if {![info exists matchinglines]} {
3999 4000 4001
	if {$restart} {
	    dofind
	}
4002 4003 4004 4005 4006
	return
    }
    if {![info exists selectedline]} return
    foreach l $matchinglines {
	if {$l > $selectedline} {
4007
	    findselectline $l
4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026
	    return
	}
    }
    bell
}

proc findprev {} {
    global matchinglines selectedline
    if {![info exists matchinglines]} {
	dofind
	return
    }
    if {![info exists selectedline]} return
    set prev {}
    foreach l $matchinglines {
	if {$l >= $selectedline} break
	set prev $l
    }
    if {$prev != {}} {
4027
	findselectline $prev
4028 4029 4030 4031 4032
    } else {
	bell
    }
}

4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045
proc stopfindproc {{done 0}} {
    global findprocpid findprocfile findids
    global ctext findoldcursor phase maincursor textcursor
    global findinprogress

    catch {unset findids}
    if {[info exists findprocpid]} {
	if {!$done} {
	    catch {exec kill $findprocpid}
	}
	catch {close $findprocfile}
	unset findprocpid
    }
4046 4047
    catch {unset findinprogress}
    notbusy find
4048 4049 4050 4051 4052
}

# mark a commit as matching by putting a yellow background
# behind the headline
proc markheadline {l id} {
P
Paul Mackerras 已提交
4053
    global canv mainfont linehtag
4054

4055
    drawcommits $l
4056 4057 4058 4059 4060 4061
    set bbox [$canv bbox $linehtag($l)]
    set t [$canv create rect $bbox -outline {} -tags matches -fill yellow]
    $canv lower $t
}

# mark the bits of a headline, author or date that match a find string
4062 4063 4064 4065 4066 4067 4068 4069 4070
proc markmatches {canv l str tag matches font} {
    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 已提交
4071 4072 4073 4074
	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 \
4075 4076 4077 4078 4079 4080
		   -outline {} -tags matches -fill yellow]
	$canv lower $t
    }
}

proc unmarkmatches {} {
4081
    global matchinglines findids
4082 4083
    allcanvs delete matches
    catch {unset matchinglines}
4084
    catch {unset findids}
4085 4086
}

4087
proc selcanvline {w x y} {
4088
    global canv canvy0 ctext linespc
P
Paul Mackerras 已提交
4089
    global rowtextx
4090
    set ymax [lindex [$canv cget -scrollregion] 3]
4091
    if {$ymax == {}} return
4092 4093 4094 4095 4096 4097
    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
    }
4098 4099 4100
    if {$w eq $canv} {
	if {![info exists rowtextx($l)] || $x < $rowtextx($l)} return
    }
4101
    unmarkmatches
4102
    selectline $l 1
4103 4104
}

4105 4106
proc commit_descriptor {p} {
    global commitinfo
4107 4108 4109
    if {![info exists commitinfo($p)]} {
	getcommit $p
    }
4110
    set l "..."
4111
    if {[llength $commitinfo($p)] > 1} {
4112 4113
	set l [lindex $commitinfo($p) 0]
    }
P
Paul Mackerras 已提交
4114
    return "$p ($l)\n"
4115 4116
}

4117 4118
# append some text to the ctext widget, and make any SHA1 ID
# that we know about be a clickable link.
4119
proc appendwithlinks {text tags} {
4120
    global ctext commitrow linknum curview
4121 4122

    set start [$ctext index "end - 1c"]
4123
    $ctext insert end $text $tags
4124 4125 4126 4127 4128
    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]
4129
	if {![info exists commitrow($curview,$linkid)]} continue
4130 4131 4132
	incr e
	$ctext tag add link "$start + $s c" "$start + $e c"
	$ctext tag add link$linknum "$start + $s c" "$start + $e c"
4133 4134
	$ctext tag bind link$linknum <1> \
	    [list selectline $commitrow($curview,$linkid) 1]
4135 4136 4137 4138 4139 4140 4141
	incr linknum
    }
    $ctext tag conf link -foreground blue -underline 1
    $ctext tag bind link <Enter> { %W configure -cursor hand2 }
    $ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
}

4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157
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}]
}

4158 4159
# add a list of tag or branch names at position pos
# returns the number of names inserted
4160
proc appendrefs {pos ids var} {
4161
    global ctext commitrow linknum curview $var maxrefs
P
Paul Mackerras 已提交
4162

4163 4164 4165
    if {[catch {$ctext index $pos}]} {
	return 0
    }
4166 4167 4168 4169 4170 4171 4172 4173
    $ctext conf -state normal
    $ctext delete $pos "$pos lineend"
    set tags {}
    foreach id $ids {
	foreach tag [set $var\($id\)] {
	    lappend tags [list $tag $id]
	}
    }
4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195
    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
	    if {[info exists commitrow($curview,$id)]} {
		$ctext tag conf $lk -foreground blue
		$ctext tag bind $lk <1> \
		    [list selectline $commitrow($curview,$id) 1]
		$ctext tag conf $lk -underline 1
		$ctext tag bind $lk <Enter> { %W configure -cursor hand2 }
		$ctext tag bind $lk <Leave> \
		    { %W configure -cursor $curtextcursor }
	    }
	    set sep ", "
P
Paul Mackerras 已提交
4196 4197
	}
    }
4198
    $ctext conf -state disabled
4199
    return [llength $tags]
P
Paul Mackerras 已提交
4200 4201
}

4202 4203 4204
# called when we have finished computing the nearby tags
proc dispneartags {delay} {
    global selectedline currentid showneartags tagphase
4205

4206 4207 4208 4209 4210 4211 4212 4213
    if {![info exists selectedline] || !$showneartags} return
    after cancel dispnexttag
    if {$delay} {
	after 200 dispnexttag
	set tagphase -1
    } else {
	after idle dispnexttag
	set tagphase 0
4214 4215 4216
    }
}

4217 4218
proc dispnexttag {} {
    global selectedline currentid showneartags tagphase ctext
P
Paul Mackerras 已提交
4219 4220

    if {![info exists selectedline] || !$showneartags} return
4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244
    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
		}
	    }
4245 4246
	}
    }
4247 4248
    if {[incr tagphase] <= 2} {
	after idle dispnexttag
P
Paul Mackerras 已提交
4249 4250 4251
    }
}

4252
proc selectline {l isnew} {
4253
    global canv canv2 canv3 ctext commitinfo selectedline
4254
    global displayorder linehtag linentag linedtag
4255
    global canvy0 linespc parentlist children curview
4256
    global currentid sha1entry
P
Paul Mackerras 已提交
4257
    global commentend idtags linknum
4258
    global mergemax numcommits pending_select
4259
    global cmitmode showneartags allcommits
4260

4261
    catch {unset pending_select}
4262
    $canv delete hover
4263
    normalline
4264
    cancel_next_highlight
4265
    if {$l < 0 || $l >= $numcommits} return
4266
    set y [expr {$canvy0 + $l * $linespc}]
4267
    set ymax [lindex [$canv cget -scrollregion] 3]
4268 4269
    set ytop [expr {$y - $linespc - 1}]
    set ybot [expr {$y + $linespc + 1}]
4270
    set wnow [$canv yview]
J
Jeff Hobbs 已提交
4271 4272
    set wtop [expr {[lindex $wnow 0] * $ymax}]
    set wbot [expr {[lindex $wnow 1] * $ymax}]
4273 4274
    set wh [expr {$wbot - $wtop}]
    set newtop $wtop
4275
    if {$ytop < $wtop} {
4276 4277 4278 4279 4280 4281 4282
	if {$ybot < $wtop} {
	    set newtop [expr {$y - $wh / 2.0}]
	} else {
	    set newtop $ytop
	    if {$newtop > $wtop - $linespc} {
		set newtop [expr {$wtop - $linespc}]
	    }
4283
	}
4284 4285 4286 4287 4288 4289 4290 4291
    } 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}]
	    }
4292
	}
4293 4294 4295 4296 4297
    }
    if {$newtop != $wtop} {
	if {$newtop < 0} {
	    set newtop 0
	}
J
Jeff Hobbs 已提交
4298
	allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
P
Paul Mackerras 已提交
4299
	drawvisible
4300
    }
4301

P
Paul Mackerras 已提交
4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315
    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

4316 4317
    if {$isnew} {
	addtohistory [list selectline $l 0]
4318 4319
    }

4320 4321
    set selectedline $l

4322
    set id [lindex $displayorder $l]
4323
    set currentid $id
4324 4325 4326 4327
    $sha1entry delete 0 end
    $sha1entry insert 0 $id
    $sha1entry selection from 0
    $sha1entry selection to end
4328
    rhighlight_sel $id
4329

4330
    $ctext conf -state normal
4331
    clear_ctext
4332
    set linknum 0
4333
    set info $commitinfo($id)
P
Paul Mackerras 已提交
4334 4335 4336 4337
    set date [formatdate [lindex $info 2]]
    $ctext insert end "Author: [lindex $info 1]  $date\n"
    set date [formatdate [lindex $info 4]]
    $ctext insert end "Committer: [lindex $info 3]  $date\n"
4338 4339 4340 4341 4342 4343 4344
    if {[info exists idtags($id)]} {
	$ctext insert end "Tags:"
	foreach tag $idtags($id) {
	    $ctext insert end " $tag"
	}
	$ctext insert end "\n"
    }
4345

4346
    set headers {}
4347 4348
    set olds [lindex $parentlist $l]
    if {[llength $olds] > 1} {
4349
	set np 0
4350
	foreach p $olds {
4351 4352 4353 4354 4355 4356
	    if {$np >= $mergemax} {
		set tag mmax
	    } else {
		set tag m$np
	    }
	    $ctext insert end "Parent: " $tag
4357
	    appendwithlinks [commit_descriptor $p] {}
4358 4359 4360
	    incr np
	}
    } else {
4361
	foreach p $olds {
P
Paul Mackerras 已提交
4362
	    append headers "Parent: [commit_descriptor $p]"
4363 4364
	}
    }
4365

4366
    foreach c $children($curview,$id) {
P
Paul Mackerras 已提交
4367
	append headers "Child:  [commit_descriptor $c]"
4368
    }
4369 4370

    # make anything that looks like a SHA1 ID be a clickable link
4371
    appendwithlinks $headers {}
P
Paul Mackerras 已提交
4372 4373 4374 4375
    if {$showneartags} {
	if {![info exists allcommits]} {
	    getallcommits
	}
4376 4377 4378 4379
	$ctext insert end "Branch: "
	$ctext mark set branch "end -1c"
	$ctext mark gravity branch left
	$ctext insert end "\nFollows: "
P
Paul Mackerras 已提交
4380 4381 4382 4383 4384 4385
	$ctext mark set follows "end -1c"
	$ctext mark gravity follows left
	$ctext insert end "\nPrecedes: "
	$ctext mark set precedes "end -1c"
	$ctext mark gravity precedes left
	$ctext insert end "\n"
4386
	dispneartags 1
P
Paul Mackerras 已提交
4387 4388
    }
    $ctext insert end "\n"
4389 4390 4391 4392 4393
    set comment [lindex $info 5]
    if {[string first "\r" $comment] >= 0} {
	set comment [string map {"\r" "\n    "} $comment]
    }
    appendwithlinks $comment {comment}
4394

4395
    $ctext tag delete Comments
4396
    $ctext tag remove found 1.0 end
4397
    $ctext conf -state disabled
4398
    set commentend [$ctext index "end - 1c"]
4399

4400
    init_flist "Comments"
P
Paul Mackerras 已提交
4401 4402 4403
    if {$cmitmode eq "tree"} {
	gettree $id
    } elseif {[llength $olds] <= 1} {
4404
	startdiff $id
4405
    } else {
4406
	mergediff $id $l
4407 4408 4409
    }
}

4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421
proc selfirstline {} {
    unmarkmatches
    selectline 0 1
}

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

4422 4423 4424
proc selnextline {dir} {
    global selectedline
    if {![info exists selectedline]} return
J
Jeff Hobbs 已提交
4425
    set l [expr {$selectedline + $dir}]
4426
    unmarkmatches
4427 4428 4429
    selectline $l 1
}

4430 4431 4432 4433 4434 4435 4436 4437
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
4438
    drawvisible
4439 4440 4441 4442 4443 4444 4445 4446
    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
4447
    selectline $l 1
4448 4449
}

4450
proc unselectline {} {
P
Paul Mackerras 已提交
4451
    global selectedline currentid
4452 4453

    catch {unset selectedline}
P
Paul Mackerras 已提交
4454
    catch {unset currentid}
4455
    allcanvs delete secsel
4456
    rhighlight_none
4457
    cancel_next_highlight
4458 4459
}

P
Paul Mackerras 已提交
4460 4461 4462 4463 4464 4465 4466 4467
proc reselectline {} {
    global selectedline

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

4468
proc addtohistory {cmd} {
4469
    global history historyindex curview
4470

4471
    set elt [list $curview $cmd]
4472
    if {$historyindex > 0
4473
	&& [lindex $history [expr {$historyindex - 1}]] == $elt} {
4474 4475 4476 4477
	return
    }

    if {$historyindex < [llength $history]} {
4478
	set history [lreplace $history $historyindex end $elt]
4479
    } else {
4480
	lappend history $elt
4481 4482 4483
    }
    incr historyindex
    if {$historyindex > 1} {
4484
	.tf.bar.leftbut conf -state normal
4485
    } else {
4486
	.tf.bar.leftbut conf -state disabled
4487
    }
4488
    .tf.bar.rightbut conf -state disabled
4489 4490
}

4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501
proc godo {elt} {
    global curview

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

4502 4503 4504 4505 4506
proc goback {} {
    global history historyindex

    if {$historyindex > 1} {
	incr historyindex -1
4507
	godo [lindex $history [expr {$historyindex - 1}]]
4508
	.tf.bar.rightbut conf -state normal
4509 4510
    }
    if {$historyindex <= 1} {
4511
	.tf.bar.leftbut conf -state disabled
4512 4513 4514 4515 4516 4517 4518
    }
}

proc goforw {} {
    global history historyindex

    if {$historyindex < [llength $history]} {
4519
	set cmd [lindex $history $historyindex]
4520
	incr historyindex
4521
	godo $cmd
4522
	.tf.bar.leftbut conf -state normal
4523 4524
    }
    if {$historyindex >= [llength $history]} {
4525
	.tf.bar.rightbut conf -state disabled
4526
    }
4527 4528
}

P
Paul Mackerras 已提交
4529
proc gettree {id} {
4530
    global treefilelist treeidlist diffids diffmergeid treepending nullid
P
Paul Mackerras 已提交
4531 4532 4533 4534 4535

    set diffids $id
    catch {unset diffmergeid}
    if {![info exists treefilelist($id)]} {
	if {![info exists treepending]} {
4536 4537 4538 4539 4540 4541
	    if {$id ne $nullid} {
		set cmd [concat | git ls-tree -r $id]
	    } else {
		set cmd [concat | git ls-files]
	    }
	    if {[catch {set gtf [open $cmd r]}]} {
P
Paul Mackerras 已提交
4542 4543 4544 4545 4546 4547
		return
	    }
	    set treepending $id
	    set treefilelist($id) {}
	    set treeidlist($id) {}
	    fconfigure $gtf -blocking 0
4548
	    filerun $gtf [list gettreeline $gtf $id]
P
Paul Mackerras 已提交
4549 4550 4551 4552 4553 4554 4555
	}
    } else {
	setfilelist $id
    }
}

proc gettreeline {gtf id} {
4556
    global treefilelist treeidlist treepending cmitmode diffids nullid
P
Paul Mackerras 已提交
4557

4558 4559
    set nl 0
    while {[incr nl] <= 1000 && [gets $gtf line] >= 0} {
4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571
	if {$diffids ne $nullid} {
	    set tl [split $line "\t"]
	    if {[lindex $tl 0 1] ne "blob"} continue
	    set sha1 [lindex $tl 0 2]
	    set fname [lindex $tl 1]
	    if {[string index $fname 0] eq "\""} {
		set fname [lindex $fname 0]
	    }
	    lappend treeidlist($id) $sha1
	} else {
	    set fname $line
	}
4572 4573 4574 4575
	lappend treefilelist($id) $fname
    }
    if {![eof $gtf]} {
	return [expr {$nl >= 1000? 2: 1}]
P
Paul Mackerras 已提交
4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587
    }
    close $gtf
    unset treepending
    if {$cmitmode ne "tree"} {
	if {![info exists diffmergeid]} {
	    gettreediffs $diffids
	}
    } elseif {$id ne $diffids} {
	gettree $diffids
    } else {
	setfilelist $id
    }
4588
    return 0
P
Paul Mackerras 已提交
4589 4590 4591
}

proc showfile {f} {
4592
    global treefilelist treeidlist diffids nullid
P
Paul Mackerras 已提交
4593 4594 4595 4596 4597 4598 4599
    global ctext commentend

    set i [lsearch -exact $treefilelist($diffids) $f]
    if {$i < 0} {
	puts "oops, $f not in list for id $diffids"
	return
    }
4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610
    if {$diffids ne $nullid} {
	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"
	    return
	}
    } else {
	if {[catch {set bf [open $f r]} err]} {
	    puts "oops, can't read $f: $err"
	    return
	}
P
Paul Mackerras 已提交
4611 4612
    }
    fconfigure $bf -blocking 0
4613
    filerun $bf [list getblobline $bf $diffids]
P
Paul Mackerras 已提交
4614
    $ctext config -state normal
4615
    clear_ctext $commentend
P
Paul Mackerras 已提交
4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626
    $ctext insert end "\n"
    $ctext insert end "$f\n" filesep
    $ctext config -state disabled
    $ctext yview $commentend
}

proc getblobline {bf id} {
    global diffids cmitmode ctext

    if {$id ne $diffids || $cmitmode ne "tree"} {
	catch {close $bf}
4627
	return 0
P
Paul Mackerras 已提交
4628 4629
    }
    $ctext config -state normal
4630 4631
    set nl 0
    while {[incr nl] <= 1000 && [gets $bf line] >= 0} {
P
Paul Mackerras 已提交
4632 4633 4634 4635 4636 4637
	$ctext insert end "$line\n"
    }
    if {[eof $bf]} {
	# delete last newline
	$ctext delete "end - 2c" "end - 1c"
	close $bf
4638
	return 0
P
Paul Mackerras 已提交
4639 4640
    }
    $ctext config -state disabled
4641
    return [expr {$nl >= 1000? 2: 1}]
P
Paul Mackerras 已提交
4642 4643
}

4644 4645
proc mergediff {id l} {
    global diffmergeid diffopts mdifffd
4646
    global diffids
4647
    global parentlist
4648

4649
    set diffmergeid $id
4650
    set diffids $id
4651
    # this doesn't seem to actually affect anything...
4652
    set env(GIT_DIFF_OPTS) $diffopts
4653
    set cmd [concat | git diff-tree --no-commit-id --cc $id]
4654 4655 4656
    if {[catch {set mdf [open $cmd r]} err]} {
	error_popup "Error getting merge diffs: $err"
	return
4657
    }
4658 4659
    fconfigure $mdf -blocking 0
    set mdifffd($id) $mdf
4660
    set np [llength [lindex $parentlist $l]]
4661
    filerun $mdf [list getmergediffline $mdf $id $np]
4662 4663
}

4664
proc getmergediffline {mdf id np} {
4665
    global diffmergeid ctext cflist mergemax
4666
    global difffilestart mdifffd
4667

4668 4669 4670 4671 4672
    $ctext conf -state normal
    set nr 0
    while {[incr nr] <= 1000 && [gets $mdf line] >= 0} {
	if {![info exists diffmergeid] || $id != $diffmergeid
	    || $mdf != $mdifffd($id)} {
4673
	    close $mdf
4674
	    return 0
4675
	}
4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706
	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
		}
4707
	    }
4708 4709 4710 4711 4712 4713 4714 4715 4716
	    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]
4717
	    }
4718 4719 4720 4721 4722 4723 4724
	    if {$num ne {}} {
		if {$num >= $mergemax} {
		    set num "max"
		}
		lappend tags m$num
	    }
	    $ctext insert end "$line\n" $tags
4725
	}
4726 4727
    }
    $ctext conf -state disabled
4728 4729 4730
    if {[eof $mdf]} {
	close $mdf
	return 0
4731
    }
4732
    return [expr {$nr >= 1000? 2: 1}]
4733 4734
}

4735
proc startdiff {ids} {
4736
    global treediffs diffids treepending diffmergeid nullid
4737

4738
    set diffids $ids
4739
    catch {unset diffmergeid}
4740
    if {![info exists treediffs($ids)] || [lsearch -exact $ids $nullid] >= 0} {
4741
	if {![info exists treepending]} {
4742
	    gettreediffs $ids
4743 4744
	}
    } else {
4745
	addtocflist $ids
4746 4747 4748 4749
    }
}

proc addtocflist {ids} {
4750
    global treediffs cflist
P
Paul Mackerras 已提交
4751
    add_flist $treediffs($ids)
4752
    getblobdiffs $ids
4753 4754
}

4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775
proc diffcmd {ids flags} {
    global nullid

    set i [lsearch -exact $ids $nullid]
    if {$i >= 0} {
	set cmd [concat | git diff-index $flags]
	if {[llength $ids] > 1} {
	    if {$i == 0} {
		lappend cmd -R [lindex $ids 1]
	    } else {
		lappend cmd [lindex $ids 0]
	    }
	} else {
	    lappend cmd HEAD
	}
    } else {
	set cmd [concat | git diff-tree --no-commit-id -r $flags $ids]
    }
    return $cmd
}

4776
proc gettreediffs {ids} {
4777
    global treediff treepending
4778

4779
    set treepending $ids
4780
    set treediff {}
4781
    if {[catch {set gdtf [open [diffcmd $ids {}] r]}]} return
4782
    fconfigure $gdtf -blocking 0
4783
    filerun $gdtf [list gettreediffline $gdtf $ids]
4784 4785
}

4786
proc gettreediffline {gdtf ids} {
4787
    global treediff treediffs treepending diffids diffmergeid
P
Paul Mackerras 已提交
4788
    global cmitmode
4789

4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805
    set nr 0
    while {[incr nr] <= 1000 && [gets $gdtf line] >= 0} {
	set file [lindex $line 5]
	lappend treediff $file
    }
    if {![eof $gdtf]} {
	return [expr {$nr >= 1000? 2: 1}]
    }
    close $gdtf
    set treediffs($ids) $treediff
    unset treepending
    if {$cmitmode eq "tree"} {
	gettree $diffids
    } elseif {$ids != $diffids} {
	if {![info exists diffmergeid]} {
	    gettreediffs $diffids
4806
	}
4807 4808
    } else {
	addtocflist $ids
4809
    }
4810
    return 0
4811 4812
}

4813
proc getblobdiffs {ids} {
4814
    global diffopts blobdifffd diffids env curdifftag curtagstart
4815
    global diffinhdr treediffs
4816

4817
    set env(GIT_DIFF_OPTS) $diffopts
4818
    if {[catch {set bdf [open [diffcmd $ids {-p -C}] r]} err]} {
4819 4820 4821
	puts "error getting diffs: $err"
	return
    }
4822
    set diffinhdr 0
4823
    fconfigure $bdf -blocking 0
4824
    set blobdifffd($ids) $bdf
4825 4826
    set curdifftag Comments
    set curtagstart 0.0
4827
    filerun $bdf [list getblobdiffline $bdf $diffids]
4828 4829
}

4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 4841 4842
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
    }
}

4843
proc getblobdiffline {bdf ids} {
4844
    global diffids blobdifffd ctext curdifftag curtagstart
4845
    global diffnexthead diffnextnote difffilestart
4846
    global diffinhdr treediffs
4847

4848
    set nr 0
4849
    $ctext conf -state normal
4850 4851 4852 4853
    while {[incr nr] <= 1000 && [gets $bdf line] >= 0} {
	if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
	    close $bdf
	    return 0
4854
	}
4855 4856 4857 4858 4859 4860 4861 4862
	if {[regexp {^diff --git a/(.*) b/(.*)} $line match fname newname]} {
	    # start of a new file
	    $ctext insert end "\n"
	    $ctext tag add $curdifftag $curtagstart end
	    set here [$ctext index "end - 1c"]
	    set curtagstart $here
	    set header $newname
	    set i [lsearch -exact $treediffs($ids) $fname]
4863 4864 4865
	    if {$i >= 0} {
		setinlist difffilestart $i $here
	    }
4866 4867 4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886
	    if {$newname ne $fname} {
		set i [lsearch -exact $treediffs($ids) $newname]
		if {$i >= 0} {
		    setinlist difffilestart $i $here
		}
	    }
	    set curdifftag "f:$fname"
	    $ctext tag delete $curdifftag
	    set l [expr {(78 - [string length $header]) / 2}]
	    set pad [string range "----------------------------------------" \
			 1 $l]
	    $ctext insert end "$pad $header $pad\n" filesep
	    set diffinhdr 1
	} elseif {$diffinhdr && [string compare -length 3 $line "---"] == 0} {
	    # do nothing
	} elseif {$diffinhdr && [string compare -length 3 $line "+++"] == 0} {
	    set diffinhdr 0
	} elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
		       $line match f1l f1c f2l f2c rest]} {
	    $ctext insert end "$line\n" hunksep
	    set diffinhdr 0
4887
	} else {
4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905
	    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"
	    } elseif {$diffinhdr || $x == "\\"} {
		# e.g. "\ No newline at end of file"
		$ctext insert end "$line\n" filesep
	    } else {
		# Something else we don't recognize
		if {$curdifftag != "Comments"} {
		    $ctext insert end "\n"
		    $ctext tag add $curdifftag $curtagstart end
		    set curtagstart [$ctext index "end - 1c"]
		    set curdifftag Comments
		}
		$ctext insert end "$line\n" filesep
4906 4907 4908 4909
	    }
	}
    }
    $ctext conf -state disabled
4910 4911 4912 4913 4914 4915
    if {[eof $bdf]} {
	close $bdf
	if {$ids == $diffids && $bdf == $blobdifffd($ids)} {
	    $ctext tag add $curdifftag $curtagstart end
	}
	return 0
4916
    }
4917
    return [expr {$nr >= 1000? 2: 1}]
4918 4919
}

4920 4921 4922 4923 4924 4925 4926
proc changediffdisp {} {
    global ctext diffelide

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

4927 4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940
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
}

4941 4942 4943
proc nextfile {} {
    global difffilestart ctext
    set here [$ctext index @0,0]
4944 4945 4946
    foreach loc $difffilestart {
	if {[$ctext compare $loc > $here]} {
	    $ctext yview $loc
4947
	    return
4948 4949
	}
    }
4950 4951
}

4952 4953 4954
proc clear_ctext {{first 1.0}} {
    global ctext smarktop smarkbot

4955 4956 4957
    set l [lindex [split $first .] 0]
    if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} {
	set smarktop $l
4958
    }
4959 4960
    if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} {
	set smarkbot $l
4961 4962 4963 4964 4965
    }
    $ctext delete $first end
}

proc incrsearch {name ix op} {
4966
    global ctext searchstring searchdirn
4967 4968

    $ctext tag remove found 1.0 end
4969 4970 4971 4972 4973 4974 4975 4976 4977 4978 4979
    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]
	}
    }
4980
    if {$searchstring ne {}} {
4981 4982 4983 4984
	set here [$ctext search $searchdirn -- $searchstring anchor]
	if {$here ne {}} {
	    $ctext see $here
	}
4985 4986 4987 4988 4989
	searchmarkvisible 1
    }
}

proc dosearch {} {
4990
    global sstring ctext searchstring searchdirn
4991 4992 4993

    focus $sstring
    $sstring icursor end
4994 4995 4996 4997 4998 4999 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 5017 5018 5019 5020 5021 5022 5023 5024 5025 5026 5027 5028 5029 5030 5031 5032 5033 5034 5035 5036 5037
    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
5038 5039 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058 5059 5060 5061 5062 5063 5064 5065 5066 5067 5068 5069 5070 5071 5072 5073 5074 5075
    }
}

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} {
5076
    global searchstring
5077

5078
    .bleft.sb set $f0 $f1
5079 5080 5081 5082 5083
    if {$searchstring ne {}} {
	searchmarkvisible 0
    }
}

5084 5085
proc setcoords {} {
    global linespc charspc canvx0 canvy0 mainfont
5086
    global xspc1 xspc2 lthickness
5087

5088 5089
    set linespc [font metrics $mainfont -linespace]
    set charspc [font measure $mainfont "m"]
P
Paul Mackerras 已提交
5090 5091
    set canvy0 [expr {int(3 + 0.5 * $linespc)}]
    set canvx0 [expr {int(3 + 0.5 * $linespc)}]
5092
    set lthickness [expr {int($linespc / 9) + 1}]
5093 5094
    set xspc1(0) $linespc
    set xspc2 $linespc
5095
}
5096

5097
proc redisplay {} {
5098
    global canv
P
Paul Mackerras 已提交
5099 5100 5101 5102 5103 5104
    global selectedline

    set ymax [lindex [$canv cget -scrollregion] 3]
    if {$ymax eq {} || $ymax == 0} return
    set span [$canv yview]
    clear_display
5105
    setcanvscroll
P
Paul Mackerras 已提交
5106 5107 5108 5109
    allcanvs yview moveto [lindex $span 0]
    drawvisible
    if {[info exists selectedline]} {
	selectline $selectedline 0
5110
	allcanvs yview moveto [lindex $span 0]
5111 5112 5113 5114
    }
}

proc incrfont {inc} {
5115
    global mainfont textfont ctext canv phase cflist
5116
    global charspc tabstop
5117
    global stopped entries
5118 5119 5120 5121
    unmarkmatches
    set mainfont [lreplace $mainfont 1 1 [expr {[lindex $mainfont 1] + $inc}]]
    set textfont [lreplace $textfont 1 1 [expr {[lindex $textfont 1] + $inc}]]
    setcoords
5122
    $ctext conf -font $textfont -tabs "[expr {$tabstop * $charspc}]"
5123
    $cflist conf -font $textfont
5124
    $ctext tag conf filesep -font [concat $textfont bold]
5125 5126 5127
    foreach e $entries {
	$e conf -font $mainfont
    }
5128
    if {$phase eq "getcommits"} {
5129 5130 5131 5132
	$canv itemconf textitems -font $mainfont
    }
    redisplay
}
5133

5134 5135 5136 5137 5138 5139 5140
proc clearsha1 {} {
    global sha1entry sha1string
    if {[string length $sha1string] == 40} {
	$sha1entry delete 0 end
    }
}

5141 5142 5143 5144 5145 5146 5147 5148 5149 5150 5151 5152 5153 5154 5155 5156 5157
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"} {
	$sha1but conf -state normal -relief raised -text "Goto: "
    } else {
	$sha1but conf -state disabled -relief flat -text "SHA1 ID: "
    }
}

proc gotocommit {} {
5158
    global sha1string currentid commitrow tagids headids
5159
    global displayorder numcommits curview
5160

5161 5162 5163 5164
    if {$sha1string == {}
	|| ([info exists currentid] && $sha1string == $currentid)} return
    if {[info exists tagids($sha1string)]} {
	set id $tagids($sha1string)
5165 5166
    } elseif {[info exists headids($sha1string)]} {
	set id $headids($sha1string)
5167 5168
    } else {
	set id [string tolower $sha1string]
5169 5170
	if {[regexp {^[0-9a-f]{4,39}$} $id]} {
	    set matches {}
P
Paul Mackerras 已提交
5171 5172 5173
	    foreach i $displayorder {
		if {[string match $id* $i]} {
		    lappend matches $i
5174 5175 5176 5177 5178 5179 5180 5181 5182 5183
		}
	    }
	    if {$matches ne {}} {
		if {[llength $matches] > 1} {
		    error_popup "Short SHA1 id $id is ambiguous"
		    return
		}
		set id [lindex $matches 0]
	    }
	}
5184
    }
5185 5186
    if {[info exists commitrow($curview,$id)]} {
	selectline $commitrow($curview,$id) 1
5187 5188
	return
    }
5189
    if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
5190 5191
	set type "SHA1 id"
    } else {
5192
	set type "Tag/Head"
5193 5194 5195 5196
    }
    error_popup "$type $sha1string is not known"
}

5197 5198 5199 5200
proc lineenter {x y id} {
    global hoverx hovery hoverid hovertimer
    global commitinfo canv

P
Paul Mackerras 已提交
5201
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226 5227 5228 5229 5230 5231 5232 5233 5234 5235 5236 5237 5238 5239 5240 5241 5242 5243 5244 5245 5246 5247 5248 5249 5250 5251 5252 5253 5254 5255
    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
    global commitinfo mainfont

    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}]
    set x1 [expr {$x + [font measure $mainfont $text] + 2 * $lthickness}]
    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
5256 5257
    set t [$canv create text $x $y -anchor nw -text $text -tags hover \
	       -font $mainfont]
5258 5259 5260
    $canv raise $t
}

5261
proc clickisonarrow {id y} {
P
Paul Mackerras 已提交
5262
    global lthickness
5263

P
Paul Mackerras 已提交
5264
    set ranges [rowranges $id]
5265
    set thresh [expr {2 * $lthickness + 6}]
P
Paul Mackerras 已提交
5266
    set n [expr {[llength $ranges] - 1}]
5267
    for {set i 1} {$i < $n} {incr i} {
P
Paul Mackerras 已提交
5268
	set row [lindex $ranges $i]
5269 5270
	if {abs([yc $row] - $y) < $thresh} {
	    return $i
5271 5272 5273 5274 5275
	}
    }
    return {}
}

5276
proc arrowjump {id n y} {
P
Paul Mackerras 已提交
5277
    global canv
5278

5279 5280
    # 1 <-> 2, 3 <-> 4, etc...
    set n [expr {(($n - 1) ^ 1) + 1}]
P
Paul Mackerras 已提交
5281
    set row [lindex [rowranges $id] $n]
5282
    set yt [yc $row]
5283 5284 5285 5286 5287 5288 5289 5290
    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
    }
5291
    allcanvs yview moveto $yfrac
5292 5293
}

5294
proc lineclick {x y id isnew} {
5295
    global ctext commitinfo children canv thickerline curview
5296

P
Paul Mackerras 已提交
5297
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
5298
    unmarkmatches
5299
    unselectline
5300 5301 5302 5303
    normalline
    $canv delete hover
    # draw this line thicker than normal
    set thickerline $id
5304
    drawlines $id
5305
    if {$isnew} {
5306 5307 5308 5309 5310 5311 5312 5313 5314 5315 5316 5317 5318
	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]
5319
    }
5320 5321
    # fill the details pane with info about this line
    $ctext conf -state normal
5322
    clear_ctext
5323 5324 5325 5326 5327 5328
    $ctext tag conf link -foreground blue -underline 1
    $ctext tag bind link <Enter> { %W configure -cursor hand2 }
    $ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
    $ctext insert end "Parent:\t"
    $ctext insert end $id [list link link0]
    $ctext tag bind link0 <1> [list selbyid $id]
5329
    set info $commitinfo($id)
5330
    $ctext insert end "\n\t[lindex $info 0]\n"
5331
    $ctext insert end "\tAuthor:\t[lindex $info 1]\n"
P
Paul Mackerras 已提交
5332 5333
    set date [formatdate [lindex $info 2]]
    $ctext insert end "\tDate:\t$date\n"
5334
    set kids $children($curview,$id)
5335
    if {$kids ne {}} {
5336
	$ctext insert end "\nChildren:"
5337
	set i 0
5338
	foreach child $kids {
5339
	    incr i
P
Paul Mackerras 已提交
5340
	    if {![info exists commitinfo($child)] && ![getcommit $child]} continue
5341
	    set info $commitinfo($child)
5342 5343 5344 5345 5346
	    $ctext insert end "\n\t"
	    $ctext insert end $child [list link link$i]
	    $ctext tag bind link$i <1> [list selbyid $child]
	    $ctext insert end "\n\t[lindex $info 0]"
	    $ctext insert end "\n\tAuthor:\t[lindex $info 1]"
P
Paul Mackerras 已提交
5347 5348
	    set date [formatdate [lindex $info 2]]
	    $ctext insert end "\n\tDate:\t$date\n"
5349 5350 5351
	}
    }
    $ctext conf -state disabled
5352
    init_flist {}
5353 5354
}

5355 5356 5357
proc normalline {} {
    global thickerline
    if {[info exists thickerline]} {
5358
	set id $thickerline
5359
	unset thickerline
5360
	drawlines $id
5361 5362 5363
    }
}

5364
proc selbyid {id} {
5365 5366 5367
    global commitrow curview
    if {[info exists commitrow($curview,$id)]} {
	selectline $commitrow($curview,$id) 1
5368 5369 5370 5371 5372 5373 5374 5375 5376 5377 5378 5379
    }
}

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} {
5380 5381
    global rowctxmenu commitrow selectedline rowmenuid curview nullid
    global fakerowmenu
5382

5383
    set rowmenuid $id
5384 5385
    if {![info exists selectedline]
	|| $commitrow($curview,$id) eq $selectedline} {
5386 5387 5388 5389
	set state disabled
    } else {
	set state normal
    }
5390 5391 5392 5393 5394 5395 5396 5397 5398
    if {$id ne $nullid} {
	set menu $rowctxmenu
    } else {
	set menu $fakerowmenu
    }
    $menu entryconfigure "Diff this*" -state $state
    $menu entryconfigure "Diff selected*" -state $state
    $menu entryconfigure "Make patch" -state $state
    tk_popup $menu $x $y
5399 5400 5401
}

proc diffvssel {dirn} {
5402
    global rowmenuid selectedline displayorder
5403 5404 5405

    if {![info exists selectedline]} return
    if {$dirn} {
5406
	set oldid [lindex $displayorder $selectedline]
5407 5408 5409
	set newid $rowmenuid
    } else {
	set oldid $rowmenuid
5410
	set newid [lindex $displayorder $selectedline]
5411
    }
5412 5413 5414 5415 5416
    addtohistory [list doseldiff $oldid $newid]
    doseldiff $oldid $newid
}

proc doseldiff {oldid newid} {
5417
    global ctext
5418 5419
    global commitinfo

5420
    $ctext conf -state normal
5421
    clear_ctext
5422
    init_flist "Top"
5423 5424 5425 5426 5427 5428 5429
    $ctext insert end "From "
    $ctext tag conf link -foreground blue -underline 1
    $ctext tag bind link <Enter> { %W configure -cursor hand2 }
    $ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
    $ctext tag bind link0 <1> [list selbyid $oldid]
    $ctext insert end $oldid [list link link0]
    $ctext insert end "\n     "
5430
    $ctext insert end [lindex $commitinfo($oldid) 0]
5431 5432 5433 5434
    $ctext insert end "\n\nTo   "
    $ctext tag bind link1 <1> [list selbyid $newid]
    $ctext insert end $newid [list link link1]
    $ctext insert end "\n     "
5435 5436 5437 5438 5439
    $ctext insert end [lindex $commitinfo($newid) 0]
    $ctext insert end "\n"
    $ctext conf -state disabled
    $ctext tag delete Comments
    $ctext tag remove found 1.0 end
5440
    startdiff [list $oldid $newid]
5441 5442
}

5443 5444 5445 5446 5447 5448 5449 5450 5451 5452 5453 5454 5455
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
    label $top.title -text "Generate patch"
5456
    grid $top.title - -pady 10
5457
    label $top.from -text "From:"
5458
    entry $top.fromsha1 -width 40 -relief flat
5459 5460 5461
    $top.fromsha1 insert 0 $oldid
    $top.fromsha1 conf -state readonly
    grid $top.from $top.fromsha1 -sticky w
5462
    entry $top.fromhead -width 60 -relief flat
5463 5464 5465 5466
    $top.fromhead insert 0 $oldhead
    $top.fromhead conf -state readonly
    grid x $top.fromhead -sticky w
    label $top.to -text "To:"
5467
    entry $top.tosha1 -width 40 -relief flat
5468 5469 5470
    $top.tosha1 insert 0 $newid
    $top.tosha1 conf -state readonly
    grid $top.to $top.tosha1 -sticky w
5471
    entry $top.tohead -width 60 -relief flat
5472 5473 5474 5475 5476 5477 5478 5479 5480
    $top.tohead insert 0 $newhead
    $top.tohead conf -state readonly
    grid x $top.tohead -sticky w
    button $top.rev -text "Reverse" -command mkpatchrev -padx 5
    grid $top.rev x -pady 10
    label $top.flab -text "Output file:"
    entry $top.fname -width 60
    $top.fname insert 0 [file normalize "patch$patchnum.patch"]
    incr patchnum
5481
    grid $top.flab $top.fname -sticky w
5482 5483 5484 5485 5486 5487 5488
    frame $top.buts
    button $top.buts.gen -text "Generate" -command mkpatchgo
    button $top.buts.can -text "Cancel" -command mkpatchcan
    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
5489
    focus $top.fname
5490 5491 5492 5493 5494 5495 5496 5497 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507 5508
}

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 {} {
5509
    global patchtop nullid
5510 5511 5512 5513

    set oldid [$patchtop.fromsha1 get]
    set newid [$patchtop.tosha1 get]
    set fname [$patchtop.fname get]
5514 5515 5516 5517 5518 5519 5520 5521 5522
    if {$newid eq $nullid} {
	set cmd [list git diff-index -p $oldid]
    } elseif {$oldid eq $nullid} {
	set cmd [list git diff-index -p -R $newid]
    } else {
	set cmd [list git diff-tree -p $oldid $newid]
    }
    lappend cmd >$fname &
    if {[catch {eval exec $cmd} err]} {
5523 5524 5525 5526 5527 5528 5529 5530 5531 5532 5533 5534 5535
	error_popup "Error creating patch: $err"
    }
    catch {destroy $patchtop}
    unset patchtop
}

proc mkpatchcan {} {
    global patchtop

    catch {destroy $patchtop}
    unset patchtop
}

5536 5537 5538 5539 5540 5541 5542 5543
proc mktag {} {
    global rowmenuid mktagtop commitinfo

    set top .maketag
    set mktagtop $top
    catch {destroy $top}
    toplevel $top
    label $top.title -text "Create tag"
5544
    grid $top.title - -pady 10
5545
    label $top.id -text "ID:"
5546
    entry $top.sha1 -width 40 -relief flat
5547 5548 5549
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
5550
    entry $top.head -width 60 -relief flat
5551 5552 5553 5554
    $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
    $top.head conf -state readonly
    grid x $top.head -sticky w
    label $top.tlab -text "Tag name:"
5555
    entry $top.tag -width 60
5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 5569 5570 5571 5572 5573 5574 5575 5576 5577 5578 5579 5580
    grid $top.tlab $top.tag -sticky w
    frame $top.buts
    button $top.buts.gen -text "Create" -command mktaggo
    button $top.buts.can -text "Cancel" -command mktagcan
    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 == {}} {
	error_popup "No tag name specified"
	return
    }
    if {[info exists tagids($tag)]} {
	error_popup "Tag \"$tag\" already exists"
	return
    }
    if {[catch {
5581
	set dir [gitdir]
5582 5583 5584 5585 5586 5587 5588 5589 5590 5591 5592
	set fname [file join $dir "refs/tags" $tag]
	set f [open $fname w]
	puts $f $id
	close $f
    } err]} {
	error_popup "Error creating tag: $err"
	return
    }

    set tagids($tag) $id
    lappend idtags($id) $tag
5593
    redrawtags $id
5594
    addedtag $id
5595 5596 5597
}

proc redrawtags {id} {
5598
    global canv linehtag commitrow idpos selectedline curview
5599
    global mainfont canvxmax iddrawn
5600

5601
    if {![info exists commitrow($curview,$id)]} return
5602 5603
    if {![info exists iddrawn($id)]} return
    drawcommits $commitrow($curview,$id)
5604 5605
    $canv delete tag.$id
    set xt [eval drawtags $id $idpos($id)]
5606
    $canv coords $linehtag($commitrow($curview,$id)) $xt [lindex $idpos($id) 2]
P
Paul Mackerras 已提交
5607 5608 5609 5610 5611 5612
    set text [$canv itemcget $linehtag($commitrow($curview,$id)) -text]
    set xr [expr {$xt + [font measure $mainfont $text]}]
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
5613 5614
    if {[info exists selectedline]
	&& $selectedline == $commitrow($curview,$id)} {
5615
	selectline $selectedline 0
5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 5628 5629 5630
    }
}

proc mktagcan {} {
    global mktagtop

    catch {destroy $mktagtop}
    unset mktagtop
}

proc mktaggo {} {
    domktag
    mktagcan
}

5631 5632 5633 5634 5635 5636 5637 5638 5639 5640 5641 5642 5643 5644 5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 5656 5657 5658 5659 5660 5661 5662 5663 5664 5665 5666 5667 5668 5669 5670 5671 5672 5673 5674 5675 5676 5677 5678 5679 5680 5681 5682 5683 5684 5685
proc writecommit {} {
    global rowmenuid wrcomtop commitinfo wrcomcmd

    set top .writecommit
    set wrcomtop $top
    catch {destroy $top}
    toplevel $top
    label $top.title -text "Write commit to file"
    grid $top.title - -pady 10
    label $top.id -text "ID:"
    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
    label $top.clab -text "Command:"
    entry $top.cmd -width 60 -textvariable wrcomcmd
    grid $top.clab $top.cmd -sticky w -pady 10
    label $top.flab -text "Output file:"
    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
    button $top.buts.gen -text "Write" -command wrcomgo
    button $top.buts.can -text "Cancel" -command wrcomcan
    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]} {
	error_popup "Error writing commit: $err"
    }
    catch {destroy $wrcomtop}
    unset wrcomtop
}

proc wrcomcan {} {
    global wrcomtop

    catch {destroy $wrcomtop}
    unset wrcomtop
}

5686 5687 5688 5689 5690 5691 5692 5693 5694 5695 5696 5697 5698 5699 5700 5701 5702 5703 5704 5705 5706 5707 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717 5718 5719 5720 5721 5722 5723 5724 5725 5726 5727 5728 5729
proc mkbranch {} {
    global rowmenuid mkbrtop

    set top .makebranch
    catch {destroy $top}
    toplevel $top
    label $top.title -text "Create new branch"
    grid $top.title - -pady 10
    label $top.id -text "ID:"
    entry $top.sha1 -width 40 -relief flat
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
    label $top.nlab -text "Name:"
    entry $top.name -width 40
    grid $top.nlab $top.name -sticky w
    frame $top.buts
    button $top.buts.go -text "Create" -command [list mkbrgo $top]
    button $top.buts.can -text "Cancel" -command "catch {destroy $top}"
    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 {}} {
	error_popup "Please specify a name for the new branch"
	return
    }
    catch {destroy $top}
    nowbusy newbranch
    update
    if {[catch {
	exec git branch $name $id
    } err]} {
	notbusy newbranch
	error_popup $err
    } else {
5730 5731
	set headids($name) $id
	lappend idheads($id) $name
5732
	addedhead $id $name
5733 5734
	notbusy newbranch
	redrawtags $id
5735
	dispneartags 0
5736 5737 5738
    }
}

5739 5740
proc cherrypick {} {
    global rowmenuid curview commitrow
5741
    global mainhead
5742

5743 5744 5745
    set oldhead [exec git rev-parse HEAD]
    set dheads [descheads $rowmenuid]
    if {$dheads ne {} && [lsearch -exact $dheads $oldhead] >= 0} {
5746 5747 5748 5749 5750 5751 5752 5753 5754 5755 5756 5757 5758 5759 5760 5761 5762 5763 5764
	set ok [confirm_popup "Commit [string range $rowmenuid 0 7] is already\
			included in branch $mainhead -- really re-apply it?"]
	if {!$ok} return
    }
    nowbusy cherrypick
    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
	error_popup "No changes committed"
	return
    }
5765
    addnewchild $newhead $oldhead
5766 5767 5768
    if {[info exists commitrow($curview,$oldhead)]} {
	insertrow $commitrow($curview,$oldhead) $newhead
	if {$mainhead ne {}} {
5769
	    movehead $newhead $mainhead
5770 5771 5772 5773 5774 5775 5776 5777
	    movedhead $newhead $mainhead
	}
	redrawtags $oldhead
	redrawtags $newhead
    }
    notbusy cherrypick
}

5778 5779
# context menu for a head
proc headmenu {x y id head} {
5780
    global headmenuid headmenuhead headctxmenu mainhead
5781 5782 5783

    set headmenuid $id
    set headmenuhead $head
5784 5785 5786 5787 5788 5789
    set state normal
    if {$head eq $mainhead} {
	set state disabled
    }
    $headctxmenu entryconfigure 0 -state $state
    $headctxmenu entryconfigure 1 -state $state
5790 5791 5792 5793 5794
    tk_popup $headctxmenu $x $y
}

proc cobranch {} {
    global headmenuid headmenuhead mainhead headids
5795
    global showlocalchanges mainheadid
5796 5797 5798 5799 5800

    # check the tree is clean first??
    set oldmainhead $mainhead
    nowbusy checkout
    update
5801
    dohidelocalchanges
5802
    if {[catch {
5803
	exec git checkout -q $headmenuhead
5804 5805 5806 5807 5808
    } err]} {
	notbusy checkout
	error_popup $err
    } else {
	notbusy checkout
5809
	set mainhead $headmenuhead
5810
	set mainheadid $headmenuid
5811 5812 5813 5814
	if {[info exists headids($oldmainhead)]} {
	    redrawtags $headids($oldmainhead)
	}
	redrawtags $headmenuid
5815 5816 5817
	if {$showlocalchanges} {
	    dodiffindex
	}
5818 5819 5820 5821
    }
}

proc rmbranch {} {
5822
    global headmenuid headmenuhead mainhead
5823 5824 5825 5826
    global headids idheads

    set head $headmenuhead
    set id $headmenuid
5827
    # this check shouldn't be needed any more...
5828 5829 5830 5831
    if {$head eq $mainhead} {
	error_popup "Cannot delete the currently checked-out branch"
	return
    }
5832 5833
    set dheads [descheads $id]
    if {$dheads eq $headids($head)} {
5834 5835 5836 5837 5838 5839 5840 5841 5842 5843 5844
	# the stuff on this branch isn't on any other branch
	if {![confirm_popup "The commits on branch $head aren't on any other\
			branch.\nReally delete branch $head?"]} return
    }
    nowbusy rmbranch
    update
    if {[catch {exec git branch -D $head} err]} {
	notbusy rmbranch
	error_popup $err
	return
    }
5845
    removehead $id $head
5846
    removedhead $id $head
5847 5848
    redrawtags $id
    notbusy rmbranch
5849
    dispneartags 0
5850 5851
}

P
Paul Mackerras 已提交
5852 5853
# Stuff for finding nearby tags
proc getallcommits {} {
5854
    global allcommits allids nbmp nextarc seeds
5855

5856
    set allids {}
5857 5858 5859 5860 5861
    set nbmp 0
    set nextarc 0
    set allcommits 0
    set seeds {}
    regetallcommits
P
Paul Mackerras 已提交
5862 5863
}

5864 5865 5866
# Called when the graph might have changed
proc regetallcommits {} {
    global allcommits seeds
5867

5868 5869 5870
    set cmd [concat | git rev-list --all --parents]
    foreach id $seeds {
	lappend cmd "^$id"
5871
    }
5872 5873 5874 5875
    set fd [open $cmd r]
    fconfigure $fd -blocking 0
    incr allcommits
    nowbusy allcommits
5876
    filerun $fd [list getallclines $fd]
5877 5878 5879 5880 5881 5882 5883 5884 5885 5886 5887 5888 5889 5890 5891 5892 5893 5894 5895 5896
}

# 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} {
    global allids allparents allchildren idtags nextarc nbmp
    global arcnos arcids arctags arcout arcend arcstart archeads growing
5897
    global seeds allcommits
5898 5899

    set nid 0
5900
    while {[incr nid] <= 1000 && [gets $fd line] >= 0} {
5901 5902 5903 5904 5905 5906 5907 5908 5909 5910 5911 5912 5913 5914 5915 5916 5917 5918
	set id [lindex $line 0]
	if {[info exists allparents($id)]} {
	    # seen it already
	    continue
	}
	lappend allids $id
	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 已提交
5919
		}
5920 5921 5922 5923 5924 5925 5926 5927 5928 5929 5930 5931 5932 5933 5934 5935 5936 5937 5938 5939 5940 5941 5942 5943 5944 5945 5946 5947 5948 5949 5950 5951 5952 5953 5954 5955 5956 5957 5958 5959 5960 5961 5962 5963 5964 5965 5966
		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
	    }
	}
	incr nbmp
	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
5967
    }
5968 5969 5970
    if {![eof $fd]} {
	return [expr {$nid >= 1000? 2: 1}]
    }
5971 5972 5973 5974 5975
    close $fd
    if {[incr allcommits -1] == 0} {
	notbusy allcommits
    }
    dispneartags 0
5976
    return 0
P
Paul Mackerras 已提交
5977 5978
}

5979 5980
proc recalcarc {a} {
    global arctags archeads arcids idtags idheads
P
Paul Mackerras 已提交
5981

5982 5983 5984 5985 5986 5987 5988 5989
    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 已提交
5990
	}
5991
    }
5992 5993
    set arctags($a) $at
    set archeads($a) $ah
P
Paul Mackerras 已提交
5994 5995
}

5996 5997 5998
proc splitarc {p} {
    global arcnos arcids nextarc nbmp arctags archeads idtags idheads
    global arcstart arcend arcout allparents growing
5999

6000 6001 6002 6003 6004 6005 6006 6007 6008 6009 6010 6011 6012 6013 6014 6015 6016 6017 6018 6019 6020 6021 6022 6023 6024 6025 6026 6027 6028 6029 6030 6031 6032 6033
    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)
    }
    incr nbmp

    foreach id $tail {
	if {[llength $arcnos($id)] == 1} {
	    set arcnos($id) $na
6034
	} else {
6035 6036
	    set j [lsearch -exact $arcnos($id) $a]
	    set arcnos($id) [lreplace $arcnos($id) $j $j $na]
6037
	}
6038 6039 6040 6041 6042 6043 6044 6045 6046 6047 6048 6049 6050 6051 6052 6053 6054 6055 6056 6057 6058 6059 6060 6061 6062 6063 6064 6065 6066 6067 6068 6069 6070 6071 6072 6073 6074 6075 6076 6077 6078 6079 6080 6081 6082 6083 6084 6085 6086 6087
    }

    # 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} {
    global allids allparents allchildren idtags nextarc nbmp
    global arcnos arcids arctags arcout arcend arcstart archeads growing
    global seeds

    lappend allids $id
    set allparents($id) [list $p]
    set allchildren($id) {}
    set arcnos($id) {}
    lappend seeds $id
    incr nbmp
    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]
}

# 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).
	if {$a eq $b} {
	    return 0
6088
	}
6089 6090 6091 6092 6093 6094 6095 6096
	# 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
6097 6098
	}
    }
6099 6100 6101 6102 6103 6104 6105

    if {![info exists arcout($a)]} {
	set arc [lindex $arcnos($a) 0]
	if {[info exists arcend($arc)]} {
	    set aend $arcend($arc)
	} else {
	    set aend {}
6106
	}
6107 6108 6109 6110 6111 6112 6113 6114 6115 6116
	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 {}
6117
	}
6118 6119 6120
	set b $arcstart($arc)
    } else {
	set bend $b
6121
    }
6122 6123 6124 6125 6126 6127 6128 6129 6130 6131 6132 6133 6134 6135 6136 6137 6138 6139
    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
	}
6140 6141
    }

6142 6143 6144 6145 6146 6147 6148 6149 6150 6151 6152 6153 6154 6155 6156 6157 6158 6159 6160 6161 6162 6163 6164 6165 6166 6167 6168 6169 6170 6171 6172
    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 已提交
6173

6174 6175 6176 6177 6178 6179 6180 6181 6182 6183 6184 6185 6186 6187 6188 6189 6190 6191 6192
# 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 已提交
6193
	}
6194 6195 6196 6197
	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 已提交
6198
	}
6199 6200 6201 6202 6203 6204 6205 6206 6207 6208 6209 6210 6211 6212 6213 6214 6215 6216 6217 6218 6219 6220 6221 6222 6223 6224 6225 6226 6227 6228 6229 6230 6231 6232 6233 6234 6235 6236 6237 6238 6239 6240 6241 6242 6243 6244 6245 6246 6247 6248 6249 6250 6251 6252 6253 6254 6255 6256 6257 6258 6259 6260 6261 6262 6263 6264 6265 6266
    }
    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 已提交
6267 6268
	}
    }
6269 6270 6271
    foreach x [array names growanc] {
	if {$dl($x)} {
	    return 0
P
Paul Mackerras 已提交
6272
	}
6273
	return 0
P
Paul Mackerras 已提交
6274
    }
6275
    return 1
P
Paul Mackerras 已提交
6276 6277
}

6278 6279
proc validate_arctags {a} {
    global arctags idtags
P
Paul Mackerras 已提交
6280

6281 6282 6283 6284 6285 6286 6287 6288 6289 6290 6291 6292 6293 6294 6295 6296 6297 6298 6299 6300 6301 6302 6303 6304 6305 6306 6307 6308 6309 6310 6311 6312 6313 6314 6315 6316 6317 6318 6319 6320 6321 6322 6323 6324 6325 6326 6327 6328 6329
    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 已提交
6330
	    }
6331 6332
	    if {$tid ne {}} {
		return $tid
P
Paul Mackerras 已提交
6333 6334
	    }
	}
6335 6336 6337 6338 6339 6340 6341 6342 6343 6344 6345 6346 6347 6348 6349 6350 6351 6352 6353 6354 6355 6356 6357 6358 6359 6360 6361 6362 6363 6364 6365 6366 6367 6368 6369 6370 6371 6372 6373 6374 6375 6376 6377 6378 6379 6380 6381 6382 6383 6384 6385 6386 6387 6388 6389 6390 6391 6392 6393 6394 6395 6396 6397 6398
	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 已提交
6399
	}
6400
    }
6401 6402 6403 6404 6405 6406 6407 6408 6409 6410 6411 6412
    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
6413

6414 6415 6416 6417 6418 6419 6420 6421 6422 6423 6424 6425 6426 6427
    # 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
6428 6429 6430 6431
	    }
	}
    }

6432 6433 6434 6435 6436 6437 6438 6439 6440
    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
	    }
6441
	}
6442 6443 6444 6445
	if {$tags eq $ctags} {
	    set cached_dtags($origid) $tags
	} else {
	    set tags $ctags
6446
	}
6447 6448 6449 6450 6451 6452 6453
    } 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"
6454
    }
6455 6456
    return $tags
}
6457

6458 6459 6460 6461 6462 6463 6464 6465 6466 6467 6468 6469 6470 6471 6472 6473 6474 6475 6476 6477 6478
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
		}
	    }
6479
	}
6480 6481 6482 6483 6484 6485 6486 6487 6488 6489 6490 6491 6492 6493 6494 6495 6496 6497 6498 6499 6500 6501 6502 6503 6504 6505 6506 6507 6508 6509 6510 6511 6512 6513 6514 6515 6516 6517 6518 6519 6520 6521 6522 6523 6524 6525 6526 6527 6528 6529 6530 6531 6532 6533 6534 6535 6536 6537 6538 6539 6540 6541 6542 6543 6544 6545 6546 6547 6548 6549 6550 6551 6552 6553 6554 6555 6556 6557 6558 6559 6560 6561 6562
	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
		}
	    }
6563 6564 6565
	}
    }

6566 6567 6568 6569 6570 6571 6572 6573 6574 6575 6576 6577 6578 6579 6580 6581 6582 6583 6584 6585 6586 6587 6588 6589 6590 6591 6592 6593 6594 6595 6596 6597
    # 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
6598
	}
6599 6600 6601 6602 6603 6604 6605
    } 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"
6606
    }
6607
    return $tags
6608 6609
}

6610 6611 6612 6613 6614
# 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
6615

6616 6617 6618 6619 6620 6621 6622 6623 6624 6625 6626 6627 6628 6629 6630
    if {![info exists allparents($id)]} {
	return {}
    }
    set ret {}
    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
		lappend $ret $t
	    }
6631
	}
6632
	set id $arcstart($a)
6633
    }
6634 6635 6636 6637 6638 6639 6640 6641 6642 6643 6644 6645 6646 6647 6648 6649 6650 6651 6652 6653 6654
    set origid $id
    set todo [list $id]
    set seen($id) 1
    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 {}} {
		    set ret [concat $ret $archeads($a)]
		}
		set d $arcstart($a)
		if {![info exists seen($d)]} {
		    lappend todo $d
		    set seen($d) 1
		}
	    }
6655 6656
	}
    }
6657 6658
    set ret [lsort -unique $ret]
    set cached_dheads($origid) $ret
6659 6660
}

6661 6662
proc addedtag {id} {
    global arcnos arcout cached_dtags cached_atags
6663

6664 6665 6666
    if {![info exists arcnos($id)]} return
    if {![info exists arcout($id)]} {
	recalcarc [lindex $arcnos($id) 0]
6667
    }
6668 6669
    catch {unset cached_dtags}
    catch {unset cached_atags}
6670 6671
}

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

6691 6692 6693
    if {![info exists arcnos($hid)]} return
    if {![info exists arcout($hid)]} {
	recalcarc [lindex $arcnos($hid) 0]
6694
    }
6695 6696 6697 6698 6699 6700 6701 6702 6703 6704 6705 6706 6707 6708
    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
	    }
6709 6710
	}
    }
6711 6712 6713
    catch {unset cached_dtags}
    catch {unset cached_atags}
    catch {unset cached_dheads}
6714 6715
}

6716
proc rereadrefs {} {
6717
    global idtags idheads idotherrefs mainhead
6718 6719 6720 6721 6722 6723 6724 6725

    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]
	}
    }
6726
    set oldmainhead $mainhead
6727
    readrefs
6728
    changedrefs
6729 6730 6731 6732
    set refids [lsort -unique [concat $refids [array names idtags] \
			[array names idheads] [array names idotherrefs]]]
    foreach id $refids {
	set v [listrefs $id]
6733 6734 6735
	if {![info exists ref($id)] || $ref($id) != $v ||
	    ($id eq $oldmainhead && $id ne $mainhead) ||
	    ($id eq $mainhead && $id ne $oldmainhead)} {
6736 6737 6738 6739 6740
	    redrawtags $id
	}
    }
}

6741 6742 6743 6744 6745 6746 6747 6748 6749 6750 6751 6752 6753 6754 6755 6756 6757 6758
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]
}

6759
proc showtag {tag isnew} {
6760
    global ctext tagcontents tagids linknum tagobjid
6761 6762 6763 6764 6765

    if {$isnew} {
	addtohistory [list showtag $tag 0]
    }
    $ctext conf -state normal
6766
    clear_ctext
6767
    set linknum 0
6768 6769 6770 6771 6772
    if {![info exists tagcontents($tag)]} {
	catch {
	    set tagcontents($tag) [exec git cat-file tag $tagobjid($tag)]
	}
    }
6773 6774 6775 6776 6777
    if {[info exists tagcontents($tag)]} {
	set text $tagcontents($tag)
    } else {
	set text "Tag: $tag\nId:  $tagids($tag)"
    }
6778
    appendwithlinks $text {}
6779
    $ctext conf -state disabled
6780
    init_flist {}
6781 6782
}

6783 6784 6785
proc doquit {} {
    global stopped
    set stopped 100
6786
    savestuff .
6787 6788
    destroy .
}
6789

6790
proc doprefs {} {
6791
    global maxwidth maxgraphpct diffopts
6792
    global oldprefs prefstop showneartags showlocalchanges
6793
    global bgcolor fgcolor ctext diffcolors selectbgcolor
6794
    global uifont tabstop
P
Paul Mackerras 已提交
6795

6796 6797 6798 6799 6800
    set top .gitkprefs
    set prefstop $top
    if {[winfo exists $top]} {
	raise $top
	return
6801
    }
6802
    foreach v {maxwidth maxgraphpct diffopts showneartags showlocalchanges} {
6803
	set oldprefs($v) [set $v]
P
Paul Mackerras 已提交
6804
    }
6805 6806 6807
    toplevel $top
    wm title $top "Gitk preferences"
    label $top.ldisp -text "Commit list display options"
6808
    $top.ldisp configure -font $uifont
6809 6810 6811 6812 6813 6814 6815 6816 6817 6818
    grid $top.ldisp - -sticky w -pady 10
    label $top.spacer -text " "
    label $top.maxwidthl -text "Maximum graph width (lines)" \
	-font optionfont
    spinbox $top.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
    grid $top.spacer $top.maxwidthl $top.maxwidth -sticky w
    label $top.maxpctl -text "Maximum graph width (% of pane)" \
	-font optionfont
    spinbox $top.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
    grid x $top.maxpctl $top.maxpct -sticky w
6819 6820 6821 6822 6823
    frame $top.showlocal
    label $top.showlocal.l -text "Show local changes" -font optionfont
    checkbutton $top.showlocal.b -variable showlocalchanges
    pack $top.showlocal.b $top.showlocal.l -side left
    grid x $top.showlocal -sticky w
6824

6825
    label $top.ddisp -text "Diff display options"
6826
    $top.ddisp configure -font $uifont
6827 6828 6829 6830 6831
    grid $top.ddisp - -sticky w -pady 10
    label $top.diffoptl -text "Options for diff program" \
	-font optionfont
    entry $top.diffopt -width 20 -textvariable diffopts
    grid x $top.diffoptl $top.diffopt -sticky w
P
Paul Mackerras 已提交
6832 6833 6834 6835 6836
    frame $top.ntag
    label $top.ntag.l -text "Display nearby tags" -font optionfont
    checkbutton $top.ntag.b -variable showneartags
    pack $top.ntag.b $top.ntag.l -side left
    grid x $top.ntag -sticky w
6837 6838 6839
    label $top.tabstopl -text "tabstop" -font optionfont
    entry $top.tabstop -width 10 -textvariable tabstop
    grid x $top.tabstopl $top.tabstop -sticky w
6840 6841

    label $top.cdisp -text "Colors: press to choose"
6842
    $top.cdisp configure -font $uifont
6843 6844 6845 6846 6847 6848 6849 6850 6851 6852 6853 6854 6855 6856 6857 6858 6859 6860 6861 6862 6863 6864 6865 6866 6867
    grid $top.cdisp - -sticky w -pady 10
    label $top.bg -padx 40 -relief sunk -background $bgcolor
    button $top.bgbut -text "Background" -font optionfont \
	-command [list choosecolor bgcolor 0 $top.bg background setbg]
    grid x $top.bgbut $top.bg -sticky w
    label $top.fg -padx 40 -relief sunk -background $fgcolor
    button $top.fgbut -text "Foreground" -font optionfont \
	-command [list choosecolor fgcolor 0 $top.fg foreground setfg]
    grid x $top.fgbut $top.fg -sticky w
    label $top.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]
    button $top.diffoldbut -text "Diff: old lines" -font optionfont \
	-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]
    button $top.diffnewbut -text "Diff: new lines" -font optionfont \
	-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]
    button $top.hunksepbut -text "Diff: hunk header" -font optionfont \
	-command [list choosecolor diffcolors 2 $top.hunksep \
		      "diff hunk header" \
		      [list $ctext tag conf hunksep -foreground]]
    grid x $top.hunksepbut $top.hunksep -sticky w
6868 6869 6870 6871
    label $top.selbgsep -padx 40 -relief sunk -background $selectbgcolor
    button $top.selbgbut -text "Select bg" -font optionfont \
	-command [list choosecolor selectbgcolor 0 $top.bg background setselbg]
    grid x $top.selbgbut $top.selbgsep -sticky w
6872

6873
    frame $top.buts
6874
    button $top.buts.ok -text "OK" -command prefsok -default active
6875
    $top.buts.ok configure -font $uifont
6876
    button $top.buts.can -text "Cancel" -command prefscan -default normal
6877
    $top.buts.can configure -font $uifont
6878 6879 6880 6881
    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
6882
    bind $top <Visibility> "focus $top.buts.ok"
6883 6884
}

6885 6886 6887 6888 6889 6890 6891 6892 6893 6894 6895
proc choosecolor {v vi w x cmd} {
    global $v

    set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \
	       -title "Gitk: choose color for $x"]
    if {$c eq {}} return
    $w conf -background $c
    lset $v $vi $c
    eval $cmd $c
}

6896 6897 6898 6899 6900 6901 6902 6903 6904 6905
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
}

6906 6907 6908 6909 6910 6911 6912 6913 6914 6915 6916 6917 6918 6919 6920 6921 6922 6923
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
}

6924
proc prefscan {} {
6925
    global maxwidth maxgraphpct diffopts
6926
    global oldprefs prefstop showneartags showlocalchanges
6927

6928
    foreach v {maxwidth maxgraphpct diffopts showneartags showlocalchanges} {
6929 6930 6931 6932 6933 6934 6935 6936
	set $v $oldprefs($v)
    }
    catch {destroy $prefstop}
    unset prefstop
}

proc prefsok {} {
    global maxwidth maxgraphpct
6937
    global oldprefs prefstop showneartags showlocalchanges
6938
    global charspc ctext tabstop
6939 6940 6941

    catch {destroy $prefstop}
    unset prefstop
6942
    $ctext configure -tabs "[expr {$tabstop * $charspc}]"
6943 6944 6945 6946 6947 6948 6949
    if {$showlocalchanges != $oldprefs(showlocalchanges)} {
	if {$showlocalchanges} {
	    doshowlocalchanges
	} else {
	    dohidelocalchanges
	}
    }
6950 6951 6952
    if {$maxwidth != $oldprefs(maxwidth)
	|| $maxgraphpct != $oldprefs(maxgraphpct)} {
	redisplay
P
Paul Mackerras 已提交
6953 6954
    } elseif {$showneartags != $oldprefs(showneartags)} {
	reselectline
6955 6956 6957 6958
    }
}

proc formatdate {d} {
6959 6960 6961 6962
    if {$d ne {}} {
	set d [clock format $d -format "%Y-%m-%d %H:%M:%S"]
    }
    return $d
P
Paul Mackerras 已提交
6963 6964
}

6965 6966 6967 6968 6969 6970 6971 6972 6973 6974 6975 6976 6977 6978 6979 6980 6981 6982 6983 6984 6985 6986 6987 6988 6989 6990 6991 6992 6993 6994 6995 6996 6997 6998 6999 7000 7001 7002 7003 7004 7005 7006 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 7150 7151 7152 7153 7154 7155 7156 7157 7158 7159 7160 7161 7162 7163 7164 7165 7166 7167 7168 7169 7170 7171 7172 7173 7174 7175 7176 7177 7178 7179 7180 7181 7182 7183 7184 7185 7186 7187 7188 7189 7190 7191 7192 7193 7194 7195 7196 7197 7198 7199 7200 7201 7202 7203 7204 7205 7206 7207 7208 7209 7210 7211 7212 7213 7214 7215 7216 7217 7218 7219 7220 7221 7222 7223 7224 7225 7226 7227 7228 7229 7230 7231 7232 7233 7234 7235 7236 7237
# 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 {}
}

7238 7239 7240
# defaults...
set datemode 0
set diffopts "-U 5 -p"
7241
set wrcomcmd "git diff-tree --stdin -p --pretty"
7242

7243
set gitencoding {}
7244
catch {
7245
    set gitencoding [exec git config --get i18n.commitencoding]
7246 7247
}
if {$gitencoding == ""} {
7248 7249 7250 7251 7252
    set gitencoding "utf-8"
}
set tclencoding [tcl_encoding $gitencoding]
if {$tclencoding == {}} {
    puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
7253
}
7254

7255 7256
set mainfont {Helvetica 9}
set textfont {Courier 9}
7257
set uifont {Helvetica 9 bold}
7258
set tabstop 8
7259
set findmergefiles 0
7260
set maxgraphpct 50
7261
set maxwidth 16
P
Paul Mackerras 已提交
7262
set revlistorder 0
7263
set fastdate 0
P
Paul Mackerras 已提交
7264 7265 7266
set uparrowlen 7
set downarrowlen 7
set mingaplen 30
P
Paul Mackerras 已提交
7267
set cmitmode "patch"
7268
set wrapcomment "none"
P
Paul Mackerras 已提交
7269
set showneartags 1
7270
set maxrefs 20
7271
set maxlinelen 200
7272
set showlocalchanges 1
7273 7274

set colors {green red blue magenta darkgrey brown orange}
7275 7276 7277
set bgcolor white
set fgcolor black
set diffcolors {red "#00a000" blue}
7278
set selectbgcolor gray85
7279 7280 7281

catch {source ~/.gitk}

7282
font create optionfont -family sans-serif -size -12
7283

7284 7285 7286 7287 7288 7289 7290 7291 7292
set revtreeargs {}
foreach arg $argv {
    switch -regexp -- $arg {
	"^$" { }
	"^-d" { set datemode 1 }
	default {
	    lappend revtreeargs $arg
	}
    }
7293
}
7294

P
Paul Mackerras 已提交
7295 7296 7297
# check that we can find a .git directory somewhere...
set gitdir [gitdir]
if {![file isdirectory $gitdir]} {
P
Paul Mackerras 已提交
7298
    show_error {} . "Cannot find the git directory \"$gitdir\"."
P
Paul Mackerras 已提交
7299 7300 7301
    exit 1
}

7302 7303 7304 7305 7306 7307 7308
set cmdline_files {}
set i [lsearch -exact $revtreeargs "--"]
if {$i >= 0} {
    set cmdline_files [lrange $revtreeargs [expr {$i + 1}] end]
    set revtreeargs [lrange $revtreeargs 0 [expr {$i - 1}]]
} elseif {$revtreeargs ne {}} {
    if {[catch {
7309
	set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs]
7310 7311 7312 7313 7314 7315 7316 7317
	set cmdline_files [split $f "\n"]
	set n [llength $cmdline_files]
	set revtreeargs [lrange $revtreeargs 0 end-$n]
    } 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 已提交
7318
	    set err [string range $err [expr {$i + 6}] end]
7319
	}
P
Paul Mackerras 已提交
7320
	show_error {} . "Bad arguments to gitk:\n$err"
7321 7322 7323 7324
	exit 1
    }
}

7325 7326
set nullid "0000000000000000000000000000000000000000"

7327
set runq {}
7328 7329
set history {}
set historyindex 0
7330 7331
set fh_serial 0
set nhl_names {}
7332
set highlight_paths {}
7333
set searchdirn -forwards
7334 7335
set boldrows {}
set boldnamerows {}
7336
set diffelide {0 0}
7337

P
Paul Mackerras 已提交
7338 7339
set optim_delay 16

P
Paul Mackerras 已提交
7340 7341
set nextviewnum 1
set curview 0
7342
set selectedview 0
7343
set selectedhlview None
P
Paul Mackerras 已提交
7344
set viewfiles(0) {}
7345
set viewperm(0) 0
7346
set viewargs(0) {}
P
Paul Mackerras 已提交
7347

7348
set cmdlineok 0
7349
set stopped 0
7350
set stuffsaved 0
7351
set patchnum 0
7352 7353 7354
set lookingforhead 0
set localrow -1
set lserial 0
7355
setcoords
7356
makewindow
7357
wm title . "[file tail $argv0]: [file tail [pwd]]"
7358
readrefs
7359

7360
if {$cmdline_files ne {} || $revtreeargs ne {}} {
P
Paul Mackerras 已提交
7361 7362
    # create a view for the files/dirs specified on the command line
    set curview 1
7363
    set selectedview 1
P
Paul Mackerras 已提交
7364 7365 7366
    set nextviewnum 2
    set viewname(1) "Command line"
    set viewfiles(1) $cmdline_files
7367
    set viewargs(1) $revtreeargs
7368
    set viewperm(1) 0
7369
    addviewmenu 1
7370 7371
    .bar.view entryconf Edit* -state normal
    .bar.view entryconf Delete* -state normal
P
Paul Mackerras 已提交
7372
}
7373 7374 7375 7376 7377 7378 7379

if {[info exists permviews]} {
    foreach v $permviews {
	set n $nextviewnum
	incr nextviewnum
	set viewname($n) [lindex $v 0]
	set viewfiles($n) [lindex $v 1]
7380
	set viewargs($n) [lindex $v 2]
7381
	set viewperm($n) 1
7382
	addviewmenu $n
7383 7384
    }
}
7385
getcommits