gitk 131.3 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 revtreeargs 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 $revtreeargs
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 38
	set fd [open [concat | git-rev-list --header $order \
			  --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 73 74 75 76
    $canv delete all
    $canv create text 3 3 -anchor nw -text "Reading commits..." \
	-font $mainfont -tags textitems
}

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

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

193
proc doupdate {} {
194
    global commfd nextupdate numcommits ncmupdate
195

196 197
    foreach v [array names commfd] {
	fileevent $commfd($v) readable {}
198
    }
199
    update
200 201 202 203 204 205 206 207
    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}]
    }
208 209 210
    foreach v [array names commfd] {
	set fd $commfd($v)
	fileevent $fd readable [list getcommitlines $fd $v]
211
    }
212 213 214
}

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

P
Paul Mackerras 已提交
219
proc updatecommits {} {
220 221
    global viewdata curview revtreeargs phase displayorder
    global children commitrow
P
Paul Mackerras 已提交
222

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

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

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

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

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

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

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

355 356 357 358 359 360 361 362 363
proc error_popup msg {
    set w .error
    toplevel $w
    wm transient $w .
    message $w.m -text $msg -justify center -aspect 400
    pack $w.m -side top -fill x -padx 20 -pady 20
    button $w.ok -text OK -command "destroy $w"
    pack $w.ok -side bottom -fill x
    bind $w <Visibility> "grab $w; focus $w"
364
    bind $w <Key-Return> "destroy $w"
365 366 367
    tkwait window $w
}

368
proc makewindow {} {
369 370
    global canv canv2 canv3 linespc charspc ctext cflist
    global textfont mainfont uifont
371
    global findtype findtypemenu findloc findstring fstring geometry
372
    global entries sha1entry sha1string sha1but
373
    global maincursor textcursor curtextcursor
374
    global rowctxmenu mergemax
375 376 377

    menu .bar
    .bar add cascade -label "File" -menu .bar.file
378
    .bar configure -font $uifont
379
    menu .bar.file
P
Paul Mackerras 已提交
380
    .bar.file add command -label "Update" -command updatecommits
381
    .bar.file add command -label "Reread references" -command rereadrefs
382
    .bar.file add command -label "Quit" -command doquit
383
    .bar.file configure -font $uifont
384 385 386
    menu .bar.edit
    .bar add cascade -label "Edit" -menu .bar.edit
    .bar.edit add command -label "Preferences" -command doprefs
387
    .bar.edit configure -font $uifont
388

389
    menu .bar.view -font $uifont
390
    menu .bar.view.hl -font $uifont -tearoff 0
P
Paul Mackerras 已提交
391
    .bar add cascade -label "View" -menu .bar.view
392 393 394
    .bar.view add command -label "New view..." -command {newview 0}
    .bar.view add command -label "Edit view..." -command editview \
	-state disabled
P
Paul Mackerras 已提交
395
    .bar.view add command -label "Delete view" -command delview -state disabled
396
    .bar.view add cascade -label "Highlight" -menu .bar.view.hl
P
Paul Mackerras 已提交
397
    .bar.view add separator
398 399
    .bar.view add radiobutton -label "All files" -command {showview 0} \
	-variable selectedview -value 0
400 401 402 403 404
    .bar.view.hl add command -label "New view..." -command {newview 1}
    .bar.view.hl add command -label "Remove" -command delhighlight \
	-state disabled
    .bar.view.hl add separator
    
405 406 407
    menu .bar.help
    .bar add cascade -label "Help" -menu .bar.help
    .bar.help add command -label "About gitk" -command about
408
    .bar.help add command -label "Key bindings" -command keys
409
    .bar.help configure -font $uifont
410 411
    . configure -menu .bar

412
    if {![info exists geometry(canv1)]} {
J
Jeff Hobbs 已提交
413 414 415 416
	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}]
417 418 419 420
	set geometry(ctextw) 80
	set geometry(ctexth) 30
	set geometry(cflistw) 30
    }
P
Paul Mackerras 已提交
421
    panedwindow .ctop -orient vertical
422 423
    if {[info exists geometry(width)]} {
	.ctop conf -width $geometry(width) -height $geometry(height)
424 425 426
	set texth [expr {$geometry(height) - $geometry(canvh) - 56}]
	set geometry(ctexth) [expr {($texth - 8) /
				    [font metrics $textfont -linespace]}]
427
    }
428 429 430 431 432 433 434 435 436 437
    frame .ctop.top
    frame .ctop.top.bar
    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
438
    canvas $canv -height $geometry(canvh) -width $geometry(canv1) \
439
	-bg white -bd 0 \
P
Paul Mackerras 已提交
440
	-yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
441 442
    .ctop.top.clist add $canv
    set canv2 .ctop.top.clist.canv2
443
    canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \
444
	-bg white -bd 0 -yscrollincr $linespc
445 446
    .ctop.top.clist add $canv2
    set canv3 .ctop.top.clist.canv3
447
    canvas $canv3 -height $geometry(canvh) -width $geometry(canv3) \
448
	-bg white -bd 0 -yscrollincr $linespc
449
    .ctop.top.clist add $canv3
450
    bind .ctop.top.clist <Configure> {resizeclistpanes %W %w}
451 452

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

    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

486
    button .ctop.top.bar.findbut -text "Find" -command dofind -font $uifont
487 488
    pack .ctop.top.bar.findbut -side left
    set findstring {}
489
    set fstring .ctop.top.bar.findstring
490
    lappend entries $fstring
491
    entry $fstring -width 30 -font $textfont -textvariable findstring -font $textfont
492
    pack $fstring -side left -expand 1 -fill x
493
    set findtype Exact
494 495
    set findtypemenu [tk_optionMenu .ctop.top.bar.findtype \
			  findtype Exact IgnCase Regexp]
496 497
    .ctop.top.bar.findtype configure -font $uifont
    .ctop.top.bar.findtype.menu configure -font $uifont
498 499
    set findloc "All fields"
    tk_optionMenu .ctop.top.bar.findloc findloc "All fields" Headline \
500
	Comments Author Committer Files Pickaxe
501 502 503
    .ctop.top.bar.findloc configure -font $uifont
    .ctop.top.bar.findloc.menu configure -font $uifont

504 505
    pack .ctop.top.bar.findloc -side right
    pack .ctop.top.bar.findtype -side right
506 507
    # for making sure type==Exact whenever loc==Pickaxe
    trace add variable findloc write findlocchange
508

509 510
    panedwindow .ctop.cdet -orient horizontal
    .ctop add .ctop.cdet
511 512
    frame .ctop.cdet.left
    set ctext .ctop.cdet.left.ctext
513 514
    text $ctext -bg white -state disabled -font $textfont \
	-width $geometry(ctextw) -height $geometry(ctexth) \
515
	-yscrollcommand {.ctop.cdet.left.sb set} -wrap none
516 517 518 519 520
    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

521
    $ctext tag conf filesep -font [concat $textfont bold] -back "#aaaaaa"
522 523 524 525 526 527 528 529
    $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
530 531 532 533 534 535 536 537 538 539 540
    $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"
541
    $ctext tag conf mmax -fore darkgrey
542
    set mergemax 16
543 544 545
    $ctext tag conf mresult -font [concat $textfont bold]
    $ctext tag conf msep -font [concat $textfont bold]
    $ctext tag conf found -back yellow
546

547
    frame .ctop.cdet.right
P
Paul Mackerras 已提交
548 549 550 551 552 553 554
    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
555
    set cflist .ctop.cdet.right.cfiles
556 557 558 559 560 561
    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
562 563 564
    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
565 566
    $cflist tag configure highlight \
	-background [$cflist cget -selectbackground]
567
    .ctop.cdet add .ctop.cdet.right
568
    bind .ctop.cdet <Configure> {resizecdetpanes %W %w}
569

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

572 573
    bindall <1> {selcanvline %W %x %y}
    #bindall <B1-Motion> {selcanvline %W %x %y}
574 575
    bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
    bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
576 577
    bindall <2> "canvscan mark %W %x %y"
    bindall <B2-Motion> "canvscan dragto %W %x %y"
578 579
    bindkey <Home> selfirstline
    bindkey <End> sellastline
580 581
    bind . <Key-Up> "selnextline -1"
    bind . <Key-Down> "selnextline 1"
582 583 584 585 586 587 588 589 590 591
    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"
592 593 594
    bindkey <Key-Delete> "$ctext yview scroll -1 pages"
    bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
    bindkey <Key-space> "$ctext yview scroll 1 pages"
595 596
    bindkey p "selnextline -1"
    bindkey n "selnextline 1"
R
Robert Suetterlin 已提交
597 598 599 600 601 602
    bindkey z "goback"
    bindkey x "goforw"
    bindkey i "selnextline -1"
    bindkey k "selnextline 1"
    bindkey j "goback"
    bindkey l "goforw"
603 604 605
    bindkey b "$ctext yview scroll -1 pages"
    bindkey d "$ctext yview scroll 18 units"
    bindkey u "$ctext yview scroll -18 units"
606 607
    bindkey / {findnext 1}
    bindkey <Key-Return> {findnext 0}
608
    bindkey ? findprev
609
    bindkey f nextfile
610
    bind . <Control-q> doquit
611
    bind . <Control-f> dofind
612
    bind . <Control-g> {findnext 0}
613
    bind . <Control-r> findprev
614 615 616 617
    bind . <Control-equal> {incrfont 1}
    bind . <Control-KP_Add> {incrfont 1}
    bind . <Control-minus> {incrfont -1}
    bind . <Control-KP_Subtract> {incrfont -1}
618
    bind . <Destroy> {savestuff %W}
619
    bind . <Button-1> "click %W"
620
    bind $fstring <Key-Return> dofind
621
    bind $sha1entry <Key-Return> gotocommit
622
    bind $sha1entry <<PasteSelection>> clearsha1
623 624
    bind $cflist <1> {sel_flist %W %x %y; break}
    bind $cflist <B1-Motion> {sel_flist %W %x %y; break}
P
Paul Mackerras 已提交
625
    bind $cflist <ButtonRelease-1> {treeclick %W %x %y}
626 627 628

    set maincursor [. cget -cursor]
    set textcursor [$ctext cget -cursor]
629
    set curtextcursor $textcursor
630

631 632 633 634 635 636
    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}
637
    $rowctxmenu add command -label "Make patch" -command mkpatch
638
    $rowctxmenu add command -label "Create tag" -command mktag
639
    $rowctxmenu add command -label "Write commit to file" -command writecommit
640 641
}

642 643 644 645 646 647 648 649 650 651 652 653 654
# 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 已提交
655 656 657 658 659
proc scrollcanv {cscroll f0 f1} {
    $cscroll set $f0 $f1
    drawfrac $f0 $f1
}

660 661 662 663
# 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} {
664
    global entries
665 666 667 668 669
    bind . $ev $script
    set escript [bind Entry $ev]
    if {$escript == {}} {
	set escript [bind Entry <Key>]
    }
670 671 672
    foreach e $entries {
	bind $e $ev "$escript; break"
    }
673 674 675
}

# set the focus back to the toplevel for any click outside
676
# the entry widgets
677
proc click {w} {
678 679 680
    global entries
    foreach e $entries {
	if {$w == $e} return
681
    }
682
    focus .
683 684 685
}

proc savestuff {w} {
686
    global canv canv2 canv3 ctext cflist mainfont textfont uifont
687
    global stuffsaved findmergefiles maxgraphpct
688
    global maxwidth
689
    global viewname viewfiles viewperm nextviewnum
P
Paul Mackerras 已提交
690
    global cmitmode
691

692
    if {$stuffsaved} return
693
    if {![winfo viewable .]} return
694 695
    catch {
	set f [open "~/.gitk-new" w]
696 697
	puts $f [list set mainfont $mainfont]
	puts $f [list set textfont $textfont]
698
	puts $f [list set uifont $uifont]
699
	puts $f [list set findmergefiles $findmergefiles]
700
	puts $f [list set maxgraphpct $maxgraphpct]
701
	puts $f [list set maxwidth $maxwidth]
P
Paul Mackerras 已提交
702
	puts $f [list set cmitmode $cmitmode]
703 704
	puts $f "set geometry(width) [winfo width .ctop]"
	puts $f "set geometry(height) [winfo height .ctop]"
J
Jeff Hobbs 已提交
705 706 707 708
	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}]"
709 710 711 712 713 714
	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"
715 716 717 718 719 720 721
	puts -nonewline $f "set permviews {"
	for {set v 0} {$v < $nextviewnum} {incr v} {
	    if {$viewperm($v)} {
		puts $f "{[list $viewname($v) $viewfiles($v)]}"
	    }
	}
	puts $f "}"
722 723 724 725
	close $f
	file rename -force "~/.gitk-new" "~/.gitk"
    }
    set stuffsaved 1
726 727
}

