gitk 171.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
proc start_rev_list {view} {
20
    global startmsecs nextupdate
P
Paul Mackerras 已提交
21
    global commfd leftover tclencoding datemode
22
    global viewargs viewfiles commitidx
23 24

    set startmsecs [clock clicks -milliseconds]
J
Jeff Hobbs 已提交
25
    set nextupdate [expr {$startmsecs + 100}]
26
    set commitidx($view) 0
27
    set args $viewargs($view)
28 29
    if {$viewfiles($view) ne {}} {
	set args [concat $args "--" $viewfiles($view)]
30
    }
P
Paul Mackerras 已提交
31 32 33 34
    set order "--topo-order"
    if {$datemode} {
	set order "--date-order"
    }
35
    if {[catch {
36
	set fd [open [concat | git rev-list --header $order \
37
			  --parents --boundary --default HEAD $args] r]
38
    } err]} {
39
	puts stderr "Error executing git rev-list: $err"
40 41
	exit 1
    }
42 43 44
    set commfd($view) $fd
    set leftover($view) {}
    fconfigure $fd -blocking 0 -translation lf
45
    if {$tclencoding != {}} {
46
	fconfigure $fd -encoding $tclencoding
47
    }
48 49
    fileevent $fd readable [list getcommitlines $fd $view]
    nowbusy $view
50 51
}

52
proc stop_rev_list {} {
53
    global commfd curview
54

55 56
    if {![info exists commfd($curview)]} return
    set fd $commfd($curview)
57
    catch {
58
	set pid [pid $fd]
59 60
	exec kill $pid
    }
61 62
    catch {close $fd}
    unset commfd($curview)
63 64
}

65
proc getcommits {} {
66
    global phase canv mainfont curview
67 68

    set phase getcommits
69 70
    initlayout
    start_rev_list $curview
71
    show_status "Reading commits..."
72 73
}

74
proc getcommitlines {fd view}  {
P
Paul Mackerras 已提交
75
    global commitlisted nextupdate
76
    global leftover commfd
P
Paul Mackerras 已提交
77
    global displayorder commitidx commitrow commitdata
78 79
    global parentlist childlist children curview hlview
    global vparentlist vchildlist vdisporder vcmitlisted
80

81
    set stuff [read $fd 500000]
P
Paul Mackerras 已提交
82
    if {$stuff == {}} {
83
	if {![eof $fd]} return
84
	global viewname
85
	unset commfd($view)
86
	notbusy $view
87
	# set it blocking so we wait for the process to terminate
88
	fconfigure $fd -blocking 1
89 90 91 92
	if {[catch {close $fd} err]} {
	    set fv {}
	    if {$view != $curview} {
		set fv " for the \"$viewname($view)\" view"
93
	    }
94 95
	    if {[string range $err 0 4] == "usage"} {
		set err "Gitk: error reading commits$fv:\
96
			bad arguments to git rev-list."
97 98
		if {$viewname($view) eq "Command line"} {
		    append err \
99
			"  (Note: arguments to gitk are passed to git rev-list\
100 101 102 103 104 105
			 to allow selection of commits to be displayed.)"
		}
	    } else {
		set err "Error reading commits$fv: $err"
	    }
	    error_popup $err
106
	}
107 108
	if {$view == $curview} {
	    after idle finishcommits
109
	}
110
	return
111
    }
P
Paul Mackerras 已提交
112
    set start 0
113
    set gotsome 0
P
Paul Mackerras 已提交
114 115 116
    while 1 {
	set i [string first "\0" $stuff $start]
	if {$i < 0} {
117
	    append leftover($view) [string range $stuff $start end]
P
Paul Mackerras 已提交
118
	    break
119
	}
P
Paul Mackerras 已提交
120
	if {$start == 0} {
121
	    set cmit $leftover($view)
122
	    append cmit [string range $stuff 0 [expr {$i - 1}]]
123
	    set leftover($view) {}
124 125
	} else {
	    set cmit [string range $stuff $start [expr {$i - 1}]]
P
Paul Mackerras 已提交
126 127
	}
	set start [expr {$i + 1}]
128 129
	set j [string first "\n" $cmit]
	set ok 0
130
	set listed 1
131 132
	if {$j >= 0} {
	    set ids [string range $cmit 0 [expr {$j - 1}]]
133 134 135 136
	    if {[string range $ids 0 0] == "-"} {
		set listed 0
		set ids [string range $ids 1 end]
	    }
137 138
	    set ok 1
	    foreach id $ids {
139
		if {[string length $id] != 40} {
140 141 142 143 144 145
		    set ok 0
		    break
		}
	    }
	}
	if {!$ok} {
146 147 148 149
	    set shortcmit $cmit
	    if {[string length $shortcmit] > 80} {
		set shortcmit "[string range $shortcmit 0 80]..."
	    }
150
	    error_popup "Can't parse git rev-list output: {$shortcmit}"
P
Paul Mackerras 已提交
151 152
	    exit 1
	}
153
	set id [lindex $ids 0]
154 155
	if {$listed} {
	    set olds [lrange $ids 1 end]
P
Paul Mackerras 已提交
156
	    set i 0
157
	    foreach p $olds {
P
Paul Mackerras 已提交
158
		if {$i == 0 || [lsearch -exact $olds $p] >= $i} {
159
		    lappend children($view,$p) $id
P
Paul Mackerras 已提交
160 161
		}
		incr i
162
	    }
163 164 165
	} else {
	    set olds {}
	}
166 167
	if {![info exists children($view,$id)]} {
	    set children($view,$id) {}
168
	}
169
	set commitdata($id) [string range $cmit [expr {$j + 1}] end]
170 171 172 173 174 175 176 177 178 179 180 181 182
	set commitrow($view,$id) $commitidx($view)
	incr commitidx($view)
	if {$view == $curview} {
	    lappend parentlist $olds
	    lappend childlist $children($view,$id)
	    lappend displayorder $id
	    lappend commitlisted $listed
	} else {
	    lappend vparentlist($view) $olds
	    lappend vchildlist($view) $children($view,$id)
	    lappend vdisporder($view) $id
	    lappend vcmitlisted($view) $listed
	}
183 184 185
	set gotsome 1
    }
    if {$gotsome} {
186
	if {$view == $curview} {
187
	    while {[layoutmore $nextupdate]} doupdate
188
	} elseif {[info exists hlview] && $view == $hlview} {
189
	    vhighlightmore
190
	}
P
Paul Mackerras 已提交
191 192
    }
    if {[clock clicks -milliseconds] >= $nextupdate} {
193
	doupdate
194 195 196
    }
}

197
proc doupdate {} {
198
    global commfd nextupdate numcommits
199

200 201
    foreach v [array names commfd] {
	fileevent $commfd($v) readable {}
202
    }
203
    update
204
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
205 206 207
    foreach v [array names commfd] {
	set fd $commfd($v)
	fileevent $fd readable [list getcommitlines $fd $v]
208
    }
209 210 211
}

proc readcommit {id} {
212
    if {[catch {set contents [exec git cat-file commit $id]}]} return
213
    parsecommit $id $contents 0
P
Paul Mackerras 已提交
214 215
}

P
Paul Mackerras 已提交
216
proc updatecommits {} {
217
    global viewdata curview phase displayorder
218
    global children commitrow selectedline thickerline
P
Paul Mackerras 已提交
219

220 221 222
    if {$phase ne {}} {
	stop_rev_list
	set phase {}
223
    }
224
    set n $curview
225 226 227 228
    foreach id $displayorder {
	catch {unset children($n,$id)}
	catch {unset commitrow($n,$id)}
    }
229
    set curview -1
230 231
    catch {unset selectedline}
    catch {unset thickerline}
232
    catch {unset viewdata($n)}
233
    discardallcommits
234
    readrefs
235
    showview $n
236 237
}

238
proc parsecommit {id contents listed} {
239 240 241 242 243 244 245 246 247
    global commitinfo cdate

    set inhdr 1
    set comment {}
    set headline {}
    set auname {}
    set audate {}
    set comname {}
    set comdate {}
P
Paul Mackerras 已提交
248 249 250 251 252 253 254 255 256 257 258 259 260 261 262
    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]
263 264
	}
    }
P
Paul Mackerras 已提交
265 266 267 268 269
    set headline {}
    # take the first line of the comment as the headline
    set i [string first "\n" $comment]
    if {$i >= 0} {
	set headline [string trim [string range $comment 0 $i]]
270 271
    } else {
	set headline $comment
P
Paul Mackerras 已提交
272 273
    }
    if {!$listed} {
274 275
	# git rev-list indents the comment by 4 spaces;
	# if we got this via git cat-file, add the indentation
P
Paul Mackerras 已提交
276 277 278 279
	set newcomment {}
	foreach line [split $comment "\n"] {
	    append newcomment "    "
	    append newcomment $line
280
	    append newcomment "\n"
P
Paul Mackerras 已提交
281 282
	}
	set comment $newcomment
283 284
    }
    if {$comdate != {}} {
285
	set cdate($id) $comdate
286
    }
287 288
    set commitinfo($id) [list $headline $auname $audate \
			     $comname $comdate $comment]
289 290
}

291
proc getcommit {id} {
292
    global commitdata commitinfo
P
Paul Mackerras 已提交
293

294 295
    if {[info exists commitdata($id)]} {
	parsecommit $id $commitdata($id) 1
P
Paul Mackerras 已提交
296 297 298 299 300 301 302 303 304
    } else {
	readcommit $id
	if {![info exists commitinfo($id)]} {
	    set commitinfo($id) {"No commit information available"}
	}
    }
    return 1
}

305
proc readrefs {} {
306
    global tagids idtags headids idheads tagcontents
307
    global otherrefids idotherrefs mainhead
308

309 310 311
    foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
	catch {unset $v}
    }
312
    set refd [open [list | git show-ref] r]
313
    while {0 <= [set n [gets $refd line]]} {
314
	if {![regexp {^([0-9a-f]{40}) refs/([^^]*)$} $line \
315 316
	    match id path]} {
	    continue
P
Paul Mackerras 已提交
317
	}
318 319 320
	if {[regexp {^remotes/.*/HEAD$} $path match]} {
	    continue
	}
321 322 323
	if {![regexp {^(tags|heads)/(.*)$} $path match type name]} {
	    set type others
	    set name $path
324
	}
325 326 327
	if {[regexp {^remotes/} $path match]} {
	    set type heads
	}
328 329 330 331 332 333 334
	if {$type == "tags"} {
	    set tagids($name) $id
	    lappend idtags($id) $name
	    set obj {}
	    set type {}
	    set tag {}
	    catch {
335
		set commit [exec git rev-parse "$id^0"]
P
Paul Mackerras 已提交
336
		if {$commit != $id} {
337 338 339 340 341
		    set tagids($name) $commit
		    lappend idtags($commit) $name
		}
	    }		
	    catch {
P
Paul Mackerras 已提交
342
	        set tagcontents($name) [exec git cat-file tag $id]
343
	    }
344 345 346 347 348 349
	} elseif { $type == "heads" } {
	    set headids($name) $id
	    lappend idheads($id) $name
	} else {
	    set otherrefids($name) $id
	    lappend idotherrefs($id) $name
350 351
	}
    }
352
    close $refd
353 354 355 356 357 358 359
    set mainhead {}
    catch {
	set thehead [exec git symbolic-ref HEAD]
	if {[string match "refs/heads/*" $thehead]} {
	    set mainhead [string range $thehead 11 end]
	}
    }
360 361
}

P
Paul Mackerras 已提交
362
proc show_error {w top msg} {
363 364
    message $w.m -text $msg -justify center -aspect 400
    pack $w.m -side top -fill x -padx 20 -pady 20
P
Paul Mackerras 已提交
365
    button $w.ok -text OK -command "destroy $top"
366
    pack $w.ok -side bottom -fill x
P
Paul Mackerras 已提交
367 368 369
    bind $top <Visibility> "grab $top; focus $top"
    bind $top <Key-Return> "destroy $top"
    tkwait window $top
370 371
}

372 373 374 375
proc error_popup msg {
    set w .error
    toplevel $w
    wm transient $w .
P
Paul Mackerras 已提交
376
    show_error $w $w $msg
377 378
}

379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395
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
}

396
proc makewindow {} {
397 398
    global canv canv2 canv3 linespc charspc ctext cflist
    global textfont mainfont uifont
399
    global findtype findtypemenu findloc findstring fstring geometry
400
    global entries sha1entry sha1string sha1but
401
    global maincursor textcursor curtextcursor
402
    global rowctxmenu mergemax wrapcomment
403
    global highlight_files gdttype
404
    global searchstring sstring
405
    global bgcolor fgcolor bglist fglist diffcolors
406
    global headctxmenu
407 408 409

    menu .bar
    .bar add cascade -label "File" -menu .bar.file
410
    .bar configure -font $uifont
411
    menu .bar.file
P
Paul Mackerras 已提交
412
    .bar.file add command -label "Update" -command updatecommits
413
    .bar.file add command -label "Reread references" -command rereadrefs
414
    .bar.file add command -label "Quit" -command doquit
415
    .bar.file configure -font $uifont
416 417 418
    menu .bar.edit
    .bar add cascade -label "Edit" -menu .bar.edit
    .bar.edit add command -label "Preferences" -command doprefs
419
    .bar.edit configure -font $uifont
420

421
    menu .bar.view -font $uifont
P
Paul Mackerras 已提交
422
    .bar add cascade -label "View" -menu .bar.view
423 424 425
    .bar.view add command -label "New view..." -command {newview 0}
    .bar.view add command -label "Edit view..." -command editview \
	-state disabled
P
Paul Mackerras 已提交
426 427
    .bar.view add command -label "Delete view" -command delview -state disabled
    .bar.view add separator
428 429
    .bar.view add radiobutton -label "All files" -command {showview 0} \
	-variable selectedview -value 0
430

431 432 433
    menu .bar.help
    .bar add cascade -label "Help" -menu .bar.help
    .bar.help add command -label "About gitk" -command about
434
    .bar.help add command -label "Key bindings" -command keys
435
    .bar.help configure -font $uifont
436 437
    . configure -menu .bar

438
    # the gui has upper and lower half, parts of a paned window.
P
Paul Mackerras 已提交
439
    panedwindow .ctop -orient vertical
440 441

    # possibly use assumed geometry
442
    if {![info exists geometry(pwsash0)]} {
443 444 445 446
        set geometry(topheight) [expr {15 * $linespc}]
        set geometry(topwidth) [expr {80 * $charspc}]
        set geometry(botheight) [expr {15 * $linespc}]
        set geometry(botwidth) [expr {50 * $charspc}]
447 448
        set geometry(pwsash0) "[expr {40 * $charspc}] 2"
        set geometry(pwsash1) "[expr {60 * $charspc}] 2"
449 450 451 452 453 454 455 456 457 458
    }

    # 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
459
    canvas $canv \
460
	-background $bgcolor -bd 0 \
P
Paul Mackerras 已提交
461
	-yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
462 463
    .tf.histframe.pwclist add $canv
    set canv2 .tf.histframe.pwclist.canv2
464
    canvas $canv2 \
465
	-background $bgcolor -bd 0 -yscrollincr $linespc
466 467
    .tf.histframe.pwclist add $canv2
    set canv3 .tf.histframe.pwclist.canv3
468
    canvas $canv3 \
469
	-background $bgcolor -bd 0 -yscrollincr $linespc
470
    .tf.histframe.pwclist add $canv3
471 472
    eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0)
    eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1)
473 474 475 476 477

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

481 482 483 484 485
    # 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
486
    set entries $sha1entry
487
    set sha1but .tf.bar.sha1label
488
    button $sha1but -text "SHA1 ID: " -state disabled -relief flat \
489
	-command gotocommit -width 8 -font $uifont
490
    $sha1but conf -disabledforeground [$sha1but cget -foreground]
491
    pack .tf.bar.sha1label -side left
492 493
    entry $sha1entry -width 40 -font $textfont -textvariable sha1string
    trace add variable sha1string write sha1change
494
    pack $sha1entry -side left -pady 2
495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511

    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};
    }
512
    button .tf.bar.leftbut -image bm-left -command goback \
513
	-state disabled -width 26
514 515
    pack .tf.bar.leftbut -side left -fill y
    button .tf.bar.rightbut -image bm-right -command goforw \
516
	-state disabled -width 26
517
    pack .tf.bar.rightbut -side left -fill y
518

519 520
    button .tf.bar.findbut -text "Find" -command dofind -font $uifont
    pack .tf.bar.findbut -side left
521
    set findstring {}
522
    set fstring .tf.bar.findstring
523
    lappend entries $fstring
524
    entry $fstring -width 30 -font $textfont -textvariable findstring
525
    trace add variable findstring write find_change
526
    pack $fstring -side left -expand 1 -fill x -in .tf.bar
527
    set findtype Exact
528 529
    set findtypemenu [tk_optionMenu .tf.bar.findtype \
		      findtype Exact IgnCase Regexp]
530
    trace add variable findtype write find_change
531 532
    .tf.bar.findtype configure -font $uifont
    .tf.bar.findtype.menu configure -font $uifont
533
    set findloc "All fields"
534
    tk_optionMenu .tf.bar.findloc findloc "All fields" Headline \
535 536
	Comments Author Committer
    trace add variable findloc write find_change
537 538 539 540 541 542 543 544 545
    .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
546
    set gdttype "touching paths:"
547 548
    set gm [tk_optionMenu .tf.lbar.gdttype gdttype "touching paths:" \
	"adding/removing string:"]
549 550
    trace add variable gdttype write hfiles_change
    $gm conf -font $uifont
551 552 553
    .tf.lbar.gdttype conf -font $uifont
    pack .tf.lbar.gdttype -side left -fill y
    entry .tf.lbar.fent -width 25 -font $textfont \
554 555
	-textvariable highlight_files
    trace add variable highlight_files write hfiles_change
556 557 558 559
    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
560
    global viewhlmenu selectedhlview
561
    set viewhlmenu [tk_optionMenu .tf.lbar.vhl selectedhlview None]
562
    $viewhlmenu entryconf None -command delvhighlight
563
    $viewhlmenu conf -font $uifont
564 565 566 567
    .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
568
    global highlight_related
569 570
    set m [tk_optionMenu .tf.lbar.relm highlight_related None \
	"Descendent" "Not descendent" "Ancestor" "Not ancestor"]
571
    $m conf -font $uifont
572
    .tf.lbar.relm conf -font $uifont
573
    trace add variable highlight_related write vrel_change
574 575 576 577 578 579 580
    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
581 582
    .ctop paneconfigure .tf -height $geometry(topheight)
    .ctop paneconfigure .tf -width $geometry(topwidth)
583 584 585 586 587 588 589 590 591 592 593 594 595 596 597

    # 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

    button .bleft.top.search -text "Search" -command dosearch \
598
	-font $uifont
599 600
    pack .bleft.top.search -side left -padx 5
    set sstring .bleft.top.sstring
601 602 603 604
    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
605
    set ctext .bleft.ctext
606 607
    text $ctext -background $bgcolor -foreground $fgcolor \
	-state disabled -font $textfont \
608
	-yscrollcommand scrolltext -wrap none
609 610 611
    scrollbar .bleft.sb -command "$ctext yview"
    pack .bleft.top -side top -fill x
    pack .bleft.sb -side right -fill y
612
    pack $ctext -side left -fill both -expand 1
613 614
    lappend bglist $ctext
    lappend fglist $ctext
615

616
    $ctext tag conf comment -wrap $wrapcomment
617
    $ctext tag conf filesep -font [concat $textfont bold] -back "#aaaaaa"
