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

# Copyright (C) 2005 Paul Mackerras.  All rights reserved.
# 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 15 16 17 18
proc gitdir {} {
    global env
    if {[info exists env(GIT_DIR)]} {
	return $env(GIT_DIR)
    } else {
	return ".git"
    }
}

19
proc start_rev_list {view} {
20
    global startmsecs nextupdate ncmupdate
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 ncmupdate 1
27
    set commitidx($view) 0
28
    set args $viewargs($view)
29 30
    if {$viewfiles($view) ne {}} {
	set args [concat $args "--" $viewfiles($view)]
31
    }
P
Paul Mackerras 已提交
32 33 34 35
    set order "--topo-order"
    if {$datemode} {
	set order "--date-order"
    }
36
    if {[catch {
37
	set fd [open [concat | git rev-list --header $order \
38
			  --parents --boundary --default HEAD $args] r]
39
    } err]} {
40
	puts stderr "Error executing git rev-list: $err"
41 42
	exit 1
    }
43 44 45
    set commfd($view) $fd
    set leftover($view) {}
    fconfigure $fd -blocking 0 -translation lf
46
    if {$tclencoding != {}} {
47
	fconfigure $fd -encoding $tclencoding
48
    }
49 50
    fileevent $fd readable [list getcommitlines $fd $view]
    nowbusy $view
51 52
}

53
proc stop_rev_list {} {
54
    global commfd curview
55

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

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

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

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

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

198
proc doupdate {} {
199
    global commfd nextupdate numcommits ncmupdate
200

201 202
    foreach v [array names commfd] {
	fileevent $commfd($v) readable {}
203
    }
204
    update
205 206 207 208 209 210 211 212
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
    if {$numcommits < 100} {
	set ncmupdate [expr {$numcommits + 1}]
    } elseif {$numcommits < 10000} {
	set ncmupdate [expr {$numcommits + 10}]
    } else {
	set ncmupdate [expr {$numcommits + 100}]
    }
213 214 215
    foreach v [array names commfd] {
	set fd $commfd($v)
	fileevent $fd readable [list getcommitlines $fd $v]
216
    }
217 218 219
}

proc readcommit {id} {
220
    if {[catch {set contents [exec git cat-file commit $id]}]} return
221
    parsecommit $id $contents 0
P
Paul Mackerras 已提交
222 223
}

P
Paul Mackerras 已提交
224
proc updatecommits {} {
225
    global viewdata curview phase displayorder
226
    global children commitrow selectedline thickerline
P
Paul Mackerras 已提交
227

228 229 230
    if {$phase ne {}} {
	stop_rev_list
	set phase {}
231
    }
232
    set n $curview
233 234 235 236
    foreach id $displayorder {
	catch {unset children($n,$id)}
	catch {unset commitrow($n,$id)}
    }
237
    set curview -1
238 239
    catch {unset selectedline}
    catch {unset thickerline}
240
    catch {unset viewdata($n)}
241
    readrefs
242
    showview $n
243 244
}

245
proc parsecommit {id contents listed} {
246 247 248 249 250 251 252 253 254
    global commitinfo cdate

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

298
proc getcommit {id} {
299
    global commitdata commitinfo
P
Paul Mackerras 已提交
300

301 302
    if {[info exists commitdata($id)]} {
	parsecommit $id $commitdata($id) 1
P
Paul Mackerras 已提交
303 304 305 306 307 308 309 310 311
    } else {
	readcommit $id
	if {![info exists commitinfo($id)]} {
	    set commitinfo($id) {"No commit information available"}
	}
    }
    return 1
}

312
proc readrefs {} {
313
    global tagids idtags headids idheads tagcontents
314
    global otherrefids idotherrefs
315

316 317 318
    foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
	catch {unset $v}
    }
319
    set refd [open [list | git ls-remote [gitdir]] r]
320 321 322 323
    while {0 <= [set n [gets $refd line]]} {
	if {![regexp {^([0-9a-f]{40})	refs/([^^]*)$} $line \
	    match id path]} {
	    continue
P
Paul Mackerras 已提交
324
	}
325 326 327
	if {[regexp {^remotes/.*/HEAD$} $path match]} {
	    continue
	}
328 329 330
	if {![regexp {^(tags|heads)/(.*)$} $path match type name]} {
	    set type others
	    set name $path
331
	}
332 333 334
	if {[regexp {^remotes/} $path match]} {
	    set type heads
	}
335 336 337 338 339 340 341
	if {$type == "tags"} {
	    set tagids($name) $id
	    lappend idtags($id) $name
	    set obj {}
	    set type {}
	    set tag {}
	    catch {
342
		set commit [exec git rev-parse "$id^0"]
343 344 345 346 347 348
		if {"$commit" != "$id"} {
		    set tagids($name) $commit
		    lappend idtags($commit) $name
		}
	    }		
	    catch {
349
	        set tagcontents($name) [exec git cat-file tag "$id"]
350
	    }
351 352 353 354 355 356
	} elseif { $type == "heads" } {
	    set headids($name) $id
	    lappend idheads($id) $name
	} else {
	    set otherrefids($name) $id
	    lappend idotherrefs($id) $name
357 358
	}
    }
359
    close $refd
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
proc makewindow {} {
380 381
    global canv canv2 canv3 linespc charspc ctext cflist
    global textfont mainfont uifont
382
    global findtype findtypemenu findloc findstring fstring geometry
383
    global entries sha1entry sha1string sha1but
384
    global maincursor textcursor curtextcursor
385
    global rowctxmenu mergemax wrapcomment
386
    global highlight_files gdttype
387
    global searchstring sstring
388 389 390

    menu .bar
    .bar add cascade -label "File" -menu .bar.file
391
    .bar configure -font $uifont
392
    menu .bar.file
P
Paul Mackerras 已提交
393
    .bar.file add command -label "Update" -command updatecommits
394
    .bar.file add command -label "Reread references" -command rereadrefs
395
    .bar.file add command -label "Quit" -command doquit
396
    .bar.file configure -font $uifont
397 398 399
    menu .bar.edit
    .bar add cascade -label "Edit" -menu .bar.edit
    .bar.edit add command -label "Preferences" -command doprefs
400
    .bar.edit configure -font $uifont
401

402
    menu .bar.view -font $uifont
P
Paul Mackerras 已提交
403
    .bar add cascade -label "View" -menu .bar.view
404 405 406
    .bar.view add command -label "New view..." -command {newview 0}
    .bar.view add command -label "Edit view..." -command editview \
	-state disabled
P
Paul Mackerras 已提交
407 408
    .bar.view add command -label "Delete view" -command delview -state disabled
    .bar.view add separator
409 410
    .bar.view add radiobutton -label "All files" -command {showview 0} \
	-variable selectedview -value 0
411
    
412 413 414
    menu .bar.help
    .bar add cascade -label "Help" -menu .bar.help
    .bar.help add command -label "About gitk" -command about
415
    .bar.help add command -label "Key bindings" -command keys
416
    .bar.help configure -font $uifont
417 418
    . configure -menu .bar

419
    if {![info exists geometry(canv1)]} {
J
Jeff Hobbs 已提交
420 421 422 423
	set geometry(canv1) [expr {45 * $charspc}]
	set geometry(canv2) [expr {30 * $charspc}]
	set geometry(canv3) [expr {15 * $charspc}]
	set geometry(canvh) [expr {25 * $linespc + 4}]
424 425 426 427
	set geometry(ctextw) 80
	set geometry(ctexth) 30
	set geometry(cflistw) 30
    }
P
Paul Mackerras 已提交
428
    panedwindow .ctop -orient vertical
429 430
    if {[info exists geometry(width)]} {
	.ctop conf -width $geometry(width) -height $geometry(height)
431 432 433
	set texth [expr {$geometry(height) - $geometry(canvh) - 56}]
	set geometry(ctexth) [expr {($texth - 8) /
				    [font metrics $textfont -linespace]}]
434
    }
435 436
    frame .ctop.top
    frame .ctop.top.bar
437 438
    frame .ctop.top.lbar
    pack .ctop.top.lbar -side bottom -fill x
439 440 441 442 443 444 445 446
    pack .ctop.top.bar -side bottom -fill x
    set cscroll .ctop.top.csb
    scrollbar $cscroll -command {allcanvs yview} -highlightthickness 0
    pack $cscroll -side right -fill y
    panedwindow .ctop.top.clist -orient horizontal -sashpad 0 -handlesize 4
    pack .ctop.top.clist -side top -fill both -expand 1
    .ctop add .ctop.top
    set canv .ctop.top.clist.canv
447
    canvas $canv -height $geometry(canvh) -width $geometry(canv1) \
448
	-bg white -bd 0 \
P
Paul Mackerras 已提交
449
	-yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
450 451
    .ctop.top.clist add $canv
    set canv2 .ctop.top.clist.canv2
452
    canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \
453
	-bg white -bd 0 -yscrollincr $linespc
454 455
    .ctop.top.clist add $canv2
    set canv3 .ctop.top.clist.canv3
456
    canvas $canv3 -height $geometry(canvh) -width $geometry(canv3) \
457
	-bg white -bd 0 -yscrollincr $linespc
458
    .ctop.top.clist add $canv3
459
    bind .ctop.top.clist <Configure> {resizeclistpanes %W %w}
460 461

    set sha1entry .ctop.top.bar.sha1
462 463 464
    set entries $sha1entry
    set sha1but .ctop.top.bar.sha1label
    button $sha1but -text "SHA1 ID: " -state disabled -relief flat \
465
	-command gotocommit -width 8 -font $uifont
466
    $sha1but conf -disabledforeground [$sha1but cget -foreground]
467
    pack .ctop.top.bar.sha1label -side left
468 469
    entry $sha1entry -width 40 -font $textfont -textvariable sha1string
    trace add variable sha1string write sha1change
470
    pack $sha1entry -side left -pady 2
471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494

    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};
    }
    button .ctop.top.bar.leftbut -image bm-left -command goback \
	-state disabled -width 26
    pack .ctop.top.bar.leftbut -side left -fill y
    button .ctop.top.bar.rightbut -image bm-right -command goforw \
	-state disabled -width 26
    pack .ctop.top.bar.rightbut -side left -fill y

495
    button .ctop.top.bar.findbut -text "Find" -command dofind -font $uifont
496 497
    pack .ctop.top.bar.findbut -side left
    set findstring {}
498
    set fstring .ctop.top.bar.findstring
499
    lappend entries $fstring
500
    entry $fstring -width 30 -font $textfont -textvariable findstring
501
    trace add variable findstring write find_change
502
    pack $fstring -side left -expand 1 -fill x
503
    set findtype Exact
504 505
    set findtypemenu [tk_optionMenu .ctop.top.bar.findtype \
			  findtype Exact IgnCase Regexp]
506
    trace add variable findtype write find_change
507 508
    .ctop.top.bar.findtype configure -font $uifont
    .ctop.top.bar.findtype.menu configure -font $uifont
509 510
    set findloc "All fields"
    tk_optionMenu .ctop.top.bar.findloc findloc "All fields" Headline \
511 512
	Comments Author Committer
    trace add variable findloc write find_change
513 514
    .ctop.top.bar.findloc configure -font $uifont
    .ctop.top.bar.findloc.menu configure -font $uifont
515 516
    pack .ctop.top.bar.findloc -side right
    pack .ctop.top.bar.findtype -side right
517

518
    label .ctop.top.lbar.flabel -text "Highlight:  Commits " \
519 520
	-font $uifont
    pack .ctop.top.lbar.flabel -side left -fill y
521 522 523 524 525 526 527
    set gdttype "touching paths:"
    set gm [tk_optionMenu .ctop.top.lbar.gdttype gdttype "touching paths:" \
		"adding/removing string:"]
    trace add variable gdttype write hfiles_change
    $gm conf -font $uifont
    .ctop.top.lbar.gdttype conf -font $uifont
    pack .ctop.top.lbar.gdttype -side left -fill y
528 529 530 531 532 533 534 535 536 537
    entry .ctop.top.lbar.fent -width 25 -font $textfont \
	-textvariable highlight_files
    trace add variable highlight_files write hfiles_change
    lappend entries .ctop.top.lbar.fent
    pack .ctop.top.lbar.fent -side left -fill x -expand 1
    label .ctop.top.lbar.vlabel -text " OR in view" -font $uifont
    pack .ctop.top.lbar.vlabel -side left -fill y
    global viewhlmenu selectedhlview
    set viewhlmenu [tk_optionMenu .ctop.top.lbar.vhl selectedhlview None]
    $viewhlmenu entryconf 0 -command delvhighlight
538 539
    $viewhlmenu conf -font $uifont
    .ctop.top.lbar.vhl conf -font $uifont
540
    pack .ctop.top.lbar.vhl -side left -fill y
541 542 543 544 545 546 547 548 549
    label .ctop.top.lbar.rlabel -text " OR " -font $uifont
    pack .ctop.top.lbar.rlabel -side left -fill y
    global highlight_related
    set m [tk_optionMenu .ctop.top.lbar.relm highlight_related None \
	       "Descendent" "Not descendent" "Ancestor" "Not ancestor"]
    $m conf -font $uifont
    .ctop.top.lbar.relm conf -font $uifont
    trace add variable highlight_related write vrel_change
    pack .ctop.top.lbar.relm -side left -fill y
550

551 552
    panedwindow .ctop.cdet -orient horizontal
    .ctop add .ctop.cdet
553
    frame .ctop.cdet.left
554 555 556 557 558 559 560 561 562 563
    frame .ctop.cdet.left.bot
    pack .ctop.cdet.left.bot -side bottom -fill x
    button .ctop.cdet.left.bot.search -text "Search" -command dosearch \
	-font $uifont
    pack .ctop.cdet.left.bot.search -side left -padx 5
    set sstring .ctop.cdet.left.bot.sstring
    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
564
    set ctext .ctop.cdet.left.ctext
565 566
    text $ctext -bg white -state disabled -font $textfont \
	-width $geometry(ctextw) -height $geometry(ctexth) \
567
	-yscrollcommand scrolltext -wrap none
568 569 570 571 572
    scrollbar .ctop.cdet.left.sb -command "$ctext yview"
    pack .ctop.cdet.left.sb -side right -fill y
    pack $ctext -side left -fill both -expand 1
    .ctop.cdet add .ctop.cdet.left

573
    $ctext tag conf comment -wrap $wrapcomment
574
    $ctext tag conf filesep -font [concat $textfont bold] -back "#aaaaaa"
575 576 577 578 579 580 581 582
    $ctext tag conf hunksep -fore blue
    $ctext tag conf d0 -fore red
    $ctext tag conf d1 -fore "#00a000"
    $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
583 584 585 586 587 588 589 590 591 592 593
    $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"
594
    $ctext tag conf mmax -fore darkgrey
595
    set mergemax 16
596 597 598
    $ctext tag conf mresult -font [concat $textfont bold]
    $ctext tag conf msep -font [concat $textfont bold]
    $ctext tag conf found -back yellow
599

600
    frame .ctop.cdet.right
P
Paul Mackerras 已提交
601 602 603 604 605 606 607
    frame .ctop.cdet.right.mode
    radiobutton .ctop.cdet.right.mode.patch -text "Patch" \
	-command reselectline -variable cmitmode -value "patch"
    radiobutton .ctop.cdet.right.mode.tree -text "Tree" \
	-command reselectline -variable cmitmode -value "tree"
    grid .ctop.cdet.right.mode.patch .ctop.cdet.right.mode.tree -sticky ew
    pack .ctop.cdet.right.mode -side top -fill x
608
    set cflist .ctop.cdet.right.cfiles
609 610 611 612 613 614
    set indent [font measure $mainfont "nn"]
    text $cflist -width $geometry(cflistw) -background white -font $mainfont \
	-tabs [list $indent [expr {2 * $indent}]] \
	-yscrollcommand ".ctop.cdet.right.sb set" \
	-cursor [. cget -cursor] \
	-spacing1 1 -spacing3 1
615 616 617
    scrollbar .ctop.cdet.right.sb -command "$cflist yview"
    pack .ctop.cdet.right.sb -side right -fill y
    pack $cflist -side left -fill both -expand 1
618 619
    $cflist tag configure highlight \
	-background [$cflist cget -selectbackground]
620
    $cflist tag configure bold -font [concat $mainfont bold]
621
    .ctop.cdet add .ctop.cdet.right
622
    bind .ctop.cdet <Configure> {resizecdetpanes %W %w}
623

P
Paul Mackerras 已提交
624
    pack .ctop -side top -fill both -expand 1
625

626 627
    bindall <1> {selcanvline %W %x %y}
    #bindall <B1-Motion> {selcanvline %W %x %y}
628 629
    bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
    bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
630 631
    bindall <2> "canvscan mark %W %x %y"
    bindall <B2-Motion> "canvscan dragto %W %x %y"
632 633
    bindkey <Home> selfirstline
    bindkey <End> sellastline
634 635
    bind . <Key-Up> "selnextline -1"
    bind . <Key-Down> "selnextline 1"
636 637
    bind . <Shift-Key-Up> "next_highlight -1"
    bind . <Shift-Key-Down> "next_highlight 1"
638 639 640 641 642 643 644 645 646 647
    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"
648 649 650
    bindkey <Key-Delete> "$ctext yview scroll -1 pages"
    bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
    bindkey <Key-space> "$ctext yview scroll 1 pages"
651 652
    bindkey p "selnextline -1"
    bindkey n "selnextline 1"
R
Robert Suetterlin 已提交
653 654 655 656 657 658
    bindkey z "goback"
    bindkey x "goforw"
    bindkey i "selnextline -1"
    bindkey k "selnextline 1"
    bindkey j "goback"
    bindkey l "goforw"
659 660 661
    bindkey b "$ctext yview scroll -1 pages"
    bindkey d "$ctext yview scroll 18 units"
    bindkey u "$ctext yview scroll -18 units"
662 663
    bindkey / {findnext 1}
    bindkey <Key-Return> {findnext 0}
664
    bindkey ? findprev
665
    bindkey f nextfile
666
    bind . <Control-q> doquit
667
    bind . <Control-f> dofind
668
    bind . <Control-g> {findnext 0}
669
    bind . <Control-r> dosearchback
670
    bind . <Control-s> dosearch
671 672 673 674
    bind . <Control-equal> {incrfont 1}
    bind . <Control-KP_Add> {incrfont 1}
    bind . <Control-minus> {incrfont -1}
    bind . <Control-KP_Subtract> {incrfont -1}
675
    bind . <Destroy> {savestuff %W}
676
    bind . <Button-1> "click %W"
677
    bind $fstring <Key-Return> dofind
678
    bind $sha1entry <Key-Return> gotocommit
679
    bind $sha1entry <<PasteSelection>> clearsha1
680 681
    bind $cflist <1> {sel_flist %W %x %y; break}
    bind $cflist <B1-Motion> {sel_flist %W %x %y; break}
P
Paul Mackerras 已提交
682
    bind $cflist <ButtonRelease-1> {treeclick %W %x %y}
683 684 685

    set maincursor [. cget -cursor]
    set textcursor [$ctext cget -cursor]
686
    set curtextcursor $textcursor
687

688 689 690 691 692 693
    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}