728 729
proc resizeclistpanes {win w} {
    global oldwidth
730
    if {[info exists oldwidth($win)]} {
731 732 733 734 735 736 737 738 739 740 741 742 743
	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 已提交
744
		set sash1 [expr {$sash0 + 20}]
745 746
	    }
	    if {$sash1 > $w - 10} {
J
Jeff Hobbs 已提交
747
		set sash1 [expr {$w - 10}]
748
		if {$sash0 > $sash1 - 20} {
J
Jeff Hobbs 已提交
749
		    set sash0 [expr {$sash1 - 20}]
750 751 752 753 754 755 756 757 758 759 760
		}
	    }
	}
	$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
761
    if {[info exists oldwidth($win)]} {
762 763 764 765 766 767 768 769 770 771
	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 已提交
772
		set sash0 [expr {$w - 15}]
773 774 775 776 777 778 779
	    }
	}
	$win sash place 0 $sash0 [lindex $s0 1]
    }
    set oldwidth($win) $w
}

780 781 782 783 784 785 786 787 788 789 790 791 792 793
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
}

794 795 796 797 798 799 800 801 802
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 已提交
803
Gitk - a commit viewer for git
804

P
Paul Mackerras 已提交
805
Copyright  2005-2006 Paul Mackerras
806

807
Use and redistribute under the terms of the GNU General Public License} \
808 809 810 811 812 813
	    -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
}

814 815 816 817 818 819 820 821 822 823 824 825
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
826 827
<Home>		Move to first commit
<End>		Move to last commit
828 829 830 831
<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
832 833 834 835 836 837 838 839
<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
840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862
<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
<Ctrl-R>		Move to previous 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
<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
}

863 864
# Procedures for manipulating the file list window at the
# bottom right of the overall window.
P
Paul Mackerras 已提交
865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 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 981 982 983 984 985 986 987 988 989 990 991 992 993 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 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 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 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094

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
		$w insert end $d
		$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
		$w insert end $tail
	    }
	    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
	}
    }
}

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) {
	if {[string index $e end] eq "/"} {
	    set de $dir$e
	    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
	    $w insert e:$ix $e
	    $w mark set s:$iy e:$ix
	    $w mark gravity s:$iy left
	    set treeheight($de) 1
	} else {
	    $w insert e:$ix $str
	    $w insert e:$ix $e
	}
    }
    $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};
}

1095
proc init_flist {first} {
1096
    global cflist cflist_top selectedline difffilestart
1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110

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

P
Paul Mackerras 已提交
1111
proc add_flist {fl} {
1112 1113 1114 1115
    global flistmode cflist

    $cflist conf -state normal
    if {$flistmode eq "flat"} {
P
Paul Mackerras 已提交
1116 1117 1118
	foreach f $fl {
	    $cflist insert end "\n$f"
	}
1119 1120 1121 1122 1123
    }
    $cflist conf -state disabled
}

proc sel_flist {w x y} {
P
Paul Mackerras 已提交
1124
    global flistmode ctext difffilestart cflist cflist_top cmitmode
1125

P
Paul Mackerras 已提交
1126
    if {$cmitmode eq "tree"} return
1127 1128
    if {![info exists cflist_top]} return
    set l [lindex [split [$w index "@$x,$y"] "."] 0]
1129 1130 1131
    $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 已提交
1132 1133 1134 1135
    if {$l == 1} {
	$ctext yview 1.0
    } else {
	catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
1136 1137 1138 1139 1140
    }
}

# Code to implement multiple views

1141 1142
proc newview {ishighlight} {
    global nextviewnum newviewname newviewperm uifont newishighlight
P
Paul Mackerras 已提交
1143

1144
    set newishighlight $ishighlight
P
Paul Mackerras 已提交
1145 1146 1147 1148 1149
    set top .gitkview
    if {[winfo exists $top]} {
	raise $top
	return
    }
1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172
    set newviewname($nextviewnum) "View $nextviewnum"
    set newviewperm($nextviewnum) 0
    vieweditor $top $nextviewnum "Gitk view definition" 
}

proc editview {} {
    global curview
    global viewname viewperm newviewname newviewperm

    set top .gitkvedit-$curview
    if {[winfo exists $top]} {
	raise $top
	return
    }
    set newviewname($curview) $viewname($curview)
    set newviewperm($curview) $viewperm($curview)
    vieweditor $top $curview "Gitk: edit view $viewname($curview)"
}

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

P
Paul Mackerras 已提交
1173
    toplevel $top
1174
    wm title $top $title
1175
    label $top.nl -text "Name" -font $uifont
1176
    entry $top.name -width 20 -textvariable newviewname($n)
1177
    grid $top.nl $top.name -sticky w -pady 5
1178
    checkbutton $top.perm -text "Remember this view" -variable newviewperm($n)
1179 1180 1181 1182 1183
    grid $top.perm - -pady 5 -sticky w
    message $top.l -aspect 500 -font $uifont \
	-text "Enter files and directories to include, one per line:"
    grid $top.l - -sticky w
    text $top.t -width 40 -height 10 -background white
1184 1185 1186 1187 1188 1189 1190 1191
    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
    }
1192
    grid $top.t - -sticky w -padx 5
P
Paul Mackerras 已提交
1193
    frame $top.buts
1194 1195
    button $top.buts.ok -text "OK" -command [list newviewok $top $n]
    button $top.buts.can -text "Cancel" -command [list destroy $top]
P
Paul Mackerras 已提交
1196 1197 1198 1199 1200 1201 1202
    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
}

1203 1204 1205 1206 1207 1208
proc doviewmenu {m first cmd op args} {
    set nmenu [$m index end]
    for {set i $first} {$i <= $nmenu} {incr i} {
	if {[$m entrycget $i -command] eq $cmd} {
	    eval $m $op $i $args
	    break
1209 1210
	}
    }
1211 1212 1213 1214 1215
}

proc allviewmenus {n op args} {
    doviewmenu .bar.view 6 [list showview $n] $op $args
    doviewmenu .bar.view.hl 3 [list addhighlight $n] $op $args
1216 1217 1218
}

proc newviewok {top n} {
1219
    global nextviewnum newviewperm newviewname newishighlight
1220
    global viewname viewfiles viewperm selectedview curview
P
Paul Mackerras 已提交
1221 1222

    set files {}
1223
    foreach f [split [$top.t get 0.0 end] "\n"] {
P
Paul Mackerras 已提交
1224 1225 1226 1227 1228
	set ft [string trim $f]
	if {$ft ne {}} {
	    lappend files $ft
	}
    }
1229 1230 1231 1232 1233 1234
    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
1235 1236 1237 1238 1239 1240
	addviewmenu $n
	if {!$newishighlight} {
	    after idle showview $n
	} else {
	    after idle addhighlight $n
	}
1241 1242 1243 1244 1245
    } else {
	# editing an existing view
	set viewperm($n) $newviewperm($n)
	if {$newviewname($n) ne $viewname($n)} {
	    set viewname($n) $newviewname($n)
1246
	    allviewmenus $n entryconf -label $viewname($n)
1247 1248 1249 1250 1251 1252 1253 1254 1255
	}
	if {$files ne $viewfiles($n)} {
	    set viewfiles($n) $files
	    if {$curview == $n} {
		after idle updatecommits
	    }
	}
    }
    catch {destroy $top}
P
Paul Mackerras 已提交
1256 1257 1258
}

proc delview {} {
1259
    global curview viewdata viewperm
P
Paul Mackerras 已提交
1260 1261

    if {$curview == 0} return
1262
    allviewmenus $curview delete
P
Paul Mackerras 已提交
1263
    set viewdata($curview) {}
1264
    set viewperm($curview) 0
P
Paul Mackerras 已提交
1265 1266 1267
    showview 0
}

1268 1269 1270 1271 1272 1273 1274 1275 1276
proc addviewmenu {n} {
    global viewname

    .bar.view add radiobutton -label $viewname($n) \
	-command [list showview $n] -variable selectedview -value $n
    .bar.view.hl add radiobutton -label $viewname($n) \
	-command [list addhighlight $n] -variable selectedhlview -value $n
}

1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295
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 已提交
1296 1297 1298
proc showview {n} {
    global curview viewdata viewfiles
    global displayorder parentlist childlist rowidlist rowoffsets
1299
    global colormap rowtextx commitrow nextcolor canvxmax
P
Paul Mackerras 已提交
1300 1301 1302
    global numcommits rowrangelist commitlisted idrowranges
    global selectedline currentid canv canvy0
    global matchinglines treediffs
1303
    global pending_select phase
1304
    global commitidx rowlaidout rowoptim linesegends
1305
    global commfd nextupdate
1306 1307
    global selectedview hlview selectedhlview
    global vparentlist vchildlist vdisporder vcmitlisted
P
Paul Mackerras 已提交
1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324

    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
1325
    normalline
P
Paul Mackerras 已提交
1326
    stopfindproc
1327
    if {$curview >= 0} {
1328 1329 1330 1331
	set vparentlist($curview) $parentlist
	set vchildlist($curview) $childlist
	set vdisporder($curview) $displayorder
	set vcmitlisted($curview) $commitlisted
1332 1333
	if {$phase ne {}} {
	    set viewdata($curview) \
1334 1335 1336
		[list $phase $rowidlist $rowoffsets $rowrangelist \
		     [flatten idrowranges] [flatten idinlist] \
		     $rowlaidout $rowoptim $numcommits $linesegends]
1337 1338
	} elseif {![info exists viewdata($curview)]
		  || [lindex $viewdata($curview) 0] ne {}} {
1339
	    set viewdata($curview) \
1340
		[list {} $rowidlist $rowoffsets $rowrangelist]
1341
	}
P
Paul Mackerras 已提交
1342 1343 1344 1345 1346 1347
    }
    catch {unset matchinglines}
    catch {unset treediffs}
    clear_display

    set curview $n
1348
    set selectedview $n
1349 1350
    set selectedhlview -1
    .bar.view entryconf 1 -state [expr {$n == 0? "disabled": "normal"}]
P
Paul Mackerras 已提交
1351
    .bar.view entryconf 2 -state [expr {$n == 0? "disabled": "normal"}]
1352 1353
    catch {unset hlview}
    .bar.view.hl entryconf 1 -state disabled
P
Paul Mackerras 已提交
1354 1355

    if {![info exists viewdata($n)]} {
1356
	set pending_select $selid
1357
	getcommits
P
Paul Mackerras 已提交
1358 1359 1360
	return
    }

1361 1362
    set v $viewdata($n)
    set phase [lindex $v 0]
1363 1364 1365 1366 1367 1368 1369
    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]
1370 1371 1372 1373
    if {$phase eq {}} {
	set numcommits [llength $displayorder]
	catch {unset idrowranges}
    } else {
1374 1375 1376 1377 1378 1379
	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]
1380 1381
    }

P
Paul Mackerras 已提交
1382 1383
    catch {unset colormap}
    catch {unset rowtextx}
1384 1385
    set nextcolor 0
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
1386 1387 1388 1389 1390
    set curview $n
    set row 0
    setcanvscroll
    set yf 0
    set row 0
1391 1392
    if {$selid ne {} && [info exists commitrow($n,$selid)]} {
	set row $commitrow($n,$selid)
P
Paul Mackerras 已提交
1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403
	# 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
1404
    if {$phase ne {}} {
1405 1406 1407 1408 1409
	if {$phase eq "getcommits"} {
	    global mainfont
	    $canv create text 3 3 -anchor nw -text "Reading commits..." \
		-font $mainfont -tags textitems
	}
1410 1411 1412 1413 1414
	if {[info exists commfd($n)]} {
	    layoutmore
	} else {
	    finishcommits
	}
1415
    }
P
Paul Mackerras 已提交
1416 1417
}

1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495
proc addhighlight {n} {
    global hlview curview viewdata highlighted highlightedrows
    global selectedhlview

    if {[info exists hlview]} {
	delhighlight
    }
    set hlview $n
    set selectedhlview $n
    .bar.view.hl entryconf 1 -state normal
    set highlighted($n) 0
    set highlightedrows {}
    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
    } else {
	highlightmore
    }
}

proc delhighlight {} {
    global hlview highlightedrows canv linehtag mainfont
    global selectedhlview selectedline

    if {![info exists hlview]} return
    unset hlview
    set selectedhlview {}
    .bar.view.hl entryconf 1 -state disabled
    foreach l $highlightedrows {
	$canv itemconf $linehtag($l) -font $mainfont
	if {$l == $selectedline} {
	    $canv delete secsel
	    set t [eval $canv create rect [$canv bbox $linehtag($l)] \
		       -outline {{}} -tags secsel \
		       -fill [$canv cget -selectbackground]]
	    $canv lower $t
	}
    }
}