618 619 620
    $ctext tag conf hunksep -fore [lindex $diffcolors 2]
    $ctext tag conf d0 -fore [lindex $diffcolors 0]
    $ctext tag conf d1 -fore [lindex $diffcolors 1]
621 622 623 624 625
    $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
626 627 628 629 630 631 632 633 634 635 636
    $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"
637
    $ctext tag conf mmax -fore darkgrey
638
    set mergemax 16
639 640 641
    $ctext tag conf mresult -font [concat $textfont bold]
    $ctext tag conf msep -font [concat $textfont bold]
    $ctext tag conf found -back yellow
642

643
    .pwbottom add .bleft
644
    .pwbottom paneconfigure .bleft -width $geometry(botwidth)
645 646 647 648 649

    # lower right
    frame .bright
    frame .bright.mode
    radiobutton .bright.mode.patch -text "Patch" \
P
Paul Mackerras 已提交
650
	-command reselectline -variable cmitmode -value "patch"
651
    radiobutton .bright.mode.tree -text "Tree" \
P
Paul Mackerras 已提交
652
	-command reselectline -variable cmitmode -value "tree"
653 654 655
    grid .bright.mode.patch .bright.mode.tree -sticky ew
    pack .bright.mode -side top -fill x
    set cflist .bright.cfiles
656
    set indent [font measure $mainfont "nn"]
657
    text $cflist \
658 659
	-background $bgcolor -foreground $fgcolor \
	-font $mainfont \
660
	-tabs [list $indent [expr {2 * $indent}]] \
661
	-yscrollcommand ".bright.sb set" \
662 663
	-cursor [. cget -cursor] \
	-spacing1 1 -spacing3 1
664 665
    lappend bglist $cflist
    lappend fglist $cflist
666 667
    scrollbar .bright.sb -command "$cflist yview"
    pack .bright.sb -side right -fill y
668
    pack $cflist -side left -fill both -expand 1
669 670
    $cflist tag configure highlight \
	-background [$cflist cget -selectbackground]
671
    $cflist tag configure bold -font [concat $mainfont bold]
672

673 674
    .pwbottom add .bright
    .ctop add .pwbottom
675

676 677 678 679 680 681 682
    # 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
683 684
    bindall <1> {selcanvline %W %x %y}
    #bindall <B1-Motion> {selcanvline %W %x %y}
685 686
    bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
    bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
687 688
    bindall <2> "canvscan mark %W %x %y"
    bindall <B2-Motion> "canvscan dragto %W %x %y"
689 690
    bindkey <Home> selfirstline
    bindkey <End> sellastline
691 692
    bind . <Key-Up> "selnextline -1"
    bind . <Key-Down> "selnextline 1"
693 694
    bind . <Shift-Key-Up> "next_highlight -1"
    bind . <Shift-Key-Down> "next_highlight 1"
695 696 697 698 699 700 701 702 703 704
    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"
705 706 707
    bindkey <Key-Delete> "$ctext yview scroll -1 pages"
    bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
    bindkey <Key-space> "$ctext yview scroll 1 pages"
708 709
    bindkey p "selnextline -1"
    bindkey n "selnextline 1"
R
Robert Suetterlin 已提交
710 711 712 713 714 715
    bindkey z "goback"
    bindkey x "goforw"
    bindkey i "selnextline -1"
    bindkey k "selnextline 1"
    bindkey j "goback"
    bindkey l "goforw"
716 717 718
    bindkey b "$ctext yview scroll -1 pages"
    bindkey d "$ctext yview scroll 18 units"
    bindkey u "$ctext yview scroll -18 units"
719 720
    bindkey / {findnext 1}
    bindkey <Key-Return> {findnext 0}
721
    bindkey ? findprev
722
    bindkey f nextfile
723
    bindkey <F5> updatecommits
724
    bind . <Control-q> doquit
725
    bind . <Control-f> dofind
726
    bind . <Control-g> {findnext 0}
727
    bind . <Control-r> dosearchback
728
    bind . <Control-s> dosearch
729 730 731 732
    bind . <Control-equal> {incrfont 1}
    bind . <Control-KP_Add> {incrfont 1}
    bind . <Control-minus> {incrfont -1}
    bind . <Control-KP_Subtract> {incrfont -1}
733
    wm protocol . WM_DELETE_WINDOW doquit
734
    bind . <Button-1> "click %W"
735
    bind $fstring <Key-Return> dofind
736
    bind $sha1entry <Key-Return> gotocommit
737
    bind $sha1entry <<PasteSelection>> clearsha1
738 739
    bind $cflist <1> {sel_flist %W %x %y; break}
    bind $cflist <B1-Motion> {sel_flist %W %x %y; break}
P
Paul Mackerras 已提交
740
    bind $cflist <ButtonRelease-1> {treeclick %W %x %y}
741 742 743

    set maincursor [. cget -cursor]
    set textcursor [$ctext cget -cursor]
744
    set curtextcursor $textcursor
745

746 747 748 749 750 751
    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}
752
    $rowctxmenu add command -label "Make patch" -command mkpatch
753
    $rowctxmenu add command -label "Create tag" -command mktag
754
    $rowctxmenu add command -label "Write commit to file" -command writecommit
755
    $rowctxmenu add command -label "Create new branch" -command mkbranch
756 757
    $rowctxmenu add command -label "Cherry-pick this commit" \
	-command cherrypick
758 759 760 761 762 763 764

    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
765 766
}

767 768 769 770 771 772 773 774 775 776 777 778 779
# 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 已提交
780 781 782
proc scrollcanv {cscroll f0 f1} {
    $cscroll set $f0 $f1
    drawfrac $f0 $f1
783
    flushhighlights
P
Paul Mackerras 已提交
784 785
}

786 787 788 789
# 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} {
790
    global entries
791 792 793 794 795
    bind . $ev $script
    set escript [bind Entry $ev]
    if {$escript == {}} {
	set escript [bind Entry <Key>]
    }
796 797 798
    foreach e $entries {
	bind $e $ev "$escript; break"
    }
799 800 801
}

# set the focus back to the toplevel for any click outside
802
# the entry widgets
803
proc click {w} {
804 805 806
    global entries
    foreach e $entries {
	if {$w == $e} return
807
    }
808
    focus .
809 810 811
}

proc savestuff {w} {
812
    global canv canv2 canv3 ctext cflist mainfont textfont uifont
813
    global stuffsaved findmergefiles maxgraphpct
P
Paul Mackerras 已提交
814
    global maxwidth showneartags
815
    global viewname viewfiles viewargs viewperm nextviewnum
816
    global cmitmode wrapcomment
817
    global colors bgcolor fgcolor diffcolors
818

819
    if {$stuffsaved} return
820
    if {![winfo viewable .]} return
821 822
    catch {
	set f [open "~/.gitk-new" w]
823 824
	puts $f [list set mainfont $mainfont]
	puts $f [list set textfont $textfont]
825
	puts $f [list set uifont $uifont]
826
	puts $f [list set findmergefiles $findmergefiles]
827
	puts $f [list set maxgraphpct $maxgraphpct]
828
	puts $f [list set maxwidth $maxwidth]
P
Paul Mackerras 已提交
829
	puts $f [list set cmitmode $cmitmode]
830
	puts $f [list set wrapcomment $wrapcomment]
P
Paul Mackerras 已提交
831
	puts $f [list set showneartags $showneartags]
832 833 834 835
	puts $f [list set bgcolor $bgcolor]
	puts $f [list set fgcolor $fgcolor]
	puts $f [list set colors $colors]
	puts $f [list set diffcolors $diffcolors]
836

837
	puts $f "set geometry(main) [wm geometry .]"
838 839
	puts $f "set geometry(topwidth) [winfo width .tf]"
	puts $f "set geometry(topheight) [winfo height .tf]"
840 841
        puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\""
        puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\""
842 843 844
	puts $f "set geometry(botwidth) [winfo width .bleft]"
	puts $f "set geometry(botheight) [winfo height .bleft]"

845 846 847
	puts -nonewline $f "set permviews {"
	for {set v 0} {$v < $nextviewnum} {incr v} {
	    if {$viewperm($v)} {
848
		puts $f "{[list $viewname($v) $viewfiles($v) $viewargs($v)]}"
849 850 851
	    }
	}
	puts $f "}"
852 853 854 855
	close $f
	file rename -force "~/.gitk-new" "~/.gitk"
    }
    set stuffsaved 1
856 857
}

858 859
proc resizeclistpanes {win w} {
    global oldwidth
860
    if {[info exists oldwidth($win)]} {
861 862 863 864 865 866 867 868 869 870 871 872 873
	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 已提交
874
		set sash1 [expr {$sash0 + 20}]
875 876
	    }
	    if {$sash1 > $w - 10} {
J
Jeff Hobbs 已提交
877
		set sash1 [expr {$w - 10}]
878
		if {$sash0 > $sash1 - 20} {
J
Jeff Hobbs 已提交
879
		    set sash0 [expr {$sash1 - 20}]
880 881 882 883 884 885 886 887 888 889 890
		}
	    }
	}
	$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
891
    if {[info exists oldwidth($win)]} {
892 893 894 895 896 897 898 899 900 901
	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 已提交
902
		set sash0 [expr {$w - 15}]
903 904 905 906 907 908 909
	    }
	}
	$win sash place 0 $sash0 [lindex $s0 1]
    }
    set oldwidth($win) $w
}

910 911 912 913 914 915 916 917 918 919 920 921 922 923
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
}

924 925 926 927 928 929 930 931 932
proc about {} {
    set w .about
    if {[winfo exists $w]} {
	raise $w
	return
    }
    toplevel $w
    wm title $w "About gitk"
    message $w.m -text {
P
Paul Mackerras 已提交
933
Gitk - a commit viewer for git
934

P
Paul Mackerras 已提交
935
Copyright  2005-2006 Paul Mackerras
936

937
Use and redistribute under the terms of the GNU General Public License} \
938 939 940 941 942 943
	    -justify center -aspect 400
    pack $w.m -side top -fill x -padx 20 -pady 20
    button $w.ok -text Close -command "destroy $w"
    pack $w.ok -side bottom
}

944 945 946 947 948 949 950 951 952 953 954 955
proc keys {} {
    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
956 957
<Home>		Move to first commit
<End>		Move to last commit
958 959 960 961
<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
962 963 964 965 966 967 968 969
<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
970 971
<Shift-Up>	Move to previous highlighted line
<Shift-Down>	Move to next highlighted line
972 973 974 975 976 977 978 979 980 981 982
<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
983 984
<Ctrl-S>		Search for next hit in diff view
<Ctrl-R>		Search for previous hit in diff view
985 986 987 988
<Ctrl-KP+>	Increase font size
<Ctrl-plus>	Increase font size
<Ctrl-KP->	Decrease font size
<Ctrl-minus>	Decrease font size
989
<F5>		Update
990 991 992 993 994 995 996
} \
	    -justify left -bg white -border 2 -relief sunken
    pack $w.m -side top -fill both
    button $w.ok -text Close -command "destroy $w"
    pack $w.ok -side bottom
}

997 998
# Procedures for manipulating the file list window at the
# bottom right of the overall window.
P
Paul Mackerras 已提交
999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051

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
1052
		$w insert end $d [highlight_tag $prefix]
P
Paul Mackerras 已提交
1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063
		$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
1064
		$w insert end $tail [highlight_tag $f]
P
Paul Mackerras 已提交
1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100
	    }
	    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
	}
    }
}

1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116
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 已提交
1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149
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) {
1150
	set de $dir$e
P
Paul Mackerras 已提交
1151 1152 1153 1154 1155 1156 1157 1158
	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
1159
	    $w insert e:$ix $e [highlight_tag $de]
P
Paul Mackerras 已提交
1160 1161 1162 1163 1164
	    $w mark set s:$iy e:$ix
	    $w mark gravity s:$iy left
	    set treeheight($de) 1
	} else {
	    $w insert e:$ix $str
1165
	    $w insert e:$ix $e [highlight_tag $de]
P
Paul Mackerras 已提交
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 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244
	}
    }
    $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};
}

1245
proc init_flist {first} {
1246
    global cflist cflist_top selectedline difffilestart
1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260

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

1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272
proc highlight_tag {f} {
    global highlight_paths

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

proc highlight_filelist {} {
1273
    global cmitmode cflist
1274

1275 1276
    $cflist conf -state normal
    if {$cmitmode ne "tree"} {
1277 1278 1279 1280 1281 1282 1283
	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"
	    }
	}
1284 1285
    } else {
	highlight_tree 2 {}
1286
    }
1287
    $cflist conf -state disabled
1288 1289 1290
}

proc unhighlight_filelist {} {
1291
    global cflist
1292

1293 1294 1295
    $cflist conf -state normal
    $cflist tag remove bold 1.0 end
    $cflist conf -state disabled
1296 1297
}

P
Paul Mackerras 已提交
1298
proc add_flist {fl} {
1299
    global cflist
1300

1301 1302 1303 1304
    $cflist conf -state normal
    foreach f $fl {
	$cflist insert end "\n"
	$cflist insert end $f [highlight_tag $f]
1305
    }
1306
    $cflist conf -state disabled
1307 1308 1309
}

proc sel_flist {w x y} {
1310
    global ctext difffilestart cflist cflist_top cmitmode
1311

P
Paul Mackerras 已提交
1312
    if {$cmitmode eq "tree"} return
1313 1314
    if {![info exists cflist_top]} return
    set l [lindex [split [$w index "@$x,$y"] "."] 0]
1315 1316 1317
    $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 已提交
1318 1319 1320 1321
    if {$l == 1} {
	$ctext yview 1.0
    } else {
	catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
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 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418
# 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
}

1419 1420
# Code to implement multiple views

1421 1422
proc newview {ishighlight} {
    global nextviewnum newviewname newviewperm uifont newishighlight
1423
    global newviewargs revtreeargs
P
Paul Mackerras 已提交
1424

1425
    set newishighlight $ishighlight
P
Paul Mackerras 已提交
1426 1427 1428 1429 1430
    set top .gitkview
    if {[winfo exists $top]} {
	raise $top
	return
    }
1431 1432
    set newviewname($nextviewnum) "View $nextviewnum"
    set newviewperm($nextviewnum) 0
1433
    set newviewargs($nextviewnum) [shellarglist $revtreeargs]
1434
    vieweditor $top $nextviewnum "Gitk view definition"
1435 1436 1437 1438 1439
}

proc editview {} {
    global curview
    global viewname viewperm newviewname newviewperm
1440
    global viewargs newviewargs
1441 1442 1443 1444 1445 1446 1447 1448

    set top .gitkvedit-$curview
    if {[winfo exists $top]} {
	raise $top
	return
    }
    set newviewname($curview) $viewname($curview)
    set newviewperm($curview) $viewperm($curview)
1449
    set newviewargs($curview) [shellarglist $viewargs($curview)]
1450 1451 1452 1453 1454 1455 1456
    vieweditor $top $curview "Gitk: edit view $viewname($curview)"
}

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

P
Paul Mackerras 已提交
1457
    toplevel $top
1458
    wm title $top $title
1459
    label $top.nl -text "Name" -font $uifont
1460
    entry $top.name -width 20 -textvariable newviewname($n)
1461
    grid $top.nl $top.name -sticky w -pady 5
1462
    checkbutton $top.perm -text "Remember this view" -variable newviewperm($n)
1463
    grid $top.perm - -pady 5 -sticky w
1464
    message $top.al -aspect 1000 -font $uifont \
1465
	-text "Commits to include (arguments to git rev-list):"
1466 1467 1468 1469 1470
    grid $top.al - -sticky w -pady 5
    entry $top.args -width 50 -textvariable newviewargs($n) \
	-background white
    grid $top.args - -sticky ew -padx 5
    message $top.l -aspect 1000 -font $uifont \
1471 1472 1473
	-text "Enter files and directories to include, one per line:"
    grid $top.l - -sticky w
    text $top.t -width 40 -height 10 -background white
1474 1475 1476 1477 1478 1479 1480 1481
    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
    }
1482
    grid $top.t - -sticky ew -padx 5
P
Paul Mackerras 已提交
1483
    frame $top.buts
1484 1485
    button $top.buts.ok -text "OK" -command [list newviewok $top $n]
    button $top.buts.can -text "Cancel" -command [list destroy $top]
P
Paul Mackerras 已提交
1486 1487 1488 1489 1490 1491 1492
    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
}

1493
proc doviewmenu {m first cmd op argv} {
1494 1495 1496
    set nmenu [$m index end]
    for {set i $first} {$i <= $nmenu} {incr i} {
	if {[$m entrycget $i -command] eq $cmd} {
1497
	    eval $m $op $i $argv
1498
	    break
1499 1500
	}
    }
1501 1502 1503
}

proc allviewmenus {n op args} {
1504 1505
    global viewhlmenu

1506
    doviewmenu .bar.view 5 [list showview $n] $op $args
1507
    doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
1508 1509 1510
}

proc newviewok {top n} {
1511
    global nextviewnum newviewperm newviewname newishighlight
1512
    global viewname viewfiles viewperm selectedview curview
1513
    global viewargs newviewargs viewhlmenu
P
Paul Mackerras 已提交
1514

1515 1516 1517 1518 1519 1520 1521 1522
    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 已提交
1523
    set files {}
1524
    foreach f [split [$top.t get 0.0 end] "\n"] {
P
Paul Mackerras 已提交
1525 1526 1527 1528 1529
	set ft [string trim $f]
	if {$ft ne {}} {
	    lappend files $ft
	}
    }
1530 1531 1532 1533 1534 1535
    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
1536
	set viewargs($n) $newargs
1537 1538 1539 1540
	addviewmenu $n
	if {!$newishighlight} {
	    after idle showview $n
	} else {
1541
	    after idle addvhighlight $n
1542
	}
1543 1544 1545 1546 1547
    } else {
	# editing an existing view
	set viewperm($n) $newviewperm($n)
	if {$newviewname($n) ne $viewname($n)} {
	    set viewname($n) $newviewname($n)
1548
	    doviewmenu .bar.view 5 [list showview $n] \
1549 1550 1551
		entryconf [list -label $viewname($n)]
	    doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
		entryconf [list -label $viewname($n) -value $viewname($n)]
1552
	}
1553
	if {$files ne $viewfiles($n) || $newargs ne $viewargs($n)} {
1554
	    set viewfiles($n) $files
1555
	    set viewargs($n) $newargs
1556 1557 1558 1559 1560 1561
	    if {$curview == $n} {
		after idle updatecommits
	    }
	}
    }
    catch {destroy $top}
P
Paul Mackerras 已提交
1562 1563 1564
}

proc delview {} {
1565
    global curview viewdata viewperm hlview selectedhlview
P
Paul Mackerras 已提交
1566 1567

    if {$curview == 0} return
1568 1569 1570 1571
    if {[info exists hlview] && $hlview == $curview} {
	set selectedhlview None
	unset hlview
    }
1572
    allviewmenus $curview delete
P
Paul Mackerras 已提交
1573
    set viewdata($curview) {}
1574
    set viewperm($curview) 0
P
Paul Mackerras 已提交
1575 1576 1577
    showview 0
}

1578
proc addviewmenu {n} {
1579
    global viewname viewhlmenu
1580 1581 1582

    .bar.view add radiobutton -label $viewname($n) \
	-command [list showview $n] -variable selectedview -value $n
1583 1584
    $viewhlmenu add radiobutton -label $viewname($n) \
	-command [list addvhighlight $n] -variable selectedhlview
1585 1586
}