694
    $rowctxmenu add command -label "Make patch" -command mkpatch
695
    $rowctxmenu add command -label "Create tag" -command mktag
696
    $rowctxmenu add command -label "Write commit to file" -command writecommit
697 698
}

699 700 701 702 703 704 705 706 707 708 709 710 711
# 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 已提交
712 713 714
proc scrollcanv {cscroll f0 f1} {
    $cscroll set $f0 $f1
    drawfrac $f0 $f1
715
    flushhighlights
P
Paul Mackerras 已提交
716 717
}

718 719 720 721
# 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} {
722
    global entries
723 724 725 726 727
    bind . $ev $script
    set escript [bind Entry $ev]
    if {$escript == {}} {
	set escript [bind Entry <Key>]
    }
728 729 730
    foreach e $entries {
	bind $e $ev "$escript; break"
    }
731 732 733
}

# set the focus back to the toplevel for any click outside
734
# the entry widgets
735
proc click {w} {
736 737 738
    global entries
    foreach e $entries {
	if {$w == $e} return
739
    }
740
    focus .
741 742 743
}

proc savestuff {w} {
744
    global canv canv2 canv3 ctext cflist mainfont textfont uifont
745
    global stuffsaved findmergefiles maxgraphpct
P
Paul Mackerras 已提交
746
    global maxwidth showneartags
747
    global viewname viewfiles viewargs viewperm nextviewnum
748
    global cmitmode wrapcomment
749

750
    if {$stuffsaved} return
751
    if {![winfo viewable .]} return
752 753
    catch {
	set f [open "~/.gitk-new" w]
754 755
	puts $f [list set mainfont $mainfont]
	puts $f [list set textfont $textfont]
756
	puts $f [list set uifont $uifont]
757
	puts $f [list set findmergefiles $findmergefiles]
758
	puts $f [list set maxgraphpct $maxgraphpct]
759
	puts $f [list set maxwidth $maxwidth]
P
Paul Mackerras 已提交
760
	puts $f [list set cmitmode $cmitmode]
761
	puts $f [list set wrapcomment $wrapcomment]
P
Paul Mackerras 已提交
762
	puts $f [list set showneartags $showneartags]
763 764
	puts $f "set geometry(width) [winfo width .ctop]"
	puts $f "set geometry(height) [winfo height .ctop]"
J
Jeff Hobbs 已提交
765 766 767 768
	puts $f "set geometry(canv1) [expr {[winfo width $canv]-2}]"
	puts $f "set geometry(canv2) [expr {[winfo width $canv2]-2}]"
	puts $f "set geometry(canv3) [expr {[winfo width $canv3]-2}]"
	puts $f "set geometry(canvh) [expr {[winfo height $canv]-2}]"
769 770 771 772 773 774
	set wid [expr {([winfo width $ctext] - 8) \
			   / [font measure $textfont "0"]}]
	puts $f "set geometry(ctextw) $wid"
	set wid [expr {([winfo width $cflist] - 11) \
			   / [font measure [$cflist cget -font] "0"]}]
	puts $f "set geometry(cflistw) $wid"
775 776 777
	puts -nonewline $f "set permviews {"
	for {set v 0} {$v < $nextviewnum} {incr v} {
	    if {$viewperm($v)} {
778
		puts $f "{[list $viewname($v) $viewfiles($v) $viewargs($v)]}"
779 780 781
	    }
	}
	puts $f "}"
782 783 784 785
	close $f
	file rename -force "~/.gitk-new" "~/.gitk"
    }
    set stuffsaved 1
786 787
}

788 789
proc resizeclistpanes {win w} {
    global oldwidth
790
    if {[info exists oldwidth($win)]} {
791 792 793 794 795 796 797 798 799 800 801 802 803
	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 已提交
804
		set sash1 [expr {$sash0 + 20}]
805 806
	    }
	    if {$sash1 > $w - 10} {
J
Jeff Hobbs 已提交
807
		set sash1 [expr {$w - 10}]
808
		if {$sash0 > $sash1 - 20} {
J
Jeff Hobbs 已提交
809
		    set sash0 [expr {$sash1 - 20}]
810 811 812 813 814 815 816 817 818 819 820
		}
	    }
	}
	$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
821
    if {[info exists oldwidth($win)]} {
822 823 824 825 826 827 828 829 830 831
	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 已提交
832
		set sash0 [expr {$w - 15}]
833 834 835 836 837 838 839
	    }
	}
	$win sash place 0 $sash0 [lindex $s0 1]
    }
    set oldwidth($win) $w
}

840 841 842 843 844 845 846 847 848 849 850 851 852 853
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
}

854 855 856 857 858 859 860 861 862
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 已提交
863
Gitk - a commit viewer for git
864

P
Paul Mackerras 已提交
865
Copyright  2005-2006 Paul Mackerras
866

867
Use and redistribute under the terms of the GNU General Public License} \
868 869 870 871 872 873
	    -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
}

874 875 876 877 878 879 880 881 882 883 884 885
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
886 887
<Home>		Move to first commit
<End>		Move to last commit
888 889 890 891
<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
892 893 894 895 896 897 898 899
<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
900 901
<Shift-Up>	Move to previous highlighted line
<Shift-Down>	Move to next highlighted line
902 903 904 905 906 907 908 909 910 911 912
<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
913 914
<Ctrl-S>		Search for next hit in diff view
<Ctrl-R>		Search for previous hit in diff view
915 916 917 918 919 920 921 922 923 924 925
<Ctrl-KP+>	Increase font size
<Ctrl-plus>	Increase font size
<Ctrl-KP->	Decrease font size
<Ctrl-minus>	Decrease font size
} \
	    -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
}

926 927
# Procedures for manipulating the file list window at the
# bottom right of the overall window.
P
Paul Mackerras 已提交
928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980

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
981
		$w insert end $d [highlight_tag $prefix]
P
Paul Mackerras 已提交
982 983 984 985 986 987 988 989 990 991 992
		$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
993
		$w insert end $tail [highlight_tag $f]
P
Paul Mackerras 已提交
994 995 996 997 998 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
	    }
	    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
	}
    }
}

1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045
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 已提交
1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078
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) {
1079
	set de $dir$e
P
Paul Mackerras 已提交
1080 1081 1082 1083 1084 1085 1086 1087
	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
1088
	    $w insert e:$ix $e [highlight_tag $de]
P
Paul Mackerras 已提交
1089 1090 1091 1092 1093
	    $w mark set s:$iy e:$ix
	    $w mark gravity s:$iy left
	    set treeheight($de) 1
	} else {
	    $w insert e:$ix $str
1094
	    $w insert e:$ix $e [highlight_tag $de]
P
Paul Mackerras 已提交
1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 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 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173
	}
    }
    $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};
}

1174
proc init_flist {first} {
1175
    global cflist cflist_top selectedline difffilestart
1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189

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

1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201
proc highlight_tag {f} {
    global highlight_paths

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

proc highlight_filelist {} {
1202
    global cmitmode cflist
1203

1204 1205
    $cflist conf -state normal
    if {$cmitmode ne "tree"} {
1206 1207 1208 1209 1210 1211 1212
	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"
	    }
	}
1213 1214
    } else {
	highlight_tree 2 {}
1215
    }
1216
    $cflist conf -state disabled
1217 1218 1219
}

proc unhighlight_filelist {} {
1220
    global cflist
1221

1222 1223 1224
    $cflist conf -state normal
    $cflist tag remove bold 1.0 end
    $cflist conf -state disabled
1225 1226
}

P
Paul Mackerras 已提交
1227
proc add_flist {fl} {
1228
    global cflist
1229

1230 1231 1232 1233
    $cflist conf -state normal
    foreach f $fl {
	$cflist insert end "\n"
	$cflist insert end $f [highlight_tag $f]
1234
    }
1235
    $cflist conf -state disabled
1236 1237 1238
}

proc sel_flist {w x y} {
1239
    global ctext difffilestart cflist cflist_top cmitmode
1240

P
Paul Mackerras 已提交
1241
    if {$cmitmode eq "tree"} return
1242 1243
    if {![info exists cflist_top]} return
    set l [lindex [split [$w index "@$x,$y"] "."] 0]
1244 1245 1246
    $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 已提交
1247 1248 1249 1250
    if {$l == 1} {
	$ctext yview 1.0
    } else {
	catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
1251 1252 1253
    }
}

1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347
# 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
}

1348 1349
# Code to implement multiple views

1350 1351
proc newview {ishighlight} {
    global nextviewnum newviewname newviewperm uifont newishighlight
1352
    global newviewargs revtreeargs
P
Paul Mackerras 已提交
1353

1354
    set newishighlight $ishighlight
P
Paul Mackerras 已提交
1355 1356 1357 1358 1359
    set top .gitkview
    if {[winfo exists $top]} {
	raise $top
	return
    }
1360 1361
    set newviewname($nextviewnum) "View $nextviewnum"
    set newviewperm($nextviewnum) 0
1362
    set newviewargs($nextviewnum) [shellarglist $revtreeargs]
1363 1364 1365 1366 1367 1368
    vieweditor $top $nextviewnum "Gitk view definition" 
}

proc editview {} {
    global curview
    global viewname viewperm newviewname newviewperm
1369
    global viewargs newviewargs
1370 1371 1372 1373 1374 1375 1376 1377

    set top .gitkvedit-$curview
    if {[winfo exists $top]} {
	raise $top
	return
    }
    set newviewname($curview) $viewname($curview)
    set newviewperm($curview) $viewperm($curview)
1378
    set newviewargs($curview) [shellarglist $viewargs($curview)]
1379 1380 1381 1382 1383 1384 1385
    vieweditor $top $curview "Gitk: edit view $viewname($curview)"
}

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

P
Paul Mackerras 已提交
1386
    toplevel $top
1387
    wm title $top $title
1388
    label $top.nl -text "Name" -font $uifont
1389
    entry $top.name -width 20 -textvariable newviewname($n)
1390
    grid $top.nl $top.name -sticky w -pady 5
1391
    checkbutton $top.perm -text "Remember this view" -variable newviewperm($n)
1392
    grid $top.perm - -pady 5 -sticky w
1393
    message $top.al -aspect 1000 -font $uifont \
1394
	-text "Commits to include (arguments to git rev-list):"
1395 1396 1397 1398 1399
    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 \
1400 1401 1402
	-text "Enter files and directories to include, one per line:"
    grid $top.l - -sticky w
    text $top.t -width 40 -height 10 -background white
1403 1404 1405 1406 1407 1408 1409 1410
    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
    }
1411
    grid $top.t - -sticky ew -padx 5
P
Paul Mackerras 已提交
1412
    frame $top.buts
1413 1414
    button $top.buts.ok -text "OK" -command [list newviewok $top $n]
    button $top.buts.can -text "Cancel" -command [list destroy $top]
P
Paul Mackerras 已提交
1415 1416 1417 1418 1419 1420 1421
    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
}

1422
proc doviewmenu {m first cmd op argv} {
1423 1424 1425
    set nmenu [$m index end]
    for {set i $first} {$i <= $nmenu} {incr i} {
	if {[$m entrycget $i -command] eq $cmd} {
1426
	    eval $m $op $i $argv
1427
	    break
1428 1429
	}
    }
1430 1431 1432
}

proc allviewmenus {n op args} {
1433 1434
    global viewhlmenu

1435
    doviewmenu .bar.view 7 [list showview $n] $op $args
1436
    doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
1437 1438 1439
}