proc highlightmore {} {
    global hlview highlighted commitidx highlightedrows linehtag mainfont
    global displayorder vdisporder curview canv commitrow selectedline

    set font [concat $mainfont bold]
    set max $commitidx($hlview)
    if {$hlview == $curview} {
	set disp $displayorder
    } else {
	set disp $vdisporder($hlview)
    }
    for {set i $highlighted($hlview)} {$i < $max} {incr i} {
	set id [lindex $disp $i]
	if {[info exists commitrow($curview,$id)]} {
	    set row $commitrow($curview,$id)
	    if {[info exists linehtag($row)]} {
		$canv itemconf $linehtag($row) -font $font
		lappend highlightedrows $row
		if {$row == $selectedline} {
		    $canv delete secsel
		    set t [eval $canv create rect \
			       [$canv bbox $linehtag($row)] \
			       -outline {{}} -tags secsel \
			       -fill [$canv cget -selectbackground]]
		    $canv lower $t
		}
	    }
	}
    }
    set highlighted($hlview) $max
}

# Graph layout functions

P
Paul Mackerras 已提交
1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530
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} {
1531
    global children commitrow childlist curview
P
Paul Mackerras 已提交
1532

1533 1534
    if {[info exists commitrow($curview,$id)]} {
	set r $commitrow($curview,$id)
P
Paul Mackerras 已提交
1535 1536 1537
	if {$l1 <= $r && $r <= $l2} {
	    return [expr {$r - $l1 + 1}]
	}
1538 1539
	set kids [lindex $childlist $r]
    } else {
1540
	set kids $children($curview,$id)
P
Paul Mackerras 已提交
1541
    }
1542
    foreach c $kids {
1543
	set r $commitrow($curview,$c)
1544 1545
	if {$l1 <= $r && $r <= $l2} {
	    return [expr {$r - $l1 + 1}]
P
Paul Mackerras 已提交
1546 1547 1548 1549 1550 1551 1552 1553 1554
	}
    }
    return 0
}

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

    set col -1
1555
    set ids [lindex $rowidlist $row]
P
Paul Mackerras 已提交
1556 1557 1558 1559 1560
    foreach id $ids {
	incr col
	if {$id eq {}} continue
	if {$col < [llength $ids] - 1 &&
	    [lsearch -exact -start [expr {$col+1}] $ids $id] >= 0} {
1561
	    puts "oops: [shortids $id] repeated in row $row col $col: {[shortids [lindex $rowidlist $row]]}"
P
Paul Mackerras 已提交
1562
	}
1563
	set o [lindex $rowoffsets $row $col]
P
Paul Mackerras 已提交
1564 1565 1566 1567 1568
	set y $row
	set x $col
	while {$o ne {}} {
	    incr y -1
	    incr x $o
1569
	    if {[lindex $rowidlist $y $x] != $id} {
P
Paul Mackerras 已提交
1570 1571 1572
		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} {
1573
		    puts "  row $i ids={[shortids [lindex $rowidlist $i]]} offs={[lindex $rowoffsets $i]}"
P
Paul Mackerras 已提交
1574 1575 1576 1577
		}
		break
	    }
	    if {!$full} break
1578
	    set o [lindex $rowoffsets $y $x]
P
Paul Mackerras 已提交
1579 1580 1581 1582 1583 1584 1585 1586 1587 1588
	}
    }
}

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
1589
	set off0 [lindex $rowoffsets $y]
P
Paul Mackerras 已提交
1590 1591
	for {set x0 $x} {1} {incr x0} {
	    if {$x0 >= [llength $off0]} {
1592
		set x0 [llength [lindex $rowoffsets [expr {$y-1}]]]
P
Paul Mackerras 已提交
1593 1594 1595 1596 1597 1598 1599 1600 1601
		break
	    }
	    set z [lindex $off0 $x0]
	    if {$z ne {}} {
		incr x0 $z
		break
	    }
	}
	set z [expr {$x0 - $x}]
1602 1603
	lset rowidlist $y [linsert [lindex $rowidlist $y] $x $oid]
	lset rowoffsets $y [linsert [lindex $rowoffsets $y] $x $z]
P
Paul Mackerras 已提交
1604
    }
1605 1606
    set tmp [lreplace [lindex $rowoffsets $y] $x $x {}]
    lset rowoffsets $y [incrange $tmp [expr {$x+1}] -1]
P
Paul Mackerras 已提交
1607 1608 1609 1610
    lappend idrowranges($oid) $y
}

proc initlayout {} {
1611
    global rowidlist rowoffsets displayorder commitlisted
P
Paul Mackerras 已提交
1612
    global rowlaidout rowoptim
P
Paul Mackerras 已提交
1613
    global idinlist rowchk rowrangelist idrowranges
1614
    global numcommits canvxmax canv
1615
    global nextcolor
1616
    global parentlist childlist children
1617
    global colormap rowtextx
P
Paul Mackerras 已提交
1618
    global linesegends
P
Paul Mackerras 已提交
1619

1620 1621
    set numcommits 0
    set displayorder {}
1622 1623 1624
    set commitlisted {}
    set parentlist {}
    set childlist {}
1625
    set rowrangelist {}
1626 1627 1628
    set nextcolor 0
    set rowidlist {{}}
    set rowoffsets {{}}
P
Paul Mackerras 已提交
1629 1630 1631 1632
    catch {unset idinlist}
    catch {unset rowchk}
    set rowlaidout 0
    set rowoptim 0
1633
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
1634 1635 1636
    catch {unset colormap}
    catch {unset rowtextx}
    catch {unset idrowranges}
1637
    set linesegends {}
1638 1639 1640 1641 1642 1643 1644 1645 1646
}

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 已提交
1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669
}

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
1670
    global uparrowlen curview
P
Paul Mackerras 已提交
1671 1672

    set row $rowlaidout
1673
    set rowlaidout [layoutrows $row $commitidx($curview) 0]
P
Paul Mackerras 已提交
1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685
    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} {
1686
    global numcommits commitrow pending_select selectedline
1687
    global linesegends idrowranges idrangedrawn curview
P
Paul Mackerras 已提交
1688

1689 1690 1691 1692 1693
    if {$numcommits == 0} {
	global phase
	set phase "incrdraw"
	allcanvs delete all
    }
P
Paul Mackerras 已提交
1694 1695
    set row $numcommits
    set numcommits $canshow
1696
    setcanvscroll
P
Paul Mackerras 已提交
1697 1698 1699
    set rows [visiblerows]
    set r0 [lindex $rows 0]
    set r1 [lindex $rows 1]
1700
    set selrow -1
P
Paul Mackerras 已提交
1701
    for {set r $row} {$r < $canshow} {incr r} {
1702 1703 1704 1705 1706 1707 1708 1709
	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 已提交
1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720
		}
	    }
	}
    }
    if {$canshow > $r1} {
	set canshow $r1
    }
    while {$row < $canshow} {
	drawcmitrow $row
	incr row
    }
1721
    if {[info exists pending_select] &&
1722 1723 1724
	[info exists commitrow($curview,$pending_select)] &&
	$commitrow($curview,$pending_select) < $numcommits} {
	selectline $commitrow($curview,$pending_select) 1
1725
    }
1726 1727 1728
    if {![info exists selectedline] && ![info exists pending_select]} {
	selectline 0 1
    }
P
Paul Mackerras 已提交
1729 1730 1731 1732 1733
}

proc layoutrows {row endrow last} {
    global rowidlist rowoffsets displayorder
    global uparrowlen downarrowlen maxwidth mingaplen
1734
    global childlist parentlist
P
Paul Mackerras 已提交
1735
    global idrowranges linesegends
1736
    global commitidx curview
P
Paul Mackerras 已提交
1737
    global idinlist rowchk rowrangelist
P
Paul Mackerras 已提交
1738

1739 1740
    set idlist [lindex $rowidlist $row]
    set offs [lindex $rowoffsets $row]
P
Paul Mackerras 已提交
1741 1742 1743 1744
    while {$row < $endrow} {
	set id [lindex $displayorder $row]
	set oldolds {}
	set newolds {}
1745
	foreach p [lindex $parentlist $row] {
P
Paul Mackerras 已提交
1746 1747 1748 1749 1750 1751
	    if {![info exists idinlist($p)]} {
		lappend newolds $p
	    } elseif {!$idinlist($p)} {
		lappend oldolds $p
	    }
	}
1752
	set lse {}
P
Paul Mackerras 已提交
1753 1754 1755
	set nev [expr {[llength $idlist] + [llength $newolds]
		       + [llength $oldolds] - $maxwidth + 1}]
	if {$nev > 0} {
1756 1757
	    if {!$last &&
		$row + $uparrowlen + $mingaplen >= $commitidx($curview)} break
P
Paul Mackerras 已提交
1758 1759 1760 1761 1762 1763 1764 1765 1766 1767
	    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
1768
			set rm1 [expr {$row - 1}]
1769
			lappend lse $i
1770
			lappend idrowranges($i) $rm1
P
Paul Mackerras 已提交
1771 1772 1773 1774 1775 1776
			if {[incr nev -1] <= 0} break
			continue
		    }
		    set rowchk($id) [expr {$row + $r}]
		}
	    }
1777 1778
	    lset rowidlist $row $idlist
	    lset rowoffsets $row $offs
P
Paul Mackerras 已提交
1779
	}
1780
	lappend linesegends $lse
P
Paul Mackerras 已提交
1781 1782 1783 1784
	set col [lsearch -exact $idlist $id]
	if {$col < 0} {
	    set col [llength $idlist]
	    lappend idlist $id
1785
	    lset rowidlist $row $idlist
P
Paul Mackerras 已提交
1786
	    set z {}
1787
	    if {[lindex $childlist $row] ne {}} {
1788
		set z [expr {[llength [lindex $rowidlist [expr {$row-1}]]] - $col}]
P
Paul Mackerras 已提交
1789 1790 1791
		unset idinlist($id)
	    }
	    lappend offs $z
1792
	    lset rowoffsets $row $offs
P
Paul Mackerras 已提交
1793 1794 1795 1796 1797 1798
	    if {$z ne {}} {
		makeuparrow $id $col $row $z
	    }
	} else {
	    unset idinlist($id)
	}
1799
	set ranges {}
P
Paul Mackerras 已提交
1800
	if {[info exists idrowranges($id)]} {
1801
	    set ranges $idrowranges($id)
1802 1803
	    lappend ranges $row
	    unset idrowranges($id)
P
Paul Mackerras 已提交
1804
	}
1805
	lappend rowrangelist $ranges
P
Paul Mackerras 已提交
1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836
	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
	}
1837 1838
	lappend rowidlist $idlist
	lappend rowoffsets $offs
P
Paul Mackerras 已提交
1839 1840 1841 1842 1843
    }
    return $row
}

proc addextraid {id row} {
1844
    global displayorder commitrow commitinfo
1845
    global commitidx commitlisted
1846
    global parentlist childlist children curview
P
Paul Mackerras 已提交
1847

1848
    incr commitidx($curview)
P
Paul Mackerras 已提交
1849
    lappend displayorder $id
1850
    lappend commitlisted 0
1851
    lappend parentlist {}
1852
    set commitrow($curview,$id) $row
P
Paul Mackerras 已提交
1853 1854 1855
    readcommit $id
    if {![info exists commitinfo($id)]} {
	set commitinfo($id) {"No commit information available"}
1856
    }
1857 1858
    if {![info exists children($curview,$id)]} {
	set children($curview,$id) {}
P
Paul Mackerras 已提交
1859
    }
1860
    lappend childlist $children($curview,$id)
P
Paul Mackerras 已提交
1861 1862 1863
}

proc layouttail {} {
1864
    global rowidlist rowoffsets idinlist commitidx curview
P
Paul Mackerras 已提交
1865
    global idrowranges rowrangelist
P
Paul Mackerras 已提交
1866

1867
    set row $commitidx($curview)
1868
    set idlist [lindex $rowidlist $row]
P
Paul Mackerras 已提交
1869 1870 1871 1872 1873 1874
    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 已提交
1875
	lappend rowrangelist $idrowranges($id)
1876
	unset idrowranges($id)
P
Paul Mackerras 已提交
1877 1878 1879
	incr row
	set offs [ntimes $col 0]
	set idlist [lreplace $idlist $col $col]
1880 1881
	lappend rowidlist $idlist
	lappend rowoffsets $offs
P
Paul Mackerras 已提交
1882 1883 1884 1885
    }

    foreach id [array names idinlist] {
	addextraid $id $row
1886 1887
	lset rowidlist $row [list $id]
	lset rowoffsets $row 0
P
Paul Mackerras 已提交
1888 1889
	makeuparrow $id 0 $row 0
	lappend idrowranges($id) $row
P
Paul Mackerras 已提交
1890
	lappend rowrangelist $idrowranges($id)
1891
	unset idrowranges($id)
P
Paul Mackerras 已提交
1892
	incr row
1893 1894
	lappend rowidlist {}
	lappend rowoffsets {}
P
Paul Mackerras 已提交
1895 1896 1897 1898 1899 1900 1901
    }
}

proc insert_pad {row col npad} {
    global rowidlist rowoffsets

    set pad [ntimes $npad {}]
1902 1903 1904
    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 已提交
1905 1906 1907
}