1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605
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 已提交
1606 1607 1608
proc showview {n} {
    global curview viewdata viewfiles
    global displayorder parentlist childlist rowidlist rowoffsets
1609
    global colormap rowtextx commitrow nextcolor canvxmax
P
Paul Mackerras 已提交
1610 1611 1612
    global numcommits rowrangelist commitlisted idrowranges
    global selectedline currentid canv canvy0
    global matchinglines treediffs
1613
    global pending_select phase
1614
    global commitidx rowlaidout rowoptim linesegends
1615
    global commfd nextupdate
1616
    global selectedview
1617
    global vparentlist vchildlist vdisporder vcmitlisted
1618
    global hlview selectedhlview
P
Paul Mackerras 已提交
1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635

    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}]
	}
    }
    unselectline
1636
    normalline
P
Paul Mackerras 已提交
1637
    stopfindproc
1638
    if {$curview >= 0} {
1639 1640 1641 1642
	set vparentlist($curview) $parentlist
	set vchildlist($curview) $childlist
	set vdisporder($curview) $displayorder
	set vcmitlisted($curview) $commitlisted
1643 1644
	if {$phase ne {}} {
	    set viewdata($curview) \
1645 1646 1647
		[list $phase $rowidlist $rowoffsets $rowrangelist \
		     [flatten idrowranges] [flatten idinlist] \
		     $rowlaidout $rowoptim $numcommits $linesegends]
1648 1649
	} elseif {![info exists viewdata($curview)]
		  || [lindex $viewdata($curview) 0] ne {}} {
1650
	    set viewdata($curview) \
1651
		[list {} $rowidlist $rowoffsets $rowrangelist]
1652
	}
P
Paul Mackerras 已提交
1653 1654 1655 1656
    }
    catch {unset matchinglines}
    catch {unset treediffs}
    clear_display
1657 1658 1659 1660
    if {[info exists hlview] && $hlview == $n} {
	unset hlview
	set selectedhlview None
    }
P
Paul Mackerras 已提交
1661 1662

    set curview $n
1663
    set selectedview $n
1664 1665
    .bar.view entryconf Edit* -state [expr {$n == 0? "disabled": "normal"}]
    .bar.view entryconf Delete* -state [expr {$n == 0? "disabled": "normal"}]
P
Paul Mackerras 已提交
1666 1667

    if {![info exists viewdata($n)]} {
1668
	set pending_select $selid
1669
	getcommits
P
Paul Mackerras 已提交
1670 1671 1672
	return
    }

1673 1674
    set v $viewdata($n)
    set phase [lindex $v 0]
1675 1676 1677 1678 1679 1680 1681
    set displayorder $vdisporder($n)
    set parentlist $vparentlist($n)
    set childlist $vchildlist($n)
    set commitlisted $vcmitlisted($n)
    set rowidlist [lindex $v 1]
    set rowoffsets [lindex $v 2]
    set rowrangelist [lindex $v 3]
1682 1683 1684 1685
    if {$phase eq {}} {
	set numcommits [llength $displayorder]
	catch {unset idrowranges}
    } else {
1686 1687 1688 1689 1690 1691
	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]
	set linesegends [lindex $v 9]
1692 1693
    }

P
Paul Mackerras 已提交
1694 1695
    catch {unset colormap}
    catch {unset rowtextx}
1696 1697
    set nextcolor 0
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
1698 1699 1700 1701 1702
    set curview $n
    set row 0
    setcanvscroll
    set yf 0
    set row 0
1703 1704
    if {$selid ne {} && [info exists commitrow($n,$selid)]} {
	set row $commitrow($n,$selid)
P
Paul Mackerras 已提交
1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715
	# 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
    selectline $row 0
1716
    if {$phase ne {}} {
1717
	if {$phase eq "getcommits"} {
1718
	    show_status "Reading commits..."
1719
	}
1720
	if {[info exists commfd($n)]} {
1721
	    layoutmore {}
1722 1723 1724
	} else {
	    finishcommits
	}
1725 1726
    } elseif {$numcommits == 0} {
	show_status "No commits selected"
1727
    }
P
Paul Mackerras 已提交
1728 1729
}

1730 1731 1732
# Stuff relating to the highlighting facility

proc ishighlighted {row} {
1733
    global vhighlights fhighlights nhighlights rhighlights
1734 1735 1736 1737 1738 1739 1740 1741 1742 1743

    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)
    }
1744 1745 1746
    if {[info exists rhighlights($row)] && $rhighlights($row) > 0} {
	return $rhighlights($row)
    }
1747 1748 1749 1750
    return 0
}

proc bolden {row font} {
1751
    global canv linehtag selectedline boldrows
1752

1753
    lappend boldrows $row
1754
    $canv itemconf $linehtag($row) -font $font
1755
    if {[info exists selectedline] && $row == $selectedline} {
1756 1757 1758 1759 1760 1761 1762 1763 1764
	$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} {
1765
    global canv2 linentag selectedline boldnamerows
1766

1767
    lappend boldnamerows $row
1768
    $canv2 itemconf $linentag($row) -font $font
1769
    if {[info exists selectedline] && $row == $selectedline} {
1770 1771 1772 1773 1774 1775 1776 1777
	$canv2 delete secsel
	set t [eval $canv2 create rect [$canv2 bbox $linentag($row)] \
		   -outline {{}} -tags secsel \
		   -fill [$canv2 cget -selectbackground]]
	$canv2 lower $t
    }
}

1778 1779
proc unbolden {} {
    global mainfont boldrows
1780

1781 1782
    set stillbold {}
    foreach row $boldrows {
1783 1784
	if {![ishighlighted $row]} {
	    bolden $row $mainfont
1785 1786
	} else {
	    lappend stillbold $row
1787 1788
	}
    }
1789
    set boldrows $stillbold
1790 1791 1792 1793
}

proc addvhighlight {n} {
    global hlview curview viewdata vhl_done vhighlights commitidx
1794 1795

    if {[info exists hlview]} {
1796
	delvhighlight
1797 1798 1799 1800 1801 1802 1803 1804 1805
    }
    set hlview $n
    if {$n != $curview && ![info exists viewdata($n)]} {
	set viewdata($n) [list getcommits {{}} {{}} {} {} {} 0 0 0 {}]
	set vparentlist($n) {}
	set vchildlist($n) {}
	set vdisporder($n) {}
	set vcmitlisted($n) {}
	start_rev_list $n
1806 1807 1808 1809
    }
    set vhl_done $commitidx($hlview)
    if {$vhl_done > 0} {
	drawvisible
1810 1811 1812
    }
}

1813 1814
proc delvhighlight {} {
    global hlview vhighlights
1815 1816 1817

    if {![info exists hlview]} return
    unset hlview
1818 1819
    catch {unset vhighlights}
    unbolden
1820 1821
}

1822 1823 1824
proc vhighlightmore {} {
    global hlview vhl_done commitidx vhighlights
    global displayorder vdisporder curview mainfont
1825 1826 1827 1828 1829 1830 1831 1832

    set font [concat $mainfont bold]
    set max $commitidx($hlview)
    if {$hlview == $curview} {
	set disp $displayorder
    } else {
	set disp $vdisporder($hlview)
    }
1833 1834 1835 1836
    set vr [visiblerows]
    set r0 [lindex $vr 0]
    set r1 [lindex $vr 1]
    for {set i $vhl_done} {$i < $max} {incr i} {
1837 1838 1839
	set id [lindex $disp $i]
	if {[info exists commitrow($curview,$id)]} {
	    set row $commitrow($curview,$id)
1840 1841 1842
	    if {$r0 <= $row && $row <= $r1} {
		if {![highlighted $row]} {
		    bolden $row $font
1843
		}
1844
		set vhighlights($row) 1
1845 1846 1847
	    }
	}
    }
1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865
    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
1866
    global mainfont highlight_paths
1867 1868 1869 1870 1871

    if {[info exists filehighlight]} {
	# delete previous highlights
	catch {close $filehighlight}
	unset filehighlight
1872 1873
	catch {unset fhighlights}
	unbolden
1874
	unhighlight_filelist
1875
    }
1876
    set highlight_paths {}
1877 1878 1879 1880 1881 1882 1883
    after cancel do_file_hl $fh_serial
    incr fh_serial
    if {$highlight_files ne {}} {
	after 300 do_file_hl $fh_serial
    }
}

1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897
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
}

1898
proc do_file_hl {serial} {
1899
    global highlight_files filehighlight highlight_paths gdttype fhl_list
1900

1901 1902 1903 1904 1905 1906 1907 1908 1909
    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"]
    }
    set cmd [concat | git-diff-tree -r -s --stdin $gdtargs]
1910 1911 1912
    set filehighlight [open $cmd r+]
    fconfigure $filehighlight -blocking 0
    fileevent $filehighlight readable readfhighlight
1913
    set fhl_list {}
1914 1915 1916 1917 1918
    drawvisible
    flushhighlights
}

proc flushhighlights {} {
1919
    global filehighlight fhl_list
1920 1921

    if {[info exists filehighlight]} {
1922
	lappend fhl_list {}
1923 1924 1925 1926 1927 1928
	puts $filehighlight ""
	flush $filehighlight
    }
}

proc askfilehighlight {row id} {
1929
    global filehighlight fhighlights fhl_list
1930

1931 1932
    lappend fhl_list $id
    set fhighlights($row) -1
1933 1934 1935 1936 1937
    puts $filehighlight $id
}

proc readfhighlight {} {
    global filehighlight fhighlights commitrow curview mainfont iddrawn
1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948
    global fhl_list

    while {[gets $filehighlight line] >= 0} {
	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
	    }
1949
	}
1950 1951 1952 1953 1954 1955 1956 1957
	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
1958
    }
1959 1960 1961 1962 1963
    if {[eof $filehighlight]} {
	# strange...
	puts "oops, git-diff-tree died"
	catch {close $filehighlight}
	unset filehighlight
1964
    }
1965
    next_hlcont
1966 1967
}

1968
proc find_change {name ix op} {
1969
    global nhighlights mainfont boldnamerows
1970
    global findstring findpattern findtype
1971 1972

    # delete previous highlights, if any
1973 1974
    foreach row $boldnamerows {
	bolden_name $row $mainfont
1975
    }
1976 1977 1978
    set boldnamerows {}
    catch {unset nhighlights}
    unbolden
1979 1980 1981 1982
    if {$findtype ne "Regexp"} {
	set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
		   $findstring]
	set findpattern "*$e*"
1983 1984 1985 1986
    }
    drawvisible
}

1987 1988 1989
proc askfindhighlight {row id} {
    global nhighlights commitinfo iddrawn mainfont
    global findstring findtype findloc findpattern
1990 1991 1992 1993

    if {![info exists commitinfo($id)]} {
	getcommit $id
    }
1994
    set info $commitinfo($id)
1995
    set isbold 0
1996 1997 1998 1999
    set fldtypes {Headline Author Date Committer CDate Comments}
    foreach f $info ty $fldtypes {
	if {$findloc ne "All fields" && $findloc ne $ty} {
	    continue
2000
	}
2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013
	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
	    }
2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024
	}
    }
    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
2025 2026
}

2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053
proc vrel_change {name ix op} {
    global highlight_related

    rhighlight_none
    if {$highlight_related ne "None"} {
	after idle drawvisible
    }
}

# 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
	after idle drawvisible
    }
}

proc rhighlight_none {} {
    global rhighlights

2054 2055
    catch {unset rhighlights}
    unbolden
2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152
}

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
}

2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227
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
}

2228 2229
# Graph layout functions

P
Paul Mackerras 已提交
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
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} {
2265
    global children commitrow childlist curview
P
Paul Mackerras 已提交
2266

2267 2268
    if {[info exists commitrow($curview,$id)]} {
	set r $commitrow($curview,$id)
P
Paul Mackerras 已提交
2269 2270 2271
	if {$l1 <= $r && $r <= $l2} {
	    return [expr {$r - $l1 + 1}]
	}
2272 2273
	set kids [lindex $childlist $r]
    } else {
2274
	set kids $children($curview,$id)
P
Paul Mackerras 已提交
2275
    }
2276
    foreach c $kids {
2277
	set r $commitrow($curview,$c)
2278 2279
	if {$l1 <= $r && $r <= $l2} {
	    return [expr {$r - $l1 + 1}]
P
Paul Mackerras 已提交
2280 2281 2282 2283 2284 2285 2286 2287 2288
	}
    }
    return 0
}

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

    set col -1
2289
    set ids [lindex $rowidlist $row]
P
Paul Mackerras 已提交
2290 2291 2292 2293 2294
    foreach id $ids {
	incr col
	if {$id eq {}} continue
	if {$col < [llength $ids] - 1 &&
	    [lsearch -exact -start [expr {$col+1}] $ids $id] >= 0} {
2295
	    puts "oops: [shortids $id] repeated in row $row col $col: {[shortids [lindex $rowidlist $row]]}"
P
Paul Mackerras 已提交
2296
	}
2297
	set o [lindex $rowoffsets $row $col]
P
Paul Mackerras 已提交
2298 2299 2300 2301 2302
	set y $row
	set x $col
	while {$o ne {}} {
	    incr y -1
	    incr x $o
2303
	    if {[lindex $rowidlist $y $x] != $id} {
P
Paul Mackerras 已提交
2304 2305 2306
		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} {
2307
		    puts "  row $i ids={[shortids [lindex $rowidlist $i]]} offs={[lindex $rowoffsets $i]}"
P
Paul Mackerras 已提交
2308 2309 2310 2311
		}
		break
	    }
	    if {!$full} break
2312
	    set o [lindex $rowoffsets $y $x]
P
Paul Mackerras 已提交
2313 2314 2315 2316 2317 2318 2319 2320 2321 2322
	}
    }
}

proc makeuparrow {oid x y z} {
    global rowidlist rowoffsets uparrowlen idrowranges

    for {set i 1} {$i < $uparrowlen && $y > 1} {incr i} {
	incr y -1
	incr x $z
2323
	set off0 [lindex $rowoffsets $y]
P
Paul Mackerras 已提交
2324 2325
	for {set x0 $x} {1} {incr x0} {
	    if {$x0 >= [llength $off0]} {
2326
		set x0 [llength [lindex $rowoffsets [expr {$y-1}]]]
P
Paul Mackerras 已提交
2327 2328 2329 2330 2331 2332 2333 2334 2335
		break
	    }
	    set z [lindex $off0 $x0]
	    if {$z ne {}} {
		incr x0 $z
		break
	    }
	}
	set z [expr {$x0 - $x}]
2336 2337
	lset rowidlist $y [linsert [lindex $rowidlist $y] $x $oid]
	lset rowoffsets $y [linsert [lindex $rowoffsets $y] $x $z]
P
Paul Mackerras 已提交
2338
    }
2339 2340
    set tmp [lreplace [lindex $rowoffsets $y] $x $x {}]
    lset rowoffsets $y [incrange $tmp [expr {$x+1}] -1]
P
Paul Mackerras 已提交
2341 2342 2343 2344
    lappend idrowranges($oid) $y
}

proc initlayout {} {
2345
    global rowidlist rowoffsets displayorder commitlisted
P
Paul Mackerras 已提交
2346
    global rowlaidout rowoptim
P
Paul Mackerras 已提交
2347
    global idinlist rowchk rowrangelist idrowranges
2348
    global numcommits canvxmax canv
2349
    global nextcolor
2350
    global parentlist childlist children
2351
    global colormap rowtextx
P
Paul Mackerras 已提交
2352
    global linesegends
P
Paul Mackerras 已提交
2353

2354 2355
    set numcommits 0
    set displayorder {}
2356 2357 2358
    set commitlisted {}
    set parentlist {}
    set childlist {}
2359
    set rowrangelist {}
2360 2361 2362
    set nextcolor 0
    set rowidlist {{}}
    set rowoffsets {{}}
P
Paul Mackerras 已提交
2363 2364 2365 2366
    catch {unset idinlist}
    catch {unset rowchk}
    set rowlaidout 0
    set rowoptim 0
2367
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
2368 2369 2370
    catch {unset colormap}
    catch {unset rowtextx}
    catch {unset idrowranges}
2371
    set linesegends {}
2372 2373 2374 2375 2376 2377 2378 2379 2380
}

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 已提交
2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401
}

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

2402
proc layoutmore {tmax} {
P
Paul Mackerras 已提交
2403
    global rowlaidout rowoptim commitidx numcommits optim_delay
2404
    global uparrowlen curview
P
Paul Mackerras 已提交
2405

2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433
    while {1} {
	if {$rowoptim - $optim_delay > $numcommits} {
	    showstuff [expr {$rowoptim - $optim_delay}]
	} elseif {$rowlaidout - $uparrowlen - 1 > $rowoptim} {
	    set nr [expr {$rowlaidout - $uparrowlen - 1 - $rowoptim}]
	    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
	    set rowlaidout [layoutrows $row [expr {$row + $nr}] 0]
	    if {$rowlaidout == $row} {
		return 0
	    }
	} else {
	    return 0
	}
	if {$tmax ne {} && [clock clicks -milliseconds] >= $tmax} {
	    return 1
	}
P
Paul Mackerras 已提交
2434 2435 2436 2437
    }
}

proc showstuff {canshow} {
2438
    global numcommits commitrow pending_select selectedline
2439
    global linesegends idrowranges idrangedrawn curview
P
Paul Mackerras 已提交
2440

2441 2442 2443 2444 2445
    if {$numcommits == 0} {
	global phase
	set phase "incrdraw"
	allcanvs delete all
    }
P
Paul Mackerras 已提交
2446 2447
    set row $numcommits
    set numcommits $canshow
2448
    setcanvscroll
P
Paul Mackerras 已提交
2449 2450 2451
    set rows [visiblerows]
    set r0 [lindex $rows 0]
    set r1 [lindex $rows 1]
2452
    set selrow -1
P
Paul Mackerras 已提交
2453
    for {set r $row} {$r < $canshow} {incr r} {
2454 2455 2456 2457 2458 2459 2460 2461
	foreach id [lindex $linesegends [expr {$r+1}]] {
	    set i -1
	    foreach {s e} [rowranges $id] {
		incr i
		if {$e ne {} && $e < $numcommits && $s <= $r1 && $e >= $r0
		    && ![info exists idrangedrawn($id,$i)]} {
		    drawlineseg $id $i
		    set idrangedrawn($id,$i) 1
P
Paul Mackerras 已提交
2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472
		}
	    }
	}
    }
    if {$canshow > $r1} {
	set canshow $r1
    }
    while {$row < $canshow} {
	drawcmitrow $row
	incr row
    }
2473
    if {[info exists pending_select] &&
2474 2475 2476
	[info exists commitrow($curview,$pending_select)] &&
	$commitrow($curview,$pending_select) < $numcommits} {
	selectline $commitrow($curview,$pending_select) 1
2477
    }
2478 2479 2480
    if {![info exists selectedline] && ![info exists pending_select]} {
	selectline 0 1
    }
P
Paul Mackerras 已提交
2481 2482 2483 2484 2485
}