proc newviewok {top n} {
1440
    global nextviewnum newviewperm newviewname newishighlight
1441
    global viewname viewfiles viewperm selectedview curview
1442
    global viewargs newviewargs viewhlmenu
P
Paul Mackerras 已提交
1443

1444 1445 1446 1447 1448 1449 1450 1451
    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 已提交
1452
    set files {}
1453
    foreach f [split [$top.t get 0.0 end] "\n"] {
P
Paul Mackerras 已提交
1454 1455 1456 1457 1458
	set ft [string trim $f]
	if {$ft ne {}} {
	    lappend files $ft
	}
    }
1459 1460 1461 1462 1463 1464
    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
1465
	set viewargs($n) $newargs
1466 1467 1468 1469
	addviewmenu $n
	if {!$newishighlight} {
	    after idle showview $n
	} else {
1470
	    after idle addvhighlight $n
1471
	}
1472 1473 1474 1475 1476
    } else {
	# editing an existing view
	set viewperm($n) $newviewperm($n)
	if {$newviewname($n) ne $viewname($n)} {
	    set viewname($n) $newviewname($n)
1477 1478 1479 1480
	    doviewmenu .bar.view 7 [list showview $n] \
		entryconf [list -label $viewname($n)]
	    doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
		entryconf [list -label $viewname($n) -value $viewname($n)]
1481
	}
1482
	if {$files ne $viewfiles($n) || $newargs ne $viewargs($n)} {
1483
	    set viewfiles($n) $files
1484
	    set viewargs($n) $newargs
1485 1486 1487 1488 1489 1490
	    if {$curview == $n} {
		after idle updatecommits
	    }
	}
    }
    catch {destroy $top}
P
Paul Mackerras 已提交
1491 1492 1493
}

proc delview {} {
1494
    global curview viewdata viewperm hlview selectedhlview
P
Paul Mackerras 已提交
1495 1496

    if {$curview == 0} return
1497 1498 1499 1500
    if {[info exists hlview] && $hlview == $curview} {
	set selectedhlview None
	unset hlview
    }
1501
    allviewmenus $curview delete
P
Paul Mackerras 已提交
1502
    set viewdata($curview) {}
1503
    set viewperm($curview) 0
P
Paul Mackerras 已提交
1504 1505 1506
    showview 0
}

1507
proc addviewmenu {n} {
1508
    global viewname viewhlmenu
1509 1510 1511

    .bar.view add radiobutton -label $viewname($n) \
	-command [list showview $n] -variable selectedview -value $n
1512 1513
    $viewhlmenu add radiobutton -label $viewname($n) \
	-command [list addvhighlight $n] -variable selectedhlview
1514 1515
}

1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534
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 已提交
1535 1536 1537
proc showview {n} {
    global curview viewdata viewfiles
    global displayorder parentlist childlist rowidlist rowoffsets
1538
    global colormap rowtextx commitrow nextcolor canvxmax
P
Paul Mackerras 已提交
1539 1540 1541
    global numcommits rowrangelist commitlisted idrowranges
    global selectedline currentid canv canvy0
    global matchinglines treediffs
1542
    global pending_select phase
1543
    global commitidx rowlaidout rowoptim linesegends
1544
    global commfd nextupdate
1545
    global selectedview
1546
    global vparentlist vchildlist vdisporder vcmitlisted
1547
    global hlview selectedhlview
P
Paul Mackerras 已提交
1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564

    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
1565
    normalline
P
Paul Mackerras 已提交
1566
    stopfindproc
1567
    if {$curview >= 0} {
1568 1569 1570 1571
	set vparentlist($curview) $parentlist
	set vchildlist($curview) $childlist
	set vdisporder($curview) $displayorder
	set vcmitlisted($curview) $commitlisted
1572 1573
	if {$phase ne {}} {
	    set viewdata($curview) \
1574 1575 1576
		[list $phase $rowidlist $rowoffsets $rowrangelist \
		     [flatten idrowranges] [flatten idinlist] \
		     $rowlaidout $rowoptim $numcommits $linesegends]
1577 1578
	} elseif {![info exists viewdata($curview)]
		  || [lindex $viewdata($curview) 0] ne {}} {
1579
	    set viewdata($curview) \
1580
		[list {} $rowidlist $rowoffsets $rowrangelist]
1581
	}
P
Paul Mackerras 已提交
1582 1583 1584 1585
    }
    catch {unset matchinglines}
    catch {unset treediffs}
    clear_display
1586 1587 1588 1589
    if {[info exists hlview] && $hlview == $n} {
	unset hlview
	set selectedhlview None
    }
P
Paul Mackerras 已提交
1590 1591

    set curview $n
1592
    set selectedview $n
P
Paul Mackerras 已提交
1593
    .bar.view entryconf 2 -state [expr {$n == 0? "disabled": "normal"}]
1594
    .bar.view entryconf 3 -state [expr {$n == 0? "disabled": "normal"}]
P
Paul Mackerras 已提交
1595 1596

    if {![info exists viewdata($n)]} {
1597
	set pending_select $selid
1598
	getcommits
P
Paul Mackerras 已提交
1599 1600 1601
	return
    }

1602 1603
    set v $viewdata($n)
    set phase [lindex $v 0]
1604 1605 1606 1607 1608 1609 1610
    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]
1611 1612 1613 1614
    if {$phase eq {}} {
	set numcommits [llength $displayorder]
	catch {unset idrowranges}
    } else {
1615 1616 1617 1618 1619 1620
	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]
1621 1622
    }

P
Paul Mackerras 已提交
1623 1624
    catch {unset colormap}
    catch {unset rowtextx}
1625 1626
    set nextcolor 0
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
1627 1628 1629 1630 1631
    set curview $n
    set row 0
    setcanvscroll
    set yf 0
    set row 0
1632 1633
    if {$selid ne {} && [info exists commitrow($n,$selid)]} {
	set row $commitrow($n,$selid)
P
Paul Mackerras 已提交
1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644
	# 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
1645
    if {$phase ne {}} {
1646
	if {$phase eq "getcommits"} {
1647
	    show_status "Reading commits..."
1648
	}
1649 1650 1651 1652 1653
	if {[info exists commfd($n)]} {
	    layoutmore
	} else {
	    finishcommits
	}
1654 1655
    } elseif {$numcommits == 0} {
	show_status "No commits selected"
1656
    }
P
Paul Mackerras 已提交
1657 1658
}

1659 1660 1661
# Stuff relating to the highlighting facility

proc ishighlighted {row} {
1662
    global vhighlights fhighlights nhighlights rhighlights
1663 1664 1665 1666 1667 1668 1669 1670 1671 1672

    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)
    }
1673 1674 1675
    if {[info exists rhighlights($row)] && $rhighlights($row) > 0} {
	return $rhighlights($row)
    }
1676 1677 1678 1679
    return 0
}

proc bolden {row font} {
1680
    global canv linehtag selectedline boldrows
1681

1682
    lappend boldrows $row
1683
    $canv itemconf $linehtag($row) -font $font
1684
    if {[info exists selectedline] && $row == $selectedline} {
1685 1686 1687 1688 1689 1690 1691 1692 1693
	$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} {
1694
    global canv2 linentag selectedline boldnamerows
1695

1696
    lappend boldnamerows $row
1697
    $canv2 itemconf $linentag($row) -font $font
1698
    if {[info exists selectedline] && $row == $selectedline} {
1699 1700 1701 1702 1703 1704 1705 1706
	$canv2 delete secsel
	set t [eval $canv2 create rect [$canv2 bbox $linentag($row)] \
		   -outline {{}} -tags secsel \
		   -fill [$canv2 cget -selectbackground]]
	$canv2 lower $t
    }
}

1707 1708
proc unbolden {} {
    global mainfont boldrows
1709

1710 1711
    set stillbold {}
    foreach row $boldrows {
1712 1713
	if {![ishighlighted $row]} {
	    bolden $row $mainfont
1714 1715
	} else {
	    lappend stillbold $row
1716 1717
	}
    }
1718
    set boldrows $stillbold
1719 1720 1721 1722
}

proc addvhighlight {n} {
    global hlview curview viewdata vhl_done vhighlights commitidx
1723 1724

    if {[info exists hlview]} {
1725
	delvhighlight
1726 1727 1728 1729 1730 1731 1732 1733 1734
    }
    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
1735 1736 1737 1738
    }
    set vhl_done $commitidx($hlview)
    if {$vhl_done > 0} {
	drawvisible
1739 1740 1741
    }
}

1742 1743
proc delvhighlight {} {
    global hlview vhighlights
1744 1745 1746

    if {![info exists hlview]} return
    unset hlview
1747 1748
    catch {unset vhighlights}
    unbolden
1749 1750
}

1751 1752 1753
proc vhighlightmore {} {
    global hlview vhl_done commitidx vhighlights
    global displayorder vdisporder curview mainfont
1754 1755 1756 1757 1758 1759 1760 1761

    set font [concat $mainfont bold]
    set max $commitidx($hlview)
    if {$hlview == $curview} {
	set disp $displayorder
    } else {
	set disp $vdisporder($hlview)
    }
1762 1763 1764 1765
    set vr [visiblerows]
    set r0 [lindex $vr 0]
    set r1 [lindex $vr 1]
    for {set i $vhl_done} {$i < $max} {incr i} {
1766 1767 1768
	set id [lindex $disp $i]
	if {[info exists commitrow($curview,$id)]} {
	    set row $commitrow($curview,$id)
1769 1770 1771
	    if {$r0 <= $row && $row <= $r1} {
		if {![highlighted $row]} {
		    bolden $row $font
1772
		}
1773
		set vhighlights($row) 1
1774 1775 1776
	    }
	}
    }
1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794
    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
1795
    global mainfont highlight_paths
1796 1797 1798 1799 1800

    if {[info exists filehighlight]} {
	# delete previous highlights
	catch {close $filehighlight}
	unset filehighlight
1801 1802
	catch {unset fhighlights}
	unbolden
1803
	unhighlight_filelist
1804
    }
1805
    set highlight_paths {}
1806 1807 1808 1809 1810 1811 1812
    after cancel do_file_hl $fh_serial
    incr fh_serial
    if {$highlight_files ne {}} {
	after 300 do_file_hl $fh_serial
    }
}

1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826
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
}

1827
proc do_file_hl {serial} {
1828
    global highlight_files filehighlight highlight_paths gdttype fhl_list
1829

1830 1831 1832 1833 1834 1835 1836 1837 1838
    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]
1839 1840 1841
    set filehighlight [open $cmd r+]
    fconfigure $filehighlight -blocking 0
    fileevent $filehighlight readable readfhighlight
1842
    set fhl_list {}
1843 1844 1845 1846 1847
    drawvisible
    flushhighlights
}

proc flushhighlights {} {
1848
    global filehighlight fhl_list
1849 1850

    if {[info exists filehighlight]} {
1851
	lappend fhl_list {}
1852 1853 1854 1855 1856 1857
	puts $filehighlight ""
	flush $filehighlight
    }
}

proc askfilehighlight {row id} {
1858
    global filehighlight fhighlights fhl_list
1859

1860 1861
    lappend fhl_list $id
    set fhighlights($row) -1
1862 1863 1864 1865 1866
    puts $filehighlight $id
}

proc readfhighlight {} {
    global filehighlight fhighlights commitrow curview mainfont iddrawn
1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877
    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
	    }
1878
	}
1879 1880 1881 1882 1883 1884 1885 1886
	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
1887
    }
1888 1889 1890 1891 1892
    if {[eof $filehighlight]} {
	# strange...
	puts "oops, git-diff-tree died"
	catch {close $filehighlight}
	unset filehighlight
1893
    }
1894
    next_hlcont
1895 1896
}

1897
proc find_change {name ix op} {
1898
    global nhighlights mainfont boldnamerows
1899
    global findstring findpattern findtype
1900 1901

    # delete previous highlights, if any
1902 1903
    foreach row $boldnamerows {
	bolden_name $row $mainfont
1904
    }
1905 1906 1907
    set boldnamerows {}
    catch {unset nhighlights}
    unbolden
1908 1909 1910 1911
    if {$findtype ne "Regexp"} {
	set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
		   $findstring]
	set findpattern "*$e*"
1912 1913 1914 1915
    }
    drawvisible
}

1916 1917 1918
proc askfindhighlight {row id} {
    global nhighlights commitinfo iddrawn mainfont
    global findstring findtype findloc findpattern
1919 1920 1921 1922

    if {![info exists commitinfo($id)]} {
	getcommit $id
    }
1923
    set info $commitinfo($id)
1924
    set isbold 0
1925 1926 1927 1928
    set fldtypes {Headline Author Date Committer CDate Comments}
    foreach f $info ty $fldtypes {
	if {$findloc ne "All fields" && $findloc ne $ty} {
	    continue
1929
	}
1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942
	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
	    }
1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953
	}
    }
    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
1954 1955
}

1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982
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

1983 1984
    catch {unset rhighlights}
    unbolden
1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 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 2054 2055 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
}

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
}

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 2153 2154 2155 2156
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
}

2157 2158
# Graph layout functions

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

2196 2197
    if {[info exists commitrow($curview,$id)]} {
	set r $commitrow($curview,$id)
P
Paul Mackerras 已提交
2198 2199 2200
	if {$l1 <= $r && $r <= $l2} {
	    return [expr {$r - $l1 + 1}]
	}
2201 2202
	set kids [lindex $childlist $r]
    } else {
2203
	set kids $children($curview,$id)
P
Paul Mackerras 已提交
2204
    }
2205
    foreach c $kids {
2206
	set r $commitrow($curview,$c)
2207 2208
	if {$l1 <= $r && $r <= $l2} {
	    return [expr {$r - $l1 + 1}]
P
Paul Mackerras 已提交
2209 2210 2211 2212 2213 2214 2215 2216 2217
	}
    }
    return 0
}

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

    set col -1
2218
    set ids [lindex $rowidlist $row]
P
Paul Mackerras 已提交
2219 2220 2221 2222 2223
    foreach id $ids {
	incr col
	if {$id eq {}} continue
	if {$col < [llength $ids] - 1 &&
	    [lsearch -exact -start [expr {$col+1}] $ids $id] >= 0} {
2224
	    puts "oops: [shortids $id] repeated in row $row col $col: {[shortids [lindex $rowidlist $row]]}"
P
Paul Mackerras 已提交
2225
	}
2226
	set o [lindex $rowoffsets $row $col]
P
Paul Mackerras 已提交
2227 2228 2229 2230 2231
	set y $row
	set x $col
	while {$o ne {}} {
	    incr y -1
	    incr x $o
2232
	    if {[lindex $rowidlist $y $x] != $id} {
P
Paul Mackerras 已提交
2233 2234 2235
		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} {
2236
		    puts "  row $i ids={[shortids [lindex $rowidlist $i]]} offs={[lindex $rowoffsets $i]}"
P
Paul Mackerras 已提交
2237 2238 2239 2240
		}
		break
	    }
	    if {!$full} break
2241
	    set o [lindex $rowoffsets $y $x]
P
Paul Mackerras 已提交
2242 2243 2244 2245 2246 2247 2248 2249 2250 2251
	}
    }
}

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
2252
	set off0 [lindex $rowoffsets $y]
P
Paul Mackerras 已提交
2253 2254
	for {set x0 $x} {1} {incr x0} {
	    if {$x0 >= [llength $off0]} {
2255
		set x0 [llength [lindex $rowoffsets [expr {$y-1}]]]
P
Paul Mackerras 已提交
2256 2257 2258 2259 2260 2261 2262 2263 2264
		break
	    }
	    set z [lindex $off0 $x0]
	    if {$z ne {}} {
		incr x0 $z
		break
	    }
	}
	set z [expr {$x0 - $x}]