proc optimize_rows {row col endrow} {
P
Paul Mackerras 已提交
1908
    global rowidlist rowoffsets idrowranges displayorder
P
Paul Mackerras 已提交
1909 1910

    for {} {$row < $endrow} {incr row} {
1911 1912
	set idlist [lindex $rowidlist $row]
	set offs [lindex $rowoffsets $row]
P
Paul Mackerras 已提交
1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923
	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}]
1924
	    set z0 [lindex $rowoffsets $y0 $x0]
P
Paul Mackerras 已提交
1925 1926
	    if {$z0 eq {}} {
		set id [lindex $idlist $col]
1927 1928
		set ranges [rowranges $id]
		if {$ranges ne {} && $y0 > [lindex $ranges 0]} {
P
Paul Mackerras 已提交
1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940
		    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}]
1941
		set z0 [lindex $rowoffsets $y0 $x0]
P
Paul Mackerras 已提交
1942 1943 1944
	    } elseif {$z > 1 || ($z > 0 && $isarrow)} {
		set npad [expr {$z - 1 + $isarrow}]
		set y1 [expr {$row + 1}]
1945
		set offs2 [lindex $rowoffsets $y1]
P
Paul Mackerras 已提交
1946 1947 1948 1949 1950 1951 1952
		set x1 -1
		foreach z $offs2 {
		    incr x1
		    if {$z eq {} || $x1 + $z < $col} continue
		    if {$x1 + $z > $col} {
			incr npad
		    }
1953
		    lset rowoffsets $y1 [incrange $offs2 $x1 $npad]
P
Paul Mackerras 已提交
1954 1955 1956 1957 1958 1959 1960 1961 1962 1963
		    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
	    }
1964 1965 1966 1967 1968 1969 1970 1971 1972
	    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 已提交
1973 1974 1975 1976 1977 1978 1979
	    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} {
1980
	    set o {}
P
Paul Mackerras 已提交
1981 1982
	    for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
		set o [lindex $offs $col]
1983 1984 1985
		if {$o eq {}} {
		    # check if this is the link to the first child
		    set id [lindex $idlist $col]
1986 1987
		    set ranges [rowranges $id]
		    if {$ranges ne {} && $row == [lindex $ranges 0]} {
1988 1989 1990 1991 1992 1993 1994 1995 1996
			# 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 已提交
1997 1998
		if {$o eq {} || $o <= 0} break
	    }
1999
	    if {$o ne {} && [incr col] < [llength $idlist]} {
P
Paul Mackerras 已提交
2000
		set y1 [expr {$row + 1}]
2001
		set offs2 [lindex $rowoffsets $y1]
P
Paul Mackerras 已提交
2002 2003 2004 2005
		set x1 -1
		foreach z $offs2 {
		    incr x1
		    if {$z eq {} || $x1 + $z < $col} continue
2006
		    lset rowoffsets $y1 [incrange $offs2 $x1 1]
P
Paul Mackerras 已提交
2007 2008 2009 2010 2011 2012 2013 2014
		    break
		}
		set idlist [linsert $idlist $col {}]
		set tmp [linsert $offs $col {}]
		incr col
		set offs [incrange $tmp $col -1]
	    }
	}
2015 2016
	lset rowidlist $row $idlist
	lset rowoffsets $row $offs
P
Paul Mackerras 已提交
2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030
	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}]
}

2031 2032 2033 2034 2035 2036 2037 2038 2039 2040
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 已提交
2041
proc rowranges {id} {
2042
    global phase idrowranges commitrow rowlaidout rowrangelist curview
P
Paul Mackerras 已提交
2043 2044

    set ranges {}
2045
    if {$phase eq {} ||
2046 2047 2048
	([info exists commitrow($curview,$id)]
	 && $commitrow($curview,$id) < $rowlaidout)} {
	set ranges [lindex $rowrangelist $commitrow($curview,$id)]
P
Paul Mackerras 已提交
2049 2050 2051 2052 2053 2054
    } elseif {[info exists idrowranges($id)]} {
	set ranges $idrowranges($id)
    }
    return $ranges
}

2055
proc drawlineseg {id i} {
P
Paul Mackerras 已提交
2056
    global rowoffsets rowidlist
2057
    global displayorder
2058
    global canv colormap linespc
2059
    global numcommits commitrow curview
P
Paul Mackerras 已提交
2060

P
Paul Mackerras 已提交
2061 2062
    set ranges [rowranges $id]
    set downarrow 1
2063 2064
    if {[info exists commitrow($curview,$id)]
	&& $commitrow($curview,$id) < $numcommits} {
P
Paul Mackerras 已提交
2065 2066 2067 2068 2069 2070
	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 已提交
2071 2072 2073
    if {$startrow == $row} return
    assigncolor $id
    set coords {}
2074
    set col [lsearch -exact [lindex $rowidlist $row] $id]
P
Paul Mackerras 已提交
2075 2076 2077 2078 2079 2080 2081
    if {$col < 0} {
	puts "oops: drawline: id $id not on row $row"
	return
    }
    set lasto {}
    set ns 0
    while {1} {
2082
	set o [lindex $rowoffsets $row $col]
P
Paul Mackerras 已提交
2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096
	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
2097 2098 2099 2100 2101 2102 2103 2104 2105
    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} {
2106
		lappend coords [xc $row [expr {$col - 1}]] [yc $row]
2107
	    } elseif {$ccol > $col + 1} {
2108
		lappend coords [xc $row [expr {$col + 1}]] [yc $row]
2109 2110 2111 2112 2113
	    }
	    lappend coords $x $y
	}
    }
    if {[llength $coords] < 4} return
P
Paul Mackerras 已提交
2114
    if {$downarrow} {
2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133
	# 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 已提交
2134
    set arrow [expr {2 * ($i > 0) + $downarrow}]
2135
    set arrow [lindex {none first last both} $arrow]
2136
    set t [$canv create line $coords -width [linewidth $id] \
P
Paul Mackerras 已提交
2137 2138 2139 2140 2141
	       -fill $colormap($id) -tags lines.$id -arrow $arrow]
    $canv lower $t
    bindline $t $id
}

2142
proc drawparentlinks {id row col olds} {
P
Paul Mackerras 已提交
2143
    global rowidlist canv colormap
P
Paul Mackerras 已提交
2144 2145 2146 2147 2148

    set row2 [expr {$row + 1}]
    set x [xc $row $col]
    set y [yc $row]
    set y2 [yc $row2]
2149
    set ids [lindex $rowidlist $row2]
P
Paul Mackerras 已提交
2150 2151 2152
    # rmx = right-most X coord used
    set rmx 0
    foreach p $olds {
2153 2154 2155 2156 2157 2158 2159 2160 2161
	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 已提交
2162 2163 2164
	set ranges [rowranges $p]
	if {$ranges ne {} && $row2 == [lindex $ranges 0]
	    && $row2 < [lindex $ranges 1]} {
2165 2166 2167
	    # drawlineseg will do this one for us
	    continue
	}
P
Paul Mackerras 已提交
2168 2169 2170 2171 2172 2173 2174 2175 2176
	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
2177
	set t [$canv create line $coords -width [linewidth $p] \
P
Paul Mackerras 已提交
2178 2179 2180 2181 2182 2183 2184
		   -fill $colormap($p) -tags lines.$p]
	$canv lower $t
	bindline $t $p
    }
    return $rmx
}

2185
proc drawlines {id} {
P
Paul Mackerras 已提交
2186
    global colormap canv
P
Paul Mackerras 已提交
2187
    global idrangedrawn
2188
    global children iddrawn commitrow rowidlist curview
P
Paul Mackerras 已提交
2189 2190

    $canv delete lines.$id
P
Paul Mackerras 已提交
2191
    set nr [expr {[llength [rowranges $id]] / 2}]
P
Paul Mackerras 已提交
2192 2193
    for {set i 0} {$i < $nr} {incr i} {
	if {[info exists idrangedrawn($id,$i)]} {
2194
	    drawlineseg $id $i
P
Paul Mackerras 已提交
2195 2196
	}
    }
2197
    foreach child $children($curview,$id) {
2198
	if {[info exists iddrawn($child)]} {
2199
	    set row $commitrow($curview,$child)
2200 2201 2202
	    set col [lsearch -exact [lindex $rowidlist $row] $child]
	    if {$col >= 0} {
		drawparentlinks $child $row $col [list $id]
P
Paul Mackerras 已提交
2203 2204 2205 2206 2207 2208 2209 2210 2211 2212
	    }
	}
    }
}

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
2213 2214
    global mainfont canvxmax
    global hlview commitrow highlightedrows
P
Paul Mackerras 已提交
2215

2216
    set ofill [expr {[lindex $commitlisted $row]? "blue": "white"}]
P
Paul Mackerras 已提交
2217 2218 2219 2220 2221 2222 2223 2224
    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}
2225
    set xt [xc $row [llength [lindex $rowidlist $row]]]
P
Paul Mackerras 已提交
2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238
    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]
2239 2240 2241 2242 2243
    set font $mainfont
    if {[info exists hlview] && [info exists commitrow($hlview,$id)]} {
	lappend font bold
	lappend highlightedrows $row
    }
P
Paul Mackerras 已提交
2244
    set linehtag($row) [$canv create text $xt $y -anchor w \
2245
			    -text $headline -font $font]
P
Paul Mackerras 已提交
2246 2247
    $canv bind $linehtag($row) <Button-3> "rowmenu %X %Y $id"
    set linentag($row) [$canv2 create text 3 $y -anchor w \
2248
			    -text $name -font $mainfont]
P
Paul Mackerras 已提交
2249 2250
    set linedtag($row) [$canv3 create text 3 $y -anchor w \
			    -text $date -font $mainfont]
2251 2252 2253 2254 2255
    set xr [expr {$xt + [font measure $mainfont $headline]}]
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
P
Paul Mackerras 已提交
2256 2257 2258
}

proc drawcmitrow {row} {
2259
    global displayorder rowidlist
P
Paul Mackerras 已提交
2260
    global idrangedrawn iddrawn
2261
    global commitinfo parentlist numcommits
P
Paul Mackerras 已提交
2262

2263 2264
    if {$row >= $numcommits} return
    foreach id [lindex $rowidlist $row] {
2265
	if {$id eq {}} continue
P
Paul Mackerras 已提交
2266
	set i -1
P
Paul Mackerras 已提交
2267
	foreach {s e} [rowranges $id] {
P
Paul Mackerras 已提交
2268 2269 2270 2271 2272
	    incr i
	    if {$row < $s} continue
	    if {$e eq {}} break
	    if {$row <= $e} {
		if {$e < $numcommits && ![info exists idrangedrawn($id,$i)]} {
2273
		    drawlineseg $id $i
P
Paul Mackerras 已提交
2274 2275 2276 2277 2278 2279 2280 2281 2282
		    set idrangedrawn($id,$i) 1
		}
		break
	    }
	}
    }

    set id [lindex $displayorder $row]
    if {[info exists iddrawn($id)]} return
2283
    set col [lsearch -exact [lindex $rowidlist $row] $id]
P
Paul Mackerras 已提交
2284 2285 2286 2287 2288
    if {$col < 0} {
	puts "oops, row $row id $id not in list"
	return
    }
    if {![info exists commitinfo($id)]} {
2289
	getcommit $id
P
Paul Mackerras 已提交
2290 2291
    }
    assigncolor $id
2292 2293 2294
    set olds [lindex $parentlist $row]
    if {$olds ne {}} {
	set rmx [drawparentlinks $id $row $col $olds]
P
Paul Mackerras 已提交
2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335
    } 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

    allcanvs delete all
    catch {unset iddrawn}
    catch {unset idrangedrawn}
}

P
Paul Mackerras 已提交
2336 2337 2338 2339 2340 2341 2342 2343 2344
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}]
	}
2345
	if {$e <= $s} continue
P
Paul Mackerras 已提交
2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376
	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]
}

2377
proc assigncolor {id} {
P
Paul Mackerras 已提交
2378
    global colormap colors nextcolor
2379
    global commitrow parentlist children children curview
2380

2381
    if {[info exists colormap($id)]} return
2382
    set ncolors [llength $colors]
2383 2384
    if {[info exists children($curview,$id)]} {
	set kids $children($curview,$id)
2385 2386 2387 2388 2389
    } else {
	set kids {}
    }
    if {[llength $kids] == 1} {
	set child [lindex $kids 0]
2390
	if {[info exists colormap($child)]
2391
	    && [llength [lindex $parentlist $commitrow($curview,$child)]] == 1} {
2392 2393
	    set colormap($id) $colormap($child)
	    return
2394
	}
2395 2396
    }
    set badcolors {}
P
Paul Mackerras 已提交
2397 2398 2399 2400 2401 2402
    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
2403
	}
P
Paul Mackerras 已提交
2404 2405 2406
	if {[info exists colormap($x)]
	    && [lsearch -exact $badcolors $colormap($x)] < 0} {
	    lappend badcolors $colormap($x)
2407 2408
	}
    }
P
Paul Mackerras 已提交
2409 2410
    if {[llength $badcolors] >= $ncolors} {
	set badcolors $origbad
2411
    }