proc layoutrows {row endrow last} {
    global rowidlist rowoffsets displayorder
    global uparrowlen downarrowlen maxwidth mingaplen
2486
    global childlist parentlist
P
Paul Mackerras 已提交
2487
    global idrowranges linesegends
2488
    global commitidx curview
P
Paul Mackerras 已提交
2489
    global idinlist rowchk rowrangelist
P
Paul Mackerras 已提交
2490

2491 2492
    set idlist [lindex $rowidlist $row]
    set offs [lindex $rowoffsets $row]
P
Paul Mackerras 已提交
2493 2494 2495 2496
    while {$row < $endrow} {
	set id [lindex $displayorder $row]
	set oldolds {}
	set newolds {}
2497
	foreach p [lindex $parentlist $row] {
P
Paul Mackerras 已提交
2498 2499 2500 2501 2502 2503
	    if {![info exists idinlist($p)]} {
		lappend newolds $p
	    } elseif {!$idinlist($p)} {
		lappend oldolds $p
	    }
	}
2504
	set lse {}
P
Paul Mackerras 已提交
2505 2506 2507
	set nev [expr {[llength $idlist] + [llength $newolds]
		       + [llength $oldolds] - $maxwidth + 1}]
	if {$nev > 0} {
2508 2509
	    if {!$last &&
		$row + $uparrowlen + $mingaplen >= $commitidx($curview)} break
P
Paul Mackerras 已提交
2510 2511 2512 2513 2514 2515 2516 2517 2518 2519
	    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
2520
			set rm1 [expr {$row - 1}]
2521
			lappend lse $i
2522
			lappend idrowranges($i) $rm1
P
Paul Mackerras 已提交
2523 2524 2525 2526 2527 2528
			if {[incr nev -1] <= 0} break
			continue
		    }
		    set rowchk($id) [expr {$row + $r}]
		}
	    }
2529 2530
	    lset rowidlist $row $idlist
	    lset rowoffsets $row $offs
P
Paul Mackerras 已提交
2531
	}
2532
	lappend linesegends $lse
P
Paul Mackerras 已提交
2533 2534 2535 2536
	set col [lsearch -exact $idlist $id]
	if {$col < 0} {
	    set col [llength $idlist]
	    lappend idlist $id
2537
	    lset rowidlist $row $idlist
P
Paul Mackerras 已提交
2538
	    set z {}
2539
	    if {[lindex $childlist $row] ne {}} {
2540
		set z [expr {[llength [lindex $rowidlist [expr {$row-1}]]] - $col}]
P
Paul Mackerras 已提交
2541 2542 2543
		unset idinlist($id)
	    }
	    lappend offs $z
2544
	    lset rowoffsets $row $offs
P
Paul Mackerras 已提交
2545 2546 2547 2548 2549 2550
	    if {$z ne {}} {
		makeuparrow $id $col $row $z
	    }
	} else {
	    unset idinlist($id)
	}
2551
	set ranges {}
P
Paul Mackerras 已提交
2552
	if {[info exists idrowranges($id)]} {
2553
	    set ranges $idrowranges($id)
2554 2555
	    lappend ranges $row
	    unset idrowranges($id)
P
Paul Mackerras 已提交
2556
	}
2557
	lappend rowrangelist $ranges
P
Paul Mackerras 已提交
2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588
	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
	    set idrowranges($i) $row
	}
	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
	}
2589 2590
	lappend rowidlist $idlist
	lappend rowoffsets $offs
P
Paul Mackerras 已提交
2591 2592 2593 2594 2595
    }
    return $row
}

proc addextraid {id row} {
2596
    global displayorder commitrow commitinfo
2597
    global commitidx commitlisted
2598
    global parentlist childlist children curview
P
Paul Mackerras 已提交
2599

2600
    incr commitidx($curview)
P
Paul Mackerras 已提交
2601
    lappend displayorder $id
2602
    lappend commitlisted 0
2603
    lappend parentlist {}
2604
    set commitrow($curview,$id) $row
P
Paul Mackerras 已提交
2605 2606 2607
    readcommit $id
    if {![info exists commitinfo($id)]} {
	set commitinfo($id) {"No commit information available"}
2608
    }
2609 2610
    if {![info exists children($curview,$id)]} {
	set children($curview,$id) {}
P
Paul Mackerras 已提交
2611
    }
2612
    lappend childlist $children($curview,$id)
P
Paul Mackerras 已提交
2613 2614 2615
}

proc layouttail {} {
2616
    global rowidlist rowoffsets idinlist commitidx curview
P
Paul Mackerras 已提交
2617
    global idrowranges rowrangelist
P
Paul Mackerras 已提交
2618

2619
    set row $commitidx($curview)
2620
    set idlist [lindex $rowidlist $row]
P
Paul Mackerras 已提交
2621 2622 2623 2624 2625 2626
    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 已提交
2627
	lappend rowrangelist $idrowranges($id)
2628
	unset idrowranges($id)
P
Paul Mackerras 已提交
2629 2630 2631
	incr row
	set offs [ntimes $col 0]
	set idlist [lreplace $idlist $col $col]
2632 2633
	lappend rowidlist $idlist
	lappend rowoffsets $offs
P
Paul Mackerras 已提交
2634 2635 2636 2637
    }

    foreach id [array names idinlist] {
	addextraid $id $row
2638 2639
	lset rowidlist $row [list $id]
	lset rowoffsets $row 0
P
Paul Mackerras 已提交
2640 2641
	makeuparrow $id 0 $row 0
	lappend idrowranges($id) $row
P
Paul Mackerras 已提交
2642
	lappend rowrangelist $idrowranges($id)
2643
	unset idrowranges($id)
P
Paul Mackerras 已提交
2644
	incr row
2645 2646
	lappend rowidlist {}
	lappend rowoffsets {}
P
Paul Mackerras 已提交
2647 2648 2649 2650 2651 2652 2653
    }
}

proc insert_pad {row col npad} {
    global rowidlist rowoffsets

    set pad [ntimes $npad {}]
2654 2655 2656
    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 已提交
2657 2658 2659
}

proc optimize_rows {row col endrow} {
P
Paul Mackerras 已提交
2660
    global rowidlist rowoffsets idrowranges displayorder
P
Paul Mackerras 已提交
2661 2662

    for {} {$row < $endrow} {incr row} {
2663 2664
	set idlist [lindex $rowidlist $row]
	set offs [lindex $rowoffsets $row]
P
Paul Mackerras 已提交
2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675
	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}]
2676
	    set z0 [lindex $rowoffsets $y0 $x0]
P
Paul Mackerras 已提交
2677 2678
	    if {$z0 eq {}} {
		set id [lindex $idlist $col]
2679 2680
		set ranges [rowranges $id]
		if {$ranges ne {} && $y0 > [lindex $ranges 0]} {
P
Paul Mackerras 已提交
2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692
		    set isarrow 1
		}
	    }
	    if {$z < -1 || ($z < 0 && $isarrow)} {
		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}]
2693
		set z0 [lindex $rowoffsets $y0 $x0]
P
Paul Mackerras 已提交
2694 2695 2696
	    } elseif {$z > 1 || ($z > 0 && $isarrow)} {
		set npad [expr {$z - 1 + $isarrow}]
		set y1 [expr {$row + 1}]
2697
		set offs2 [lindex $rowoffsets $y1]
P
Paul Mackerras 已提交
2698 2699 2700 2701 2702 2703 2704
		set x1 -1
		foreach z $offs2 {
		    incr x1
		    if {$z eq {} || $x1 + $z < $col} continue
		    if {$x1 + $z > $col} {
			incr npad
		    }
2705
		    lset rowoffsets $y1 [incrange $offs2 $x1 $npad]
P
Paul Mackerras 已提交
2706 2707 2708 2709 2710 2711 2712 2713 2714 2715
		    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
	    }
2716 2717 2718 2719 2720 2721 2722 2723 2724
	    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}]
		}
	    }
P
Paul Mackerras 已提交
2725 2726 2727 2728 2729 2730 2731
	    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} {
2732
	    set o {}
P
Paul Mackerras 已提交
2733 2734
	    for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
		set o [lindex $offs $col]
2735 2736 2737
		if {$o eq {}} {
		    # check if this is the link to the first child
		    set id [lindex $idlist $col]
2738 2739
		    set ranges [rowranges $id]
		    if {$ranges ne {} && $row == [lindex $ranges 0]} {
2740 2741 2742 2743 2744 2745 2746 2747 2748
			# 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 已提交
2749 2750
		if {$o eq {} || $o <= 0} break
	    }
2751
	    if {$o ne {} && [incr col] < [llength $idlist]} {
P
Paul Mackerras 已提交
2752
		set y1 [expr {$row + 1}]
2753
		set offs2 [lindex $rowoffsets $y1]
P
Paul Mackerras 已提交
2754 2755 2756 2757
		set x1 -1
		foreach z $offs2 {
		    incr x1
		    if {$z eq {} || $x1 + $z < $col} continue
2758
		    lset rowoffsets $y1 [incrange $offs2 $x1 1]
P
Paul Mackerras 已提交
2759 2760 2761 2762 2763 2764 2765 2766
		    break
		}
		set idlist [linsert $idlist $col {}]
		set tmp [linsert $offs $col {}]
		incr col
		set offs [incrange $tmp $col -1]
	    }
	}
2767 2768
	lset rowidlist $row $idlist
	lset rowoffsets $row $offs
P
Paul Mackerras 已提交
2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782
	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}]
}

2783 2784 2785 2786 2787 2788 2789 2790 2791 2792
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 已提交
2793
proc rowranges {id} {
2794
    global phase idrowranges commitrow rowlaidout rowrangelist curview
P
Paul Mackerras 已提交
2795 2796

    set ranges {}
2797
    if {$phase eq {} ||
2798 2799 2800
	([info exists commitrow($curview,$id)]
	 && $commitrow($curview,$id) < $rowlaidout)} {
	set ranges [lindex $rowrangelist $commitrow($curview,$id)]
P
Paul Mackerras 已提交
2801 2802 2803 2804 2805 2806
    } elseif {[info exists idrowranges($id)]} {
	set ranges $idrowranges($id)
    }
    return $ranges
}

2807
proc drawlineseg {id i} {
P
Paul Mackerras 已提交
2808
    global rowoffsets rowidlist
2809
    global displayorder
2810
    global canv colormap linespc
2811
    global numcommits commitrow curview
P
Paul Mackerras 已提交
2812

P
Paul Mackerras 已提交
2813 2814
    set ranges [rowranges $id]
    set downarrow 1
2815 2816
    if {[info exists commitrow($curview,$id)]
	&& $commitrow($curview,$id) < $numcommits} {
P
Paul Mackerras 已提交
2817 2818 2819 2820 2821 2822
	set downarrow [expr {$i < [llength $ranges] / 2 - 1}]
    } else {
	set downarrow 1
    }
    set startrow [lindex $ranges [expr {2 * $i}]]
    set row [lindex $ranges [expr {2 * $i + 1}]]
P
Paul Mackerras 已提交
2823 2824 2825
    if {$startrow == $row} return
    assigncolor $id
    set coords {}
2826
    set col [lsearch -exact [lindex $rowidlist $row] $id]
P
Paul Mackerras 已提交
2827 2828 2829 2830 2831 2832 2833
    if {$col < 0} {
	puts "oops: drawline: id $id not on row $row"
	return
    }
    set lasto {}
    set ns 0
    while {1} {
2834
	set o [lindex $rowoffsets $row $col]
P
Paul Mackerras 已提交
2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848
	if {$o eq {}} break
	if {$o ne $lasto} {
	    # changing direction
	    set x [xc $row $col]
	    set y [yc $row]
	    lappend coords $x $y
	    set lasto $o
	}
	incr col $o
	incr row -1
    }
    set x [xc $row $col]
    set y [yc $row]
    lappend coords $x $y
2849 2850 2851 2852 2853 2854 2855 2856 2857
    if {$i == 0} {
	# draw the link to the first child as part of this line
	incr row -1
	set child [lindex $displayorder $row]
	set ccol [lsearch -exact [lindex $rowidlist $row] $child]
	if {$ccol >= 0} {
	    set x [xc $row $ccol]
	    set y [yc $row]
	    if {$ccol < $col - 1} {
2858
		lappend coords [xc $row [expr {$col - 1}]] [yc $row]
2859
	    } elseif {$ccol > $col + 1} {
2860
		lappend coords [xc $row [expr {$col + 1}]] [yc $row]
2861 2862 2863 2864 2865
	    }
	    lappend coords $x $y
	}
    }
    if {[llength $coords] < 4} return
P
Paul Mackerras 已提交
2866
    if {$downarrow} {
2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885
	# This line has an arrow at the lower end: check if the arrow is
	# on a diagonal segment, and if so, work around the Tk 8.4
	# refusal to draw arrows on diagonal lines.
	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 已提交
2886
    set arrow [expr {2 * ($i > 0) + $downarrow}]
2887
    set arrow [lindex {none first last both} $arrow]
2888
    set t [$canv create line $coords -width [linewidth $id] \
P
Paul Mackerras 已提交
2889 2890 2891 2892 2893
	       -fill $colormap($id) -tags lines.$id -arrow $arrow]
    $canv lower $t
    bindline $t $id
}

2894
proc drawparentlinks {id row col olds} {
P
Paul Mackerras 已提交
2895
    global rowidlist canv colormap
P
Paul Mackerras 已提交
2896 2897 2898 2899 2900

    set row2 [expr {$row + 1}]
    set x [xc $row $col]
    set y [yc $row]
    set y2 [yc $row2]
2901
    set ids [lindex $rowidlist $row2]
P
Paul Mackerras 已提交
2902 2903 2904
    # rmx = right-most X coord used
    set rmx 0
    foreach p $olds {
2905 2906 2907 2908 2909 2910 2911 2912 2913
	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
	}
P
Paul Mackerras 已提交
2914 2915 2916
	set ranges [rowranges $p]
	if {$ranges ne {} && $row2 == [lindex $ranges 0]
	    && $row2 < [lindex $ranges 1]} {
2917 2918 2919
	    # drawlineseg will do this one for us
	    continue
	}
P
Paul Mackerras 已提交
2920 2921 2922 2923 2924 2925 2926 2927 2928
	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
2929
	set t [$canv create line $coords -width [linewidth $p] \
P
Paul Mackerras 已提交
2930 2931 2932 2933 2934 2935 2936
		   -fill $colormap($p) -tags lines.$p]
	$canv lower $t
	bindline $t $p
    }
    return $rmx
}

2937
proc drawlines {id} {
P
Paul Mackerras 已提交
2938
    global colormap canv
P
Paul Mackerras 已提交
2939
    global idrangedrawn
2940
    global children iddrawn commitrow rowidlist curview
P
Paul Mackerras 已提交
2941 2942

    $canv delete lines.$id
P
Paul Mackerras 已提交
2943
    set nr [expr {[llength [rowranges $id]] / 2}]
P
Paul Mackerras 已提交
2944 2945
    for {set i 0} {$i < $nr} {incr i} {
	if {[info exists idrangedrawn($id,$i)]} {
2946
	    drawlineseg $id $i
P
Paul Mackerras 已提交
2947 2948
	}
    }
2949
    foreach child $children($curview,$id) {
2950
	if {[info exists iddrawn($child)]} {
2951
	    set row $commitrow($curview,$child)
2952 2953 2954
	    set col [lsearch -exact [lindex $rowidlist $row] $child]
	    if {$col >= 0} {
		drawparentlinks $child $row $col [list $id]
P
Paul Mackerras 已提交
2955 2956 2957 2958 2959 2960
	    }
	}
    }
}

proc drawcmittext {id row col rmx} {
2961
    global linespc canv canv2 canv3 canvy0 fgcolor
P
Paul Mackerras 已提交
2962 2963 2964
    global commitlisted commitinfo rowidlist
    global rowtextx idpos idtags idheads idotherrefs
    global linehtag linentag linedtag
2965
    global mainfont canvxmax boldrows boldnamerows fgcolor
P
Paul Mackerras 已提交
2966

2967
    set ofill [expr {[lindex $commitlisted $row]? "blue": "white"}]
P
Paul Mackerras 已提交
2968 2969 2970 2971 2972
    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}] \
2973
	       -fill $ofill -outline $fgcolor -width 1 -tags circle]
P
Paul Mackerras 已提交
2974 2975
    $canv raise $t
    $canv bind $t <1> {selcanvline {} %x %y}
2976
    set xt [xc $row [llength [lindex $rowidlist $row]]]
P
Paul Mackerras 已提交
2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989
    if {$xt < $rmx} {
	set xt $rmx
    }
    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]
2990
    set font $mainfont
2991 2992 2993
    set nfont $mainfont
    set isbold [ishighlighted $row]
    if {$isbold > 0} {
2994
	lappend boldrows $row
2995
	lappend font bold
2996
	if {$isbold > 1} {
2997
	    lappend boldnamerows $row
2998 2999
	    lappend nfont bold
	}
3000
    }
3001 3002
    set linehtag($row) [$canv create text $xt $y -anchor w -fill $fgcolor \
			    -text $headline -font $font -tags text]
P
Paul Mackerras 已提交
3003
    $canv bind $linehtag($row) <Button-3> "rowmenu %X %Y $id"
3004 3005 3006 3007
    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]
3008 3009 3010 3011 3012
    set xr [expr {$xt + [font measure $mainfont $headline]}]
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
P
Paul Mackerras 已提交
3013 3014 3015
}

proc drawcmitrow {row} {
3016
    global displayorder rowidlist
P
Paul Mackerras 已提交
3017
    global idrangedrawn iddrawn
3018
    global commitinfo parentlist numcommits
3019
    global filehighlight fhighlights findstring nhighlights
3020
    global hlview vhighlights
3021
    global highlight_related rhighlights
P
Paul Mackerras 已提交
3022

3023 3024
    if {$row >= $numcommits} return
    foreach id [lindex $rowidlist $row] {
3025
	if {$id eq {}} continue
P
Paul Mackerras 已提交
3026
	set i -1
P
Paul Mackerras 已提交
3027
	foreach {s e} [rowranges $id] {
P
Paul Mackerras 已提交
3028 3029 3030 3031 3032
	    incr i
	    if {$row < $s} continue
	    if {$e eq {}} break
	    if {$row <= $e} {
		if {$e < $numcommits && ![info exists idrangedrawn($id,$i)]} {
3033
		    drawlineseg $id $i
P
Paul Mackerras 已提交
3034 3035 3036 3037 3038 3039 3040 3041
		    set idrangedrawn($id,$i) 1
		}
		break
	    }
	}
    }

    set id [lindex $displayorder $row]
3042 3043 3044 3045 3046 3047
    if {[info exists hlview] && ![info exists vhighlights($row)]} {
	askvhighlight $row $id
    }
    if {[info exists filehighlight] && ![info exists fhighlights($row)]} {
	askfilehighlight $row $id
    }
3048 3049
    if {$findstring ne {} && ![info exists nhighlights($row)]} {
	askfindhighlight $row $id
3050
    }
3051 3052 3053
    if {$highlight_related ne "None" && ![info exists rhighlights($row)]} {
	askrelhighlight $row $id
    }
P
Paul Mackerras 已提交
3054
    if {[info exists iddrawn($id)]} return
3055
    set col [lsearch -exact [lindex $rowidlist $row] $id]
P
Paul Mackerras 已提交
3056 3057 3058 3059 3060
    if {$col < 0} {
	puts "oops, row $row id $id not in list"
	return
    }
    if {![info exists commitinfo($id)]} {
3061
	getcommit $id
P
Paul Mackerras 已提交
3062 3063
    }
    assigncolor $id
3064 3065 3066
    set olds [lindex $parentlist $row]
    if {$olds ne {}} {
	set rmx [drawparentlinks $id $row $col $olds]
P
Paul Mackerras 已提交
3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101
    } else {
	set rmx 0
    }
    drawcmittext $id $row $col $rmx
    set iddrawn($id) 1
}

proc drawfrac {f0 f1} {
    global numcommits canv
    global 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}]
    if {$row < 0} {
	set row 0
    }
    set y1 [expr {int($f1 * $ymax)}]
    set endrow [expr {int(($y1 - 3) / $linespc) + 1}]
    if {$endrow >= $numcommits} {
	set endrow [expr {$numcommits - 1}]
    }
    for {} {$row <= $endrow} {incr row} {
	drawcmitrow $row
    }
}