2265 2266
	lset rowidlist $y [linsert [lindex $rowidlist $y] $x $oid]
	lset rowoffsets $y [linsert [lindex $rowoffsets $y] $x $z]
P
Paul Mackerras 已提交
2267
    }
2268 2269
    set tmp [lreplace [lindex $rowoffsets $y] $x $x {}]
    lset rowoffsets $y [incrange $tmp [expr {$x+1}] -1]
P
Paul Mackerras 已提交
2270 2271 2272 2273
    lappend idrowranges($oid) $y
}

proc initlayout {} {
2274
    global rowidlist rowoffsets displayorder commitlisted
P
Paul Mackerras 已提交
2275
    global rowlaidout rowoptim
P
Paul Mackerras 已提交
2276
    global idinlist rowchk rowrangelist idrowranges
2277
    global numcommits canvxmax canv
2278
    global nextcolor
2279
    global parentlist childlist children
2280
    global colormap rowtextx
P
Paul Mackerras 已提交
2281
    global linesegends
P
Paul Mackerras 已提交
2282

2283 2284
    set numcommits 0
    set displayorder {}
2285 2286 2287
    set commitlisted {}
    set parentlist {}
    set childlist {}
2288
    set rowrangelist {}
2289 2290 2291
    set nextcolor 0
    set rowidlist {{}}
    set rowoffsets {{}}
P
Paul Mackerras 已提交
2292 2293 2294 2295
    catch {unset idinlist}
    catch {unset rowchk}
    set rowlaidout 0
    set rowoptim 0
2296
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
2297 2298 2299
    catch {unset colormap}
    catch {unset rowtextx}
    catch {unset idrowranges}
2300
    set linesegends {}
2301 2302 2303 2304 2305 2306 2307 2308 2309
}

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 已提交
2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332
}

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

proc layoutmore {} {
    global rowlaidout rowoptim commitidx numcommits optim_delay
2333
    global uparrowlen curview
P
Paul Mackerras 已提交
2334 2335

    set row $rowlaidout
2336
    set rowlaidout [layoutrows $row $commitidx($curview) 0]
P
Paul Mackerras 已提交
2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348
    set orow [expr {$rowlaidout - $uparrowlen - 1}]
    if {$orow > $rowoptim} {
	optimize_rows $rowoptim 0 $orow
	set rowoptim $orow
    }
    set canshow [expr {$rowoptim - $optim_delay}]
    if {$canshow > $numcommits} {
	showstuff $canshow
    }
}

proc showstuff {canshow} {
2349
    global numcommits commitrow pending_select selectedline
2350
    global linesegends idrowranges idrangedrawn curview
P
Paul Mackerras 已提交
2351

2352 2353 2354 2355 2356
    if {$numcommits == 0} {
	global phase
	set phase "incrdraw"
	allcanvs delete all
    }
P
Paul Mackerras 已提交
2357 2358
    set row $numcommits
    set numcommits $canshow
2359
    setcanvscroll
P
Paul Mackerras 已提交
2360 2361 2362
    set rows [visiblerows]
    set r0 [lindex $rows 0]
    set r1 [lindex $rows 1]
2363
    set selrow -1
P
Paul Mackerras 已提交
2364
    for {set r $row} {$r < $canshow} {incr r} {
2365 2366 2367 2368 2369 2370 2371 2372
	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 已提交
2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383
		}
	    }
	}
    }
    if {$canshow > $r1} {
	set canshow $r1
    }
    while {$row < $canshow} {
	drawcmitrow $row
	incr row
    }
2384
    if {[info exists pending_select] &&
2385 2386 2387
	[info exists commitrow($curview,$pending_select)] &&
	$commitrow($curview,$pending_select) < $numcommits} {
	selectline $commitrow($curview,$pending_select) 1
2388
    }
2389 2390 2391
    if {![info exists selectedline] && ![info exists pending_select]} {
	selectline 0 1
    }
P
Paul Mackerras 已提交
2392 2393 2394 2395 2396
}

proc layoutrows {row endrow last} {
    global rowidlist rowoffsets displayorder
    global uparrowlen downarrowlen maxwidth mingaplen
2397
    global childlist parentlist
P
Paul Mackerras 已提交
2398
    global idrowranges linesegends
2399
    global commitidx curview
P
Paul Mackerras 已提交
2400
    global idinlist rowchk rowrangelist
P
Paul Mackerras 已提交
2401

2402 2403
    set idlist [lindex $rowidlist $row]
    set offs [lindex $rowoffsets $row]
P
Paul Mackerras 已提交
2404 2405 2406 2407
    while {$row < $endrow} {
	set id [lindex $displayorder $row]
	set oldolds {}
	set newolds {}
2408
	foreach p [lindex $parentlist $row] {
P
Paul Mackerras 已提交
2409 2410 2411 2412 2413 2414
	    if {![info exists idinlist($p)]} {
		lappend newolds $p
	    } elseif {!$idinlist($p)} {
		lappend oldolds $p
	    }
	}
2415
	set lse {}
P
Paul Mackerras 已提交
2416 2417 2418
	set nev [expr {[llength $idlist] + [llength $newolds]
		       + [llength $oldolds] - $maxwidth + 1}]
	if {$nev > 0} {
2419 2420
	    if {!$last &&
		$row + $uparrowlen + $mingaplen >= $commitidx($curview)} break
P
Paul Mackerras 已提交
2421 2422 2423 2424 2425 2426 2427 2428 2429 2430
	    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
2431
			set rm1 [expr {$row - 1}]
2432
			lappend lse $i
2433
			lappend idrowranges($i) $rm1
P
Paul Mackerras 已提交
2434 2435 2436 2437 2438 2439
			if {[incr nev -1] <= 0} break
			continue
		    }
		    set rowchk($id) [expr {$row + $r}]
		}
	    }
2440 2441
	    lset rowidlist $row $idlist
	    lset rowoffsets $row $offs
P
Paul Mackerras 已提交
2442
	}
2443
	lappend linesegends $lse
P
Paul Mackerras 已提交
2444 2445 2446 2447
	set col [lsearch -exact $idlist $id]
	if {$col < 0} {
	    set col [llength $idlist]
	    lappend idlist $id
2448
	    lset rowidlist $row $idlist
P
Paul Mackerras 已提交
2449
	    set z {}
2450
	    if {[lindex $childlist $row] ne {}} {
2451
		set z [expr {[llength [lindex $rowidlist [expr {$row-1}]]] - $col}]
P
Paul Mackerras 已提交
2452 2453 2454
		unset idinlist($id)
	    }
	    lappend offs $z
2455
	    lset rowoffsets $row $offs
P
Paul Mackerras 已提交
2456 2457 2458 2459 2460 2461
	    if {$z ne {}} {
		makeuparrow $id $col $row $z
	    }
	} else {
	    unset idinlist($id)
	}
2462
	set ranges {}
P
Paul Mackerras 已提交
2463
	if {[info exists idrowranges($id)]} {
2464
	    set ranges $idrowranges($id)
2465 2466
	    lappend ranges $row
	    unset idrowranges($id)
P
Paul Mackerras 已提交
2467
	}
2468
	lappend rowrangelist $ranges
P
Paul Mackerras 已提交
2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499
	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
	}
2500 2501
	lappend rowidlist $idlist
	lappend rowoffsets $offs
P
Paul Mackerras 已提交
2502 2503 2504 2505 2506
    }
    return $row
}

proc addextraid {id row} {
2507
    global displayorder commitrow commitinfo
2508
    global commitidx commitlisted
2509
    global parentlist childlist children curview
P
Paul Mackerras 已提交
2510

2511
    incr commitidx($curview)
P
Paul Mackerras 已提交
2512
    lappend displayorder $id
2513
    lappend commitlisted 0
2514
    lappend parentlist {}
2515
    set commitrow($curview,$id) $row
P
Paul Mackerras 已提交
2516 2517 2518
    readcommit $id
    if {![info exists commitinfo($id)]} {
	set commitinfo($id) {"No commit information available"}
2519
    }
2520 2521
    if {![info exists children($curview,$id)]} {
	set children($curview,$id) {}
P
Paul Mackerras 已提交
2522
    }
2523
    lappend childlist $children($curview,$id)
P
Paul Mackerras 已提交
2524 2525 2526
}

proc layouttail {} {
2527
    global rowidlist rowoffsets idinlist commitidx curview
P
Paul Mackerras 已提交
2528
    global idrowranges rowrangelist
P
Paul Mackerras 已提交
2529

2530
    set row $commitidx($curview)
2531
    set idlist [lindex $rowidlist $row]
P
Paul Mackerras 已提交
2532 2533 2534 2535 2536 2537
    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 已提交
2538
	lappend rowrangelist $idrowranges($id)
2539
	unset idrowranges($id)
P
Paul Mackerras 已提交
2540 2541 2542
	incr row
	set offs [ntimes $col 0]
	set idlist [lreplace $idlist $col $col]
2543 2544
	lappend rowidlist $idlist
	lappend rowoffsets $offs
P
Paul Mackerras 已提交
2545 2546 2547 2548
    }

    foreach id [array names idinlist] {
	addextraid $id $row
2549 2550
	lset rowidlist $row [list $id]
	lset rowoffsets $row 0
P
Paul Mackerras 已提交
2551 2552
	makeuparrow $id 0 $row 0
	lappend idrowranges($id) $row
P
Paul Mackerras 已提交
2553
	lappend rowrangelist $idrowranges($id)
2554
	unset idrowranges($id)
P
Paul Mackerras 已提交
2555
	incr row
2556 2557
	lappend rowidlist {}
	lappend rowoffsets {}
P
Paul Mackerras 已提交
2558 2559 2560 2561 2562 2563 2564
    }
}

proc insert_pad {row col npad} {
    global rowidlist rowoffsets

    set pad [ntimes $npad {}]
2565 2566 2567
    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 已提交
2568 2569 2570
}

proc optimize_rows {row col endrow} {
P
Paul Mackerras 已提交
2571
    global rowidlist rowoffsets idrowranges displayorder
P
Paul Mackerras 已提交
2572 2573

    for {} {$row < $endrow} {incr row} {
2574 2575
	set idlist [lindex $rowidlist $row]
	set offs [lindex $rowoffsets $row]
P
Paul Mackerras 已提交
2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586
	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}]
2587
	    set z0 [lindex $rowoffsets $y0 $x0]
P
Paul Mackerras 已提交
2588 2589
	    if {$z0 eq {}} {
		set id [lindex $idlist $col]
2590 2591
		set ranges [rowranges $id]
		if {$ranges ne {} && $y0 > [lindex $ranges 0]} {
P
Paul Mackerras 已提交
2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603
		    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}]
2604
		set z0 [lindex $rowoffsets $y0 $x0]
P
Paul Mackerras 已提交
2605 2606 2607
	    } elseif {$z > 1 || ($z > 0 && $isarrow)} {
		set npad [expr {$z - 1 + $isarrow}]
		set y1 [expr {$row + 1}]
2608
		set offs2 [lindex $rowoffsets $y1]
P
Paul Mackerras 已提交
2609 2610 2611 2612 2613 2614 2615
		set x1 -1
		foreach z $offs2 {
		    incr x1
		    if {$z eq {} || $x1 + $z < $col} continue
		    if {$x1 + $z > $col} {
			incr npad
		    }
2616
		    lset rowoffsets $y1 [incrange $offs2 $x1 $npad]
P
Paul Mackerras 已提交
2617 2618 2619 2620 2621 2622 2623 2624 2625 2626
		    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
	    }
2627 2628 2629 2630 2631 2632 2633 2634 2635
	    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 已提交
2636 2637 2638 2639 2640 2641 2642
	    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} {
2643
	    set o {}
P
Paul Mackerras 已提交
2644 2645
	    for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
		set o [lindex $offs $col]
2646 2647 2648
		if {$o eq {}} {
		    # check if this is the link to the first child
		    set id [lindex $idlist $col]
2649 2650
		    set ranges [rowranges $id]
		    if {$ranges ne {} && $row == [lindex $ranges 0]} {
2651 2652 2653 2654 2655 2656 2657 2658 2659
			# 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 已提交
2660 2661
		if {$o eq {} || $o <= 0} break
	    }
2662
	    if {$o ne {} && [incr col] < [llength $idlist]} {
P
Paul Mackerras 已提交
2663
		set y1 [expr {$row + 1}]
2664
		set offs2 [lindex $rowoffsets $y1]
P
Paul Mackerras 已提交
2665 2666 2667 2668
		set x1 -1
		foreach z $offs2 {
		    incr x1
		    if {$z eq {} || $x1 + $z < $col} continue
2669
		    lset rowoffsets $y1 [incrange $offs2 $x1 1]
P
Paul Mackerras 已提交
2670 2671 2672 2673 2674 2675 2676 2677
		    break
		}
		set idlist [linsert $idlist $col {}]
		set tmp [linsert $offs $col {}]
		incr col
		set offs [incrange $tmp $col -1]
	    }
	}
2678 2679
	lset rowidlist $row $idlist
	lset rowoffsets $row $offs
P
Paul Mackerras 已提交
2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693
	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}]
}

2694 2695 2696 2697 2698 2699 2700 2701 2702 2703
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 已提交
2704
proc rowranges {id} {
2705
    global phase idrowranges commitrow rowlaidout rowrangelist curview
P
Paul Mackerras 已提交
2706 2707

    set ranges {}
2708
    if {$phase eq {} ||
2709 2710 2711
	([info exists commitrow($curview,$id)]
	 && $commitrow($curview,$id) < $rowlaidout)} {
	set ranges [lindex $rowrangelist $commitrow($curview,$id)]
P
Paul Mackerras 已提交
2712 2713 2714 2715 2716 2717
    } elseif {[info exists idrowranges($id)]} {
	set ranges $idrowranges($id)
    }
    return $ranges
}

2718
proc drawlineseg {id i} {
P
Paul Mackerras 已提交
2719
    global rowoffsets rowidlist
2720
    global displayorder
2721
    global canv colormap linespc
2722
    global numcommits commitrow curview
P
Paul Mackerras 已提交
2723

P
Paul Mackerras 已提交
2724 2725
    set ranges [rowranges $id]
    set downarrow 1
2726 2727
    if {[info exists commitrow($curview,$id)]
	&& $commitrow($curview,$id) < $numcommits} {
P
Paul Mackerras 已提交
2728 2729 2730 2731 2732 2733
	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 已提交
2734 2735 2736
    if {$startrow == $row} return
    assigncolor $id
    set coords {}
2737
    set col [lsearch -exact [lindex $rowidlist $row] $id]
P
Paul Mackerras 已提交
2738 2739 2740 2741 2742 2743 2744
    if {$col < 0} {
	puts "oops: drawline: id $id not on row $row"
	return
    }
    set lasto {}
    set ns 0
    while {1} {
2745
	set o [lindex $rowoffsets $row $col]
P
Paul Mackerras 已提交
2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759
	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
2760 2761 2762 2763 2764 2765 2766 2767 2768
    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} {
2769
		lappend coords [xc $row [expr {$col - 1}]] [yc $row]
2770
	    } elseif {$ccol > $col + 1} {
2771
		lappend coords [xc $row [expr {$col + 1}]] [yc $row]
2772 2773 2774 2775 2776
	    }
	    lappend coords $x $y
	}
    }
    if {[llength $coords] < 4} return