P
Paul Mackerras 已提交
2412
    set origbad $badcolors
2413
    if {[llength $badcolors] < $ncolors - 1} {
2414
	foreach child $kids {
2415 2416 2417 2418
	    if {[info exists colormap($child)]
		&& [lsearch -exact $badcolors $colormap($child)] < 0} {
		lappend badcolors $colormap($child)
	    }
2419
	    foreach p [lindex $parentlist $commitrow($curview,$child)] {
2420 2421 2422
		if {[info exists colormap($p)]
		    && [lsearch -exact $badcolors $colormap($p)] < 0} {
		    lappend badcolors $colormap($p)
2423 2424 2425 2426 2427 2428
		}
	    }
	}
	if {[llength $badcolors] >= $ncolors} {
	    set badcolors $origbad
	}
2429 2430 2431 2432 2433
    }
    for {set i 0} {$i <= $ncolors} {incr i} {
	set c [lindex $colors $nextcolor]
	if {[incr nextcolor] >= $ncolors} {
	    set nextcolor 0
2434
	}
2435
	if {[lsearch -exact $badcolors $c]} break
2436
    }
2437
    set colormap($id) $c
2438 2439
}

2440 2441 2442 2443 2444 2445
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"
2446
    $canv bind $t <Button-1> "lineclick %x %y $id 1"
2447 2448
}

2449
proc drawtags {id x xt y1} {
2450
    global idtags idheads idotherrefs
2451
    global linespc lthickness
2452
    global canv mainfont commitrow rowtextx curview
2453 2454 2455

    set marks {}
    set ntags 0
2456
    set nheads 0
2457 2458 2459 2460 2461 2462
    if {[info exists idtags($id)]} {
	set marks $idtags($id)
	set ntags [llength $marks]
    }
    if {[info exists idheads($id)]} {
	set marks [concat $marks $idheads($id)]
2463 2464 2465 2466
	set nheads [llength $idheads($id)]
    }
    if {[info exists idotherrefs($id)]} {
	set marks [concat $marks $idotherrefs($id)]
2467 2468 2469 2470 2471 2472
    }
    if {$marks eq {}} {
	return $xt
    }

    set delta [expr {int(0.5 * ($linespc - $lthickness))}]
J
Jeff Hobbs 已提交
2473 2474
    set yt [expr {$y1 - 0.5 * $linespc}]
    set yb [expr {$yt + $linespc - 1}]
2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486
    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 已提交
2487 2488
	set xl [expr {$x + $delta}]
	set xr [expr {$x + $delta + $wid + $lthickness}]
2489 2490
	if {[incr ntags -1] >= 0} {
	    # draw a tag
J
Jeff Hobbs 已提交
2491 2492
	    set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
		       $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
2493 2494
		       -width 1 -outline black -fill yellow -tags tag.$id]
	    $canv bind $t <1> [list showtag $tag 1]
2495
	    set rowtextx($commitrow($curview,$id)) [expr {$xr + $linespc}]
2496
	} else {
2497 2498 2499 2500 2501 2502
	    # draw a head or other ref
	    if {[incr nheads -1] >= 0} {
		set col green
	    } else {
		set col "#ddddff"
	    }
J
Jeff Hobbs 已提交
2503
	    set xl [expr {$xl - $delta/2}]
2504
	    $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
2505
		-width 1 -outline black -fill $col -tags tag.$id
2506 2507 2508 2509 2510 2511 2512 2513
	    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
	    }
2514
	}
2515 2516 2517 2518 2519
	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]
	}
2520 2521 2522 2523
    }
    return $xt
}

2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534
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
}
2535 2536

proc finishcommits {} {
2537
    global commitidx phase curview
2538
    global canv mainfont ctext maincursor textcursor
2539
    global findinprogress pending_select
2540

2541
    if {$commitidx($curview) > 0} {
2542 2543
	drawrest
    } else {
2544 2545 2546 2547
	$canv delete all
	$canv create text 3 3 -anchor nw -text "No commits selected" \
	    -font $mainfont -tags textitems
    }
P
Paul Mackerras 已提交
2548
    set phase {}
2549
    catch {unset pending_select}
2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560
}

# 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
2561 2562
}

2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582
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
    }
}

2583
proc drawrest {} {
P
Paul Mackerras 已提交
2584 2585 2586
    global numcommits
    global startmsecs
    global canvy0 numcommits linespc
2587
    global rowlaidout commitidx curview
2588
    global pending_select
P
Paul Mackerras 已提交
2589 2590

    set row $rowlaidout
2591
    layoutrows $rowlaidout $commitidx($curview) 1
P
Paul Mackerras 已提交
2592
    layouttail
2593 2594
    optimize_rows $row 0 $commitidx($curview)
    showstuff $commitidx($curview)
2595 2596 2597
    if {[info exists pending_select]} {
	selectline 0 1
    }
P
Paul Mackerras 已提交
2598

J
Jeff Hobbs 已提交
2599
    set drawmsecs [expr {[clock clicks -milliseconds] - $startmsecs}]
2600
    #puts "overall $drawmsecs ms for $numcommits commits"
2601 2602
}

2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615
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 已提交
2616 2617
	    lappend matches [list $j [expr {$j+$foundstrlen-1}]]
	    set i [expr {$j + $foundstrlen}]
2618 2619 2620 2621 2622
	}
    }
    return $matches
}

2623 2624
proc dofind {} {
    global findtype findloc findstring markedmatches commitinfo
2625
    global numcommits displayorder linehtag linentag linedtag
2626
    global mainfont canv canv2 canv3 selectedline
P
Paul Mackerras 已提交
2627 2628
    global matchinglines foundstring foundstrlen matchstring
    global commitdata
2629 2630

    stopfindproc
2631
    unmarkmatches
2632
    focus .
2633
    set matchinglines {}
2634 2635 2636 2637
    if {$findloc == "Pickaxe"} {
	findpatches
	return
    }
2638
    if {$findtype == "IgnCase"} {
2639
	set foundstring [string tolower $findstring]
2640
    } else {
2641
	set foundstring $findstring
2642
    }
2643 2644
    set foundstrlen [string length $findstring]
    if {$foundstrlen == 0} return
P
Paul Mackerras 已提交
2645 2646
    regsub -all {[*?\[\\]} $foundstring {\\&} matchstring
    set matchstring "*$matchstring*"
2647 2648 2649 2650
    if {$findloc == "Files"} {
	findfiles
	return
    }
2651 2652 2653 2654 2655 2656
    if {![info exists selectedline]} {
	set oldsel -1
    } else {
	set oldsel $selectedline
    }
    set didsel 0
2657
    set fldtypes {Headline Author Date Committer CDate Comment}
P
Paul Mackerras 已提交
2658
    set l -1
2659 2660
    foreach id $displayorder {
	set d $commitdata($id)
P
Paul Mackerras 已提交
2661 2662 2663 2664 2665 2666 2667 2668 2669 2670
	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)]} {
2671
	    getcommit $id
P
Paul Mackerras 已提交
2672
	}
2673 2674 2675 2676 2677 2678
	set info $commitinfo($id)
	set doesmatch 0
	foreach f $info ty $fldtypes {
	    if {$findloc != "All fields" && $findloc != $ty} {
		continue
	    }
2679
	    set matches [findmatches $f]
2680 2681 2682
	    if {$matches == {}} continue
	    set doesmatch 1
	    if {$ty == "Headline"} {
P
Paul Mackerras 已提交
2683
		drawcmitrow $l
2684 2685
		markmatches $canv $l $f $linehtag($l) $matches $mainfont
	    } elseif {$ty == "Author"} {
P
Paul Mackerras 已提交
2686
		drawcmitrow $l
2687
		markmatches $canv2 $l $f $linentag($l) $matches $mainfont
2688
	    } elseif {$ty == "Date"} {
P
Paul Mackerras 已提交
2689
		drawcmitrow $l
2690 2691 2692 2693 2694 2695
		markmatches $canv3 $l $f $linedtag($l) $matches $mainfont
	    }
	}
	if {$doesmatch} {
	    lappend matchinglines $l
	    if {!$didsel && $l > $oldsel} {
2696
		findselectline $l
2697 2698 2699 2700 2701 2702 2703
		set didsel 1
	    }
	}
    }
    if {$matchinglines == {}} {
	bell
    } elseif {!$didsel} {
2704 2705 2706 2707 2708 2709
	findselectline [lindex $matchinglines 0]
    }
}

proc findselectline {l} {
    global findloc commentend ctext
2710
    selectline $l 1
2711 2712 2713 2714 2715 2716
    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 已提交
2717
	    set end [expr {[lindex $match 1] + 1}]
2718 2719
	    $ctext tag add found "1.0 + $start c" "1.0 + $end c"
	}
2720 2721 2722
    }
}

2723
proc findnext {restart} {
2724 2725
    global matchinglines selectedline
    if {![info exists matchinglines]} {
2726 2727 2728
	if {$restart} {
	    dofind
	}
2729 2730 2731 2732 2733
	return
    }
    if {![info exists selectedline]} return
    foreach l $matchinglines {
	if {$l > $selectedline} {
2734
	    findselectline $l
2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753
	    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 != {}} {
2754
	findselectline $prev
2755 2756 2757 2758 2759
    } else {
	bell
    }
}

2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784
proc findlocchange {name ix op} {
    global findloc findtype findtypemenu
    if {$findloc == "Pickaxe"} {
	set findtype Exact
	set state disabled
    } else {
	set state normal
    }
    $findtypemenu entryconf 1 -state $state
    $findtypemenu entryconf 2 -state $state
}

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
    }
2785 2786
    catch {unset findinprogress}
    notbusy find
2787 2788 2789 2790 2791
}

proc findpatches {} {
    global findstring selectedline numcommits
    global findprocpid findprocfile
2792
    global finddidsel ctext displayorder findinprogress
2793
    global findinsertpos
2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808

    if {$numcommits == 0} return

    # make a list of all the ids to search, starting at the one
    # after the selected line (if any)
    if {[info exists selectedline]} {
	set l $selectedline
    } else {
	set l -1
    }
    set inputids {}
    for {set i 0} {$i < $numcommits} {incr i} {
	if {[incr l] >= $numcommits} {
	    set l 0
	}
2809
	append inputids [lindex $displayorder $l] "\n"
2810 2811 2812 2813 2814 2815 2816 2817 2818 2819
    }

    if {[catch {
	set f [open [list | git-diff-tree --stdin -s -r -S$findstring \
			 << $inputids] r]
    } err]} {
	error_popup "Error starting search process: $err"
	return
    }

2820
    set findinsertpos end
2821 2822 2823 2824 2825
    set findprocfile $f
    set findprocpid [pid $f]
    fconfigure $f -blocking 0
    fileevent $f readable readfindproc
    set finddidsel 0
2826
    nowbusy find
2827 2828 2829 2830 2831
    set findinprogress 1
}

proc readfindproc {} {
    global findprocfile finddidsel
2832
    global commitrow matchinglines findinsertpos curview
2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848

    set n [gets $findprocfile line]
    if {$n < 0} {
	if {[eof $findprocfile]} {
	    stopfindproc 1
	    if {!$finddidsel} {
		bell
	    }
	}
	return
    }
    if {![regexp {^[0-9a-f]{40}} $line id]} {
	error_popup "Can't parse git-diff-tree output: $line"
	stopfindproc
	return
    }
2849
    if {![info exists commitrow($curview,$id)]} {
2850 2851 2852
	puts stderr "spurious id: $id"
	return
    }
2853
    set l $commitrow($curview,$id)
2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871
    insertmatch $l $id
}

proc insertmatch {l id} {
    global matchinglines findinsertpos finddidsel

    if {$findinsertpos == "end"} {
	if {$matchinglines != {} && $l < [lindex $matchinglines 0]} {
	    set matchinglines [linsert $matchinglines 0 $l]
	    set findinsertpos 1
	} else {
	    lappend matchinglines $l
	}
    } else {
	set matchinglines [linsert $matchinglines $findinsertpos $l]
	incr findinsertpos
    }
    markheadline $l $id
2872 2873 2874 2875 2876 2877 2878
    if {!$finddidsel} {
	findselectline $l
	set finddidsel 1
    }
}