proc drawvisible {} {
    global canv
    eval drawfrac [$canv yview]
}

proc clear_display {} {
    global iddrawn idrangedrawn
3102
    global vhighlights fhighlights nhighlights rhighlights
P
Paul Mackerras 已提交
3103 3104 3105 3106

    allcanvs delete all
    catch {unset iddrawn}
    catch {unset idrangedrawn}
3107 3108 3109
    catch {unset vhighlights}
    catch {unset fhighlights}
    catch {unset nhighlights}
3110
    catch {unset rhighlights}
P
Paul Mackerras 已提交
3111 3112
}

P
Paul Mackerras 已提交
3113 3114 3115 3116 3117 3118 3119 3120 3121
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}]
	}
3122
	if {$e <= $s} continue
P
Paul Mackerras 已提交
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
	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]
}

3154
proc assigncolor {id} {
P
Paul Mackerras 已提交
3155
    global colormap colors nextcolor
3156
    global commitrow parentlist children children curview
3157

3158
    if {[info exists colormap($id)]} return
3159
    set ncolors [llength $colors]
3160 3161
    if {[info exists children($curview,$id)]} {
	set kids $children($curview,$id)
3162 3163 3164 3165 3166
    } else {
	set kids {}
    }
    if {[llength $kids] == 1} {
	set child [lindex $kids 0]
3167
	if {[info exists colormap($child)]
3168
	    && [llength [lindex $parentlist $commitrow($curview,$child)]] == 1} {
3169 3170
	    set colormap($id) $colormap($child)
	    return
3171
	}
3172 3173
    }
    set badcolors {}
P
Paul Mackerras 已提交
3174 3175 3176 3177 3178 3179
    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
3180
	}
P
Paul Mackerras 已提交
3181 3182 3183
	if {[info exists colormap($x)]
	    && [lsearch -exact $badcolors $colormap($x)] < 0} {
	    lappend badcolors $colormap($x)
3184 3185
	}
    }
P
Paul Mackerras 已提交
3186 3187
    if {[llength $badcolors] >= $ncolors} {
	set badcolors $origbad
3188
    }
P
Paul Mackerras 已提交
3189
    set origbad $badcolors
3190
    if {[llength $badcolors] < $ncolors - 1} {
3191
	foreach child $kids {
3192 3193 3194 3195
	    if {[info exists colormap($child)]
		&& [lsearch -exact $badcolors $colormap($child)] < 0} {
		lappend badcolors $colormap($child)
	    }
3196
	    foreach p [lindex $parentlist $commitrow($curview,$child)] {
3197 3198 3199
		if {[info exists colormap($p)]
		    && [lsearch -exact $badcolors $colormap($p)] < 0} {
		    lappend badcolors $colormap($p)
3200 3201 3202 3203 3204 3205
		}
	    }
	}
	if {[llength $badcolors] >= $ncolors} {
	    set badcolors $origbad
	}
3206 3207 3208 3209 3210
    }
    for {set i 0} {$i <= $ncolors} {incr i} {
	set c [lindex $colors $nextcolor]
	if {[incr nextcolor] >= $ncolors} {
	    set nextcolor 0
3211
	}
3212
	if {[lsearch -exact $badcolors $c]} break
3213
    }
3214
    set colormap($id) $c
3215 3216
}

3217 3218 3219 3220 3221 3222
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"
3223
    $canv bind $t <Button-1> "lineclick %x %y $id 1"
3224 3225
}

3226
proc drawtags {id x xt y1} {
3227
    global idtags idheads idotherrefs mainhead
3228
    global linespc lthickness
3229
    global canv mainfont commitrow rowtextx curview fgcolor bgcolor
3230 3231 3232

    set marks {}
    set ntags 0
3233
    set nheads 0
3234 3235 3236 3237 3238 3239
    if {[info exists idtags($id)]} {
	set marks $idtags($id)
	set ntags [llength $marks]
    }
    if {[info exists idheads($id)]} {
	set marks [concat $marks $idheads($id)]
3240 3241 3242 3243
	set nheads [llength $idheads($id)]
    }
    if {[info exists idotherrefs($id)]} {
	set marks [concat $marks $idotherrefs($id)]
3244 3245 3246 3247 3248 3249
    }
    if {$marks eq {}} {
	return $xt
    }

    set delta [expr {int(0.5 * ($linespc - $lthickness))}]
J
Jeff Hobbs 已提交
3250 3251
    set yt [expr {$y1 - 0.5 * $linespc}]
    set yb [expr {$yt + $linespc - 1}]
3252 3253
    set xvals {}
    set wvals {}
3254
    set i -1
3255
    foreach tag $marks {
3256 3257 3258 3259 3260 3261
	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]
	}
3262 3263 3264 3265 3266 3267 3268 3269
	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 已提交
3270 3271
	set xl [expr {$x + $delta}]
	set xr [expr {$x + $delta + $wid + $lthickness}]
3272
	set font $mainfont
3273 3274
	if {[incr ntags -1] >= 0} {
	    # draw a tag
J
Jeff Hobbs 已提交
3275 3276
	    set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
		       $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
3277 3278
		       -width 1 -outline black -fill yellow -tags tag.$id]
	    $canv bind $t <1> [list showtag $tag 1]
3279
	    set rowtextx($commitrow($curview,$id)) [expr {$xr + $linespc}]
3280
	} else {
3281 3282 3283
	    # draw a head or other ref
	    if {[incr nheads -1] >= 0} {
		set col green
3284 3285 3286
		if {$tag eq $mainhead} {
		    lappend font bold
		}
3287 3288 3289
	    } else {
		set col "#ddddff"
	    }
J
Jeff Hobbs 已提交
3290
	    set xl [expr {$xl - $delta/2}]
3291
	    $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
3292
		-width 1 -outline black -fill $col -tags tag.$id
3293 3294 3295 3296 3297 3298 3299 3300
	    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
	    }
3301
	}
3302
	set t [$canv create text $xl $y1 -anchor w -text $tag -fill $fgcolor \
3303
		   -font $font -tags [list tag.$id text]]
3304 3305
	if {$ntags >= 0} {
	    $canv bind $t <1> [list showtag $tag 1]
3306 3307
	} elseif {$nheads >= 0} {
	    $canv bind $t <Button-3> [list headmenu %X %Y $id $tag]
3308
	}
3309 3310 3311 3312
    }
    return $xt
}

3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323
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
}
3324

3325
proc show_status {msg} {
3326
    global canv mainfont fgcolor
3327 3328

    clear_display
3329 3330
    $canv create text 3 3 -anchor nw -text $msg -font $mainfont \
	-tags text -fill $fgcolor
3331 3332
}

3333
proc finishcommits {} {
3334
    global commitidx phase curview
P
Paul Mackerras 已提交
3335
    global pending_select
3336

3337
    if {$commitidx($curview) > 0} {
3338 3339
	drawrest
    } else {
3340
	show_status "No commits selected"
3341
    }
P
Paul Mackerras 已提交
3342
    set phase {}
3343
    catch {unset pending_select}
3344 3345
}

3346
# Insert a new commit as the child of the commit on row $row.
3347 3348 3349 3350 3351 3352
# 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} {
    global displayorder parentlist childlist commitlisted
    global commitrow curview rowidlist rowoffsets numcommits
    global rowrangelist idrowranges rowlaidout rowoptim numcommits
3353
    global linesegends selectedline
3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365

    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]
    set kids [lindex $childlist $row]
    lappend kids $newcmit
    lset childlist $row $kids
    set childlist [linsert $childlist $row {}]
3366
    set commitlisted [linsert $commitlisted $row 1]
3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441
    set l [llength $displayorder]
    for {set r $row} {$r < $l} {incr r} {
	set id [lindex $displayorder $r]
	set commitrow($curview,$id) $r
    }

    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 {}]
    set l [llength $rowrangelist]
    for {set r 0} {$r < $l} {incr r} {
	set ranges [lindex $rowrangelist $r]
	if {$ranges ne {} && [lindex $ranges end] >= $row} {
	    set newranges {}
	    foreach x $ranges {
		if {$x >= $row} {
		    lappend newranges [expr {$x + 1}]
		} else {
		    lappend newranges $x
		}
	    }
	    lset rowrangelist $r $newranges
	}
    }
    if {[llength $kids] > 1} {
	set rp1 [expr {$row + 1}]
	set ranges [lindex $rowrangelist $rp1]
	if {$ranges eq {}} {
	    set ranges [list $row $rp1]
	} elseif {[lindex $ranges end-1] == $rp1} {
	    lset ranges end-1 $row
	}
	lset rowrangelist $rp1 $ranges
    }
    foreach id [array names idrowranges] {
	set ranges $idrowranges($id)
	if {$ranges ne {} && [lindex $ranges end] >= $row} {
	    set newranges {}
	    foreach x $ranges {
		if {$x >= $row} {
		    lappend newranges [expr {$x + 1}]
		} else {
		    lappend newranges $x
		}
	    }
	    set idrowranges($id) $newranges
	}
    }

    set linesegends [linsert $linesegends $row {}]

    incr rowlaidout
    incr rowoptim
    incr numcommits

3442 3443 3444
    if {[info exists selectedline] && $selectedline >= $row} {
	incr selectedline
    }
3445 3446 3447
    redisplay
}

3448 3449 3450 3451 3452 3453 3454 3455 3456
# 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
3457 3458
}

3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478
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
    }
}

3479
proc drawrest {} {
P
Paul Mackerras 已提交
3480
    global startmsecs
3481
    global rowlaidout commitidx curview
3482
    global pending_select
P
Paul Mackerras 已提交
3483 3484

    set row $rowlaidout
3485
    layoutrows $rowlaidout $commitidx($curview) 1
P
Paul Mackerras 已提交
3486
    layouttail
3487 3488
    optimize_rows $row 0 $commitidx($curview)
    showstuff $commitidx($curview)
3489 3490 3491
    if {[info exists pending_select]} {
	selectline 0 1
    }
P
Paul Mackerras 已提交
3492

J
Jeff Hobbs 已提交
3493
    set drawmsecs [expr {[clock clicks -milliseconds] - $startmsecs}]
P
Paul Mackerras 已提交
3494
    #global numcommits
3495
    #puts "overall $drawmsecs ms for $numcommits commits"
3496 3497
}

3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510
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 已提交
3511 3512
	    lappend matches [list $j [expr {$j+$foundstrlen-1}]]
	    set i [expr {$j + $foundstrlen}]
3513 3514 3515 3516 3517
	}
    }
    return $matches
}

3518 3519
proc dofind {} {
    global findtype findloc findstring markedmatches commitinfo
3520
    global numcommits displayorder linehtag linentag linedtag
3521
    global mainfont canv canv2 canv3 selectedline
P
Paul Mackerras 已提交
3522 3523
    global matchinglines foundstring foundstrlen matchstring
    global commitdata
3524 3525

    stopfindproc
3526
    unmarkmatches
3527
    cancel_next_highlight
3528
    focus .
3529 3530
    set matchinglines {}
    if {$findtype == "IgnCase"} {
3531
	set foundstring [string tolower $findstring]
3532
    } else {
3533
	set foundstring $findstring
3534
    }
3535 3536
    set foundstrlen [string length $findstring]
    if {$foundstrlen == 0} return
P
Paul Mackerras 已提交
3537 3538
    regsub -all {[*?\[\\]} $foundstring {\\&} matchstring
    set matchstring "*$matchstring*"
3539 3540 3541 3542 3543 3544
    if {![info exists selectedline]} {
	set oldsel -1
    } else {
	set oldsel $selectedline
    }
    set didsel 0
3545
    set fldtypes {Headline Author Date Committer CDate Comments}
P
Paul Mackerras 已提交
3546
    set l -1
3547 3548
    foreach id $displayorder {
	set d $commitdata($id)
P
Paul Mackerras 已提交
3549 3550 3551 3552 3553 3554 3555 3556 3557 3558
	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)]} {
3559
	    getcommit $id
P
Paul Mackerras 已提交
3560
	}
3561 3562 3563 3564 3565 3566
	set info $commitinfo($id)
	set doesmatch 0
	foreach f $info ty $fldtypes {
	    if {$findloc != "All fields" && $findloc != $ty} {
		continue
	    }
3567
	    set matches [findmatches $f]
3568 3569 3570
	    if {$matches == {}} continue
	    set doesmatch 1
	    if {$ty == "Headline"} {
P
Paul Mackerras 已提交
3571
		drawcmitrow $l
3572 3573
		markmatches $canv $l $f $linehtag($l) $matches $mainfont
	    } elseif {$ty == "Author"} {
P
Paul Mackerras 已提交
3574
		drawcmitrow $l
3575
		markmatches $canv2 $l $f $linentag($l) $matches $mainfont
3576
	    } elseif {$ty == "Date"} {
P
Paul Mackerras 已提交
3577
		drawcmitrow $l
3578 3579 3580 3581 3582 3583
		markmatches $canv3 $l $f $linedtag($l) $matches $mainfont
	    }
	}
	if {$doesmatch} {
	    lappend matchinglines $l
	    if {!$didsel && $l > $oldsel} {
3584
		findselectline $l
3585 3586 3587 3588 3589 3590 3591
		set didsel 1
	    }
	}
    }
    if {$matchinglines == {}} {
	bell
    } elseif {!$didsel} {
3592 3593 3594 3595 3596 3597
	findselectline [lindex $matchinglines 0]
    }
}

proc findselectline {l} {
    global findloc commentend ctext
3598
    selectline $l 1
3599 3600 3601 3602 3603 3604
    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 已提交
3605
	    set end [expr {[lindex $match 1] + 1}]
3606 3607
	    $ctext tag add found "1.0 + $start c" "1.0 + $end c"
	}
3608 3609 3610
    }
}

3611
proc findnext {restart} {
3612 3613
    global matchinglines selectedline
    if {![info exists matchinglines]} {
3614 3615 3616
	if {$restart} {
	    dofind
	}
3617 3618 3619 3620 3621
	return
    }
    if {![info exists selectedline]} return
    foreach l $matchinglines {
	if {$l > $selectedline} {
3622
	    findselectline $l
3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641
	    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 != {}} {
3642
	findselectline $prev
3643 3644 3645 3646 3647
    } else {
	bell
    }
}

3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660
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
    }
3661 3662
    catch {unset findinprogress}
    notbusy find
3663 3664 3665 3666 3667
}

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

P
Paul Mackerras 已提交
3670
    drawcmitrow $l
3671 3672 3673 3674 3675 3676
    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
3677 3678 3679 3680 3681 3682 3683 3684 3685
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 已提交
3686 3687 3688 3689
	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 \
3690 3691 3692 3693 3694 3695
		   -outline {} -tags matches -fill yellow]
	$canv lower $t
    }
}

proc unmarkmatches {} {
3696
    global matchinglines findids
3697 3698
    allcanvs delete matches
    catch {unset matchinglines}
3699
    catch {unset findids}
3700 3701
}

3702
proc selcanvline {w x y} {
3703
    global canv canvy0 ctext linespc
P
Paul Mackerras 已提交
3704
    global rowtextx
3705
    set ymax [lindex [$canv cget -scrollregion] 3]
3706
    if {$ymax == {}} return
3707 3708 3709 3710 3711 3712
    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
    }
3713 3714 3715
    if {$w eq $canv} {
	if {![info exists rowtextx($l)] || $x < $rowtextx($l)} return
    }
3716
    unmarkmatches
3717
    selectline $l 1
3718 3719
}

3720 3721
proc commit_descriptor {p} {
    global commitinfo
3722 3723 3724
    if {![info exists commitinfo($p)]} {
	getcommit $p
    }
3725
    set l "..."
3726
    if {[llength $commitinfo($p)] > 1} {
3727 3728
	set l [lindex $commitinfo($p) 0]
    }
P
Paul Mackerras 已提交
3729
    return "$p ($l)\n"
3730 3731
}

3732 3733
# append some text to the ctext widget, and make any SHA1 ID
# that we know about be a clickable link.
3734
proc appendwithlinks {text tags} {
3735
    global ctext commitrow linknum curview
3736 3737

    set start [$ctext index "end - 1c"]
3738
    $ctext insert end $text $tags
3739 3740 3741 3742 3743
    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]
3744
	if {![info exists commitrow($curview,$linkid)]} continue
3745 3746 3747
	incr e
	$ctext tag add link "$start + $s c" "$start + $e c"
	$ctext tag add link$linknum "$start + $s c" "$start + $e c"
3748 3749
	$ctext tag bind link$linknum <1> \
	    [list selectline $commitrow($curview,$linkid) 1]
3750 3751 3752 3753 3754 3755 3756
	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 }
}

3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772
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}]
}

3773 3774
# add a list of tag or branch names at position pos
# returns the number of names inserted
3775 3776
proc appendrefs {pos tags var} {
    global ctext commitrow linknum curview $var
P
Paul Mackerras 已提交
3777

3778 3779 3780
    if {[catch {$ctext index $pos}]} {
	return 0
    }
3781
    set tags [lsort $tags]
P
Paul Mackerras 已提交
3782 3783
    set sep {}
    foreach tag $tags {
3784
	set id [set $var\($tag\)]
P
Paul Mackerras 已提交
3785 3786 3787
	set lk link$linknum
	incr linknum
	$ctext insert $pos $sep
3788
	$ctext insert $pos $tag $lk
P
Paul Mackerras 已提交
3789 3790 3791 3792 3793 3794 3795 3796 3797 3798
	$ctext tag conf $lk -foreground blue
	if {[info exists commitrow($curview,$id)]} {
	    $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 ", "
    }
3799
    return [llength $tags]
P
Paul Mackerras 已提交
3800 3801
}

3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813
proc taglist {ids} {
    global idtags

    set tags {}
    foreach id $ids {
	foreach tag $idtags($id) {
	    lappend tags $tag
	}
    }
    return $tags
}

P
Paul Mackerras 已提交
3814 3815 3816
# called when we have finished computing the nearby tags
proc dispneartags {} {
    global selectedline currentid ctext anc_tags desc_tags showneartags
3817
    global desc_heads
P
Paul Mackerras 已提交
3818 3819 3820 3821

    if {![info exists selectedline] || !$showneartags} return
    set id $currentid
    $ctext conf -state normal
3822
    if {[info exists desc_heads($id)]} {
3823
	if {[appendrefs branch $desc_heads($id) headids] > 1} {
3824 3825 3826
	    $ctext insert "branch -2c" "es"
	}
    }
P
Paul Mackerras 已提交
3827
    if {[info exists anc_tags($id)]} {
3828
	appendrefs follows [taglist $anc_tags($id)] tagids
P
Paul Mackerras 已提交
3829 3830
    }
    if {[info exists desc_tags($id)]} {
3831
	appendrefs precedes [taglist $desc_tags($id)] tagids
P
Paul Mackerras 已提交
3832 3833 3834 3835
    }
    $ctext conf -state disabled
}

3836
proc selectline {l isnew} {
3837
    global canv canv2 canv3 ctext commitinfo selectedline
3838
    global displayorder linehtag linentag linedtag
3839
    global canvy0 linespc parentlist childlist
3840
    global currentid sha1entry
P
Paul Mackerras 已提交
3841
    global commentend idtags linknum
3842
    global mergemax numcommits pending_select
3843
    global cmitmode desc_tags anc_tags showneartags allcommits desc_heads
3844

3845
    catch {unset pending_select}
3846
    $canv delete hover
3847
    normalline
3848
    cancel_next_highlight
3849
    if {$l < 0 || $l >= $numcommits} return
3850
    set y [expr {$canvy0 + $l * $linespc}]
3851
    set ymax [lindex [$canv cget -scrollregion] 3]
3852 3853
    set ytop [expr {$y - $linespc - 1}]
    set ybot [expr {$y + $linespc + 1}]
3854
    set wnow [$canv yview]
J
Jeff Hobbs 已提交
3855 3856
    set wtop [expr {[lindex $wnow 0] * $ymax}]
    set wbot [expr {[lindex $wnow 1] * $ymax}]
3857 3858
    set wh [expr {$wbot - $wtop}]
    set newtop $wtop
3859
    if {$ytop < $wtop} {
3860 3861 3862 3863 3864 3865 3866
	if {$ybot < $wtop} {
	    set newtop [expr {$y - $wh / 2.0}]
	} else {
	    set newtop $ytop
	    if {$newtop > $wtop - $linespc} {
		set newtop [expr {$wtop - $linespc}]
	    }
3867
	}
3868 3869 3870 3871 3872 3873 3874 3875
    } 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}]
	    }