P
Paul Mackerras 已提交
2777
    if {$downarrow} {
2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796
	# 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 已提交
2797
    set arrow [expr {2 * ($i > 0) + $downarrow}]
2798
    set arrow [lindex {none first last both} $arrow]
2799
    set t [$canv create line $coords -width [linewidth $id] \
P
Paul Mackerras 已提交
2800 2801 2802 2803 2804
	       -fill $colormap($id) -tags lines.$id -arrow $arrow]
    $canv lower $t
    bindline $t $id
}

2805
proc drawparentlinks {id row col olds} {
P
Paul Mackerras 已提交
2806
    global rowidlist canv colormap
P
Paul Mackerras 已提交
2807 2808 2809 2810 2811

    set row2 [expr {$row + 1}]
    set x [xc $row $col]
    set y [yc $row]
    set y2 [yc $row2]
2812
    set ids [lindex $rowidlist $row2]
P
Paul Mackerras 已提交
2813 2814 2815
    # rmx = right-most X coord used
    set rmx 0
    foreach p $olds {
2816 2817 2818 2819 2820 2821 2822 2823 2824
	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 已提交
2825 2826 2827
	set ranges [rowranges $p]
	if {$ranges ne {} && $row2 == [lindex $ranges 0]
	    && $row2 < [lindex $ranges 1]} {
2828 2829 2830
	    # drawlineseg will do this one for us
	    continue
	}
P
Paul Mackerras 已提交
2831 2832 2833 2834 2835 2836 2837 2838 2839
	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
2840
	set t [$canv create line $coords -width [linewidth $p] \
P
Paul Mackerras 已提交
2841 2842 2843 2844 2845 2846 2847
		   -fill $colormap($p) -tags lines.$p]
	$canv lower $t
	bindline $t $p
    }
    return $rmx
}

2848
proc drawlines {id} {
P
Paul Mackerras 已提交
2849
    global colormap canv
P
Paul Mackerras 已提交
2850
    global idrangedrawn
2851
    global children iddrawn commitrow rowidlist curview
P
Paul Mackerras 已提交
2852 2853

    $canv delete lines.$id
P
Paul Mackerras 已提交
2854
    set nr [expr {[llength [rowranges $id]] / 2}]
P
Paul Mackerras 已提交
2855 2856
    for {set i 0} {$i < $nr} {incr i} {
	if {[info exists idrangedrawn($id,$i)]} {
2857
	    drawlineseg $id $i
P
Paul Mackerras 已提交
2858 2859
	}
    }
2860
    foreach child $children($curview,$id) {
2861
	if {[info exists iddrawn($child)]} {
2862
	    set row $commitrow($curview,$child)
2863 2864 2865
	    set col [lsearch -exact [lindex $rowidlist $row] $child]
	    if {$col >= 0} {
		drawparentlinks $child $row $col [list $id]
P
Paul Mackerras 已提交
2866 2867 2868 2869 2870 2871 2872 2873 2874 2875
	    }
	}
    }
}

proc drawcmittext {id row col rmx} {
    global linespc canv canv2 canv3 canvy0
    global commitlisted commitinfo rowidlist
    global rowtextx idpos idtags idheads idotherrefs
    global linehtag linentag linedtag
2876
    global mainfont canvxmax boldrows boldnamerows
P
Paul Mackerras 已提交
2877

2878
    set ofill [expr {[lindex $commitlisted $row]? "blue": "white"}]
P
Paul Mackerras 已提交
2879 2880 2881 2882 2883 2884 2885 2886
    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}] \
	       -fill $ofill -outline black -width 1]
    $canv raise $t
    $canv bind $t <1> {selcanvline {} %x %y}
2887
    set xt [xc $row [llength [lindex $rowidlist $row]]]
P
Paul Mackerras 已提交
2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900
    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]
2901
    set font $mainfont
2902 2903 2904
    set nfont $mainfont
    set isbold [ishighlighted $row]
    if {$isbold > 0} {
2905
	lappend boldrows $row
2906
	lappend font bold
2907
	if {$isbold > 1} {
2908
	    lappend boldnamerows $row
2909 2910
	    lappend nfont bold
	}
2911
    }
P
Paul Mackerras 已提交
2912
    set linehtag($row) [$canv create text $xt $y -anchor w \
2913
			    -text $headline -font $font]
P
Paul Mackerras 已提交
2914 2915
    $canv bind $linehtag($row) <Button-3> "rowmenu %X %Y $id"
    set linentag($row) [$canv2 create text 3 $y -anchor w \
2916
			    -text $name -font $nfont]
P
Paul Mackerras 已提交
2917 2918
    set linedtag($row) [$canv3 create text 3 $y -anchor w \
			    -text $date -font $mainfont]
2919 2920 2921 2922 2923
    set xr [expr {$xt + [font measure $mainfont $headline]}]
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
P
Paul Mackerras 已提交
2924 2925 2926
}

proc drawcmitrow {row} {
2927
    global displayorder rowidlist
P
Paul Mackerras 已提交
2928
    global idrangedrawn iddrawn
2929
    global commitinfo parentlist numcommits
2930
    global filehighlight fhighlights findstring nhighlights
2931
    global hlview vhighlights
2932
    global highlight_related rhighlights
P
Paul Mackerras 已提交
2933

2934 2935
    if {$row >= $numcommits} return
    foreach id [lindex $rowidlist $row] {
2936
	if {$id eq {}} continue
P
Paul Mackerras 已提交
2937
	set i -1
P
Paul Mackerras 已提交
2938
	foreach {s e} [rowranges $id] {
P
Paul Mackerras 已提交
2939 2940 2941 2942 2943
	    incr i
	    if {$row < $s} continue
	    if {$e eq {}} break
	    if {$row <= $e} {
		if {$e < $numcommits && ![info exists idrangedrawn($id,$i)]} {
2944
		    drawlineseg $id $i
P
Paul Mackerras 已提交
2945 2946 2947 2948 2949 2950 2951 2952
		    set idrangedrawn($id,$i) 1
		}
		break
	    }
	}
    }

    set id [lindex $displayorder $row]
2953 2954 2955 2956 2957 2958
    if {[info exists hlview] && ![info exists vhighlights($row)]} {
	askvhighlight $row $id
    }
    if {[info exists filehighlight] && ![info exists fhighlights($row)]} {
	askfilehighlight $row $id
    }
2959 2960
    if {$findstring ne {} && ![info exists nhighlights($row)]} {
	askfindhighlight $row $id
2961
    }
2962 2963 2964
    if {$highlight_related ne "None" && ![info exists rhighlights($row)]} {
	askrelhighlight $row $id
    }
P
Paul Mackerras 已提交
2965
    if {[info exists iddrawn($id)]} return
2966
    set col [lsearch -exact [lindex $rowidlist $row] $id]
P
Paul Mackerras 已提交
2967 2968 2969 2970 2971
    if {$col < 0} {
	puts "oops, row $row id $id not in list"
	return
    }
    if {![info exists commitinfo($id)]} {
2972
	getcommit $id
P
Paul Mackerras 已提交
2973 2974
    }
    assigncolor $id
2975 2976 2977
    set olds [lindex $parentlist $row]
    if {$olds ne {}} {
	set rmx [drawparentlinks $id $row $col $olds]
P
Paul Mackerras 已提交
2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012
    } 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
3013
    global vhighlights fhighlights nhighlights rhighlights
P
Paul Mackerras 已提交
3014 3015 3016 3017

    allcanvs delete all
    catch {unset iddrawn}
    catch {unset idrangedrawn}
3018 3019 3020
    catch {unset vhighlights}
    catch {unset fhighlights}
    catch {unset nhighlights}
3021
    catch {unset rhighlights}
P
Paul Mackerras 已提交
3022 3023
}

P
Paul Mackerras 已提交
3024 3025 3026 3027 3028 3029 3030 3031 3032
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}]
	}
3033
	if {$e <= $s} continue
P
Paul Mackerras 已提交
3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064
	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]
}

3065
proc assigncolor {id} {
P
Paul Mackerras 已提交
3066
    global colormap colors nextcolor
3067
    global commitrow parentlist children children curview
3068

3069
    if {[info exists colormap($id)]} return
3070
    set ncolors [llength $colors]
3071 3072
    if {[info exists children($curview,$id)]} {
	set kids $children($curview,$id)
3073 3074 3075 3076 3077
    } else {
	set kids {}
    }
    if {[llength $kids] == 1} {
	set child [lindex $kids 0]
3078
	if {[info exists colormap($child)]
3079
	    && [llength [lindex $parentlist $commitrow($curview,$child)]] == 1} {
3080 3081
	    set colormap($id) $colormap($child)
	    return
3082
	}
3083 3084
    }
    set badcolors {}
P
Paul Mackerras 已提交
3085 3086 3087 3088 3089 3090
    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
3091
	}
P
Paul Mackerras 已提交
3092 3093 3094
	if {[info exists colormap($x)]
	    && [lsearch -exact $badcolors $colormap($x)] < 0} {
	    lappend badcolors $colormap($x)
3095 3096
	}
    }
P
Paul Mackerras 已提交
3097 3098
    if {[llength $badcolors] >= $ncolors} {
	set badcolors $origbad
3099
    }
P
Paul Mackerras 已提交
3100
    set origbad $badcolors
3101
    if {[llength $badcolors] < $ncolors - 1} {
3102
	foreach child $kids {
3103 3104 3105 3106
	    if {[info exists colormap($child)]
		&& [lsearch -exact $badcolors $colormap($child)] < 0} {
		lappend badcolors $colormap($child)
	    }
3107
	    foreach p [lindex $parentlist $commitrow($curview,$child)] {
3108 3109 3110
		if {[info exists colormap($p)]
		    && [lsearch -exact $badcolors $colormap($p)] < 0} {
		    lappend badcolors $colormap($p)
3111 3112 3113 3114 3115 3116
		}
	    }
	}
	if {[llength $badcolors] >= $ncolors} {
	    set badcolors $origbad
	}
3117 3118 3119 3120 3121
    }
    for {set i 0} {$i <= $ncolors} {incr i} {
	set c [lindex $colors $nextcolor]
	if {[incr nextcolor] >= $ncolors} {
	    set nextcolor 0
3122
	}
3123
	if {[lsearch -exact $badcolors $c]} break
3124
    }
3125
    set colormap($id) $c
3126 3127
}

3128 3129 3130 3131 3132 3133
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"
3134
    $canv bind $t <Button-1> "lineclick %x %y $id 1"
3135 3136
}

3137
proc drawtags {id x xt y1} {
3138
    global idtags idheads idotherrefs
3139
    global linespc lthickness
3140
    global canv mainfont commitrow rowtextx curview
3141 3142 3143

    set marks {}
    set ntags 0
3144
    set nheads 0
3145 3146 3147 3148 3149 3150
    if {[info exists idtags($id)]} {
	set marks $idtags($id)
	set ntags [llength $marks]
    }
    if {[info exists idheads($id)]} {
	set marks [concat $marks $idheads($id)]
3151 3152 3153 3154
	set nheads [llength $idheads($id)]
    }
    if {[info exists idotherrefs($id)]} {
	set marks [concat $marks $idotherrefs($id)]
3155 3156 3157 3158 3159 3160
    }
    if {$marks eq {}} {
	return $xt
    }

    set delta [expr {int(0.5 * ($linespc - $lthickness))}]
J
Jeff Hobbs 已提交
3161 3162
    set yt [expr {$y1 - 0.5 * $linespc}]
    set yb [expr {$yt + $linespc - 1}]
3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174
    set xvals {}
    set wvals {}
    foreach tag $marks {
	set wid [font measure $mainfont $tag]
	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 已提交
3175 3176
	set xl [expr {$x + $delta}]
	set xr [expr {$x + $delta + $wid + $lthickness}]
3177 3178
	if {[incr ntags -1] >= 0} {
	    # draw a tag
J
Jeff Hobbs 已提交
3179 3180
	    set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
		       $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
3181 3182
		       -width 1 -outline black -fill yellow -tags tag.$id]
	    $canv bind $t <1> [list showtag $tag 1]
3183
	    set rowtextx($commitrow($curview,$id)) [expr {$xr + $linespc}]
3184
	} else {
3185 3186 3187 3188 3189 3190
	    # draw a head or other ref
	    if {[incr nheads -1] >= 0} {
		set col green
	    } else {
		set col "#ddddff"
	    }
J
Jeff Hobbs 已提交
3191
	    set xl [expr {$xl - $delta/2}]
3192
	    $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
3193
		-width 1 -outline black -fill $col -tags tag.$id
3194 3195 3196 3197 3198 3199 3200 3201
	    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
	    }
3202
	}
3203 3204 3205 3206 3207
	set t [$canv create text $xl $y1 -anchor w -text $tag \
		   -font $mainfont -tags tag.$id]
	if {$ntags >= 0} {
	    $canv bind $t <1> [list showtag $tag 1]
	}
3208 3209 3210 3211
    }
    return $xt
}

3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222
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
}
3223

3224 3225 3226 3227 3228 3229 3230
proc show_status {msg} {
    global canv mainfont

    clear_display
    $canv create text 3 3 -anchor nw -text $msg -font $mainfont -tags textitems
}

3231
proc finishcommits {} {
3232
    global commitidx phase curview
3233
    global canv mainfont ctext maincursor textcursor
3234
    global findinprogress pending_select
3235

3236
    if {$commitidx($curview) > 0} {
3237 3238
	drawrest
    } else {
3239
	show_status "No commits selected"
3240
    }
P
Paul Mackerras 已提交
3241
    set phase {}
3242
    catch {unset pending_select}
3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253
}

# 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
3254 3255
}

3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275
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
    }
}

3276
proc drawrest {} {
P
Paul Mackerras 已提交
3277 3278 3279
    global numcommits
    global startmsecs
    global canvy0 numcommits linespc
3280
    global rowlaidout commitidx curview
3281
    global pending_select
P
Paul Mackerras 已提交
3282 3283

    set row $rowlaidout
3284
    layoutrows $rowlaidout $commitidx($curview) 1
P
Paul Mackerras 已提交
3285
    layouttail
3286 3287
    optimize_rows $row 0 $commitidx($curview)
    showstuff $commitidx($curview)
3288 3289 3290
    if {[info exists pending_select]} {
	selectline 0 1
    }
P
Paul Mackerras 已提交
3291

J
Jeff Hobbs 已提交
3292
    set drawmsecs [expr {[clock clicks -milliseconds] - $startmsecs}]
3293
    #puts "overall $drawmsecs ms for $numcommits commits"
3294 3295
}

3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308
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 已提交
3309 3310
	    lappend matches [list $j [expr {$j+$foundstrlen-1}]]
	    set i [expr {$j + $foundstrlen}]
3311 3312 3313 3314 3315
	}
    }
    return $matches
}