proc findfiles {} {
2879
    global selectedline numcommits displayorder ctext
2880
    global ffileline finddidsel parentlist
2881
    global findinprogress findstartline findinsertpos
2882
    global treediffs fdiffid fdiffsneeded fdiffpos
2883
    global findmergefiles
2884 2885 2886 2887 2888 2889 2890 2891 2892 2893

    if {$numcommits == 0} return

    if {[info exists selectedline]} {
	set l [expr {$selectedline + 1}]
    } else {
	set l 0
    }
    set ffileline $l
    set findstartline $l
2894 2895 2896
    set diffsneeded {}
    set fdiffsneeded {}
    while 1 {
2897
	set id [lindex $displayorder $l]
2898
	if {$findmergefiles || [llength [lindex $parentlist $l]] == 1} {
2899 2900 2901
	    if {![info exists treediffs($id)]} {
		append diffsneeded "$id\n"
		lappend fdiffsneeded $id
2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917
	    }
	}
	if {[incr l] >= $numcommits} {
	    set l 0
	}
	if {$l == $findstartline} break
    }

    # start off a git-diff-tree process if needed
    if {$diffsneeded ne {}} {
	if {[catch {
	    set df [open [list | git-diff-tree -r --stdin << $diffsneeded] r]
	} err ]} {
	    error_popup "Error starting search process: $err"
	    return
	}
2918
	catch {unset fdiffid}
2919 2920 2921 2922 2923 2924 2925
	set fdiffpos 0
	fconfigure $df -blocking 0
	fileevent $df readable [list readfilediffs $df]
    }

    set finddidsel 0
    set findinsertpos end
2926
    set id [lindex $displayorder $l]
2927
    nowbusy find
2928
    set findinprogress 1
2929
    findcont
2930 2931 2932 2933
    update
}

proc readfilediffs {df} {
2934
    global findid fdiffid fdiffs
2935 2936 2937 2938 2939 2940 2941 2942 2943

    set n [gets $df line]
    if {$n < 0} {
	if {[eof $df]} {
	    donefilediff
	    if {[catch {close $df} err]} {
		stopfindproc
		bell
		error_popup "Error in git-diff-tree: $err"
2944 2945
	    } elseif {[info exists findid]} {
		set id $findid
2946 2947
		stopfindproc
		bell
2948
		error_popup "Couldn't find diffs for $id"
2949 2950 2951 2952
	    }
	}
	return
    }
2953
    if {[regexp {^([0-9a-f]{40})$} $line match id]} {
2954 2955
	# start of a new string of diffs
	donefilediff
2956
	set fdiffid $id
2957 2958 2959 2960 2961 2962 2963
	set fdiffs {}
    } elseif {[string match ":*" $line]} {
	lappend fdiffs [lindex $line 5]
    }
}

proc donefilediff {} {
2964
    global fdiffid fdiffs treediffs findid
2965 2966
    global fdiffsneeded fdiffpos

2967 2968
    if {[info exists fdiffid]} {
	while {[lindex $fdiffsneeded $fdiffpos] ne $fdiffid
2969 2970 2971
	       && $fdiffpos < [llength $fdiffsneeded]} {
	    # git-diff-tree doesn't output anything for a commit
	    # which doesn't change anything
2972 2973 2974 2975
	    set nullid [lindex $fdiffsneeded $fdiffpos]
	    set treediffs($nullid) {}
	    if {[info exists findid] && $nullid eq $findid} {
		unset findid
2976
		findcont
2977 2978 2979 2980 2981
	    }
	    incr fdiffpos
	}
	incr fdiffpos

2982 2983
	if {![info exists treediffs($fdiffid)]} {
	    set treediffs($fdiffid) $fdiffs
2984
	}
2985 2986
	if {[info exists findid] && $fdiffid eq $findid} {
	    unset findid
2987
	    findcont
2988 2989
	}
    }
2990 2991
}

2992
proc findcont {} {
2993
    global findid treediffs parentlist
2994
    global ffileline findstartline finddidsel
2995
    global displayorder numcommits matchinglines findinprogress
2996 2997 2998
    global findmergefiles

    set l $ffileline
2999 3000 3001
    while {1} {
	set id [lindex $displayorder $l]
	if {$findmergefiles || [llength [lindex $parentlist $l]] == 1} {
3002 3003
	    if {![info exists treediffs($id)]} {
		set findid $id
3004 3005 3006 3007
		set ffileline $l
		return
	    }
	    set doesmatch 0
3008
	    foreach f $treediffs($id) {
3009 3010 3011 3012 3013 3014 3015
		set x [findmatches $f]
		if {$x != {}} {
		    set doesmatch 1
		    break
		}
	    }
	    if {$doesmatch} {
3016
		insertmatch $l $id
3017 3018
	    }
	}
3019 3020
	if {[incr l] >= $numcommits} {
	    set l 0
3021
	}
3022
	if {$l == $findstartline} break
3023 3024 3025 3026 3027 3028 3029 3030 3031 3032
    }
    stopfindproc
    if {!$finddidsel} {
	bell
    }
}

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

P
Paul Mackerras 已提交
3035
    drawcmitrow $l
3036 3037 3038 3039 3040 3041
    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
3042 3043 3044 3045 3046 3047 3048 3049 3050
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 已提交
3051 3052 3053 3054
	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 \
3055 3056 3057 3058 3059 3060
		   -outline {} -tags matches -fill yellow]
	$canv lower $t
    }
}

proc unmarkmatches {} {
3061
    global matchinglines findids
3062 3063
    allcanvs delete matches
    catch {unset matchinglines}
3064
    catch {unset findids}
3065 3066
}

3067
proc selcanvline {w x y} {
3068
    global canv canvy0 ctext linespc
P
Paul Mackerras 已提交
3069
    global rowtextx
3070
    set ymax [lindex [$canv cget -scrollregion] 3]
3071
    if {$ymax == {}} return
3072 3073 3074 3075 3076 3077
    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
    }
3078 3079 3080
    if {$w eq $canv} {
	if {![info exists rowtextx($l)] || $x < $rowtextx($l)} return
    }
3081
    unmarkmatches
3082
    selectline $l 1
3083 3084
}

3085 3086 3087 3088 3089 3090 3091 3092 3093
proc commit_descriptor {p} {
    global commitinfo
    set l "..."
    if {[info exists commitinfo($p)]} {
	set l [lindex $commitinfo($p) 0]
    }
    return "$p ($l)"
}

3094 3095 3096
# append some text to the ctext widget, and make any SHA1 ID
# that we know about be a clickable link.
proc appendwithlinks {text} {
3097
    global ctext commitrow linknum curview
3098 3099 3100 3101 3102 3103 3104 3105 3106

    set start [$ctext index "end - 1c"]
    $ctext insert end $text
    $ctext insert end "\n"
    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]
3107
	if {![info exists commitrow($curview,$linkid)]} continue
3108 3109 3110
	incr e
	$ctext tag add link "$start + $s c" "$start + $e c"
	$ctext tag add link$linknum "$start + $s c" "$start + $e c"
3111 3112
	$ctext tag bind link$linknum <1> \
	    [list selectline $commitrow($curview,$linkid) 1]
3113 3114 3115 3116 3117 3118 3119
	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 }
}

3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135
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}]
}

3136
proc selectline {l isnew} {
3137
    global canv canv2 canv3 ctext commitinfo selectedline
3138
    global displayorder linehtag linentag linedtag
3139
    global canvy0 linespc parentlist childlist
3140
    global currentid sha1entry
P
Paul Mackerras 已提交
3141
    global commentend idtags linknum
3142
    global mergemax numcommits pending_select
P
Paul Mackerras 已提交
3143
    global cmitmode
3144

3145
    catch {unset pending_select}
3146
    $canv delete hover
3147
    normalline
3148
    if {$l < 0 || $l >= $numcommits} return
3149
    set y [expr {$canvy0 + $l * $linespc}]
3150
    set ymax [lindex [$canv cget -scrollregion] 3]
3151 3152
    set ytop [expr {$y - $linespc - 1}]
    set ybot [expr {$y + $linespc + 1}]
3153
    set wnow [$canv yview]
J
Jeff Hobbs 已提交
3154 3155
    set wtop [expr {[lindex $wnow 0] * $ymax}]
    set wbot [expr {[lindex $wnow 1] * $ymax}]
3156 3157
    set wh [expr {$wbot - $wtop}]
    set newtop $wtop
3158
    if {$ytop < $wtop} {
3159 3160 3161 3162 3163 3164 3165
	if {$ybot < $wtop} {
	    set newtop [expr {$y - $wh / 2.0}]
	} else {
	    set newtop $ytop
	    if {$newtop > $wtop - $linespc} {
		set newtop [expr {$wtop - $linespc}]
	    }
3166
	}
3167 3168 3169 3170 3171 3172 3173 3174
    } 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}]
	    }
3175
	}
3176 3177 3178 3179 3180
    }
    if {$newtop != $wtop} {
	if {$newtop < 0} {
	    set newtop 0
	}
J
Jeff Hobbs 已提交
3181
	allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
P
Paul Mackerras 已提交
3182
	drawvisible
3183
    }
3184

P
Paul Mackerras 已提交
3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198
    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

3199 3200
    if {$isnew} {
	addtohistory [list selectline $l 0]
3201 3202
    }

3203 3204
    set selectedline $l

3205
    set id [lindex $displayorder $l]
3206
    set currentid $id
3207 3208 3209 3210 3211
    $sha1entry delete 0 end
    $sha1entry insert 0 $id
    $sha1entry selection from 0
    $sha1entry selection to end

3212
    $ctext conf -state normal
3213
    $ctext delete 0.0 end
3214
    set linknum 0
3215
    set info $commitinfo($id)
P
Paul Mackerras 已提交
3216 3217 3218 3219
    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"
3220 3221 3222 3223 3224 3225 3226
    if {[info exists idtags($id)]} {
	$ctext insert end "Tags:"
	foreach tag $idtags($id) {
	    $ctext insert end " $tag"
	}
	$ctext insert end "\n"
    }
3227 3228
 
    set comment {}
3229 3230
    set olds [lindex $parentlist $l]
    if {[llength $olds] > 1} {
3231
	set np 0
3232
	foreach p $olds {
3233 3234 3235 3236 3237 3238 3239 3240 3241 3242
	    if {$np >= $mergemax} {
		set tag mmax
	    } else {
		set tag m$np
	    }
	    $ctext insert end "Parent: " $tag
	    appendwithlinks [commit_descriptor $p]
	    incr np
	}
    } else {
3243 3244
	foreach p $olds {
	    append comment "Parent: [commit_descriptor $p]\n"
3245 3246
	}
    }
3247

3248 3249
    foreach c [lindex $childlist $l] {
	append comment "Child:  [commit_descriptor $c]\n"
3250 3251 3252
    }
    append comment "\n"
    append comment [lindex $info 5]
3253 3254

    # make anything that looks like a SHA1 ID be a clickable link
3255
    appendwithlinks $comment
3256

3257
    $ctext tag delete Comments
3258
    $ctext tag remove found 1.0 end
3259
    $ctext conf -state disabled
3260
    set commentend [$ctext index "end - 1c"]
3261

3262
    init_flist "Comments"
P
Paul Mackerras 已提交
3263 3264 3265
    if {$cmitmode eq "tree"} {
	gettree $id
    } elseif {[llength $olds] <= 1} {
3266
	startdiff $id
3267
    } else {
3268
	mergediff $id $l
3269 3270 3271
    }
}

3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283
proc selfirstline {} {
    unmarkmatches
    selectline 0 1
}

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

3284 3285 3286
proc selnextline {dir} {
    global selectedline
    if {![info exists selectedline]} return
J
Jeff Hobbs 已提交
3287
    set l [expr {$selectedline + $dir}]
3288
    unmarkmatches
3289 3290 3291
    selectline $l 1
}

3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310
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
    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    
}

3311
proc unselectline {} {
P
Paul Mackerras 已提交
3312
    global selectedline currentid
3313 3314

    catch {unset selectedline}
P
Paul Mackerras 已提交
3315
    catch {unset currentid}
3316 3317 3318
    allcanvs delete secsel
}