3876
	}
3877 3878 3879 3880 3881
    }
    if {$newtop != $wtop} {
	if {$newtop < 0} {
	    set newtop 0
	}
J
Jeff Hobbs 已提交
3882
	allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
P
Paul Mackerras 已提交
3883
	drawvisible
3884
    }
3885

P
Paul Mackerras 已提交
3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899
    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

3900 3901
    if {$isnew} {
	addtohistory [list selectline $l 0]
3902 3903
    }

3904 3905
    set selectedline $l

3906
    set id [lindex $displayorder $l]
3907
    set currentid $id
3908 3909 3910 3911
    $sha1entry delete 0 end
    $sha1entry insert 0 $id
    $sha1entry selection from 0
    $sha1entry selection to end
3912
    rhighlight_sel $id
3913

3914
    $ctext conf -state normal
3915
    clear_ctext
3916
    set linknum 0
3917
    set info $commitinfo($id)
P
Paul Mackerras 已提交
3918 3919 3920 3921
    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"
3922 3923 3924 3925 3926 3927 3928
    if {[info exists idtags($id)]} {
	$ctext insert end "Tags:"
	foreach tag $idtags($id) {
	    $ctext insert end " $tag"
	}
	$ctext insert end "\n"
    }
3929

3930
    set headers {}
3931 3932
    set olds [lindex $parentlist $l]
    if {[llength $olds] > 1} {
3933
	set np 0
3934
	foreach p $olds {
3935 3936 3937 3938 3939 3940
	    if {$np >= $mergemax} {
		set tag mmax
	    } else {
		set tag m$np
	    }
	    $ctext insert end "Parent: " $tag
3941
	    appendwithlinks [commit_descriptor $p] {}
3942 3943 3944
	    incr np
	}
    } else {
3945
	foreach p $olds {
P
Paul Mackerras 已提交
3946
	    append headers "Parent: [commit_descriptor $p]"
3947 3948
	}
    }
3949

3950
    foreach c [lindex $childlist $l] {
P
Paul Mackerras 已提交
3951
	append headers "Child:  [commit_descriptor $c]"
3952
    }
3953 3954

    # make anything that looks like a SHA1 ID be a clickable link
3955
    appendwithlinks $headers {}
P
Paul Mackerras 已提交
3956 3957 3958 3959
    if {$showneartags} {
	if {![info exists allcommits]} {
	    getallcommits
	}
3960 3961 3962 3963
	$ctext insert end "Branch: "
	$ctext mark set branch "end -1c"
	$ctext mark gravity branch left
	if {[info exists desc_heads($id)]} {
3964
	    if {[appendrefs branch $desc_heads($id) headids] > 1} {
3965 3966 3967 3968 3969
		# turn "Branch" into "Branches"
		$ctext insert "branch -2c" "es"
	    }
	}
	$ctext insert end "\nFollows: "
P
Paul Mackerras 已提交
3970 3971 3972
	$ctext mark set follows "end -1c"
	$ctext mark gravity follows left
	if {[info exists anc_tags($id)]} {
3973
	    appendrefs follows [taglist $anc_tags($id)] tagids
P
Paul Mackerras 已提交
3974 3975 3976 3977 3978
	}
	$ctext insert end "\nPrecedes: "
	$ctext mark set precedes "end -1c"
	$ctext mark gravity precedes left
	if {[info exists desc_tags($id)]} {
3979
	    appendrefs precedes [taglist $desc_tags($id)] tagids
P
Paul Mackerras 已提交
3980 3981 3982 3983
	}
	$ctext insert end "\n"
    }
    $ctext insert end "\n"
3984
    appendwithlinks [lindex $info 5] {comment}
3985

3986
    $ctext tag delete Comments
3987
    $ctext tag remove found 1.0 end
3988
    $ctext conf -state disabled
3989
    set commentend [$ctext index "end - 1c"]
3990

3991
    init_flist "Comments"
P
Paul Mackerras 已提交
3992 3993 3994
    if {$cmitmode eq "tree"} {
	gettree $id
    } elseif {[llength $olds] <= 1} {
3995
	startdiff $id
3996
    } else {
3997
	mergediff $id $l
3998 3999 4000
    }
}

4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012
proc selfirstline {} {
    unmarkmatches
    selectline 0 1
}

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

4013 4014 4015
proc selnextline {dir} {
    global selectedline
    if {![info exists selectedline]} return
J
Jeff Hobbs 已提交
4016
    set l [expr {$selectedline + $dir}]
4017
    unmarkmatches
4018 4019 4020
    selectline $l 1
}

4021 4022 4023 4024 4025 4026 4027 4028
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
4029
    drawvisible
4030 4031 4032 4033 4034 4035 4036 4037
    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
4038
    selectline $l 1
4039 4040
}

4041
proc unselectline {} {
P
Paul Mackerras 已提交
4042
    global selectedline currentid
4043 4044

    catch {unset selectedline}
P
Paul Mackerras 已提交
4045
    catch {unset currentid}
4046
    allcanvs delete secsel
4047
    rhighlight_none
4048
    cancel_next_highlight
4049 4050
}

P
Paul Mackerras 已提交
4051 4052 4053 4054 4055 4056 4057 4058
proc reselectline {} {
    global selectedline

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

4059
proc addtohistory {cmd} {
4060
    global history historyindex curview
4061

4062
    set elt [list $curview $cmd]
4063
    if {$historyindex > 0
4064
	&& [lindex $history [expr {$historyindex - 1}]] == $elt} {
4065 4066 4067 4068
	return
    }

    if {$historyindex < [llength $history]} {
4069
	set history [lreplace $history $historyindex end $elt]
4070
    } else {
4071
	lappend history $elt
4072 4073 4074
    }
    incr historyindex
    if {$historyindex > 1} {
4075
	.tf.bar.leftbut conf -state normal
4076
    } else {
4077
	.tf.bar.leftbut conf -state disabled
4078
    }
4079
    .tf.bar.rightbut conf -state disabled
4080 4081
}

4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092
proc godo {elt} {
    global curview

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

4093 4094 4095 4096 4097
proc goback {} {
    global history historyindex

    if {$historyindex > 1} {
	incr historyindex -1
4098
	godo [lindex $history [expr {$historyindex - 1}]]
4099
	.tf.bar.rightbut conf -state normal
4100 4101
    }
    if {$historyindex <= 1} {
4102
	.tf.bar.leftbut conf -state disabled
4103 4104 4105 4106 4107 4108 4109
    }
}

proc goforw {} {
    global history historyindex

    if {$historyindex < [llength $history]} {
4110
	set cmd [lindex $history $historyindex]
4111
	incr historyindex
4112
	godo $cmd
4113
	.tf.bar.leftbut conf -state normal
4114 4115
    }
    if {$historyindex >= [llength $history]} {
4116
	.tf.bar.rightbut conf -state disabled
4117
    }
4118 4119
}

P
Paul Mackerras 已提交
4120 4121 4122 4123 4124 4125 4126
proc gettree {id} {
    global treefilelist treeidlist diffids diffmergeid treepending

    set diffids $id
    catch {unset diffmergeid}
    if {![info exists treefilelist($id)]} {
	if {![info exists treepending]} {
4127
	    if {[catch {set gtf [open [concat | git ls-tree -r $id] r]}]} {
P
Paul Mackerras 已提交
4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174
		return
	    }
	    set treepending $id
	    set treefilelist($id) {}
	    set treeidlist($id) {}
	    fconfigure $gtf -blocking 0
	    fileevent $gtf readable [list gettreeline $gtf $id]
	}
    } else {
	setfilelist $id
    }
}

proc gettreeline {gtf id} {
    global treefilelist treeidlist treepending cmitmode diffids

    while {[gets $gtf line] >= 0} {
	if {[lindex $line 1] ne "blob"} continue
	set sha1 [lindex $line 2]
	set fname [lindex $line 3]
	lappend treefilelist($id) $fname
	lappend treeidlist($id) $sha1
    }
    if {![eof $gtf]} return
    close $gtf
    unset treepending
    if {$cmitmode ne "tree"} {
	if {![info exists diffmergeid]} {
	    gettreediffs $diffids
	}
    } elseif {$id ne $diffids} {
	gettree $diffids
    } else {
	setfilelist $id
    }
}

proc showfile {f} {
    global treefilelist treeidlist diffids
    global ctext commentend

    set i [lsearch -exact $treefilelist($diffids) $f]
    if {$i < 0} {
	puts "oops, $f not in list for id $diffids"
	return
    }
    set blob [lindex $treeidlist($diffids) $i]
4175
    if {[catch {set bf [open [concat | git cat-file blob $blob] r]} err]} {
P
Paul Mackerras 已提交
4176 4177 4178 4179 4180 4181
	puts "oops, error reading blob $blob: $err"
	return
    }
    fconfigure $bf -blocking 0
    fileevent $bf readable [list getblobline $bf $diffids]
    $ctext config -state normal
4182
    clear_ctext $commentend
P
Paul Mackerras 已提交
4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207
    $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}
	return
    }
    $ctext config -state normal
    while {[gets $bf line] >= 0} {
	$ctext insert end "$line\n"
    }
    if {[eof $bf]} {
	# delete last newline
	$ctext delete "end - 2c" "end - 1c"
	close $bf
    }
    $ctext config -state disabled
}

4208 4209
proc mergediff {id l} {
    global diffmergeid diffopts mdifffd
4210
    global diffids
4211
    global parentlist
4212

4213
    set diffmergeid $id
4214
    set diffids $id
4215
    # this doesn't seem to actually affect anything...
4216
    set env(GIT_DIFF_OPTS) $diffopts
4217
    set cmd [concat | git diff-tree --no-commit-id --cc $id]
4218 4219 4220
    if {[catch {set mdf [open $cmd r]} err]} {
	error_popup "Error getting merge diffs: $err"
	return
4221
    }
4222 4223
    fconfigure $mdf -blocking 0
    set mdifffd($id) $mdf
4224 4225
    set np [llength [lindex $parentlist $l]]
    fileevent $mdf readable [list getmergediffline $mdf $id $np]
4226
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
4227 4228
}

4229 4230
proc getmergediffline {mdf id np} {
    global diffmergeid ctext cflist nextupdate mergemax
4231
    global difffilestart mdifffd
4232

4233
    set n [gets $mdf line]
4234
    if {$n < 0} {
4235 4236
	if {[eof $mdf]} {
	    close $mdf
4237 4238 4239
	}
	return
    }
4240 4241
    if {![info exists diffmergeid] || $id != $diffmergeid
	|| $mdf != $mdifffd($id)} {
4242
	return
4243 4244
    }
    $ctext conf -state normal
4245 4246
    if {[regexp {^diff --cc (.*)} $line match fname]} {
	# start of a new file
4247 4248
	$ctext insert end "\n"
	set here [$ctext index "end - 1c"]
4249
	lappend difffilestart $here
P
Paul Mackerras 已提交
4250
	add_flist [list $fname]
4251
	set l [expr {(78 - [string length $fname]) / 2}]
4252
	set pad [string range "----------------------------------------" 1 $l]
4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271
	$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
4272
	    } else {
4273 4274
		set isbad 1
		break
4275
	    }
4276
	}
4277 4278 4279 4280 4281 4282 4283 4284 4285
	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]
4286
	}
4287 4288 4289
	if {$num ne {}} {
	    if {$num >= $mergemax} {
		set num "max"
4290
	    }
4291
	    lappend tags m$num
4292
	}
4293
	$ctext insert end "$line\n" $tags
4294 4295
    }
    $ctext conf -state disabled
4296 4297 4298 4299
    if {[clock clicks -milliseconds] >= $nextupdate} {
	incr nextupdate 100
	fileevent $mdf readable {}
	update
4300
	fileevent $mdf readable [list getmergediffline $mdf $id $np]
4301 4302 4303
    }
}

4304 4305
proc startdiff {ids} {
    global treediffs diffids treepending diffmergeid
4306

4307
    set diffids $ids
4308
    catch {unset diffmergeid}
4309
    if {![info exists treediffs($ids)]} {
4310
	if {![info exists treepending]} {
4311
	    gettreediffs $ids
4312 4313
	}
    } else {
4314
	addtocflist $ids
4315 4316 4317 4318
    }
}

proc addtocflist {ids} {
4319
    global treediffs cflist
P
Paul Mackerras 已提交
4320
    add_flist $treediffs($ids)
4321
    getblobdiffs $ids
4322 4323
}

4324
proc gettreediffs {ids} {
4325
    global treediff treepending
4326
    set treepending $ids
4327
    set treediff {}
4328
    if {[catch \
4329
	 {set gdtf [open [concat | git diff-tree --no-commit-id -r $ids] r]} \
4330
	]} return
4331
    fconfigure $gdtf -blocking 0
4332
    fileevent $gdtf readable [list gettreediffline $gdtf $ids]
4333 4334
}

4335
proc gettreediffline {gdtf ids} {
4336
    global treediff treediffs treepending diffids diffmergeid
P
Paul Mackerras 已提交
4337
    global cmitmode
4338

4339 4340 4341 4342
    set n [gets $gdtf line]
    if {$n < 0} {
	if {![eof $gdtf]} return
	close $gdtf
4343
	set treediffs($ids) $treediff
4344
	unset treepending
P
Paul Mackerras 已提交
4345 4346 4347
	if {$cmitmode eq "tree"} {
	    gettree $diffids
	} elseif {$ids != $diffids} {
4348 4349
	    if {![info exists diffmergeid]} {
		gettreediffs $diffids
4350
	    }
4351 4352
	} else {
	    addtocflist $ids
4353
	}
4354 4355
	return
    }
4356
    set file [lindex $line 5]
4357
    lappend treediff $file
4358 4359
}

4360
proc getblobdiffs {ids} {
4361
    global diffopts blobdifffd diffids env curdifftag curtagstart
4362
    global nextupdate diffinhdr treediffs
4363

4364
    set env(GIT_DIFF_OPTS) $diffopts
4365
    set cmd [concat | git diff-tree --no-commit-id -r -p -C $ids]
4366
    if {[catch {set bdf [open $cmd r]} err]} {
4367 4368 4369
	puts "error getting diffs: $err"
	return
    }
4370
    set diffinhdr 0
4371
    fconfigure $bdf -blocking 0
4372
    set blobdifffd($ids) $bdf
4373 4374 4375
    set curdifftag Comments
    set curtagstart 0.0
    fileevent $bdf readable [list getblobdiffline $bdf $diffids]
4376
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
4377 4378
}

4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391
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
    }
}

4392
proc getblobdiffline {bdf ids} {
4393
    global diffids blobdifffd ctext curdifftag curtagstart
4394 4395
    global diffnexthead diffnextnote difffilestart
    global nextupdate diffinhdr treediffs
4396

4397 4398 4399 4400
    set n [gets $bdf line]
    if {$n < 0} {
	if {[eof $bdf]} {
	    close $bdf
4401
	    if {$ids == $diffids && $bdf == $blobdifffd($ids)} {
4402 4403 4404 4405 4406
		$ctext tag add $curdifftag $curtagstart end
	    }
	}
	return
    }
4407
    if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
4408 4409 4410
	return
    }
    $ctext conf -state normal
4411
    if {[regexp {^diff --git a/(.*) b/(.*)} $line match fname newname]} {
4412 4413 4414
	# start of a new file
	$ctext insert end "\n"
	$ctext tag add $curdifftag $curtagstart end
4415
	set here [$ctext index "end - 1c"]
4416 4417
	set curtagstart $here
	set header $newname
4418 4419 4420 4421 4422 4423 4424 4425 4426
	set i [lsearch -exact $treediffs($ids) $fname]
	if {$i >= 0} {
	    setinlist difffilestart $i $here
	}
	if {$newname ne $fname} {
	    set i [lsearch -exact $treediffs($ids) $newname]
	    if {$i >= 0} {
		setinlist difffilestart $i $here
	    }
4427
	}
4428 4429
	set curdifftag "f:$fname"
	$ctext tag delete $curdifftag
4430
	set l [expr {(78 - [string length $header]) / 2}]
4431
	set pad [string range "----------------------------------------" 1 $l]
4432
	$ctext insert end "$pad $header $pad\n" filesep
4433
	set diffinhdr 1
4434 4435 4436
    } elseif {$diffinhdr && [string compare -length 3 $line "---"] == 0} {
	# do nothing
    } elseif {$diffinhdr && [string compare -length 3 $line "+++"] == 0} {
4437
	set diffinhdr 0
4438 4439
    } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
		   $line match f1l f1c f2l f2c rest]} {
4440
	$ctext insert end "$line\n" hunksep
4441
	set diffinhdr 0
4442 4443 4444 4445 4446 4447 4448
    } else {
	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"
4449
	} elseif {$diffinhdr || $x == "\\"} {
4450 4451
	    # e.g. "\ No newline at end of file"
	    $ctext insert end "$line\n" filesep
4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463
	} 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
	}
    }
    $ctext conf -state disabled
4464 4465 4466 4467 4468 4469
    if {[clock clicks -milliseconds] >= $nextupdate} {
	incr nextupdate 100
	fileevent $bdf readable {}
	update
	fileevent $bdf readable "getblobdiffline $bdf {$ids}"
    }
4470 4471
}

4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485
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
}

4486 4487 4488
proc nextfile {} {
    global difffilestart ctext
    set here [$ctext index @0,0]
4489 4490 4491
    foreach loc $difffilestart {
	if {[$ctext compare $loc > $here]} {
	    $ctext yview $loc
4492
	    return
4493 4494
	}
    }
4495 4496
}

4497 4498 4499
proc clear_ctext {{first 1.0}} {
    global ctext smarktop smarkbot

4500 4501 4502
    set l [lindex [split $first .] 0]
    if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} {
	set smarktop $l
4503
    }
4504 4505
    if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} {
	set smarkbot $l
4506 4507 4508 4509 4510
    }
    $ctext delete $first end
}

proc incrsearch {name ix op} {
4511
    global ctext searchstring searchdirn
4512 4513

    $ctext tag remove found 1.0 end
4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524
    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]
	}
    }
4525
    if {$searchstring ne {}} {
4526 4527 4528 4529
	set here [$ctext search $searchdirn -- $searchstring anchor]
	if {$here ne {}} {
	    $ctext see $here
	}
4530 4531 4532 4533 4534
	searchmarkvisible 1
    }
}

proc dosearch {} {
4535
    global sstring ctext searchstring searchdirn
4536 4537 4538

    focus $sstring
    $sstring icursor end
4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582
    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
4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599 4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620
    }
}

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} {
4621
    global searchstring
4622

4623
    .bleft.sb set $f0 $f1
4624 4625 4626 4627 4628
    if {$searchstring ne {}} {
	searchmarkvisible 0
    }
}