3316 3317
proc dofind {} {
    global findtype findloc findstring markedmatches commitinfo
3318
    global numcommits displayorder linehtag linentag linedtag
3319
    global mainfont canv canv2 canv3 selectedline
P
Paul Mackerras 已提交
3320 3321
    global matchinglines foundstring foundstrlen matchstring
    global commitdata
3322 3323

    stopfindproc
3324
    unmarkmatches
3325
    cancel_next_highlight
3326
    focus .
3327 3328
    set matchinglines {}
    if {$findtype == "IgnCase"} {
3329
	set foundstring [string tolower $findstring]
3330
    } else {
3331
	set foundstring $findstring
3332
    }
3333 3334
    set foundstrlen [string length $findstring]
    if {$foundstrlen == 0} return
P
Paul Mackerras 已提交
3335 3336
    regsub -all {[*?\[\\]} $foundstring {\\&} matchstring
    set matchstring "*$matchstring*"
3337 3338 3339 3340 3341 3342
    if {![info exists selectedline]} {
	set oldsel -1
    } else {
	set oldsel $selectedline
    }
    set didsel 0
3343
    set fldtypes {Headline Author Date Committer CDate Comments}
P
Paul Mackerras 已提交
3344
    set l -1
3345 3346
    foreach id $displayorder {
	set d $commitdata($id)
P
Paul Mackerras 已提交
3347 3348 3349 3350 3351 3352 3353 3354 3355 3356
	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)]} {
3357
	    getcommit $id
P
Paul Mackerras 已提交
3358
	}
3359 3360 3361 3362 3363 3364
	set info $commitinfo($id)
	set doesmatch 0
	foreach f $info ty $fldtypes {
	    if {$findloc != "All fields" && $findloc != $ty} {
		continue
	    }
3365
	    set matches [findmatches $f]
3366 3367 3368
	    if {$matches == {}} continue
	    set doesmatch 1
	    if {$ty == "Headline"} {
P
Paul Mackerras 已提交
3369
		drawcmitrow $l
3370 3371
		markmatches $canv $l $f $linehtag($l) $matches $mainfont
	    } elseif {$ty == "Author"} {
P
Paul Mackerras 已提交
3372
		drawcmitrow $l
3373
		markmatches $canv2 $l $f $linentag($l) $matches $mainfont
3374
	    } elseif {$ty == "Date"} {
P
Paul Mackerras 已提交
3375
		drawcmitrow $l
3376 3377 3378 3379 3380 3381
		markmatches $canv3 $l $f $linedtag($l) $matches $mainfont
	    }
	}
	if {$doesmatch} {
	    lappend matchinglines $l
	    if {!$didsel && $l > $oldsel} {
3382
		findselectline $l
3383 3384 3385 3386 3387 3388 3389
		set didsel 1
	    }
	}
    }
    if {$matchinglines == {}} {
	bell
    } elseif {!$didsel} {
3390 3391 3392 3393 3394 3395
	findselectline [lindex $matchinglines 0]
    }
}

proc findselectline {l} {
    global findloc commentend ctext
3396
    selectline $l 1
3397 3398 3399 3400 3401 3402
    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 已提交
3403
	    set end [expr {[lindex $match 1] + 1}]
3404 3405
	    $ctext tag add found "1.0 + $start c" "1.0 + $end c"
	}
3406 3407 3408
    }
}

3409
proc findnext {restart} {
3410 3411
    global matchinglines selectedline
    if {![info exists matchinglines]} {
3412 3413 3414
	if {$restart} {
	    dofind
	}
3415 3416 3417 3418 3419
	return
    }
    if {![info exists selectedline]} return
    foreach l $matchinglines {
	if {$l > $selectedline} {
3420
	    findselectline $l
3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439
	    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 != {}} {
3440
	findselectline $prev
3441 3442 3443 3444 3445
    } else {
	bell
    }
}

3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458
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
    }
3459 3460
    catch {unset findinprogress}
    notbusy find
3461 3462 3463 3464 3465
}

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

P
Paul Mackerras 已提交
3468
    drawcmitrow $l
3469 3470 3471 3472 3473 3474
    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
3475 3476 3477 3478 3479 3480 3481 3482 3483
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 已提交
3484 3485 3486 3487
	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 \
3488 3489 3490 3491 3492 3493
		   -outline {} -tags matches -fill yellow]
	$canv lower $t
    }
}

proc unmarkmatches {} {
3494
    global matchinglines findids
3495 3496
    allcanvs delete matches
    catch {unset matchinglines}
3497
    catch {unset findids}
3498 3499
}

3500
proc selcanvline {w x y} {
3501
    global canv canvy0 ctext linespc
P
Paul Mackerras 已提交
3502
    global rowtextx
3503
    set ymax [lindex [$canv cget -scrollregion] 3]
3504
    if {$ymax == {}} return
3505 3506 3507 3508 3509 3510
    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
    }
3511 3512 3513
    if {$w eq $canv} {
	if {![info exists rowtextx($l)] || $x < $rowtextx($l)} return
    }
3514
    unmarkmatches
3515
    selectline $l 1
3516 3517
}

3518 3519
proc commit_descriptor {p} {
    global commitinfo
3520 3521 3522
    if {![info exists commitinfo($p)]} {
	getcommit $p
    }
3523
    set l "..."
3524
    if {[llength $commitinfo($p)] > 1} {
3525 3526
	set l [lindex $commitinfo($p) 0]
    }
P
Paul Mackerras 已提交
3527
    return "$p ($l)\n"
3528 3529
}

3530 3531
# append some text to the ctext widget, and make any SHA1 ID
# that we know about be a clickable link.
3532
proc appendwithlinks {text tags} {
3533
    global ctext commitrow linknum curview
3534 3535

    set start [$ctext index "end - 1c"]
3536
    $ctext insert end $text $tags
3537 3538 3539 3540 3541
    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]
3542
	if {![info exists commitrow($curview,$linkid)]} continue
3543 3544 3545
	incr e
	$ctext tag add link "$start + $s c" "$start + $e c"
	$ctext tag add link$linknum "$start + $s c" "$start + $e c"
3546 3547
	$ctext tag bind link$linknum <1> \
	    [list selectline $commitrow($curview,$linkid) 1]
3548 3549 3550 3551 3552 3553 3554
	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 }
}

3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570
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}]
}

P
Paul Mackerras 已提交
3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618
# add a list of tag names at position pos
proc appendrefs {pos l} {
    global ctext commitrow linknum curview idtags

    if {[catch {$ctext index $pos}]} return
    set tags {}
    foreach id $l {
	foreach tag $idtags($id) {
	    lappend tags [concat $tag $id]
	}
    }
    set tags [lsort -index 1 $tags]
    set sep {}
    foreach tag $tags {
	set name [lindex $tag 0]
	set id [lindex $tag 1]
	set lk link$linknum
	incr linknum
	$ctext insert $pos $sep
	$ctext insert $pos $name $lk
	$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 ", "
    }
}

# called when we have finished computing the nearby tags
proc dispneartags {} {
    global selectedline currentid ctext anc_tags desc_tags showneartags

    if {![info exists selectedline] || !$showneartags} return
    set id $currentid
    $ctext conf -state normal
    if {[info exists anc_tags($id)]} {
	appendrefs follows $anc_tags($id)
    }
    if {[info exists desc_tags($id)]} {
	appendrefs precedes $desc_tags($id)
    }
    $ctext conf -state disabled
}

3619
proc selectline {l isnew} {
3620
    global canv canv2 canv3 ctext commitinfo selectedline
3621
    global displayorder linehtag linentag linedtag
3622
    global canvy0 linespc parentlist childlist
3623
    global currentid sha1entry
P
Paul Mackerras 已提交
3624
    global commentend idtags linknum
3625
    global mergemax numcommits pending_select
P
Paul Mackerras 已提交
3626
    global cmitmode desc_tags anc_tags showneartags allcommits
3627

3628
    catch {unset pending_select}
3629
    $canv delete hover
3630
    normalline
3631
    cancel_next_highlight
3632
    if {$l < 0 || $l >= $numcommits} return
3633
    set y [expr {$canvy0 + $l * $linespc}]
3634
    set ymax [lindex [$canv cget -scrollregion] 3]
3635 3636
    set ytop [expr {$y - $linespc - 1}]
    set ybot [expr {$y + $linespc + 1}]
3637
    set wnow [$canv yview]
J
Jeff Hobbs 已提交
3638 3639
    set wtop [expr {[lindex $wnow 0] * $ymax}]
    set wbot [expr {[lindex $wnow 1] * $ymax}]
3640 3641
    set wh [expr {$wbot - $wtop}]
    set newtop $wtop
3642
    if {$ytop < $wtop} {
3643 3644 3645 3646 3647 3648 3649
	if {$ybot < $wtop} {
	    set newtop [expr {$y - $wh / 2.0}]
	} else {
	    set newtop $ytop
	    if {$newtop > $wtop - $linespc} {
		set newtop [expr {$wtop - $linespc}]
	    }
3650
	}
3651 3652 3653 3654 3655 3656 3657 3658
    } 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}]
	    }
3659
	}
3660 3661 3662 3663 3664
    }
    if {$newtop != $wtop} {
	if {$newtop < 0} {
	    set newtop 0
	}
J
Jeff Hobbs 已提交
3665
	allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
P
Paul Mackerras 已提交
3666
	drawvisible
3667
    }
3668

P
Paul Mackerras 已提交
3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682
    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

3683 3684
    if {$isnew} {
	addtohistory [list selectline $l 0]
3685 3686
    }

3687 3688
    set selectedline $l

3689
    set id [lindex $displayorder $l]
3690
    set currentid $id
3691 3692 3693 3694
    $sha1entry delete 0 end
    $sha1entry insert 0 $id
    $sha1entry selection from 0
    $sha1entry selection to end
3695
    rhighlight_sel $id
3696

3697
    $ctext conf -state normal
3698
    clear_ctext
3699
    set linknum 0
3700
    set info $commitinfo($id)
P
Paul Mackerras 已提交
3701 3702 3703 3704
    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"
3705 3706 3707 3708 3709 3710 3711
    if {[info exists idtags($id)]} {
	$ctext insert end "Tags:"
	foreach tag $idtags($id) {
	    $ctext insert end " $tag"
	}
	$ctext insert end "\n"
    }
3712
 
3713
    set headers {}
3714 3715
    set olds [lindex $parentlist $l]
    if {[llength $olds] > 1} {
3716
	set np 0
3717
	foreach p $olds {
3718 3719 3720 3721 3722 3723
	    if {$np >= $mergemax} {
		set tag mmax
	    } else {
		set tag m$np
	    }
	    $ctext insert end "Parent: " $tag
3724
	    appendwithlinks [commit_descriptor $p] {}
3725 3726 3727
	    incr np
	}
    } else {
3728
	foreach p $olds {
P
Paul Mackerras 已提交
3729
	    append headers "Parent: [commit_descriptor $p]"
3730 3731
	}
    }
3732

3733
    foreach c [lindex $childlist $l] {
P
Paul Mackerras 已提交
3734
	append headers "Child:  [commit_descriptor $c]"
3735
    }
3736 3737

    # make anything that looks like a SHA1 ID be a clickable link
3738
    appendwithlinks $headers {}
P
Paul Mackerras 已提交
3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757
    if {$showneartags} {
	if {![info exists allcommits]} {
	    getallcommits
	}
	$ctext insert end "Follows: "
	$ctext mark set follows "end -1c"
	$ctext mark gravity follows left
	if {[info exists anc_tags($id)]} {
	    appendrefs follows $anc_tags($id)
	}
	$ctext insert end "\nPrecedes: "
	$ctext mark set precedes "end -1c"
	$ctext mark gravity precedes left
	if {[info exists desc_tags($id)]} {
	    appendrefs precedes $desc_tags($id)
	}
	$ctext insert end "\n"
    }
    $ctext insert end "\n"
3758
    appendwithlinks [lindex $info 5] {comment}
3759

3760
    $ctext tag delete Comments
3761
    $ctext tag remove found 1.0 end
3762
    $ctext conf -state disabled
3763
    set commentend [$ctext index "end - 1c"]
3764

3765
    init_flist "Comments"
P
Paul Mackerras 已提交
3766 3767 3768
    if {$cmitmode eq "tree"} {
	gettree $id
    } elseif {[llength $olds] <= 1} {
3769
	startdiff $id
3770
    } else {
3771
	mergediff $id $l
3772 3773 3774
    }
}

3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786
proc selfirstline {} {
    unmarkmatches
    selectline 0 1
}

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

3787 3788 3789
proc selnextline {dir} {
    global selectedline
    if {![info exists selectedline]} return
J
Jeff Hobbs 已提交
3790
    set l [expr {$selectedline + $dir}]
3791
    unmarkmatches
3792 3793 3794
    selectline $l 1
}

3795 3796 3797 3798 3799 3800 3801 3802
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
3803
    drawvisible
3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814
    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
    selectline $l 1    
}

3815
proc unselectline {} {
P
Paul Mackerras 已提交
3816
    global selectedline currentid
3817 3818

    catch {unset selectedline}
P
Paul Mackerras 已提交
3819
    catch {unset currentid}
3820
    allcanvs delete secsel
3821
    rhighlight_none
3822
    cancel_next_highlight
3823 3824
}

P
Paul Mackerras 已提交
3825 3826 3827 3828 3829 3830 3831 3832
proc reselectline {} {
    global selectedline

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

3833
proc addtohistory {cmd} {
3834
    global history historyindex curview
3835

3836
    set elt [list $curview $cmd]
3837
    if {$historyindex > 0
3838
	&& [lindex $history [expr {$historyindex - 1}]] == $elt} {
3839 3840 3841 3842
	return
    }

    if {$historyindex < [llength $history]} {
3843
	set history [lreplace $history $historyindex end $elt]
3844
    } else {
3845
	lappend history $elt
3846 3847 3848 3849 3850 3851 3852 3853 3854 3855
    }
    incr historyindex
    if {$historyindex > 1} {
	.ctop.top.bar.leftbut conf -state normal
    } else {
	.ctop.top.bar.leftbut conf -state disabled
    }
    .ctop.top.bar.rightbut conf -state disabled
}

3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866
proc godo {elt} {
    global curview

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

3867 3868 3869 3870 3871
proc goback {} {
    global history historyindex

    if {$historyindex > 1} {
	incr historyindex -1
3872
	godo [lindex $history [expr {$historyindex - 1}]]
3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883
	.ctop.top.bar.rightbut conf -state normal
    }
    if {$historyindex <= 1} {
	.ctop.top.bar.leftbut conf -state disabled
    }
}

proc goforw {} {
    global history historyindex

    if {$historyindex < [llength $history]} {
3884
	set cmd [lindex $history $historyindex]
3885
	incr historyindex
3886
	godo $cmd
3887 3888 3889 3890 3891
	.ctop.top.bar.leftbut conf -state normal
    }
    if {$historyindex >= [llength $history]} {
	.ctop.top.bar.rightbut conf -state disabled
    }
3892 3893
}

P
Paul Mackerras 已提交
3894 3895 3896 3897 3898 3899 3900
proc gettree {id} {
    global treefilelist treeidlist diffids diffmergeid treepending

    set diffids $id
    catch {unset diffmergeid}
    if {![info exists treefilelist($id)]} {
	if {![info exists treepending]} {
3901
	    if {[catch {set gtf [open [concat | git ls-tree -r $id] r]}]} {
P
Paul Mackerras 已提交
3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948
		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]
3949
    if {[catch {set bf [open [concat | git cat-file blob $blob] r]} err]} {
P
Paul Mackerras 已提交
3950 3951 3952 3953 3954 3955
	puts "oops, error reading blob $blob: $err"
	return
    }
    fconfigure $bf -blocking 0
    fileevent $bf readable [list getblobline $bf $diffids]
    $ctext config -state normal
3956
    clear_ctext $commentend
P
Paul Mackerras 已提交
3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981
    $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
}

3982 3983
proc mergediff {id l} {
    global diffmergeid diffopts mdifffd
3984
    global diffids
3985
    global parentlist
3986

3987
    set diffmergeid $id
3988
    set diffids $id
3989
    # this doesn't seem to actually affect anything...
3990
    set env(GIT_DIFF_OPTS) $diffopts
3991
    set cmd [concat | git diff-tree --no-commit-id --cc $id]
3992 3993 3994
    if {[catch {set mdf [open $cmd r]} err]} {
	error_popup "Error getting merge diffs: $err"
	return
3995
    }
3996 3997
    fconfigure $mdf -blocking 0
    set mdifffd($id) $mdf
3998 3999
    set np [llength [lindex $parentlist $l]]
    fileevent $mdf readable [list getmergediffline $mdf $id $np]
4000
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
4001 4002
}

4003 4004
proc getmergediffline {mdf id np} {
    global diffmergeid ctext cflist nextupdate mergemax
4005
    global difffilestart mdifffd
4006

4007
    set n [gets $mdf line]
4008
    if {$n < 0} {
4009 4010
	if {[eof $mdf]} {
	    close $mdf
4011 4012 4013
	}
	return
    }
4014 4015
    if {![info exists diffmergeid] || $id != $diffmergeid
	|| $mdf != $mdifffd($id)} {
4016
	return
4017 4018
    }
    $ctext conf -state normal
4019 4020
    if {[regexp {^diff --cc (.*)} $line match fname]} {
	# start of a new file
4021 4022
	$ctext insert end "\n"
	set here [$ctext index "end - 1c"]
4023
	lappend difffilestart $here
P
Paul Mackerras 已提交
4024
	add_flist [list $fname]
4025
	set l [expr {(78 - [string length $fname]) / 2}]
4026
	set pad [string range "----------------------------------------" 1 $l]
4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045
	$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
4046
	    } else {
4047 4048
		set isbad 1
		break
4049
	    }
4050
	}
4051 4052 4053 4054 4055 4056 4057 4058 4059
	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]
4060
	}
4061 4062 4063
	if {$num ne {}} {
	    if {$num >= $mergemax} {
		set num "max"
4064
	    }
4065
	    lappend tags m$num
4066
	}
4067
	$ctext insert end "$line\n" $tags
4068 4069
    }
    $ctext conf -state disabled
4070 4071 4072 4073
    if {[clock clicks -milliseconds] >= $nextupdate} {
	incr nextupdate 100
	fileevent $mdf readable {}
	update
4074
	fileevent $mdf readable [list getmergediffline $mdf $id $np]
4075 4076 4077
    }
}