P
Paul Mackerras 已提交
3319 3320 3321 3322 3323 3324 3325 3326
proc reselectline {} {
    global selectedline

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

3327
proc addtohistory {cmd} {
3328
    global history historyindex curview
3329

3330
    set elt [list $curview $cmd]
3331
    if {$historyindex > 0
3332
	&& [lindex $history [expr {$historyindex - 1}]] == $elt} {
3333 3334 3335 3336
	return
    }

    if {$historyindex < [llength $history]} {
3337
	set history [lreplace $history $historyindex end $elt]
3338
    } else {
3339
	lappend history $elt
3340 3341 3342 3343 3344 3345 3346 3347 3348 3349
    }
    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
}

3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360
proc godo {elt} {
    global curview

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

3361 3362 3363 3364 3365
proc goback {} {
    global history historyindex

    if {$historyindex > 1} {
	incr historyindex -1
3366
	godo [lindex $history [expr {$historyindex - 1}]]
3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377
	.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]} {
3378
	set cmd [lindex $history $historyindex]
3379
	incr historyindex
3380
	godo $cmd
3381 3382 3383 3384 3385
	.ctop.top.bar.leftbut conf -state normal
    }
    if {$historyindex >= [llength $history]} {
	.ctop.top.bar.rightbut conf -state disabled
    }
3386 3387
}

P
Paul Mackerras 已提交
3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475
proc gettree {id} {
    global treefilelist treeidlist diffids diffmergeid treepending

    set diffids $id
    catch {unset diffmergeid}
    if {![info exists treefilelist($id)]} {
	if {![info exists treepending]} {
	    if {[catch {set gtf [open [concat | git-ls-tree -r $id] r]}]} {
		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]
    if {[catch {set bf [open [concat | git-cat-file blob $blob] r]} err]} {
	puts "oops, error reading blob $blob: $err"
	return
    }
    fconfigure $bf -blocking 0
    fileevent $bf readable [list getblobline $bf $diffids]
    $ctext config -state normal
    $ctext delete $commentend end
    $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
}

3476 3477
proc mergediff {id l} {
    global diffmergeid diffopts mdifffd
3478
    global diffids
3479
    global parentlist
3480

3481
    set diffmergeid $id
3482
    set diffids $id
3483
    # this doesn't seem to actually affect anything...
3484
    set env(GIT_DIFF_OPTS) $diffopts
3485 3486 3487 3488
    set cmd [concat | git-diff-tree --no-commit-id --cc $id]
    if {[catch {set mdf [open $cmd r]} err]} {
	error_popup "Error getting merge diffs: $err"
	return
3489
    }
3490 3491
    fconfigure $mdf -blocking 0
    set mdifffd($id) $mdf
3492 3493
    set np [llength [lindex $parentlist $l]]
    fileevent $mdf readable [list getmergediffline $mdf $id $np]
3494
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
3495 3496
}

3497 3498
proc getmergediffline {mdf id np} {
    global diffmergeid ctext cflist nextupdate mergemax
3499
    global difffilestart mdifffd
3500

3501
    set n [gets $mdf line]
3502
    if {$n < 0} {
3503 3504
	if {[eof $mdf]} {
	    close $mdf
3505 3506 3507
	}
	return
    }
3508 3509
    if {![info exists diffmergeid] || $id != $diffmergeid
	|| $mdf != $mdifffd($id)} {
3510
	return
3511 3512
    }
    $ctext conf -state normal
3513 3514
    if {[regexp {^diff --cc (.*)} $line match fname]} {
	# start of a new file
3515 3516
	$ctext insert end "\n"
	set here [$ctext index "end - 1c"]
3517
	lappend difffilestart $here
P
Paul Mackerras 已提交
3518
	add_flist [list $fname]
3519
	set l [expr {(78 - [string length $fname]) / 2}]
3520
	set pad [string range "----------------------------------------" 1 $l]
3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539
	$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
3540
	    } else {
3541 3542
		set isbad 1
		break
3543
	    }
3544
	}
3545 3546 3547 3548 3549 3550 3551 3552 3553
	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]
3554
	}
3555 3556 3557
	if {$num ne {}} {
	    if {$num >= $mergemax} {
		set num "max"
3558
	    }
3559
	    lappend tags m$num
3560
	}
3561
	$ctext insert end "$line\n" $tags
3562 3563
    }
    $ctext conf -state disabled
3564 3565 3566 3567
    if {[clock clicks -milliseconds] >= $nextupdate} {
	incr nextupdate 100
	fileevent $mdf readable {}
	update
3568
	fileevent $mdf readable [list getmergediffline $mdf $id $np]
3569 3570 3571
    }
}

3572 3573
proc startdiff {ids} {
    global treediffs diffids treepending diffmergeid
3574

3575
    set diffids $ids
3576
    catch {unset diffmergeid}
3577
    if {![info exists treediffs($ids)]} {
3578
	if {![info exists treepending]} {
3579
	    gettreediffs $ids
3580 3581
	}
    } else {
3582
	addtocflist $ids
3583 3584 3585 3586
    }
}

proc addtocflist {ids} {
3587
    global treediffs cflist
P
Paul Mackerras 已提交
3588
    add_flist $treediffs($ids)
3589
    getblobdiffs $ids
3590 3591
}

3592
proc gettreediffs {ids} {
3593
    global treediff treepending
3594
    set treepending $ids
3595
    set treediff {}
3596 3597 3598
    if {[catch \
	 {set gdtf [open [concat | git-diff-tree --no-commit-id -r $ids] r]} \
	]} return
3599
    fconfigure $gdtf -blocking 0
3600
    fileevent $gdtf readable [list gettreediffline $gdtf $ids]
3601 3602
}

3603
proc gettreediffline {gdtf ids} {
3604
    global treediff treediffs treepending diffids diffmergeid
P
Paul Mackerras 已提交
3605
    global cmitmode
3606

3607 3608 3609 3610
    set n [gets $gdtf line]
    if {$n < 0} {
	if {![eof $gdtf]} return
	close $gdtf
3611
	set treediffs($ids) $treediff
3612
	unset treepending
P
Paul Mackerras 已提交
3613 3614 3615
	if {$cmitmode eq "tree"} {
	    gettree $diffids
	} elseif {$ids != $diffids} {
3616 3617
	    if {![info exists diffmergeid]} {
		gettreediffs $diffids
3618
	    }
3619 3620
	} else {
	    addtocflist $ids
3621
	}
3622 3623
	return
    }
3624
    set file [lindex $line 5]
3625
    lappend treediff $file
3626 3627
}

3628
proc getblobdiffs {ids} {
3629
    global diffopts blobdifffd diffids env curdifftag curtagstart
3630
    global nextupdate diffinhdr treediffs
3631

3632
    set env(GIT_DIFF_OPTS) $diffopts
3633
    set cmd [concat | git-diff-tree --no-commit-id -r -p -C $ids]
3634
    if {[catch {set bdf [open $cmd r]} err]} {
3635 3636 3637
	puts "error getting diffs: $err"
	return
    }
3638
    set diffinhdr 0
3639
    fconfigure $bdf -blocking 0
3640
    set blobdifffd($ids) $bdf
3641 3642 3643
    set curdifftag Comments
    set curtagstart 0.0
    fileevent $bdf readable [list getblobdiffline $bdf $diffids]
3644
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
3645 3646
}

3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659
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
    }
}

3660
proc getblobdiffline {bdf ids} {
3661
    global diffids blobdifffd ctext curdifftag curtagstart
3662 3663
    global diffnexthead diffnextnote difffilestart
    global nextupdate diffinhdr treediffs
3664

3665 3666 3667 3668
    set n [gets $bdf line]
    if {$n < 0} {
	if {[eof $bdf]} {
	    close $bdf
3669
	    if {$ids == $diffids && $bdf == $blobdifffd($ids)} {
3670 3671 3672 3673 3674
		$ctext tag add $curdifftag $curtagstart end
	    }
	}
	return
    }
3675
    if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
3676 3677 3678
	return
    }
    $ctext conf -state normal
3679
    if {[regexp {^diff --git a/(.*) b/(.*)} $line match fname newname]} {
3680 3681 3682
	# start of a new file
	$ctext insert end "\n"
	$ctext tag add $curdifftag $curtagstart end
3683
	set here [$ctext index "end - 1c"]
3684 3685
	set curtagstart $here
	set header $newname
3686 3687 3688 3689 3690 3691 3692 3693 3694
	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
	    }
3695
	}
3696 3697
	set curdifftag "f:$fname"
	$ctext tag delete $curdifftag
3698
	set l [expr {(78 - [string length $header]) / 2}]
3699
	set pad [string range "----------------------------------------" 1 $l]
3700
	$ctext insert end "$pad $header $pad\n" filesep
3701
	set diffinhdr 1
3702 3703 3704
    } elseif {$diffinhdr && [string compare -length 3 $line "---"] == 0} {
	# do nothing
    } elseif {$diffinhdr && [string compare -length 3 $line "+++"] == 0} {
3705
	set diffinhdr 0
3706 3707
    } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
		   $line match f1l f1c f2l f2c rest]} {
3708
	$ctext insert end "$line\n" hunksep
3709
	set diffinhdr 0
3710 3711 3712 3713 3714 3715 3716
    } 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"
3717
	} elseif {$diffinhdr || $x == "\\"} {
3718 3719
	    # e.g. "\ No newline at end of file"
	    $ctext insert end "$line\n" filesep
3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731
	} 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
3732 3733 3734 3735 3736 3737
    if {[clock clicks -milliseconds] >= $nextupdate} {
	incr nextupdate 100
	fileevent $bdf readable {}
	update
	fileevent $bdf readable "getblobdiffline $bdf {$ids}"
    }
3738 3739
}

3740 3741 3742
proc nextfile {} {
    global difffilestart ctext
    set here [$ctext index @0,0]
3743 3744 3745
    foreach loc $difffilestart {
	if {[$ctext compare $loc > $here]} {
	    $ctext yview $loc
3746 3747
	}
    }
3748 3749
}

3750 3751
proc setcoords {} {
    global linespc charspc canvx0 canvy0 mainfont
3752
    global xspc1 xspc2 lthickness
3753

3754 3755
    set linespc [font metrics $mainfont -linespace]
    set charspc [font measure $mainfont "m"]
P
Paul Mackerras 已提交
3756 3757
    set canvy0 [expr {int(3 + 0.5 * $linespc)}]
    set canvx0 [expr {int(3 + 0.5 * $linespc)}]
3758
    set lthickness [expr {int($linespc / 9) + 1}]
3759 3760
    set xspc1(0) $linespc
    set xspc2 $linespc
3761
}
3762

3763
proc redisplay {} {
3764
    global canv
P
Paul Mackerras 已提交
3765 3766 3767 3768 3769 3770
    global selectedline

    set ymax [lindex [$canv cget -scrollregion] 3]
    if {$ymax eq {} || $ymax == 0} return
    set span [$canv yview]
    clear_display
3771
    setcanvscroll
P
Paul Mackerras 已提交
3772 3773 3774 3775
    allcanvs yview moveto [lindex $span 0]
    drawvisible
    if {[info exists selectedline]} {
	selectline $selectedline 0
3776 3777 3778 3779
    }
}

proc incrfont {inc} {
3780
    global mainfont textfont ctext canv phase
3781
    global stopped entries
3782 3783 3784 3785 3786 3787
    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]
3788 3789 3790
    foreach e $entries {
	$e conf -font $mainfont
    }
3791
    if {$phase eq "getcommits"} {
3792 3793 3794 3795
	$canv itemconf textitems -font $mainfont
    }
    redisplay
}
3796

3797 3798 3799 3800 3801 3802 3803
proc clearsha1 {} {
    global sha1entry sha1string
    if {[string length $sha1string] == 40} {
	$sha1entry delete 0 end
    }
}

3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820
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 {} {
3821
    global sha1string currentid commitrow tagids headids
3822
    global displayorder numcommits curview
3823

3824 3825 3826 3827
    if {$sha1string == {}
	|| ([info exists currentid] && $sha1string == $currentid)} return
    if {[info exists tagids($sha1string)]} {
	set id $tagids($sha1string)
3828 3829
    } elseif {[info exists headids($sha1string)]} {
	set id $headids($sha1string)
3830 3831
    } else {
	set id [string tolower $sha1string]
3832 3833
	if {[regexp {^[0-9a-f]{4,39}$} $id]} {
	    set matches {}
P
Paul Mackerras 已提交
3834 3835 3836
	    foreach i $displayorder {
		if {[string match $id* $i]} {
		    lappend matches $i
3837 3838 3839 3840 3841 3842 3843 3844 3845 3846
		}
	    }
	    if {$matches ne {}} {
		if {[llength $matches] > 1} {
		    error_popup "Short SHA1 id $id is ambiguous"
		    return
		}
		set id [lindex $matches 0]
	    }
	}
3847
    }
3848 3849
    if {[info exists commitrow($curview,$id)]} {
	selectline $commitrow($curview,$id) 1
3850 3851
	return
    }
3852
    if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
3853 3854
	set type "SHA1 id"
    } else {
3855
	set type "Tag/Head"
3856 3857 3858 3859
    }
    error_popup "$type $sha1string is not known"
}

3860 3861 3862 3863
proc lineenter {x y id} {
    global hoverx hovery hoverid hovertimer
    global commitinfo canv

P
Paul Mackerras 已提交
3864
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918
    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 已提交
3919
    set t [$canv create text $x $y -anchor nw -text $text -tags hover -font $mainfont]
3920 3921 3922
    $canv raise $t
}

3923
proc clickisonarrow {id y} {
P
Paul Mackerras 已提交
3924
    global lthickness
3925

P
Paul Mackerras 已提交
3926
    set ranges [rowranges $id]
3927
    set thresh [expr {2 * $lthickness + 6}]
P
Paul Mackerras 已提交
3928
    set n [expr {[llength $ranges] - 1}]
3929
    for {set i 1} {$i < $n} {incr i} {
P
Paul Mackerras 已提交
3930
	set row [lindex $ranges $i]
3931 3932
	if {abs([yc $row] - $y) < $thresh} {
	    return $i
3933 3934 3935 3936 3937
	}
    }
    return {}
}

3938
proc arrowjump {id n y} {
P
Paul Mackerras 已提交
3939
    global canv
3940

3941 3942
    # 1 <-> 2, 3 <-> 4, etc...
    set n [expr {(($n - 1) ^ 1) + 1}]
P
Paul Mackerras 已提交
3943
    set row [lindex [rowranges $id] $n]
3944
    set yt [yc $row]
3945 3946 3947 3948 3949 3950 3951 3952
    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
    }