4629 4630
proc setcoords {} {
    global linespc charspc canvx0 canvy0 mainfont
4631
    global xspc1 xspc2 lthickness
4632

4633 4634
    set linespc [font metrics $mainfont -linespace]
    set charspc [font measure $mainfont "m"]
P
Paul Mackerras 已提交
4635 4636
    set canvy0 [expr {int(3 + 0.5 * $linespc)}]
    set canvx0 [expr {int(3 + 0.5 * $linespc)}]
4637
    set lthickness [expr {int($linespc / 9) + 1}]
4638 4639
    set xspc1(0) $linespc
    set xspc2 $linespc
4640
}
4641

4642
proc redisplay {} {
4643
    global canv
P
Paul Mackerras 已提交
4644 4645 4646 4647 4648 4649
    global selectedline

    set ymax [lindex [$canv cget -scrollregion] 3]
    if {$ymax eq {} || $ymax == 0} return
    set span [$canv yview]
    clear_display
4650
    setcanvscroll
P
Paul Mackerras 已提交
4651 4652 4653 4654
    allcanvs yview moveto [lindex $span 0]
    drawvisible
    if {[info exists selectedline]} {
	selectline $selectedline 0
4655
	allcanvs yview moveto [lindex $span 0]
4656 4657 4658 4659
    }
}

proc incrfont {inc} {
4660
    global mainfont textfont ctext canv phase
4661
    global stopped entries
4662 4663 4664 4665 4666 4667
    unmarkmatches
    set mainfont [lreplace $mainfont 1 1 [expr {[lindex $mainfont 1] + $inc}]]
    set textfont [lreplace $textfont 1 1 [expr {[lindex $textfont 1] + $inc}]]
    setcoords
    $ctext conf -font $textfont
    $ctext tag conf filesep -font [concat $textfont bold]
4668 4669 4670
    foreach e $entries {
	$e conf -font $mainfont
    }
4671
    if {$phase eq "getcommits"} {
4672 4673 4674 4675
	$canv itemconf textitems -font $mainfont
    }
    redisplay
}
4676

4677 4678 4679 4680 4681 4682 4683
proc clearsha1 {} {
    global sha1entry sha1string
    if {[string length $sha1string] == 40} {
	$sha1entry delete 0 end
    }
}

4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700
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 {} {
4701
    global sha1string currentid commitrow tagids headids
4702
    global displayorder numcommits curview
4703

4704 4705 4706 4707
    if {$sha1string == {}
	|| ([info exists currentid] && $sha1string == $currentid)} return
    if {[info exists tagids($sha1string)]} {
	set id $tagids($sha1string)
4708 4709
    } elseif {[info exists headids($sha1string)]} {
	set id $headids($sha1string)
4710 4711
    } else {
	set id [string tolower $sha1string]
4712 4713
	if {[regexp {^[0-9a-f]{4,39}$} $id]} {
	    set matches {}
P
Paul Mackerras 已提交
4714 4715 4716
	    foreach i $displayorder {
		if {[string match $id* $i]} {
		    lappend matches $i
4717 4718 4719 4720 4721 4722 4723 4724 4725 4726
		}
	    }
	    if {$matches ne {}} {
		if {[llength $matches] > 1} {
		    error_popup "Short SHA1 id $id is ambiguous"
		    return
		}
		set id [lindex $matches 0]
	    }
	}
4727
    }
4728 4729
    if {[info exists commitrow($curview,$id)]} {
	selectline $commitrow($curview,$id) 1
4730 4731
	return
    }
4732
    if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
4733 4734
	set type "SHA1 id"
    } else {
4735
	set type "Tag/Head"
4736 4737 4738 4739
    }
    error_popup "$type $sha1string is not known"
}

4740 4741 4742 4743
proc lineenter {x y id} {
    global hoverx hovery hoverid hovertimer
    global commitinfo canv

P
Paul Mackerras 已提交
4744
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798
    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
4799 4800
    set t [$canv create text $x $y -anchor nw -text $text -tags hover \
	       -font $mainfont]
4801 4802 4803
    $canv raise $t
}

4804
proc clickisonarrow {id y} {
P
Paul Mackerras 已提交
4805
    global lthickness
4806

P
Paul Mackerras 已提交
4807
    set ranges [rowranges $id]
4808
    set thresh [expr {2 * $lthickness + 6}]
P
Paul Mackerras 已提交
4809
    set n [expr {[llength $ranges] - 1}]
4810
    for {set i 1} {$i < $n} {incr i} {
P
Paul Mackerras 已提交
4811
	set row [lindex $ranges $i]
4812 4813
	if {abs([yc $row] - $y) < $thresh} {
	    return $i
4814 4815 4816 4817 4818
	}
    }
    return {}
}

4819
proc arrowjump {id n y} {
P
Paul Mackerras 已提交
4820
    global canv
4821

4822 4823
    # 1 <-> 2, 3 <-> 4, etc...
    set n [expr {(($n - 1) ^ 1) + 1}]
P
Paul Mackerras 已提交
4824
    set row [lindex [rowranges $id] $n]
4825
    set yt [yc $row]
4826 4827 4828 4829 4830 4831 4832 4833
    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
    }
4834
    allcanvs yview moveto $yfrac
4835 4836
}

4837
proc lineclick {x y id isnew} {
4838
    global ctext commitinfo children canv thickerline curview
4839

P
Paul Mackerras 已提交
4840
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
4841
    unmarkmatches
4842
    unselectline
4843 4844 4845 4846
    normalline
    $canv delete hover
    # draw this line thicker than normal
    set thickerline $id
4847
    drawlines $id
4848
    if {$isnew} {
4849 4850 4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861
	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]
4862
    }
4863 4864
    # fill the details pane with info about this line
    $ctext conf -state normal
4865
    clear_ctext
4866 4867 4868 4869 4870 4871
    $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]
4872
    set info $commitinfo($id)
4873
    $ctext insert end "\n\t[lindex $info 0]\n"
4874
    $ctext insert end "\tAuthor:\t[lindex $info 1]\n"
P
Paul Mackerras 已提交
4875 4876
    set date [formatdate [lindex $info 2]]
    $ctext insert end "\tDate:\t$date\n"
4877
    set kids $children($curview,$id)
4878
    if {$kids ne {}} {
4879
	$ctext insert end "\nChildren:"
4880
	set i 0
4881
	foreach child $kids {
4882
	    incr i
P
Paul Mackerras 已提交
4883
	    if {![info exists commitinfo($child)] && ![getcommit $child]} continue
4884
	    set info $commitinfo($child)
4885 4886 4887 4888 4889
	    $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 已提交
4890 4891
	    set date [formatdate [lindex $info 2]]
	    $ctext insert end "\n\tDate:\t$date\n"
4892 4893 4894
	}
    }
    $ctext conf -state disabled
4895
    init_flist {}
4896 4897
}

4898 4899 4900
proc normalline {} {
    global thickerline
    if {[info exists thickerline]} {
4901
	set id $thickerline
4902
	unset thickerline
4903
	drawlines $id
4904 4905 4906
    }
}

4907
proc selbyid {id} {
4908 4909 4910
    global commitrow curview
    if {[info exists commitrow($curview,$id)]} {
	selectline $commitrow($curview,$id) 1
4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921 4922
    }
}

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} {
4923
    global rowctxmenu commitrow selectedline rowmenuid curview
4924

4925 4926
    if {![info exists selectedline]
	|| $commitrow($curview,$id) eq $selectedline} {
4927 4928 4929 4930
	set state disabled
    } else {
	set state normal
    }
4931 4932 4933
    $rowctxmenu entryconfigure "Diff this*" -state $state
    $rowctxmenu entryconfigure "Diff selected*" -state $state
    $rowctxmenu entryconfigure "Make patch" -state $state
4934 4935 4936 4937 4938
    set rowmenuid $id
    tk_popup $rowctxmenu $x $y
}

proc diffvssel {dirn} {
4939
    global rowmenuid selectedline displayorder
4940 4941 4942

    if {![info exists selectedline]} return
    if {$dirn} {
4943
	set oldid [lindex $displayorder $selectedline]
4944 4945 4946
	set newid $rowmenuid
    } else {
	set oldid $rowmenuid
4947
	set newid [lindex $displayorder $selectedline]
4948
    }
4949 4950 4951 4952 4953
    addtohistory [list doseldiff $oldid $newid]
    doseldiff $oldid $newid
}

proc doseldiff {oldid newid} {
4954
    global ctext
4955 4956
    global commitinfo

4957
    $ctext conf -state normal
4958
    clear_ctext
4959
    init_flist "Top"
4960 4961 4962 4963 4964 4965 4966
    $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     "
4967
    $ctext insert end [lindex $commitinfo($oldid) 0]
4968 4969 4970 4971
    $ctext insert end "\n\nTo   "
    $ctext tag bind link1 <1> [list selbyid $newid]
    $ctext insert end $newid [list link link1]
    $ctext insert end "\n     "
4972 4973 4974 4975 4976
    $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
4977
    startdiff [list $oldid $newid]
4978 4979
}

4980 4981 4982 4983 4984 4985 4986 4987 4988 4989 4990 4991 4992
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"
4993
    grid $top.title - -pady 10
4994
    label $top.from -text "From:"
4995
    entry $top.fromsha1 -width 40 -relief flat
4996 4997 4998
    $top.fromsha1 insert 0 $oldid
    $top.fromsha1 conf -state readonly
    grid $top.from $top.fromsha1 -sticky w
4999
    entry $top.fromhead -width 60 -relief flat
5000 5001 5002 5003
    $top.fromhead insert 0 $oldhead
    $top.fromhead conf -state readonly
    grid x $top.fromhead -sticky w
    label $top.to -text "To:"
5004
    entry $top.tosha1 -width 40 -relief flat
5005 5006 5007
    $top.tosha1 insert 0 $newid
    $top.tosha1 conf -state readonly
    grid $top.to $top.tosha1 -sticky w
5008
    entry $top.tohead -width 60 -relief flat
5009 5010 5011 5012 5013 5014 5015 5016 5017
    $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
5018
    grid $top.flab $top.fname -sticky w
5019 5020 5021 5022 5023 5024 5025
    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
5026
    focus $top.fname
5027 5028 5029 5030 5031 5032 5033 5034 5035 5036 5037 5038 5039 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050
}

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 {} {
    global patchtop

    set oldid [$patchtop.fromsha1 get]
    set newid [$patchtop.tosha1 get]
    set fname [$patchtop.fname get]
5051
    if {[catch {exec git diff-tree -p $oldid $newid >$fname &} err]} {
5052 5053 5054 5055 5056 5057 5058 5059 5060 5061 5062 5063 5064
	error_popup "Error creating patch: $err"
    }
    catch {destroy $patchtop}
    unset patchtop
}

proc mkpatchcan {} {
    global patchtop

    catch {destroy $patchtop}
    unset patchtop
}

5065 5066 5067 5068 5069 5070 5071 5072
proc mktag {} {
    global rowmenuid mktagtop commitinfo

    set top .maketag
    set mktagtop $top
    catch {destroy $top}
    toplevel $top
    label $top.title -text "Create tag"
5073
    grid $top.title - -pady 10
5074
    label $top.id -text "ID:"
5075
    entry $top.sha1 -width 40 -relief flat
5076 5077 5078
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
5079
    entry $top.head -width 60 -relief flat
5080 5081 5082 5083
    $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:"
5084
    entry $top.tag -width 60
5085 5086 5087 5088 5089 5090 5091 5092 5093 5094 5095 5096 5097 5098 5099 5100 5101 5102 5103 5104 5105 5106 5107 5108 5109
    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 {
5110
	set dir [gitdir]
5111 5112 5113 5114 5115 5116 5117 5118 5119 5120 5121
	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
5122
    redrawtags $id
5123
    addedtag $id
5124 5125 5126
}

proc redrawtags {id} {
5127
    global canv linehtag commitrow idpos selectedline curview
5128
    global mainfont canvxmax
5129

5130 5131
    if {![info exists commitrow($curview,$id)]} return
    drawcmitrow $commitrow($curview,$id)
5132 5133
    $canv delete tag.$id
    set xt [eval drawtags $id $idpos($id)]
5134
    $canv coords $linehtag($commitrow($curview,$id)) $xt [lindex $idpos($id) 2]
P
Paul Mackerras 已提交
5135 5136 5137 5138 5139 5140
    set text [$canv itemcget $linehtag($commitrow($curview,$id)) -text]
    set xr [expr {$xt + [font measure $mainfont $text]}]
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
5141 5142
    if {[info exists selectedline]
	&& $selectedline == $commitrow($curview,$id)} {
5143
	selectline $selectedline 0
5144 5145 5146 5147 5148 5149 5150 5151 5152 5153 5154 5155 5156 5157 5158
    }
}

proc mktagcan {} {
    global mktagtop

    catch {destroy $mktagtop}
    unset mktagtop
}

proc mktaggo {} {
    domktag
    mktagcan
}

5159 5160 5161 5162 5163 5164 5165 5166 5167 5168 5169 5170 5171 5172 5173 5174 5175 5176 5177 5178 5179 5180 5181 5182 5183 5184 5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 5213
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
}

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 5256 5257
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 {
5258
	addedhead $id $name
5259 5260 5261 5262 5263 5264
	# XXX should update list of heads displayed for selected commit
	notbusy newbranch
	redrawtags $id
    }
}

5265 5266 5267 5268 5269 5270 5271 5272 5273 5274 5275 5276 5277 5278 5279 5280 5281 5282 5283 5284 5285 5286 5287 5288 5289 5290 5291 5292 5293 5294 5295 5296 5297 5298 5299 5300 5301 5302 5303 5304 5305 5306 5307 5308
proc cherrypick {} {
    global rowmenuid curview commitrow
    global mainhead desc_heads anc_tags desc_tags allparents allchildren

    if {[info exists desc_heads($rowmenuid)]
	&& [lsearch -exact $desc_heads($rowmenuid) $mainhead] >= 0} {
	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
    set oldhead [exec git rev-parse HEAD]
    # 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
    }
    set allparents($newhead) $oldhead
    lappend allchildren($oldhead) $newhead
    set desc_heads($newhead) $mainhead
    if {[info exists anc_tags($oldhead)]} {
	set anc_tags($newhead) $anc_tags($oldhead)
    }
    set desc_tags($newhead) {}
    if {[info exists commitrow($curview,$oldhead)]} {
	insertrow $commitrow($curview,$oldhead) $newhead
	if {$mainhead ne {}} {
	    movedhead $newhead $mainhead
	}
	redrawtags $oldhead
	redrawtags $newhead
    }
    notbusy cherrypick
}

5309 5310 5311 5312 5313 5314 5315 5316 5317 5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331
# context menu for a head
proc headmenu {x y id head} {
    global headmenuid headmenuhead headctxmenu

    set headmenuid $id
    set headmenuhead $head
    tk_popup $headctxmenu $x $y
}

proc cobranch {} {
    global headmenuid headmenuhead mainhead headids

    # check the tree is clean first??
    set oldmainhead $mainhead
    nowbusy checkout
    update
    if {[catch {
	exec git checkout $headmenuhead
    } err]} {
	notbusy checkout
	error_popup $err
    } else {
	notbusy checkout
5332
	set mainhead $headmenuhead
5333 5334 5335 5336 5337 5338 5339 5340 5341 5342 5343 5344 5345 5346 5347 5348 5349
	if {[info exists headids($oldmainhead)]} {
	    redrawtags $headids($oldmainhead)
	}
	redrawtags $headmenuid
    }
}

proc rmbranch {} {
    global desc_heads headmenuid headmenuhead mainhead
    global headids idheads

    set head $headmenuhead
    set id $headmenuid
    if {$head eq $mainhead} {
	error_popup "Cannot delete the currently checked-out branch"
	return
    }
5350
    if {$desc_heads($id) eq $head} {
5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361
	# 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
    }
5362
    removedhead $id $head
5363 5364 5365 5366
    redrawtags $id
    notbusy rmbranch
}

P
Paul Mackerras 已提交
5367 5368
# Stuff for finding nearby tags
proc getallcommits {} {
5369
    global allcstart allcommits allcfd allids
5370

5371
    set allids {}
P
Paul Mackerras 已提交
5372
    set fd [open [concat | git rev-list --all --topo-order --parents] r]
5373
    set allcfd $fd
P
Paul Mackerras 已提交
5374 5375 5376 5377 5378 5379
    fconfigure $fd -blocking 0
    set allcommits "reading"
    nowbusy allcommits
    restartgetall $fd
}

5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392 5393
proc discardallcommits {} {
    global allparents allchildren allcommits allcfd
    global desc_tags anc_tags alldtags tagisdesc allids desc_heads

    if {![info exists allcommits]} return
    if {$allcommits eq "reading"} {
	catch {close $allcfd}
    }
    foreach v {allcommits allchildren allparents allids desc_tags anc_tags
		alldtags tagisdesc desc_heads} {
	catch {unset $v}
    }
}

P
Paul Mackerras 已提交
5394 5395 5396 5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423
proc restartgetall {fd} {
    global allcstart

    fileevent $fd readable [list getallclines $fd]
    set allcstart [clock clicks -milliseconds]
}

proc combine_dtags {l1 l2} {
    global tagisdesc notfirstd

    set res [lsort -unique [concat $l1 $l2]]
    for {set i 0} {$i < [llength $res]} {incr i} {
	set x [lindex $res $i]
	for {set j [expr {$i+1}]} {$j < [llength $res]} {} {
	    set y [lindex $res $j]
	    if {[info exists tagisdesc($x,$y)]} {
		if {$tagisdesc($x,$y) > 0} {
		    # x is a descendent of y, exclude x
		    set res [lreplace $res $i $i]
		    incr i -1
		    break
		} else {
		    # y is a descendent of x, exclude y
		    set res [lreplace $res $j $j]
		}
	    } else {
		# no relation, keep going
		incr j
	    }
	}
5424
    }
P
Paul Mackerras 已提交
5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450
    return $res
}

proc combine_atags {l1 l2} {
    global tagisdesc

    set res [lsort -unique [concat $l1 $l2]]
    for {set i 0} {$i < [llength $res]} {incr i} {
	set x [lindex $res $i]
	for {set j [expr {$i+1}]} {$j < [llength $res]} {} {
	    set y [lindex $res $j]
	    if {[info exists tagisdesc($x,$y)]} {
		if {$tagisdesc($x,$y) < 0} {
		    # x is an ancestor of y, exclude x
		    set res [lreplace $res $i $i]
		    incr i -1
		    break
		} else {
		    # y is an ancestor of x, exclude y
		    set res [lreplace $res $j $j]
		}
	    } else {
		# no relation, keep going
		incr j
	    }
	}
5451
    }
P
Paul Mackerras 已提交
5452 5453 5454
    return $res
}

5455 5456 5457 5458 5459 5460 5461 5462 5463 5464 5465 5466 5467 5468 5469 5470 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 5486 5487 5488 5489 5490 5491
proc forward_pass {id children} {
    global idtags desc_tags idheads desc_heads alldtags tagisdesc

    set dtags {}
    set dheads {}
    foreach child $children {
	if {[info exists idtags($child)]} {
	    set ctags [list $child]
	} else {
	    set ctags $desc_tags($child)
	}
	if {$dtags eq {}} {
	    set dtags $ctags
	} elseif {$ctags ne $dtags} {
	    set dtags [combine_dtags $dtags $ctags]
	}
	set cheads $desc_heads($child)
	if {$dheads eq {}} {
	    set dheads $cheads
	} elseif {$cheads ne $dheads} {
	    set dheads [lsort -unique [concat $dheads $cheads]]
	}
    }
    set desc_tags($id) $dtags
    if {[info exists idtags($id)]} {
	set adt $dtags
	foreach tag $dtags {
	    set adt [concat $adt $alldtags($tag)]
	}
	set adt [lsort -unique $adt]
	set alldtags($id) $adt
	foreach tag $adt {
	    set tagisdesc($id,$tag) -1
	    set tagisdesc($tag,$id) 1
	}
    }
    if {[info exists idheads($id)]} {
5492
	set dheads [concat $dheads $idheads($id)]
5493 5494 5495 5496
    }
    set desc_heads($id) $dheads
}