4078 4079
proc startdiff {ids} {
    global treediffs diffids treepending diffmergeid
4080

4081
    set diffids $ids
4082
    catch {unset diffmergeid}
4083
    if {![info exists treediffs($ids)]} {
4084
	if {![info exists treepending]} {
4085
	    gettreediffs $ids
4086 4087
	}
    } else {
4088
	addtocflist $ids
4089 4090 4091 4092
    }
}

proc addtocflist {ids} {
4093
    global treediffs cflist
P
Paul Mackerras 已提交
4094
    add_flist $treediffs($ids)
4095
    getblobdiffs $ids
4096 4097
}

4098
proc gettreediffs {ids} {
4099
    global treediff treepending
4100
    set treepending $ids
4101
    set treediff {}
4102
    if {[catch \
4103
	 {set gdtf [open [concat | git diff-tree --no-commit-id -r $ids] r]} \
4104
	]} return
4105
    fconfigure $gdtf -blocking 0
4106
    fileevent $gdtf readable [list gettreediffline $gdtf $ids]
4107 4108
}

4109
proc gettreediffline {gdtf ids} {
4110
    global treediff treediffs treepending diffids diffmergeid
P
Paul Mackerras 已提交
4111
    global cmitmode
4112

4113 4114 4115 4116
    set n [gets $gdtf line]
    if {$n < 0} {
	if {![eof $gdtf]} return
	close $gdtf
4117
	set treediffs($ids) $treediff
4118
	unset treepending
P
Paul Mackerras 已提交
4119 4120 4121
	if {$cmitmode eq "tree"} {
	    gettree $diffids
	} elseif {$ids != $diffids} {
4122 4123
	    if {![info exists diffmergeid]} {
		gettreediffs $diffids
4124
	    }
4125 4126
	} else {
	    addtocflist $ids
4127
	}
4128 4129
	return
    }
4130
    set file [lindex $line 5]
4131
    lappend treediff $file
4132 4133
}

4134
proc getblobdiffs {ids} {
4135
    global diffopts blobdifffd diffids env curdifftag curtagstart
4136
    global nextupdate diffinhdr treediffs
4137

4138
    set env(GIT_DIFF_OPTS) $diffopts
4139
    set cmd [concat | git diff-tree --no-commit-id -r -p -C $ids]
4140
    if {[catch {set bdf [open $cmd r]} err]} {
4141 4142 4143
	puts "error getting diffs: $err"
	return
    }
4144
    set diffinhdr 0
4145
    fconfigure $bdf -blocking 0
4146
    set blobdifffd($ids) $bdf
4147 4148 4149
    set curdifftag Comments
    set curtagstart 0.0
    fileevent $bdf readable [list getblobdiffline $bdf $diffids]
4150
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
4151 4152
}

4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165
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
    }
}

4166
proc getblobdiffline {bdf ids} {
4167
    global diffids blobdifffd ctext curdifftag curtagstart
4168 4169
    global diffnexthead diffnextnote difffilestart
    global nextupdate diffinhdr treediffs
4170

4171 4172 4173 4174
    set n [gets $bdf line]
    if {$n < 0} {
	if {[eof $bdf]} {
	    close $bdf
4175
	    if {$ids == $diffids && $bdf == $blobdifffd($ids)} {
4176 4177 4178 4179 4180
		$ctext tag add $curdifftag $curtagstart end
	    }
	}
	return
    }
4181
    if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
4182 4183 4184
	return
    }
    $ctext conf -state normal
4185
    if {[regexp {^diff --git a/(.*) b/(.*)} $line match fname newname]} {
4186 4187 4188
	# start of a new file
	$ctext insert end "\n"
	$ctext tag add $curdifftag $curtagstart end
4189
	set here [$ctext index "end - 1c"]
4190 4191
	set curtagstart $here
	set header $newname
4192 4193 4194 4195 4196 4197 4198 4199 4200
	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
	    }
4201
	}
4202 4203
	set curdifftag "f:$fname"
	$ctext tag delete $curdifftag
4204
	set l [expr {(78 - [string length $header]) / 2}]
4205
	set pad [string range "----------------------------------------" 1 $l]
4206
	$ctext insert end "$pad $header $pad\n" filesep
4207
	set diffinhdr 1
4208 4209 4210
    } elseif {$diffinhdr && [string compare -length 3 $line "---"] == 0} {
	# do nothing
    } elseif {$diffinhdr && [string compare -length 3 $line "+++"] == 0} {
4211
	set diffinhdr 0
4212 4213
    } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
		   $line match f1l f1c f2l f2c rest]} {
4214
	$ctext insert end "$line\n" hunksep
4215
	set diffinhdr 0
4216 4217 4218 4219 4220 4221 4222
    } 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"
4223
	} elseif {$diffinhdr || $x == "\\"} {
4224 4225
	    # e.g. "\ No newline at end of file"
	    $ctext insert end "$line\n" filesep
4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237
	} 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
4238 4239 4240 4241 4242 4243
    if {[clock clicks -milliseconds] >= $nextupdate} {
	incr nextupdate 100
	fileevent $bdf readable {}
	update
	fileevent $bdf readable "getblobdiffline $bdf {$ids}"
    }
4244 4245
}

4246 4247 4248
proc nextfile {} {
    global difffilestart ctext
    set here [$ctext index @0,0]
4249 4250 4251
    foreach loc $difffilestart {
	if {[$ctext compare $loc > $here]} {
	    $ctext yview $loc
4252 4253
	}
    }
4254 4255
}

4256 4257 4258
proc clear_ctext {{first 1.0}} {
    global ctext smarktop smarkbot

4259 4260 4261
    set l [lindex [split $first .] 0]
    if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} {
	set smarktop $l
4262
    }
4263 4264
    if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} {
	set smarkbot $l
4265 4266 4267 4268 4269
    }
    $ctext delete $first end
}

proc incrsearch {name ix op} {
4270
    global ctext searchstring searchdirn
4271 4272

    $ctext tag remove found 1.0 end
4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283
    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]
	}
    }
4284
    if {$searchstring ne {}} {
4285 4286 4287 4288
	set here [$ctext search $searchdirn -- $searchstring anchor]
	if {$here ne {}} {
	    $ctext see $here
	}
4289 4290 4291 4292 4293
	searchmarkvisible 1
    }
}

proc dosearch {} {
4294
    global sstring ctext searchstring searchdirn
4295 4296 4297

    focus $sstring
    $sstring icursor end
4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341
    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
4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379
    }
}

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} {
4380
    global searchstring
4381 4382 4383 4384 4385 4386 4387

    .ctop.cdet.left.sb set $f0 $f1
    if {$searchstring ne {}} {
	searchmarkvisible 0
    }
}

4388 4389
proc setcoords {} {
    global linespc charspc canvx0 canvy0 mainfont
4390
    global xspc1 xspc2 lthickness
4391

4392 4393
    set linespc [font metrics $mainfont -linespace]
    set charspc [font measure $mainfont "m"]
P
Paul Mackerras 已提交
4394 4395
    set canvy0 [expr {int(3 + 0.5 * $linespc)}]
    set canvx0 [expr {int(3 + 0.5 * $linespc)}]
4396
    set lthickness [expr {int($linespc / 9) + 1}]
4397 4398
    set xspc1(0) $linespc
    set xspc2 $linespc
4399
}
4400

4401
proc redisplay {} {
4402
    global canv
P
Paul Mackerras 已提交
4403 4404 4405 4406 4407 4408
    global selectedline

    set ymax [lindex [$canv cget -scrollregion] 3]
    if {$ymax eq {} || $ymax == 0} return
    set span [$canv yview]
    clear_display
4409
    setcanvscroll
P
Paul Mackerras 已提交
4410 4411 4412 4413
    allcanvs yview moveto [lindex $span 0]
    drawvisible
    if {[info exists selectedline]} {
	selectline $selectedline 0
4414 4415 4416 4417
    }
}

proc incrfont {inc} {
4418
    global mainfont textfont ctext canv phase
4419
    global stopped entries
4420 4421 4422 4423 4424 4425
    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]
4426 4427 4428
    foreach e $entries {
	$e conf -font $mainfont
    }
4429
    if {$phase eq "getcommits"} {
4430 4431 4432 4433
	$canv itemconf textitems -font $mainfont
    }
    redisplay
}
4434

4435 4436 4437 4438 4439 4440 4441
proc clearsha1 {} {
    global sha1entry sha1string
    if {[string length $sha1string] == 40} {
	$sha1entry delete 0 end
    }
}

4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458
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 {} {
4459
    global sha1string currentid commitrow tagids headids
4460
    global displayorder numcommits curview
4461

4462 4463 4464 4465
    if {$sha1string == {}
	|| ([info exists currentid] && $sha1string == $currentid)} return
    if {[info exists tagids($sha1string)]} {
	set id $tagids($sha1string)
4466 4467
    } elseif {[info exists headids($sha1string)]} {
	set id $headids($sha1string)
4468 4469
    } else {
	set id [string tolower $sha1string]
4470 4471
	if {[regexp {^[0-9a-f]{4,39}$} $id]} {
	    set matches {}
P
Paul Mackerras 已提交
4472 4473 4474
	    foreach i $displayorder {
		if {[string match $id* $i]} {
		    lappend matches $i
4475 4476 4477 4478 4479 4480 4481 4482 4483 4484
		}
	    }
	    if {$matches ne {}} {
		if {[llength $matches] > 1} {
		    error_popup "Short SHA1 id $id is ambiguous"
		    return
		}
		set id [lindex $matches 0]
	    }
	}
4485
    }
4486 4487
    if {[info exists commitrow($curview,$id)]} {
	selectline $commitrow($curview,$id) 1
4488 4489
	return
    }
4490
    if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
4491 4492
	set type "SHA1 id"
    } else {
4493
	set type "Tag/Head"
4494 4495 4496 4497
    }
    error_popup "$type $sha1string is not known"
}

4498 4499 4500 4501
proc lineenter {x y id} {
    global hoverx hovery hoverid hovertimer
    global commitinfo canv

P
Paul Mackerras 已提交
4502
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556
    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
F
Frank Sorenson 已提交
4557
    set t [$canv create text $x $y -anchor nw -text $text -tags hover -font $mainfont]
4558 4559 4560
    $canv raise $t
}

4561
proc clickisonarrow {id y} {
P
Paul Mackerras 已提交
4562
    global lthickness
4563

P
Paul Mackerras 已提交
4564
    set ranges [rowranges $id]
4565
    set thresh [expr {2 * $lthickness + 6}]
P
Paul Mackerras 已提交
4566
    set n [expr {[llength $ranges] - 1}]
4567
    for {set i 1} {$i < $n} {incr i} {
P
Paul Mackerras 已提交
4568
	set row [lindex $ranges $i]
4569 4570
	if {abs([yc $row] - $y) < $thresh} {
	    return $i
4571 4572 4573 4574 4575
	}
    }
    return {}
}

4576
proc arrowjump {id n y} {
P
Paul Mackerras 已提交
4577
    global canv
4578

4579 4580
    # 1 <-> 2, 3 <-> 4, etc...
    set n [expr {(($n - 1) ^ 1) + 1}]
P
Paul Mackerras 已提交
4581
    set row [lindex [rowranges $id] $n]
4582
    set yt [yc $row]
4583 4584 4585 4586 4587 4588 4589 4590
    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
    }
4591
    allcanvs yview moveto $yfrac
4592 4593
}

4594
proc lineclick {x y id isnew} {
4595
    global ctext commitinfo children canv thickerline curview
4596

P
Paul Mackerras 已提交
4597
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
4598
    unmarkmatches
4599
    unselectline
4600 4601 4602 4603
    normalline
    $canv delete hover
    # draw this line thicker than normal
    set thickerline $id
4604
    drawlines $id
4605
    if {$isnew} {
4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618
	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]
4619
    }
4620 4621
    # fill the details pane with info about this line
    $ctext conf -state normal
4622
    clear_ctext
4623 4624 4625 4626 4627 4628
    $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]
4629
    set info $commitinfo($id)
4630
    $ctext insert end "\n\t[lindex $info 0]\n"
4631
    $ctext insert end "\tAuthor:\t[lindex $info 1]\n"
P
Paul Mackerras 已提交
4632 4633
    set date [formatdate [lindex $info 2]]
    $ctext insert end "\tDate:\t$date\n"
4634
    set kids $children($curview,$id)
4635
    if {$kids ne {}} {
4636
	$ctext insert end "\nChildren:"
4637
	set i 0
4638
	foreach child $kids {
4639
	    incr i
P
Paul Mackerras 已提交
4640
	    if {![info exists commitinfo($child)] && ![getcommit $child]} continue
4641
	    set info $commitinfo($child)
4642 4643 4644 4645 4646
	    $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 已提交
4647 4648
	    set date [formatdate [lindex $info 2]]
	    $ctext insert end "\n\tDate:\t$date\n"
4649 4650 4651
	}
    }
    $ctext conf -state disabled