3953
    allcanvs yview moveto $yfrac
3954 3955
}

3956
proc lineclick {x y id isnew} {
3957
    global ctext commitinfo children canv thickerline curview
3958

P
Paul Mackerras 已提交
3959
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
3960
    unmarkmatches
3961
    unselectline
3962 3963 3964 3965
    normalline
    $canv delete hover
    # draw this line thicker than normal
    set thickerline $id
3966
    drawlines $id
3967
    if {$isnew} {
3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980
	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]
3981
    }
3982 3983 3984
    # fill the details pane with info about this line
    $ctext conf -state normal
    $ctext delete 0.0 end
3985 3986 3987 3988 3989 3990
    $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]
3991
    set info $commitinfo($id)
3992
    $ctext insert end "\n\t[lindex $info 0]\n"
3993
    $ctext insert end "\tAuthor:\t[lindex $info 1]\n"
P
Paul Mackerras 已提交
3994 3995
    set date [formatdate [lindex $info 2]]
    $ctext insert end "\tDate:\t$date\n"
3996
    set kids $children($curview,$id)
3997
    if {$kids ne {}} {
3998
	$ctext insert end "\nChildren:"
3999
	set i 0
4000
	foreach child $kids {
4001
	    incr i
P
Paul Mackerras 已提交
4002
	    if {![info exists commitinfo($child)] && ![getcommit $child]} continue
4003
	    set info $commitinfo($child)
4004 4005 4006 4007 4008
	    $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 已提交
4009 4010
	    set date [formatdate [lindex $info 2]]
	    $ctext insert end "\n\tDate:\t$date\n"
4011 4012 4013
	}
    }
    $ctext conf -state disabled
4014
    init_flist {}
4015 4016
}

4017 4018 4019
proc normalline {} {
    global thickerline
    if {[info exists thickerline]} {
4020
	set id $thickerline
4021
	unset thickerline
4022
	drawlines $id
4023 4024 4025
    }
}

4026
proc selbyid {id} {
4027 4028 4029
    global commitrow curview
    if {[info exists commitrow($curview,$id)]} {
	selectline $commitrow($curview,$id) 1
4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041
    }
}

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

4044 4045
    if {![info exists selectedline]
	|| $commitrow($curview,$id) eq $selectedline} {
4046 4047 4048 4049 4050 4051
	set state disabled
    } else {
	set state normal
    }
    $rowctxmenu entryconfigure 0 -state $state
    $rowctxmenu entryconfigure 1 -state $state
4052
    $rowctxmenu entryconfigure 2 -state $state
4053 4054 4055 4056 4057
    set rowmenuid $id
    tk_popup $rowctxmenu $x $y
}

proc diffvssel {dirn} {
4058
    global rowmenuid selectedline displayorder
4059 4060 4061

    if {![info exists selectedline]} return
    if {$dirn} {
4062
	set oldid [lindex $displayorder $selectedline]
4063 4064 4065
	set newid $rowmenuid
    } else {
	set oldid $rowmenuid
4066
	set newid [lindex $displayorder $selectedline]
4067
    }
4068 4069 4070 4071 4072
    addtohistory [list doseldiff $oldid $newid]
    doseldiff $oldid $newid
}

proc doseldiff {oldid newid} {
4073
    global ctext
4074 4075
    global commitinfo

4076 4077
    $ctext conf -state normal
    $ctext delete 0.0 end
4078
    init_flist "Top"
4079 4080 4081 4082 4083 4084 4085
    $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     "
4086
    $ctext insert end [lindex $commitinfo($oldid) 0]
4087 4088 4089 4090
    $ctext insert end "\n\nTo   "
    $ctext tag bind link1 <1> [list selbyid $newid]
    $ctext insert end $newid [list link link1]
    $ctext insert end "\n     "
4091 4092 4093 4094 4095
    $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
4096
    startdiff [list $oldid $newid]
4097 4098
}

4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111
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"
4112
    grid $top.title - -pady 10
4113
    label $top.from -text "From:"
4114
    entry $top.fromsha1 -width 40 -relief flat
4115 4116 4117
    $top.fromsha1 insert 0 $oldid
    $top.fromsha1 conf -state readonly
    grid $top.from $top.fromsha1 -sticky w
4118
    entry $top.fromhead -width 60 -relief flat
4119 4120 4121 4122
    $top.fromhead insert 0 $oldhead
    $top.fromhead conf -state readonly
    grid x $top.fromhead -sticky w
    label $top.to -text "To:"
4123
    entry $top.tosha1 -width 40 -relief flat
4124 4125 4126
    $top.tosha1 insert 0 $newid
    $top.tosha1 conf -state readonly
    grid $top.to $top.tosha1 -sticky w
4127
    entry $top.tohead -width 60 -relief flat
4128 4129 4130 4131 4132 4133 4134 4135 4136
    $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
4137
    grid $top.flab $top.fname -sticky w
4138 4139 4140 4141 4142 4143 4144
    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
4145
    focus $top.fname
4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183
}

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]
    if {[catch {exec git-diff-tree -p $oldid $newid >$fname &} err]} {
	error_popup "Error creating patch: $err"
    }
    catch {destroy $patchtop}
    unset patchtop
}

proc mkpatchcan {} {
    global patchtop

    catch {destroy $patchtop}
    unset patchtop
}

4184 4185 4186 4187 4188 4189 4190 4191
proc mktag {} {
    global rowmenuid mktagtop commitinfo

    set top .maketag
    set mktagtop $top
    catch {destroy $top}
    toplevel $top
    label $top.title -text "Create tag"
4192
    grid $top.title - -pady 10
4193
    label $top.id -text "ID:"
4194
    entry $top.sha1 -width 40 -relief flat
4195 4196 4197
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
4198
    entry $top.head -width 60 -relief flat
4199 4200 4201 4202
    $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:"
4203
    entry $top.tag -width 60
4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228
    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 {
4229
	set dir [gitdir]
4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240
	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
4241 4242 4243 4244
    redrawtags $id
}

proc redrawtags {id} {
4245
    global canv linehtag commitrow idpos selectedline curview
4246

4247 4248
    if {![info exists commitrow($curview,$id)]} return
    drawcmitrow $commitrow($curview,$id)
4249 4250
    $canv delete tag.$id
    set xt [eval drawtags $id $idpos($id)]
4251 4252 4253
    $canv coords $linehtag($commitrow($curview,$id)) $xt [lindex $idpos($id) 2]
    if {[info exists selectedline]
	&& $selectedline == $commitrow($curview,$id)} {
4254
	selectline $selectedline 0
4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269
    }
}

proc mktagcan {} {
    global mktagtop

    catch {destroy $mktagtop}
    unset mktagtop
}

proc mktaggo {} {
    domktag
    mktagcan
}

4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 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
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
}

4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363
proc listrefs {id} {
    global idtags idheads idotherrefs

    set x {}
    if {[info exists idtags($id)]} {
	set x $idtags($id)
    }
    set y {}
    if {[info exists idheads($id)]} {
	set y $idheads($id)
    }
    set z {}
    if {[info exists idotherrefs($id)]} {
	set z $idotherrefs($id)
    }
    return [list $x $y $z]
}

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

4364
proc showtag {tag isnew} {
4365
    global ctext tagcontents tagids linknum
4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379

    if {$isnew} {
	addtohistory [list showtag $tag 0]
    }
    $ctext conf -state normal
    $ctext delete 0.0 end
    set linknum 0
    if {[info exists tagcontents($tag)]} {
	set text $tagcontents($tag)
    } else {
	set text "Tag: $tag\nId:  $tagids($tag)"
    }
    appendwithlinks $text
    $ctext conf -state disabled
4380
    init_flist {}
4381 4382
}

4383 4384 4385 4386 4387
proc doquit {} {
    global stopped
    set stopped 100
    destroy .
}
4388

4389 4390 4391
proc doprefs {} {
    global maxwidth maxgraphpct diffopts findmergefiles
    global oldprefs prefstop
P
Paul Mackerras 已提交
4392

4393 4394 4395 4396 4397
    set top .gitkprefs
    set prefstop $top
    if {[winfo exists $top]} {
	raise $top
	return
4398
    }
4399 4400
    foreach v {maxwidth maxgraphpct diffopts findmergefiles} {
	set oldprefs($v) [set $v]
P
Paul Mackerras 已提交
4401
    }
4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458
    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
    checkbutton $top.findm -variable findmergefiles
    label $top.findml -text "Include merges for \"Find\" in \"Files\"" \
	-font optionfont
    grid $top.findm $top.findml - -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
    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 {} {
    global maxwidth maxgraphpct diffopts findmergefiles
    global oldprefs prefstop

    foreach v {maxwidth maxgraphpct diffopts findmergefiles} {
	set $v $oldprefs($v)
    }
    catch {destroy $prefstop}
    unset prefstop
}

proc prefsok {} {
    global maxwidth maxgraphpct
    global oldprefs prefstop

    catch {destroy $prefstop}
    unset prefstop
    if {$maxwidth != $oldprefs(maxwidth)
	|| $maxgraphpct != $oldprefs(maxgraphpct)} {
	redisplay
    }
}

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

4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 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 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599 4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637 4638 4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733
# 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 {}
}

4734 4735 4736
# defaults...
set datemode 0
set diffopts "-U 5 -p"
4737
set wrcomcmd "git-diff-tree --stdin -p --pretty"
4738

4739
set gitencoding {}
4740 4741 4742 4743
catch {
    set gitencoding [exec git-repo-config --get i18n.commitencoding]
}
if {$gitencoding == ""} {
4744 4745 4746 4747 4748
    set gitencoding "utf-8"
}
set tclencoding [tcl_encoding $gitencoding]
if {$tclencoding == {}} {
    puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
4749
}
4750

4751 4752
set mainfont {Helvetica 9}
set textfont {Courier 9}
4753
set uifont {Helvetica 9 bold}
4754
set findmergefiles 0
4755
set maxgraphpct 50
4756
set maxwidth 16
P
Paul Mackerras 已提交
4757
set revlistorder 0
4758
set fastdate 0
P
Paul Mackerras 已提交
4759 4760 4761
set uparrowlen 7
set downarrowlen 7
set mingaplen 30
4762
set flistmode "flat"
P
Paul Mackerras 已提交
4763
set cmitmode "patch"
4764 4765 4766 4767 4768

set colors {green red blue magenta darkgrey brown orange}

catch {source ~/.gitk}

4769
font create optionfont -family sans-serif -size -12
4770

4771 4772 4773 4774 4775 4776 4777 4778 4779
set revtreeargs {}
foreach arg $argv {
    switch -regexp -- $arg {
	"^$" { }
	"^-d" { set datemode 1 }
	default {
	    lappend revtreeargs $arg
	}
    }
4780
}
4781

P
Paul Mackerras 已提交
4782 4783 4784 4785 4786 4787 4788
# check that we can find a .git directory somewhere...
set gitdir [gitdir]
if {![file isdirectory $gitdir]} {
    error_popup "Cannot find the git directory \"$gitdir\"."
    exit 1
}

4789 4790 4791
set history {}
set historyindex 0

P
Paul Mackerras 已提交
4792 4793
set optim_delay 16

P
Paul Mackerras 已提交
4794 4795
set nextviewnum 1
set curview 0
4796
set selectedview 0
4797
set selectedhlview {}
P
Paul Mackerras 已提交
4798
set viewfiles(0) {}
4799
set viewperm(0) 0
P
Paul Mackerras 已提交
4800

4801
set stopped 0
4802
set stuffsaved 0
4803
set patchnum 0
4804
setcoords
4805
makewindow
4806
readrefs
4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818

set cmdline_files {}
catch {
    set fileargs [eval exec git-rev-parse --no-revs --no-flags $revtreeargs]
    set cmdline_files [split $fileargs "\n"]
    set n [llength $cmdline_files]
    set revtreeargs [lrange $revtreeargs 0 end-$n]
}
if {[lindex $revtreeargs end] eq "--"} {
    set revtreeargs [lrange $revtreeargs 0 end-1]
}

P
Paul Mackerras 已提交
4819 4820 4821
if {$cmdline_files ne {}} {
    # create a view for the files/dirs specified on the command line
    set curview 1
4822
    set selectedview 1
P
Paul Mackerras 已提交
4823 4824 4825
    set nextviewnum 2
    set viewname(1) "Command line"
    set viewfiles(1) $cmdline_files
4826
    set viewperm(1) 0
4827 4828
    addviewmenu 1
    .bar.view entryconf 1 -state normal
P
Paul Mackerras 已提交
4829 4830
    .bar.view entryconf 2 -state normal
}
4831 4832 4833 4834 4835 4836 4837 4838

if {[info exists permviews]} {
    foreach v $permviews {
	set n $nextviewnum
	incr nextviewnum
	set viewname($n) [lindex $v 0]
	set viewfiles($n) [lindex $v 1]
	set viewperm($n) 1
4839
	addviewmenu $n
4840 4841
    }
}
4842
getcommits