P
Paul Mackerras 已提交
5497 5498
proc getallclines {fd} {
    global allparents allchildren allcommits allcstart
5499
    global desc_tags anc_tags idtags tagisdesc allids
5500
    global idheads travindex
P
Paul Mackerras 已提交
5501 5502 5503 5504 5505 5506 5507 5508 5509 5510 5511 5512 5513

    while {[gets $fd line] >= 0} {
	set id [lindex $line 0]
	lappend allids $id
	set olds [lrange $line 1 end]
	set allparents($id) $olds
	if {![info exists allchildren($id)]} {
	    set allchildren($id) {}
	}
	foreach p $olds {
	    lappend allchildren($p) $id
	}
	# compute nearest tagged descendents as we go
5514
	# also compute descendent heads
5515
	forward_pass $id $allchildren($id)
P
Paul Mackerras 已提交
5516 5517 5518 5519 5520 5521 5522
	if {[clock clicks -milliseconds] - $allcstart >= 50} {
	    fileevent $fd readable {}
	    after idle restartgetall $fd
	    return
	}
    }
    if {[eof $fd]} {
5523 5524 5525
	set travindex [llength $allids]
	set allcommits "traversing"
	after idle restartatags
P
Paul Mackerras 已提交
5526 5527 5528 5529 5530 5531 5532 5533
	if {[catch {close $fd} err]} {
	    error_popup "Error reading full commit graph: $err.\n\
			 Results may be incomplete."
	}
    }
}

# walk backward through the tree and compute nearest tagged ancestors
5534 5535
proc restartatags {} {
    global allids allparents idtags anc_tags travindex
P
Paul Mackerras 已提交
5536 5537

    set t0 [clock clicks -milliseconds]
5538
    set i $travindex
P
Paul Mackerras 已提交
5539 5540 5541 5542 5543 5544 5545 5546 5547 5548 5549 5550 5551 5552 5553 5554 5555
    while {[incr i -1] >= 0} {
	set id [lindex $allids $i]
	set atags {}
	foreach p $allparents($id) {
	    if {[info exists idtags($p)]} {
		set ptags [list $p]
	    } else {
		set ptags $anc_tags($p)
	    }
	    if {$atags eq {}} {
		set atags $ptags
	    } elseif {$ptags ne $atags} {
		set atags [combine_atags $atags $ptags]
	    }
	}
	set anc_tags($id) $atags
	if {[clock clicks -milliseconds] - $t0 >= 50} {
5556 5557
	    set travindex $i
	    after idle restartatags
P
Paul Mackerras 已提交
5558 5559
	    return
	}
5560
    }
P
Paul Mackerras 已提交
5561
    set allcommits "done"
5562
    set travindex 0
P
Paul Mackerras 已提交
5563 5564
    notbusy allcommits
    dispneartags
5565 5566
}

5567 5568 5569 5570 5571 5572 5573 5574 5575 5576 5577 5578 5579 5580 5581 5582 5583 5584 5585 5586 5587 5588 5589 5590 5591 5592 5593 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 5604 5605 5606 5607 5608 5609 5610 5611 5612 5613 5614 5615 5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 5628 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638 5639 5640 5641 5642
# update the desc_tags and anc_tags arrays for a new tag just added
proc addedtag {id} {
    global desc_tags anc_tags allparents allchildren allcommits
    global idtags tagisdesc alldtags

    if {![info exists desc_tags($id)]} return
    set adt $desc_tags($id)
    foreach t $desc_tags($id) {
	set adt [concat $adt $alldtags($t)]
    }
    set adt [lsort -unique $adt]
    set alldtags($id) $adt
    foreach t $adt {
	set tagisdesc($id,$t) -1
	set tagisdesc($t,$id) 1
    }
    if {[info exists anc_tags($id)]} {
	set todo $anc_tags($id)
	while {$todo ne {}} {
	    set do [lindex $todo 0]
	    set todo [lrange $todo 1 end]
	    if {[info exists tagisdesc($id,$do)]} continue
	    set tagisdesc($do,$id) -1
	    set tagisdesc($id,$do) 1
	    if {[info exists anc_tags($do)]} {
		set todo [concat $todo $anc_tags($do)]
	    }
	}
    }

    set lastold $desc_tags($id)
    set lastnew [list $id]
    set nup 0
    set nch 0
    set todo $allparents($id)
    while {$todo ne {}} {
	set do [lindex $todo 0]
	set todo [lrange $todo 1 end]
	if {![info exists desc_tags($do)]} continue
	if {$desc_tags($do) ne $lastold} {
	    set lastold $desc_tags($do)
	    set lastnew [combine_dtags $lastold [list $id]]
	    incr nch
	}
	if {$lastold eq $lastnew} continue
	set desc_tags($do) $lastnew
	incr nup
	if {![info exists idtags($do)]} {
	    set todo [concat $todo $allparents($do)]
	}
    }

    if {![info exists anc_tags($id)]} return
    set lastold $anc_tags($id)
    set lastnew [list $id]
    set nup 0
    set nch 0
    set todo $allchildren($id)
    while {$todo ne {}} {
	set do [lindex $todo 0]
	set todo [lrange $todo 1 end]
	if {![info exists anc_tags($do)]} continue
	if {$anc_tags($do) ne $lastold} {
	    set lastold $anc_tags($do)
	    set lastnew [combine_atags $lastold [list $id]]
	    incr nch
	}
	if {$lastold eq $lastnew} continue
	set anc_tags($do) $lastnew
	incr nup
	if {![info exists idtags($do)]} {
	    set todo [concat $todo $allchildren($do)]
	}
    }
}

5643
# update the desc_heads array for a new head just added
5644 5645 5646 5647 5648
proc addedhead {hid head} {
    global desc_heads allparents headids idheads

    set headids($head) $hid
    lappend idheads($hid) $head
5649 5650 5651 5652 5653 5654

    set todo [list $hid]
    while {$todo ne {}} {
	set do [lindex $todo 0]
	set todo [lrange $todo 1 end]
	if {![info exists desc_heads($do)] ||
5655
	    [lsearch -exact $desc_heads($do) $head] >= 0} continue
5656
	set oldheads $desc_heads($do)
5657
	lappend desc_heads($do) $head
5658 5659 5660 5661 5662 5663 5664 5665 5666 5667 5668 5669
	set heads $desc_heads($do)
	while {1} {
	    set p $allparents($do)
	    if {[llength $p] != 1 || ![info exists desc_heads($p)] ||
		$desc_heads($p) ne $oldheads} break
	    set do $p
	    set desc_heads($do) $heads
	}
	set todo [concat $todo $p]
    }
}

5670
# update the desc_heads array for a head just removed
5671 5672 5673 5674 5675 5676 5677 5678 5679 5680 5681 5682
proc removedhead {hid head} {
    global desc_heads allparents headids idheads

    unset headids($head)
    if {$idheads($hid) eq $head} {
	unset idheads($hid)
    } else {
	set i [lsearch -exact $idheads($hid) $head]
	if {$i >= 0} {
	    set idheads($hid) [lreplace $idheads($hid) $i $i]
	}
    }
5683 5684 5685 5686 5687 5688

    set todo [list $hid]
    while {$todo ne {}} {
	set do [lindex $todo 0]
	set todo [lrange $todo 1 end]
	if {![info exists desc_heads($do)]} continue
5689
	set i [lsearch -exact $desc_heads($do) $head]
5690 5691 5692 5693 5694 5695 5696 5697 5698 5699 5700 5701 5702 5703
	if {$i < 0} continue
	set oldheads $desc_heads($do)
	set heads [lreplace $desc_heads($do) $i $i]
	while {1} {
	    set desc_heads($do) $heads
	    set p $allparents($do)
	    if {[llength $p] != 1 || ![info exists desc_heads($p)] ||
		$desc_heads($p) ne $oldheads} break
	    set do $p
	}
	set todo [concat $todo $p]
    }
}

5704 5705 5706 5707 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717 5718 5719 5720
# update things for a head moved to a child of its previous location
proc movedhead {id name} {
    global headids idheads

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

5721 5722 5723 5724 5725 5726 5727 5728 5729 5730 5731 5732 5733 5734 5735 5736 5737 5738 5739 5740 5741 5742
proc changedrefs {} {
    global desc_heads desc_tags anc_tags allcommits allids
    global allchildren allparents idtags travindex

    if {![info exists allcommits]} return
    catch {unset desc_heads}
    catch {unset desc_tags}
    catch {unset anc_tags}
    catch {unset alldtags}
    catch {unset tagisdesc}
    foreach id $allids {
	forward_pass $id $allchildren($id)
    }
    if {$allcommits ne "reading"} {
	set travindex [llength $allids]
	if {$allcommits ne "traversing"} {
	    set allcommits "traversing"
	    after idle restartatags
	}
    }
}

5743
proc rereadrefs {} {
5744
    global idtags idheads idotherrefs mainhead
5745 5746 5747 5748 5749 5750 5751 5752

    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]
	}
    }
5753
    set oldmainhead $mainhead
5754
    readrefs
5755
    changedrefs
5756 5757 5758 5759
    set refids [lsort -unique [concat $refids [array names idtags] \
			[array names idheads] [array names idotherrefs]]]
    foreach id $refids {
	set v [listrefs $id]
5760 5761 5762
	if {![info exists ref($id)] || $ref($id) != $v ||
	    ($id eq $oldmainhead && $id ne $mainhead) ||
	    ($id eq $mainhead && $id ne $oldmainhead)} {
5763 5764 5765 5766 5767
	    redrawtags $id
	}
    }
}

5768 5769 5770 5771 5772 5773 5774 5775 5776 5777 5778 5779 5780 5781 5782 5783 5784 5785
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]
}

5786
proc showtag {tag isnew} {
5787
    global ctext tagcontents tagids linknum
5788 5789 5790 5791 5792

    if {$isnew} {
	addtohistory [list showtag $tag 0]
    }
    $ctext conf -state normal
5793
    clear_ctext
5794 5795 5796 5797 5798 5799
    set linknum 0
    if {[info exists tagcontents($tag)]} {
	set text $tagcontents($tag)
    } else {
	set text "Tag: $tag\nId:  $tagids($tag)"
    }
5800
    appendwithlinks $text {}
5801
    $ctext conf -state disabled
5802
    init_flist {}
5803 5804
}

5805 5806 5807
proc doquit {} {
    global stopped
    set stopped 100
5808
    savestuff .
5809 5810
    destroy .
}
5811

5812
proc doprefs {} {
5813
    global maxwidth maxgraphpct diffopts
P
Paul Mackerras 已提交
5814
    global oldprefs prefstop showneartags
5815
    global bgcolor fgcolor ctext diffcolors
P
Paul Mackerras 已提交
5816

5817 5818 5819 5820 5821
    set top .gitkprefs
    set prefstop $top
    if {[winfo exists $top]} {
	raise $top
	return
5822
    }
P
Paul Mackerras 已提交
5823
    foreach v {maxwidth maxgraphpct diffopts showneartags} {
5824
	set oldprefs($v) [set $v]
P
Paul Mackerras 已提交
5825
    }
5826 5827 5828 5829 5830 5831 5832 5833 5834 5835 5836 5837 5838
    toplevel $top
    wm title $top "Gitk preferences"
    label $top.ldisp -text "Commit list display options"
    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
5839

5840 5841 5842 5843 5844 5845
    label $top.ddisp -text "Diff display options"
    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 已提交
5846 5847 5848 5849 5850
    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
5851 5852 5853 5854 5855 5856 5857 5858 5859 5860 5861 5862 5863 5864 5865 5866 5867 5868 5869 5870 5871 5872 5873 5874 5875 5876 5877 5878

    label $top.cdisp -text "Colors: press to choose"
    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

5879 5880 5881 5882 5883 5884 5885 5886 5887
    frame $top.buts
    button $top.buts.ok -text "OK" -command prefsok
    button $top.buts.can -text "Cancel" -command prefscan
    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
}

5888 5889 5890 5891 5892 5893 5894 5895 5896 5897 5898 5899 5900 5901 5902 5903 5904 5905 5906 5907 5908 5909 5910 5911 5912 5913 5914 5915 5916
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
}

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
}

5917
proc prefscan {} {
5918
    global maxwidth maxgraphpct diffopts
P
Paul Mackerras 已提交
5919
    global oldprefs prefstop showneartags
5920

P
Paul Mackerras 已提交
5921
    foreach v {maxwidth maxgraphpct diffopts showneartags} {
5922 5923 5924 5925 5926 5927 5928 5929
	set $v $oldprefs($v)
    }
    catch {destroy $prefstop}
    unset prefstop
}

proc prefsok {} {
    global maxwidth maxgraphpct
P
Paul Mackerras 已提交
5930
    global oldprefs prefstop showneartags
5931 5932 5933 5934 5935 5936

    catch {destroy $prefstop}
    unset prefstop
    if {$maxwidth != $oldprefs(maxwidth)
	|| $maxgraphpct != $oldprefs(maxgraphpct)} {
	redisplay
P
Paul Mackerras 已提交
5937 5938
    } elseif {$showneartags != $oldprefs(showneartags)} {
	reselectline
5939 5940 5941 5942 5943
    }
}

proc formatdate {d} {
    return [clock format $d -format "%Y-%m-%d %H:%M:%S"]
P
Paul Mackerras 已提交
5944 5945
}

5946 5947 5948 5949 5950 5951 5952 5953 5954 5955 5956 5957 5958 5959 5960 5961 5962 5963 5964 5965 5966 5967 5968 5969 5970 5971 5972 5973 5974 5975 5976 5977 5978 5979 5980 5981 5982 5983 5984 5985 5986 5987 5988 5989 5990 5991 5992 5993 5994 5995 5996 5997 5998 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 6034 6035 6036 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 6088 6089 6090 6091 6092 6093 6094 6095 6096 6097 6098 6099 6100 6101 6102 6103 6104 6105 6106 6107 6108 6109 6110 6111 6112 6113 6114 6115 6116 6117 6118 6119 6120 6121 6122 6123 6124 6125 6126 6127 6128 6129 6130 6131 6132 6133 6134 6135 6136 6137 6138 6139 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 6173 6174 6175 6176 6177 6178 6179 6180 6181 6182 6183 6184 6185 6186 6187 6188 6189 6190 6191 6192 6193 6194 6195 6196 6197 6198 6199 6200 6201 6202 6203 6204 6205 6206 6207 6208 6209 6210 6211 6212 6213 6214 6215 6216 6217 6218
# 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 {}
}

6219 6220 6221
# defaults...
set datemode 0
set diffopts "-U 5 -p"
6222
set wrcomcmd "git diff-tree --stdin -p --pretty"
6223

6224
set gitencoding {}
6225
catch {
6226
    set gitencoding [exec git config --get i18n.commitencoding]
6227 6228
}
if {$gitencoding == ""} {
6229 6230 6231 6232 6233
    set gitencoding "utf-8"
}
set tclencoding [tcl_encoding $gitencoding]
if {$tclencoding == {}} {
    puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
6234
}
6235

6236 6237
set mainfont {Helvetica 9}
set textfont {Courier 9}
6238
set uifont {Helvetica 9 bold}
6239
set findmergefiles 0
6240
set maxgraphpct 50
6241
set maxwidth 16
P
Paul Mackerras 已提交
6242
set revlistorder 0
6243
set fastdate 0
P
Paul Mackerras 已提交
6244 6245 6246
set uparrowlen 7
set downarrowlen 7
set mingaplen 30
P
Paul Mackerras 已提交
6247
set cmitmode "patch"
6248
set wrapcomment "none"
P
Paul Mackerras 已提交
6249
set showneartags 1
6250 6251

set colors {green red blue magenta darkgrey brown orange}
6252 6253 6254
set bgcolor white
set fgcolor black
set diffcolors {red "#00a000" blue}
6255 6256 6257

catch {source ~/.gitk}

6258
font create optionfont -family sans-serif -size -12
6259

6260 6261 6262 6263 6264 6265 6266 6267 6268
set revtreeargs {}
foreach arg $argv {
    switch -regexp -- $arg {
	"^$" { }
	"^-d" { set datemode 1 }
	default {
	    lappend revtreeargs $arg
	}
    }
6269
}
6270

P
Paul Mackerras 已提交
6271 6272 6273
# check that we can find a .git directory somewhere...
set gitdir [gitdir]
if {![file isdirectory $gitdir]} {
P
Paul Mackerras 已提交
6274
    show_error {} . "Cannot find the git directory \"$gitdir\"."
P
Paul Mackerras 已提交
6275 6276 6277
    exit 1
}

6278 6279 6280 6281 6282 6283 6284
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 {
6285
	set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs]
6286 6287 6288 6289 6290 6291 6292 6293
	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 已提交
6294
	    set err [string range $err [expr {$i + 6}] end]
6295
	}
P
Paul Mackerras 已提交
6296
	show_error {} . "Bad arguments to gitk:\n$err"
6297 6298 6299 6300
	exit 1
    }
}

6301 6302
set history {}
set historyindex 0
6303 6304
set fh_serial 0
set nhl_names {}
6305
set highlight_paths {}
6306
set searchdirn -forwards
6307 6308
set boldrows {}
set boldnamerows {}
6309

P
Paul Mackerras 已提交
6310 6311
set optim_delay 16

P
Paul Mackerras 已提交
6312 6313
set nextviewnum 1
set curview 0
6314
set selectedview 0
6315
set selectedhlview None
P
Paul Mackerras 已提交
6316
set viewfiles(0) {}
6317
set viewperm(0) 0
6318
set viewargs(0) {}
P
Paul Mackerras 已提交
6319

6320
set cmdlineok 0
6321
set stopped 0
6322
set stuffsaved 0
6323
set patchnum 0
6324
setcoords
6325
makewindow
6326
wm title . "[file tail $argv0]: [file tail [pwd]]"
6327
readrefs
6328

6329
if {$cmdline_files ne {} || $revtreeargs ne {}} {
P
Paul Mackerras 已提交
6330 6331
    # create a view for the files/dirs specified on the command line
    set curview 1
6332
    set selectedview 1
P
Paul Mackerras 已提交
6333 6334 6335
    set nextviewnum 2
    set viewname(1) "Command line"
    set viewfiles(1) $cmdline_files
6336
    set viewargs(1) $revtreeargs
6337
    set viewperm(1) 0
6338
    addviewmenu 1
6339 6340
    .bar.view entryconf Edit* -state normal
    .bar.view entryconf Delete* -state normal
P
Paul Mackerras 已提交
6341
}
6342 6343 6344 6345 6346 6347 6348

if {[info exists permviews]} {
    foreach v $permviews {
	set n $nextviewnum
	incr nextviewnum
	set viewname($n) [lindex $v 0]
	set viewfiles($n) [lindex $v 1]
6349
	set viewargs($n) [lindex $v 2]
6350
	set viewperm($n) 1
6351
	addviewmenu $n
6352 6353
    }
}
6354
getcommits