4652
    init_flist {}
4653 4654
}

4655 4656 4657
proc normalline {} {
    global thickerline
    if {[info exists thickerline]} {
4658
	set id $thickerline
4659
	unset thickerline
4660
	drawlines $id
4661 4662 4663
    }
}

4664
proc selbyid {id} {
4665 4666 4667
    global commitrow curview
    if {[info exists commitrow($curview,$id)]} {
	selectline $commitrow($curview,$id) 1
4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679
    }
}

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

4682 4683
    if {![info exists selectedline]
	|| $commitrow($curview,$id) eq $selectedline} {
4684 4685 4686 4687 4688 4689
	set state disabled
    } else {
	set state normal
    }
    $rowctxmenu entryconfigure 0 -state $state
    $rowctxmenu entryconfigure 1 -state $state
4690
    $rowctxmenu entryconfigure 2 -state $state
4691 4692 4693 4694 4695
    set rowmenuid $id
    tk_popup $rowctxmenu $x $y
}

proc diffvssel {dirn} {
4696
    global rowmenuid selectedline displayorder
4697 4698 4699

    if {![info exists selectedline]} return
    if {$dirn} {
4700
	set oldid [lindex $displayorder $selectedline]
4701 4702 4703
	set newid $rowmenuid
    } else {
	set oldid $rowmenuid
4704
	set newid [lindex $displayorder $selectedline]
4705
    }
4706 4707 4708 4709 4710
    addtohistory [list doseldiff $oldid $newid]
    doseldiff $oldid $newid
}

proc doseldiff {oldid newid} {
4711
    global ctext
4712 4713
    global commitinfo

4714
    $ctext conf -state normal
4715
    clear_ctext
4716
    init_flist "Top"
4717 4718 4719 4720 4721 4722 4723
    $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     "
4724
    $ctext insert end [lindex $commitinfo($oldid) 0]
4725 4726 4727 4728
    $ctext insert end "\n\nTo   "
    $ctext tag bind link1 <1> [list selbyid $newid]
    $ctext insert end $newid [list link link1]
    $ctext insert end "\n     "
4729 4730 4731 4732 4733
    $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
4734
    startdiff [list $oldid $newid]
4735 4736
}

4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749
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"
4750
    grid $top.title - -pady 10
4751
    label $top.from -text "From:"
4752
    entry $top.fromsha1 -width 40 -relief flat
4753 4754 4755
    $top.fromsha1 insert 0 $oldid
    $top.fromsha1 conf -state readonly
    grid $top.from $top.fromsha1 -sticky w
4756
    entry $top.fromhead -width 60 -relief flat
4757 4758 4759 4760
    $top.fromhead insert 0 $oldhead
    $top.fromhead conf -state readonly
    grid x $top.fromhead -sticky w
    label $top.to -text "To:"
4761
    entry $top.tosha1 -width 40 -relief flat
4762 4763 4764
    $top.tosha1 insert 0 $newid
    $top.tosha1 conf -state readonly
    grid $top.to $top.tosha1 -sticky w
4765
    entry $top.tohead -width 60 -relief flat
4766 4767 4768 4769 4770 4771 4772 4773 4774
    $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
4775
    grid $top.flab $top.fname -sticky w
4776 4777 4778 4779 4780 4781 4782
    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
4783
    focus $top.fname
4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807
}

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]
4808
    if {[catch {exec git diff-tree -p $oldid $newid >$fname &} err]} {
4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821
	error_popup "Error creating patch: $err"
    }
    catch {destroy $patchtop}
    unset patchtop
}

proc mkpatchcan {} {
    global patchtop

    catch {destroy $patchtop}
    unset patchtop
}

4822 4823 4824 4825 4826 4827 4828 4829
proc mktag {} {
    global rowmenuid mktagtop commitinfo

    set top .maketag
    set mktagtop $top
    catch {destroy $top}
    toplevel $top
    label $top.title -text "Create tag"
4830
    grid $top.title - -pady 10
4831
    label $top.id -text "ID:"
4832
    entry $top.sha1 -width 40 -relief flat
4833 4834 4835
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
4836
    entry $top.head -width 60 -relief flat
4837 4838 4839 4840
    $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:"
4841
    entry $top.tag -width 60
4842 4843 4844 4845 4846 4847 4848 4849 4850 4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866
    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 {
4867
	set dir [gitdir]
4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878
	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
4879 4880 4881 4882
    redrawtags $id
}

proc redrawtags {id} {
4883
    global canv linehtag commitrow idpos selectedline curview
P
Paul Mackerras 已提交
4884
    global mainfont
4885

4886 4887
    if {![info exists commitrow($curview,$id)]} return
    drawcmitrow $commitrow($curview,$id)
4888 4889
    $canv delete tag.$id
    set xt [eval drawtags $id $idpos($id)]
4890
    $canv coords $linehtag($commitrow($curview,$id)) $xt [lindex $idpos($id) 2]
P
Paul Mackerras 已提交
4891 4892 4893 4894 4895 4896
    set text [$canv itemcget $linehtag($commitrow($curview,$id)) -text]
    set xr [expr {$xt + [font measure $mainfont $text]}]
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
4897 4898
    if {[info exists selectedline]
	&& $selectedline == $commitrow($curview,$id)} {
4899
	selectline $selectedline 0
4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914
    }
}

proc mktagcan {} {
    global mktagtop

    catch {destroy $mktagtop}
    unset mktagtop
}

proc mktaggo {} {
    domktag
    mktagcan
}

4915 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969
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
}

P
Paul Mackerras 已提交
4970 4971 4972
# Stuff for finding nearby tags
proc getallcommits {} {
    global allcstart allcommits
4973

P
Paul Mackerras 已提交
4974 4975 4976 4977 4978 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 4989 4990 4991 4992 4993 4994 4995 4996 4997 4998 4999 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010
    set fd [open [concat | git rev-list --all --topo-order --parents] r]
    fconfigure $fd -blocking 0
    set allcommits "reading"
    nowbusy allcommits
    restartgetall $fd
}

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
	    }
	}
5011
    }
P
Paul Mackerras 已提交
5012 5013 5014 5015 5016 5017 5018 5019 5020 5021 5022 5023 5024 5025 5026 5027 5028 5029 5030 5031 5032 5033 5034 5035 5036 5037
    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
	    }
	}
5038
    }
P
Paul Mackerras 已提交
5039 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058 5059 5060 5061 5062 5063 5064 5065 5066 5067 5068 5069 5070 5071 5072 5073 5074 5075 5076 5077 5078 5079 5080 5081 5082 5083 5084 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 5110 5111 5112 5113 5114 5115 5116 5117 5118 5119 5120 5121 5122 5123
    return $res
}

proc getallclines {fd} {
    global allparents allchildren allcommits allcstart
    global desc_tags anc_tags idtags alldtags tagisdesc allids

    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
	set dtags {}
	foreach child $allchildren($id) {
	    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 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 {[clock clicks -milliseconds] - $allcstart >= 50} {
	    fileevent $fd readable {}
	    after idle restartgetall $fd
	    return
	}
    }
    if {[eof $fd]} {
	after idle restartatags [llength $allids]
	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
proc restartatags {i} {
    global allids allparents idtags anc_tags t0

    set t0 [clock clicks -milliseconds]
    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} {
	    after idle restartatags $i
	    return
	}
5124
    }
P
Paul Mackerras 已提交
5125 5126 5127
    set allcommits "done"
    notbusy allcommits
    dispneartags
5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 5143 5144 5145 5146 5147 5148 5149 5150
}

proc rereadrefs {} {
    global idtags idheads idotherrefs

    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]
	}
    }
    readrefs
    set refids [lsort -unique [concat $refids [array names idtags] \
			[array names idheads] [array names idotherrefs]]]
    foreach id $refids {
	set v [listrefs $id]
	if {![info exists ref($id)] || $ref($id) != $v} {
	    redrawtags $id
	}
    }
}

5151
proc showtag {tag isnew} {
5152
    global ctext tagcontents tagids linknum
5153 5154 5155 5156 5157

    if {$isnew} {
	addtohistory [list showtag $tag 0]
    }
    $ctext conf -state normal
5158
    clear_ctext
5159 5160 5161 5162 5163 5164
    set linknum 0
    if {[info exists tagcontents($tag)]} {
	set text $tagcontents($tag)
    } else {
	set text "Tag: $tag\nId:  $tagids($tag)"
    }
5165
    appendwithlinks $text {}
5166
    $ctext conf -state disabled
5167
    init_flist {}
5168 5169
}

5170 5171 5172 5173 5174
proc doquit {} {
    global stopped
    set stopped 100
    destroy .
}
5175

5176
proc doprefs {} {
5177
    global maxwidth maxgraphpct diffopts
P
Paul Mackerras 已提交
5178
    global oldprefs prefstop showneartags
P
Paul Mackerras 已提交
5179

5180 5181 5182 5183 5184
    set top .gitkprefs
    set prefstop $top
    if {[winfo exists $top]} {
	raise $top
	return
5185
    }
P
Paul Mackerras 已提交
5186
    foreach v {maxwidth maxgraphpct diffopts showneartags} {
5187
	set oldprefs($v) [set $v]
P
Paul Mackerras 已提交
5188
    }
5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207
    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
    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 已提交
5208 5209 5210 5211 5212
    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
5213 5214 5215 5216 5217 5218 5219 5220 5221 5222
    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
}

proc prefscan {} {
5223
    global maxwidth maxgraphpct diffopts
P
Paul Mackerras 已提交
5224
    global oldprefs prefstop showneartags
5225

P
Paul Mackerras 已提交
5226
    foreach v {maxwidth maxgraphpct diffopts showneartags} {
5227 5228 5229 5230 5231 5232 5233 5234
	set $v $oldprefs($v)
    }
    catch {destroy $prefstop}
    unset prefstop
}

proc prefsok {} {
    global maxwidth maxgraphpct
P
Paul Mackerras 已提交
5235
    global oldprefs prefstop showneartags
5236 5237 5238 5239 5240 5241

    catch {destroy $prefstop}
    unset prefstop
    if {$maxwidth != $oldprefs(maxwidth)
	|| $maxgraphpct != $oldprefs(maxgraphpct)} {
	redisplay
P
Paul Mackerras 已提交
5242 5243
    } elseif {$showneartags != $oldprefs(showneartags)} {
	reselectline
5244 5245 5246 5247 5248
    }
}

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

5251 5252 5253 5254 5255 5256 5257 5258 5259 5260 5261 5262 5263 5264 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 5309 5310 5311 5312 5313 5314 5315 5316 5317 5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337 5338 5339 5340 5341 5342 5343 5344 5345 5346 5347 5348 5349 5350 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364 5365 5366 5367 5368 5369 5370 5371 5372 5373 5374 5375 5376 5377 5378 5379 5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392 5393 5394 5395 5396 5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423 5424 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 5451 5452 5453 5454 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 5492 5493 5494 5495 5496 5497 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507 5508 5509 5510 5511 5512 5513 5514 5515 5516 5517 5518 5519 5520 5521 5522 5523
# 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 {}
}

5524 5525 5526
# defaults...
set datemode 0
set diffopts "-U 5 -p"
5527
set wrcomcmd "git diff-tree --stdin -p --pretty"
5528

5529
set gitencoding {}
5530
catch {
5531
    set gitencoding [exec git repo-config --get i18n.commitencoding]
5532 5533
}
if {$gitencoding == ""} {
5534 5535 5536 5537 5538
    set gitencoding "utf-8"
}
set tclencoding [tcl_encoding $gitencoding]
if {$tclencoding == {}} {
    puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
5539
}
5540

5541 5542
set mainfont {Helvetica 9}
set textfont {Courier 9}
5543
set uifont {Helvetica 9 bold}
5544
set findmergefiles 0
5545
set maxgraphpct 50
5546
set maxwidth 16
P
Paul Mackerras 已提交
5547
set revlistorder 0
5548
set fastdate 0
P
Paul Mackerras 已提交
5549 5550 5551
set uparrowlen 7
set downarrowlen 7
set mingaplen 30
P
Paul Mackerras 已提交
5552
set cmitmode "patch"
5553
set wrapcomment "none"
P
Paul Mackerras 已提交
5554
set showneartags 1
5555 5556 5557 5558 5559

set colors {green red blue magenta darkgrey brown orange}

catch {source ~/.gitk}

5560
font create optionfont -family sans-serif -size -12
5561

5562 5563 5564 5565 5566 5567 5568 5569 5570
set revtreeargs {}
foreach arg $argv {
    switch -regexp -- $arg {
	"^$" { }
	"^-d" { set datemode 1 }
	default {
	    lappend revtreeargs $arg
	}
    }
5571
}
5572

P
Paul Mackerras 已提交
5573 5574 5575
# check that we can find a .git directory somewhere...
set gitdir [gitdir]
if {![file isdirectory $gitdir]} {
P
Paul Mackerras 已提交
5576
    show_error {} . "Cannot find the git directory \"$gitdir\"."
P
Paul Mackerras 已提交
5577 5578 5579
    exit 1
}

5580 5581 5582 5583 5584 5585 5586
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 {
5587
	set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs]
5588 5589 5590 5591 5592 5593 5594 5595
	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 已提交
5596
	    set err [string range $err [expr {$i + 6}] end]
5597
	}
P
Paul Mackerras 已提交
5598
	show_error {} . "Bad arguments to gitk:\n$err"
5599 5600 5601 5602
	exit 1
    }
}

5603 5604
set history {}
set historyindex 0
5605 5606
set fh_serial 0
set nhl_names {}
5607
set highlight_paths {}
5608
set searchdirn -forwards
5609 5610
set boldrows {}
set boldnamerows {}
5611

P
Paul Mackerras 已提交
5612 5613
set optim_delay 16

P
Paul Mackerras 已提交
5614 5615
set nextviewnum 1
set curview 0
5616
set selectedview 0
5617
set selectedhlview None
P
Paul Mackerras 已提交
5618
set viewfiles(0) {}
5619
set viewperm(0) 0
5620
set viewargs(0) {}
P
Paul Mackerras 已提交
5621

5622
set cmdlineok 0
5623
set stopped 0
5624
set stuffsaved 0
5625
set patchnum 0
5626
setcoords
5627
makewindow
5628
readrefs
5629

5630
if {$cmdline_files ne {} || $revtreeargs ne {}} {
P
Paul Mackerras 已提交
5631 5632
    # create a view for the files/dirs specified on the command line
    set curview 1
5633
    set selectedview 1
P
Paul Mackerras 已提交
5634 5635 5636
    set nextviewnum 2
    set viewname(1) "Command line"
    set viewfiles(1) $cmdline_files
5637
    set viewargs(1) $revtreeargs
5638
    set viewperm(1) 0
5639
    addviewmenu 1
P
Paul Mackerras 已提交
5640
    .bar.view entryconf 2 -state normal
5641
    .bar.view entryconf 3 -state normal
P
Paul Mackerras 已提交
5642
}
5643 5644 5645 5646 5647 5648 5649

if {[info exists permviews]} {
    foreach v $permviews {
	set n $nextviewnum
	incr nextviewnum
	set viewname($n) [lindex $v 0]
	set viewfiles($n) [lindex $v 1]
5650
	set viewargs($n) [lindex $v 2]
5651
	set viewperm($n) 1
5652
	addviewmenu $n
5653 5654
    }
}
5655
getcommits