gitk 115.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 {} {
20
    global startmsecs nextupdate ncmupdate
P
Paul Mackerras 已提交
21
    global commfd leftover tclencoding datemode
22
    global revtreeargs curview viewfiles
23 24

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

53 54 55 56 57 58 59 60 61 62 63 64
proc stop_rev_list {} {
    global commfd

    if {![info exists commfd]} return
    catch {
	set pid [pid $commfd]
	exec kill $pid
    }
    catch {close $commfd}
    unset commfd
}

65
proc getcommits {} {
P
Paul Mackerras 已提交
66
    global phase canv mainfont
67 68

    set phase getcommits
69
    start_rev_list
70 71 72 73 74
    $canv delete all
    $canv create text 3 3 -anchor nw -text "Reading commits..." \
	-font $mainfont -tags textitems
}

P
Paul Mackerras 已提交
75
proc getcommitlines {commfd}  {
P
Paul Mackerras 已提交
76 77 78
    global commitlisted nextupdate
    global leftover
    global displayorder commitidx commitrow commitdata
79
    global parentlist childlist children
80

P
Paul Mackerras 已提交
81 82
    set stuff [read $commfd]
    if {$stuff == {}} {
83
	if {![eof $commfd]} return
84
	# set it blocking so we wait for the process to terminate
85
	fconfigure $commfd -blocking 1
86
	if {![catch {close $commfd} err]} {
87
	    after idle finishcommits
88 89
	    return
	}
90
	if {[string range $err 0 4] == "usage"} {
91
	    set err \
J
Jeff Hobbs 已提交
92 93 94
		"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.)"
95
	} else {
96
	    set err "Error reading commits: $err"
97
	}
98
	error_popup $err
99
	exit 1
100
    }
P
Paul Mackerras 已提交
101
    set start 0
102
    set gotsome 0
P
Paul Mackerras 已提交
103 104 105
    while 1 {
	set i [string first "\0" $stuff $start]
	if {$i < 0} {
106
	    append leftover [string range $stuff $start end]
P
Paul Mackerras 已提交
107
	    break
108
	}
P
Paul Mackerras 已提交
109
	if {$start == 0} {
110 111
	    set cmit $leftover
	    append cmit [string range $stuff 0 [expr {$i - 1}]]
112
	    set leftover {}
113 114
	} else {
	    set cmit [string range $stuff $start [expr {$i - 1}]]
P
Paul Mackerras 已提交
115 116
	}
	set start [expr {$i + 1}]
117 118
	set j [string first "\n" $cmit]
	set ok 0
119
	set listed 1
120 121
	if {$j >= 0} {
	    set ids [string range $cmit 0 [expr {$j - 1}]]
122 123 124 125
	    if {[string range $ids 0 0] == "-"} {
		set listed 0
		set ids [string range $ids 1 end]
	    }
126 127
	    set ok 1
	    foreach id $ids {
128
		if {[string length $id] != 40} {
129 130 131 132 133 134
		    set ok 0
		    break
		}
	    }
	}
	if {!$ok} {
135 136 137 138 139
	    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 已提交
140 141
	    exit 1
	}
142
	set id [lindex $ids 0]
143 144
	if {$listed} {
	    set olds [lrange $ids 1 end]
P
Paul Mackerras 已提交
145
	    set i 0
146
	    foreach p $olds {
P
Paul Mackerras 已提交
147 148 149 150
		if {$i == 0 || [lsearch -exact $olds $p] >= $i} {
		    lappend children($p) $id
		}
		incr i
151
	    }
152 153 154
	} else {
	    set olds {}
	}
155 156 157
	lappend parentlist $olds
	if {[info exists children($id)]} {
	    lappend childlist $children($id)
158
	    unset children($id)
159 160 161
	} else {
	    lappend childlist {}
	}
162
	set commitdata($id) [string range $cmit [expr {$j + 1}] end]
163 164 165
	set commitrow($id) $commitidx
	incr commitidx
	lappend displayorder $id
166
	lappend commitlisted $listed
167 168 169 170
	set gotsome 1
    }
    if {$gotsome} {
	layoutmore
P
Paul Mackerras 已提交
171 172 173
    }
    if {[clock clicks -milliseconds] >= $nextupdate} {
	doupdate 1
174 175 176
    }
}

177 178
proc doupdate {reading} {
    global commfd nextupdate numcommits ncmupdate
179

180 181 182
    if {$reading} {
	fileevent $commfd readable {}
    }
183
    update
184 185 186 187 188 189 190 191 192 193 194
    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}]
    }
    if {$reading} {
	fileevent $commfd readable [list getcommitlines $commfd]
    }
195 196 197
}

proc readcommit {id} {
198
    if {[catch {set contents [exec git-cat-file commit $id]}]} return
199
    parsecommit $id $contents 0
P
Paul Mackerras 已提交
200 201
}

P
Paul Mackerras 已提交
202
proc updatecommits {} {
203
    global viewdata curview revtreeargs phase
P
Paul Mackerras 已提交
204

205 206 207 208
    if {$phase ne {}} {
	stop_rev_list
	set phase {}
    }
209 210 211
    set n $curview
    set curview -1
    catch {unset viewdata($n)}
212
    readrefs
213
    showview $n
214 215
}

216
proc parsecommit {id contents listed} {
217 218 219 220 221 222 223 224 225
    global commitinfo cdate

    set inhdr 1
    set comment {}
    set headline {}
    set auname {}
    set audate {}
    set comname {}
    set comdate {}
P
Paul Mackerras 已提交
226 227 228 229 230 231 232 233 234 235 236 237 238 239 240
    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]
241 242
	}
    }
P
Paul Mackerras 已提交
243 244 245 246 247
    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]]
248 249
    } else {
	set headline $comment
P
Paul Mackerras 已提交
250 251 252 253 254 255 256 257
    }
    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
258
	    append newcomment "\n"
P
Paul Mackerras 已提交
259 260
	}
	set comment $newcomment
261 262
    }
    if {$comdate != {}} {
263
	set cdate($id) $comdate
264
    }
265 266
    set commitinfo($id) [list $headline $auname $audate \
			     $comname $comdate $comment]
267 268
}

269
proc getcommit {id} {
270
    global commitdata commitinfo
P
Paul Mackerras 已提交
271

272 273
    if {[info exists commitdata($id)]} {
	parsecommit $id $commitdata($id) 1
P
Paul Mackerras 已提交
274 275 276 277 278 279 280 281 282
    } else {
	readcommit $id
	if {![info exists commitinfo($id)]} {
	    set commitinfo($id) {"No commit information available"}
	}
    }
    return 1
}

283
proc readrefs {} {
284
    global tagids idtags headids idheads tagcontents
285
    global otherrefids idotherrefs
286

287 288 289
    foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
	catch {unset $v}
    }
290
    set refd [open [list | git ls-remote [gitdir]] r]
291 292 293 294
    while {0 <= [set n [gets $refd line]]} {
	if {![regexp {^([0-9a-f]{40})	refs/([^^]*)$} $line \
	    match id path]} {
	    continue
P
Paul Mackerras 已提交
295
	}
296 297 298
	if {![regexp {^(tags|heads)/(.*)$} $path match type name]} {
	    set type others
	    set name $path
299
	}
300 301 302 303 304 305 306 307 308 309 310 311 312 313 314
	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"]
315
	    }
316 317 318 319 320 321
	} elseif { $type == "heads" } {
	    set headids($name) $id
	    lappend idheads($id) $name
	} else {
	    set otherrefids($name) $id
	    lappend idotherrefs($id) $name
322 323
	}
    }
324
    close $refd
325 326
}

327 328 329 330 331 332 333 334 335
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"
336
    bind $w <Key-Return> "destroy $w"
337 338 339
    tkwait window $w
}

340
proc makewindow {} {
341 342
    global canv canv2 canv3 linespc charspc ctext cflist
    global textfont mainfont uifont
343
    global findtype findtypemenu findloc findstring fstring geometry
344
    global entries sha1entry sha1string sha1but
345
    global maincursor textcursor curtextcursor
346
    global rowctxmenu mergemax
347 348 349

    menu .bar
    .bar add cascade -label "File" -menu .bar.file
350
    .bar configure -font $uifont
351
    menu .bar.file
P
Paul Mackerras 已提交
352
    .bar.file add command -label "Update" -command updatecommits
353
    .bar.file add command -label "Reread references" -command rereadrefs
354
    .bar.file add command -label "Quit" -command doquit
355
    .bar.file configure -font $uifont
356 357 358
    menu .bar.edit
    .bar add cascade -label "Edit" -menu .bar.edit
    .bar.edit add command -label "Preferences" -command doprefs
359
    .bar.edit configure -font $uifont
360
    menu .bar.view -font $uifont
P
Paul Mackerras 已提交
361 362 363 364 365
    .bar add cascade -label "View" -menu .bar.view
    .bar.view add command -label "New view..." -command newview
    .bar.view add command -label "Delete view" -command delview -state disabled
    .bar.view add separator
    .bar.view add command -label "All files" -command {showview 0}
366 367 368
    menu .bar.help
    .bar add cascade -label "Help" -menu .bar.help
    .bar.help add command -label "About gitk" -command about
369
    .bar.help add command -label "Key bindings" -command keys
370
    .bar.help configure -font $uifont
371 372
    . configure -menu .bar

373
    if {![info exists geometry(canv1)]} {
J
Jeff Hobbs 已提交
374 375 376 377
	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}]
378 379 380 381
	set geometry(ctextw) 80
	set geometry(ctexth) 30
	set geometry(cflistw) 30
    }
P
Paul Mackerras 已提交
382
    panedwindow .ctop -orient vertical
383 384
    if {[info exists geometry(width)]} {
	.ctop conf -width $geometry(width) -height $geometry(height)
385 386 387
	set texth [expr {$geometry(height) - $geometry(canvh) - 56}]
	set geometry(ctexth) [expr {($texth - 8) /
				    [font metrics $textfont -linespace]}]
388
    }
389 390 391 392 393 394 395 396 397 398
    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
399
    canvas $canv -height $geometry(canvh) -width $geometry(canv1) \
400
	-bg white -bd 0 \
P
Paul Mackerras 已提交
401
	-yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
402 403
    .ctop.top.clist add $canv
    set canv2 .ctop.top.clist.canv2
404
    canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \
405
	-bg white -bd 0 -yscrollincr $linespc
406 407
    .ctop.top.clist add $canv2
    set canv3 .ctop.top.clist.canv3
408
    canvas $canv3 -height $geometry(canvh) -width $geometry(canv3) \
409
	-bg white -bd 0 -yscrollincr $linespc
410
    .ctop.top.clist add $canv3
411
    bind .ctop.top.clist <Configure> {resizeclistpanes %W %w}
412 413

    set sha1entry .ctop.top.bar.sha1
414 415 416
    set entries $sha1entry
    set sha1but .ctop.top.bar.sha1label
    button $sha1but -text "SHA1 ID: " -state disabled -relief flat \
417
	-command gotocommit -width 8 -font $uifont
418
    $sha1but conf -disabledforeground [$sha1but cget -foreground]
419
    pack .ctop.top.bar.sha1label -side left
420 421
    entry $sha1entry -width 40 -font $textfont -textvariable sha1string
    trace add variable sha1string write sha1change
422
    pack $sha1entry -side left -pady 2
423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446

    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

447
    button .ctop.top.bar.findbut -text "Find" -command dofind -font $uifont
448 449
    pack .ctop.top.bar.findbut -side left
    set findstring {}
450
    set fstring .ctop.top.bar.findstring
451
    lappend entries $fstring
452
    entry $fstring -width 30 -font $textfont -textvariable findstring -font $textfont
453
    pack $fstring -side left -expand 1 -fill x
454
    set findtype Exact
455 456
    set findtypemenu [tk_optionMenu .ctop.top.bar.findtype \
			  findtype Exact IgnCase Regexp]
457 458
    .ctop.top.bar.findtype configure -font $uifont
    .ctop.top.bar.findtype.menu configure -font $uifont
459 460
    set findloc "All fields"
    tk_optionMenu .ctop.top.bar.findloc findloc "All fields" Headline \
461
	Comments Author Committer Files Pickaxe
462 463 464
    .ctop.top.bar.findloc configure -font $uifont
    .ctop.top.bar.findloc.menu configure -font $uifont

465 466
    pack .ctop.top.bar.findloc -side right
    pack .ctop.top.bar.findtype -side right
467 468
    # for making sure type==Exact whenever loc==Pickaxe
    trace add variable findloc write findlocchange
469

470 471
    panedwindow .ctop.cdet -orient horizontal
    .ctop add .ctop.cdet
472 473
    frame .ctop.cdet.left
    set ctext .ctop.cdet.left.ctext
474 475
    text $ctext -bg white -state disabled -font $textfont \
	-width $geometry(ctextw) -height $geometry(ctexth) \
476
	-yscrollcommand ".ctop.cdet.left.sb set" -wrap none
477 478 479 480 481
    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

482
    $ctext tag conf filesep -font [concat $textfont bold] -back "#aaaaaa"
483 484 485 486 487 488 489 490
    $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
491 492 493 494 495 496 497 498 499 500 501
    $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"
502
    $ctext tag conf mmax -fore darkgrey
503
    set mergemax 16
504 505 506
    $ctext tag conf mresult -font [concat $textfont bold]
    $ctext tag conf msep -font [concat $textfont bold]
    $ctext tag conf found -back yellow
507

508 509
    frame .ctop.cdet.right
    set cflist .ctop.cdet.right.cfiles
510
    listbox $cflist -bg white -selectmode extended -width $geometry(cflistw) \
511
	-yscrollcommand ".ctop.cdet.right.sb set" -font $mainfont
512 513 514 515
    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
    .ctop.cdet add .ctop.cdet.right
516
    bind .ctop.cdet <Configure> {resizecdetpanes %W %w}
517

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

520 521
    bindall <1> {selcanvline %W %x %y}
    #bindall <B1-Motion> {selcanvline %W %x %y}
522 523
    bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
    bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
524 525
    bindall <2> "canvscan mark %W %x %y"
    bindall <B2-Motion> "canvscan dragto %W %x %y"
526 527
    bindkey <Home> selfirstline
    bindkey <End> sellastline
528 529
    bind . <Key-Up> "selnextline -1"
    bind . <Key-Down> "selnextline 1"
530 531 532 533 534 535 536 537 538 539
    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"
540 541 542
    bindkey <Key-Delete> "$ctext yview scroll -1 pages"
    bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
    bindkey <Key-space> "$ctext yview scroll 1 pages"
543 544
    bindkey p "selnextline -1"
    bindkey n "selnextline 1"
R
Robert Suetterlin 已提交
545 546 547 548 549 550
    bindkey z "goback"
    bindkey x "goforw"
    bindkey i "selnextline -1"
    bindkey k "selnextline 1"
    bindkey j "goback"
    bindkey l "goforw"
551 552 553
    bindkey b "$ctext yview scroll -1 pages"
    bindkey d "$ctext yview scroll 18 units"
    bindkey u "$ctext yview scroll -18 units"
554 555
    bindkey / {findnext 1}
    bindkey <Key-Return> {findnext 0}
556
    bindkey ? findprev
557
    bindkey f nextfile
558
    bind . <Control-q> doquit
559
    bind . <Control-f> dofind
560
    bind . <Control-g> {findnext 0}
561
    bind . <Control-r> findprev
562 563 564 565
    bind . <Control-equal> {incrfont 1}
    bind . <Control-KP_Add> {incrfont 1}
    bind . <Control-minus> {incrfont -1}
    bind . <Control-KP_Subtract> {incrfont -1}
566
    bind $cflist <<ListboxSelect>> listboxsel
567
    bind . <Destroy> {savestuff %W}
568
    bind . <Button-1> "click %W"
569
    bind $fstring <Key-Return> dofind
570
    bind $sha1entry <Key-Return> gotocommit
571
    bind $sha1entry <<PasteSelection>> clearsha1
572 573 574

    set maincursor [. cget -cursor]
    set textcursor [$ctext cget -cursor]
575
    set curtextcursor $textcursor
576

577 578 579 580 581 582
    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}
583
    $rowctxmenu add command -label "Make patch" -command mkpatch
584
    $rowctxmenu add command -label "Create tag" -command mktag
585
    $rowctxmenu add command -label "Write commit to file" -command writecommit
586 587
}

588 589 590 591 592 593 594 595 596 597 598 599 600
# 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 已提交
601 602 603 604 605
proc scrollcanv {cscroll f0 f1} {
    $cscroll set $f0 $f1
    drawfrac $f0 $f1
}

606 607 608 609
# 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} {
610
    global entries
611 612 613 614 615
    bind . $ev $script
    set escript [bind Entry $ev]
    if {$escript == {}} {
	set escript [bind Entry <Key>]
    }
616 617 618
    foreach e $entries {
	bind $e $ev "$escript; break"
    }
619 620 621
}

# set the focus back to the toplevel for any click outside
622
# the entry widgets
623
proc click {w} {
624 625 626
    global entries
    foreach e $entries {
	if {$w == $e} return
627
    }
628
    focus .
629 630 631
}

proc savestuff {w} {
632
    global canv canv2 canv3 ctext cflist mainfont textfont uifont
633
    global stuffsaved findmergefiles maxgraphpct
634
    global maxwidth
635

636
    if {$stuffsaved} return
637
    if {![winfo viewable .]} return
638 639
    catch {
	set f [open "~/.gitk-new" w]
640 641
	puts $f [list set mainfont $mainfont]
	puts $f [list set textfont $textfont]
642
	puts $f [list set uifont $uifont]
643
	puts $f [list set findmergefiles $findmergefiles]
644
	puts $f [list set maxgraphpct $maxgraphpct]
645
	puts $f [list set maxwidth $maxwidth]
646 647
	puts $f "set geometry(width) [winfo width .ctop]"
	puts $f "set geometry(height) [winfo height .ctop]"
J
Jeff Hobbs 已提交
648 649 650 651
	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}]"
652 653 654 655 656 657 658 659 660 661
	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"
	close $f
	file rename -force "~/.gitk-new" "~/.gitk"
    }
    set stuffsaved 1
662 663
}

664 665
proc resizeclistpanes {win w} {
    global oldwidth
666
    if {[info exists oldwidth($win)]} {
667 668 669 670 671 672 673 674 675 676 677 678 679
	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 已提交
680
		set sash1 [expr {$sash0 + 20}]
681 682
	    }
	    if {$sash1 > $w - 10} {
J
Jeff Hobbs 已提交
683
		set sash1 [expr {$w - 10}]
684
		if {$sash0 > $sash1 - 20} {
J
Jeff Hobbs 已提交
685
		    set sash0 [expr {$sash1 - 20}]
686 687 688 689 690 691 692 693 694 695 696
		}
	    }
	}
	$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
697
    if {[info exists oldwidth($win)]} {
698 699 700 701 702 703 704 705 706 707
	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 已提交
708
		set sash0 [expr {$w - 15}]
709 710 711 712 713 714 715
	    }
	}
	$win sash place 0 $sash0 [lindex $s0 1]
    }
    set oldwidth($win) $w
}

716 717 718 719 720 721 722 723 724 725 726 727 728 729
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
}

730 731 732 733 734 735 736 737 738
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 已提交
739
Gitk - a commit viewer for git
740

P
Paul Mackerras 已提交
741
Copyright  2005-2006 Paul Mackerras
742

743
Use and redistribute under the terms of the GNU General Public License} \
744 745 746 747 748 749
	    -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
}

750 751 752 753 754 755 756 757 758 759 760 761
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
762 763
<Home>		Move to first commit
<End>		Move to last commit
764 765 766 767
<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
768 769 770 771 772 773 774 775
<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
776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798
<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
}

P
Paul Mackerras 已提交
799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871
proc newview {} {
    global newviewname nextviewnum newviewtop

    set top .gitkview
    if {[winfo exists $top]} {
	raise $top
	return
    }
    set newviewtop $top
    toplevel $top
    wm title $top "Gitk view definition"
    label $top.nl -text "Name"
    entry $top.name -width 20 -textvariable newviewname
    set newviewname "View $nextviewnum"
    grid $top.nl $top.name -sticky w
    label $top.l -text "Files and directories to include:"
    grid $top.l - -sticky w -pady 10
    text $top.t -width 30 -height 10
    grid $top.t - -sticky w
    frame $top.buts
    button $top.buts.ok -text "OK" -command newviewok
    button $top.buts.can -text "Cancel" -command newviewcan
    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
}

proc newviewok {} {
    global newviewtop nextviewnum
    global viewname viewfiles

    set n $nextviewnum
    incr nextviewnum
    set viewname($n) [$newviewtop.name get]
    set files {}
    foreach f [split [$newviewtop.t get 0.0 end] "\n"] {
	set ft [string trim $f]
	if {$ft ne {}} {
	    lappend files $ft
	}
    }
    set viewfiles($n) $files
    catch {destroy $newviewtop}
    unset newviewtop
    .bar.view add command -label $viewname($n) -command [list showview $n]
    after idle showview $n
}

proc newviewcan {} {
    global newviewtop

    catch {destroy $newviewtop}
    unset newviewtop
}

proc delview {} {
    global curview viewdata

    if {$curview == 0} return
    set nmenu [.bar.view index end]
    set targetcmd [list showview $curview]
    for {set i 5} {$i <= $nmenu} {incr i} {
	if {[.bar.view entrycget $i -command] eq $targetcmd} {
	    .bar.view delete $i
	    break
	}
    }
    set viewdata($curview) {}
    showview 0
}

872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890
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 已提交
891 892 893 894 895 896 897
proc showview {n} {
    global curview viewdata viewfiles
    global displayorder parentlist childlist rowidlist rowoffsets
    global colormap rowtextx commitrow
    global numcommits rowrangelist commitlisted idrowranges
    global selectedline currentid canv canvy0
    global matchinglines treediffs
898
    global pending_select phase
899 900
    global commitidx rowlaidout rowoptim linesegends leftover
    global commfd nextupdate
P
Paul Mackerras 已提交
901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917

    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
918
    normalline
P
Paul Mackerras 已提交
919
    stopfindproc
920 921 922 923 924 925 926 927 928 929
    if {$curview >= 0} {
	if {$phase ne {}} {
	    set viewdata($curview) \
		[list $phase $displayorder $parentlist $childlist $rowidlist \
		     $rowoffsets $rowrangelist $commitlisted \
		     [flatten children] [flatten idrowranges] \
		     [flatten idinlist] \
		     $commitidx $rowlaidout $rowoptim $numcommits \
		     $linesegends $leftover $commfd]
	    fileevent $commfd readable {}
930 931
	} elseif {![info exists viewdata($curview)]
		  || [lindex $viewdata($curview) 0] ne {}} {
932 933 934 935
	    set viewdata($curview) \
		[list {} $displayorder $parentlist $childlist $rowidlist \
		     $rowoffsets $rowrangelist $commitlisted]
	}
P
Paul Mackerras 已提交
936 937 938 939 940 941 942 943 944
    }
    catch {unset matchinglines}
    catch {unset treediffs}
    clear_display

    set curview $n
    .bar.view entryconf 2 -state [expr {$n == 0? "disabled": "normal"}]

    if {![info exists viewdata($n)]} {
945
	set pending_select $selid
946
	getcommits
P
Paul Mackerras 已提交
947 948 949
	return
    }

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
    set v $viewdata($n)
    set phase [lindex $v 0]
    set displayorder [lindex $v 1]
    set parentlist [lindex $v 2]
    set childlist [lindex $v 3]
    set rowidlist [lindex $v 4]
    set rowoffsets [lindex $v 5]
    set rowrangelist [lindex $v 6]
    set commitlisted [lindex $v 7]
    if {$phase eq {}} {
	set numcommits [llength $displayorder]
	catch {unset idrowranges}
	catch {unset children}
    } else {
	unflatten children [lindex $v 8]
	unflatten idrowranges [lindex $v 9]
	unflatten idinlist [lindex $v 10]
	set commitidx [lindex $v 11]
	set rowlaidout [lindex $v 12]
	set rowoptim [lindex $v 13]
	set numcommits [lindex $v 14]
	set linesegends [lindex $v 15]
	set leftover [lindex $v 16]
	set commfd [lindex $v 17]
	fileevent $commfd readable [list getcommitlines $commfd]
	set nextupdate [expr {[clock clicks -milliseconds] + 100}]
    }

P
Paul Mackerras 已提交
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
    catch {unset colormap}
    catch {unset rowtextx}
    catch {unset commitrow}
    set curview $n
    set row 0
    foreach id $displayorder {
	set commitrow($id) $row
	incr row
    }
    setcanvscroll
    set yf 0
    set row 0
    if {$selid ne {} && [info exists commitrow($selid)]} {
	set row $commitrow($selid)
	# 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
1003 1004 1005 1006 1007 1008 1009 1010
    if {$phase eq {}} {
	global maincursor textcursor
	. config -cursor $maincursor
	settextcursor $textcursor
    } else {
	. config -cursor watch
	settextcursor watch
    }
P
Paul Mackerras 已提交
1011 1012
}

P
Paul Mackerras 已提交
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
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} {
1048
    global children commitrow childlist
P
Paul Mackerras 已提交
1049 1050 1051 1052 1053 1054

    if {[info exists commitrow($id)]} {
	set r $commitrow($id)
	if {$l1 <= $r && $r <= $l2} {
	    return [expr {$r - $l1 + 1}]
	}
1055 1056 1057
	set kids [lindex $childlist $r]
    } else {
	set kids $children($id)
P
Paul Mackerras 已提交
1058
    }
1059 1060 1061 1062
    foreach c $kids {
	set r $commitrow($c)
	if {$l1 <= $r && $r <= $l2} {
	    return [expr {$r - $l1 + 1}]
P
Paul Mackerras 已提交
1063 1064 1065 1066 1067 1068 1069 1070 1071
	}
    }
    return 0
}

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

    set col -1
1072
    set ids [lindex $rowidlist $row]
P
Paul Mackerras 已提交
1073 1074 1075 1076 1077
    foreach id $ids {
	incr col
	if {$id eq {}} continue
	if {$col < [llength $ids] - 1 &&
	    [lsearch -exact -start [expr {$col+1}] $ids $id] >= 0} {
1078
	    puts "oops: [shortids $id] repeated in row $row col $col: {[shortids [lindex $rowidlist $row]]}"
P
Paul Mackerras 已提交
1079
	}
1080
	set o [lindex $rowoffsets $row $col]
P
Paul Mackerras 已提交
1081 1082 1083 1084 1085
	set y $row
	set x $col
	while {$o ne {}} {
	    incr y -1
	    incr x $o
1086
	    if {[lindex $rowidlist $y $x] != $id} {
P
Paul Mackerras 已提交
1087 1088 1089
		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} {
1090
		    puts "  row $i ids={[shortids [lindex $rowidlist $i]]} offs={[lindex $rowoffsets $i]}"
P
Paul Mackerras 已提交
1091 1092 1093 1094
		}
		break
	    }
	    if {!$full} break
1095
	    set o [lindex $rowoffsets $y $x]
P
Paul Mackerras 已提交
1096 1097 1098 1099 1100 1101 1102 1103 1104 1105
	}
    }
}

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
1106
	set off0 [lindex $rowoffsets $y]
P
Paul Mackerras 已提交
1107 1108
	for {set x0 $x} {1} {incr x0} {
	    if {$x0 >= [llength $off0]} {
1109
		set x0 [llength [lindex $rowoffsets [expr {$y-1}]]]
P
Paul Mackerras 已提交
1110 1111 1112 1113 1114 1115 1116 1117 1118
		break
	    }
	    set z [lindex $off0 $x0]
	    if {$z ne {}} {
		incr x0 $z
		break
	    }
	}
	set z [expr {$x0 - $x}]
1119 1120
	lset rowidlist $y [linsert [lindex $rowidlist $y] $x $oid]
	lset rowoffsets $y [linsert [lindex $rowoffsets $y] $x $z]
P
Paul Mackerras 已提交
1121
    }
1122 1123
    set tmp [lreplace [lindex $rowoffsets $y] $x $x {}]
    lset rowoffsets $y [incrange $tmp [expr {$x+1}] -1]
P
Paul Mackerras 已提交
1124 1125 1126 1127
    lappend idrowranges($oid) $y
}

proc initlayout {} {
1128
    global rowidlist rowoffsets displayorder commitlisted
P
Paul Mackerras 已提交
1129
    global rowlaidout rowoptim
P
Paul Mackerras 已提交
1130
    global idinlist rowchk rowrangelist idrowranges
1131
    global commitidx numcommits canvxmax canv
1132
    global nextcolor
1133
    global parentlist childlist children
P
Paul Mackerras 已提交
1134 1135
    global colormap rowtextx commitrow
    global linesegends
P
Paul Mackerras 已提交
1136

1137 1138 1139
    set commitidx 0
    set numcommits 0
    set displayorder {}
1140 1141 1142
    set commitlisted {}
    set parentlist {}
    set childlist {}
1143
    set rowrangelist {}
1144
    catch {unset children}
1145 1146 1147
    set nextcolor 0
    set rowidlist {{}}
    set rowoffsets {{}}
P
Paul Mackerras 已提交
1148 1149 1150 1151
    catch {unset idinlist}
    catch {unset rowchk}
    set rowlaidout 0
    set rowoptim 0
1152
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
1153 1154 1155 1156
    catch {unset colormap}
    catch {unset rowtextx}
    catch {unset commitrow}
    catch {unset idrowranges}
1157
    set linesegends {}
1158 1159 1160 1161 1162 1163 1164 1165 1166
}

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 已提交
1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205
}

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
    global uparrowlen

    set row $rowlaidout
    set rowlaidout [layoutrows $row $commitidx 0]
    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} {
1206
    global numcommits commitrow pending_select selectedline
P
Paul Mackerras 已提交
1207 1208
    global linesegends idrowranges idrangedrawn

1209 1210 1211 1212 1213
    if {$numcommits == 0} {
	global phase
	set phase "incrdraw"
	allcanvs delete all
    }
P
Paul Mackerras 已提交
1214 1215
    set row $numcommits
    set numcommits $canshow
1216
    setcanvscroll
P
Paul Mackerras 已提交
1217 1218 1219
    set rows [visiblerows]
    set r0 [lindex $rows 0]
    set r1 [lindex $rows 1]
1220
    set selrow -1
P
Paul Mackerras 已提交
1221
    for {set r $row} {$r < $canshow} {incr r} {
1222 1223 1224 1225 1226 1227 1228 1229
	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 已提交
1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240
		}
	    }
	}
    }
    if {$canshow > $r1} {
	set canshow $r1
    }
    while {$row < $canshow} {
	drawcmitrow $row
	incr row
    }
1241 1242 1243 1244 1245
    if {[info exists pending_select] &&
	[info exists commitrow($pending_select)] &&
	$commitrow($pending_select) < $numcommits} {
	selectline $commitrow($pending_select) 1
    }
1246 1247 1248
    if {![info exists selectedline] && ![info exists pending_select]} {
	selectline 0 1
    }
P
Paul Mackerras 已提交
1249 1250 1251 1252 1253
}

proc layoutrows {row endrow last} {
    global rowidlist rowoffsets displayorder
    global uparrowlen downarrowlen maxwidth mingaplen
1254
    global childlist parentlist
P
Paul Mackerras 已提交
1255 1256
    global idrowranges linesegends
    global commitidx
P
Paul Mackerras 已提交
1257
    global idinlist rowchk rowrangelist
P
Paul Mackerras 已提交
1258

1259 1260
    set idlist [lindex $rowidlist $row]
    set offs [lindex $rowoffsets $row]
P
Paul Mackerras 已提交
1261 1262 1263 1264
    while {$row < $endrow} {
	set id [lindex $displayorder $row]
	set oldolds {}
	set newolds {}
1265
	foreach p [lindex $parentlist $row] {
P
Paul Mackerras 已提交
1266 1267 1268 1269 1270 1271
	    if {![info exists idinlist($p)]} {
		lappend newolds $p
	    } elseif {!$idinlist($p)} {
		lappend oldolds $p
	    }
	}
1272
	set lse {}
P
Paul Mackerras 已提交
1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286
	set nev [expr {[llength $idlist] + [llength $newolds]
		       + [llength $oldolds] - $maxwidth + 1}]
	if {$nev > 0} {
	    if {!$last && $row + $uparrowlen + $mingaplen >= $commitidx} break
	    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
1287
			set rm1 [expr {$row - 1}]
1288
			lappend lse $i
1289
			lappend idrowranges($i) $rm1
P
Paul Mackerras 已提交
1290 1291 1292 1293 1294 1295
			if {[incr nev -1] <= 0} break
			continue
		    }
		    set rowchk($id) [expr {$row + $r}]
		}
	    }
1296 1297
	    lset rowidlist $row $idlist
	    lset rowoffsets $row $offs
P
Paul Mackerras 已提交
1298
	}
1299
	lappend linesegends $lse
P
Paul Mackerras 已提交
1300 1301 1302 1303
	set col [lsearch -exact $idlist $id]
	if {$col < 0} {
	    set col [llength $idlist]
	    lappend idlist $id
1304
	    lset rowidlist $row $idlist
P
Paul Mackerras 已提交
1305
	    set z {}
1306
	    if {[lindex $childlist $row] ne {}} {
1307
		set z [expr {[llength [lindex $rowidlist [expr {$row-1}]]] - $col}]
P
Paul Mackerras 已提交
1308 1309 1310
		unset idinlist($id)
	    }
	    lappend offs $z
1311
	    lset rowoffsets $row $offs
P
Paul Mackerras 已提交
1312 1313 1314 1315 1316 1317
	    if {$z ne {}} {
		makeuparrow $id $col $row $z
	    }
	} else {
	    unset idinlist($id)
	}
1318
	set ranges {}
P
Paul Mackerras 已提交
1319
	if {[info exists idrowranges($id)]} {
1320
	    set ranges $idrowranges($id)
1321 1322
	    lappend ranges $row
	    unset idrowranges($id)
P
Paul Mackerras 已提交
1323
	}
1324
	lappend rowrangelist $ranges
P
Paul Mackerras 已提交
1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355
	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
	}
1356 1357
	lappend rowidlist $idlist
	lappend rowoffsets $offs
P
Paul Mackerras 已提交
1358 1359 1360 1361 1362
    }
    return $row
}

proc addextraid {id row} {
1363
    global displayorder commitrow commitinfo
1364
    global commitidx commitlisted
1365
    global parentlist childlist children
P
Paul Mackerras 已提交
1366 1367 1368

    incr commitidx
    lappend displayorder $id
1369
    lappend commitlisted 0
1370
    lappend parentlist {}
P
Paul Mackerras 已提交
1371 1372 1373 1374
    set commitrow($id) $row
    readcommit $id
    if {![info exists commitinfo($id)]} {
	set commitinfo($id) {"No commit information available"}
1375 1376 1377
    }
    if {[info exists children($id)]} {
	lappend childlist $children($id)
1378
	unset children($id)
1379 1380
    } else {
	lappend childlist {}
P
Paul Mackerras 已提交
1381 1382 1383 1384 1385
    }
}

proc layouttail {} {
    global rowidlist rowoffsets idinlist commitidx
P
Paul Mackerras 已提交
1386
    global idrowranges rowrangelist
P
Paul Mackerras 已提交
1387 1388

    set row $commitidx
1389
    set idlist [lindex $rowidlist $row]
P
Paul Mackerras 已提交
1390 1391 1392 1393 1394 1395
    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 已提交
1396
	lappend rowrangelist $idrowranges($id)
1397
	unset idrowranges($id)
P
Paul Mackerras 已提交
1398 1399 1400
	incr row
	set offs [ntimes $col 0]
	set idlist [lreplace $idlist $col $col]
1401 1402
	lappend rowidlist $idlist
	lappend rowoffsets $offs
P
Paul Mackerras 已提交
1403 1404 1405 1406
    }

    foreach id [array names idinlist] {
	addextraid $id $row
1407 1408
	lset rowidlist $row [list $id]
	lset rowoffsets $row 0
P
Paul Mackerras 已提交
1409 1410
	makeuparrow $id 0 $row 0
	lappend idrowranges($id) $row
P
Paul Mackerras 已提交
1411
	lappend rowrangelist $idrowranges($id)
1412
	unset idrowranges($id)
P
Paul Mackerras 已提交
1413
	incr row
1414 1415
	lappend rowidlist {}
	lappend rowoffsets {}
P
Paul Mackerras 已提交
1416 1417 1418 1419 1420 1421 1422
    }
}

proc insert_pad {row col npad} {
    global rowidlist rowoffsets

    set pad [ntimes $npad {}]
1423 1424 1425
    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 已提交
1426 1427 1428
}

proc optimize_rows {row col endrow} {
P
Paul Mackerras 已提交
1429
    global rowidlist rowoffsets idrowranges displayorder
P
Paul Mackerras 已提交
1430 1431

    for {} {$row < $endrow} {incr row} {
1432 1433
	set idlist [lindex $rowidlist $row]
	set offs [lindex $rowoffsets $row]
P
Paul Mackerras 已提交
1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444
	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}]
1445
	    set z0 [lindex $rowoffsets $y0 $x0]
P
Paul Mackerras 已提交
1446 1447
	    if {$z0 eq {}} {
		set id [lindex $idlist $col]
1448 1449
		set ranges [rowranges $id]
		if {$ranges ne {} && $y0 > [lindex $ranges 0]} {
P
Paul Mackerras 已提交
1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461
		    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}]
1462
		set z0 [lindex $rowoffsets $y0 $x0]
P
Paul Mackerras 已提交
1463 1464 1465
	    } elseif {$z > 1 || ($z > 0 && $isarrow)} {
		set npad [expr {$z - 1 + $isarrow}]
		set y1 [expr {$row + 1}]
1466
		set offs2 [lindex $rowoffsets $y1]
P
Paul Mackerras 已提交
1467 1468 1469 1470 1471 1472 1473
		set x1 -1
		foreach z $offs2 {
		    incr x1
		    if {$z eq {} || $x1 + $z < $col} continue
		    if {$x1 + $z > $col} {
			incr npad
		    }
1474
		    lset rowoffsets $y1 [incrange $offs2 $x1 $npad]
P
Paul Mackerras 已提交
1475 1476 1477 1478 1479 1480 1481 1482 1483 1484
		    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
	    }
1485 1486 1487 1488 1489 1490 1491 1492 1493
	    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 已提交
1494 1495 1496 1497 1498 1499 1500
	    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} {
1501
	    set o {}
P
Paul Mackerras 已提交
1502 1503
	    for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
		set o [lindex $offs $col]
1504 1505 1506
		if {$o eq {}} {
		    # check if this is the link to the first child
		    set id [lindex $idlist $col]
1507 1508
		    set ranges [rowranges $id]
		    if {$ranges ne {} && $row == [lindex $ranges 0]} {
1509 1510 1511 1512 1513 1514 1515 1516 1517
			# 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 已提交
1518 1519
		if {$o eq {} || $o <= 0} break
	    }
1520
	    if {$o ne {} && [incr col] < [llength $idlist]} {
P
Paul Mackerras 已提交
1521
		set y1 [expr {$row + 1}]
1522
		set offs2 [lindex $rowoffsets $y1]
P
Paul Mackerras 已提交
1523 1524 1525 1526
		set x1 -1
		foreach z $offs2 {
		    incr x1
		    if {$z eq {} || $x1 + $z < $col} continue
1527
		    lset rowoffsets $y1 [incrange $offs2 $x1 1]
P
Paul Mackerras 已提交
1528 1529 1530 1531 1532 1533 1534 1535
		    break
		}
		set idlist [linsert $idlist $col {}]
		set tmp [linsert $offs $col {}]
		incr col
		set offs [incrange $tmp $col -1]
	    }
	}
1536 1537
	lset rowidlist $row $idlist
	lset rowoffsets $row $offs
P
Paul Mackerras 已提交
1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551
	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}]
}

1552 1553 1554 1555 1556 1557 1558 1559 1560 1561
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 已提交
1562
proc rowranges {id} {
1563
    global phase idrowranges commitrow rowlaidout rowrangelist
P
Paul Mackerras 已提交
1564 1565

    set ranges {}
1566 1567
    if {$phase eq {} ||
	([info exists commitrow($id)] && $commitrow($id) < $rowlaidout)} {
P
Paul Mackerras 已提交
1568 1569 1570 1571 1572 1573 1574
	set ranges [lindex $rowrangelist $commitrow($id)]
    } elseif {[info exists idrowranges($id)]} {
	set ranges $idrowranges($id)
    }
    return $ranges
}

1575
proc drawlineseg {id i} {
P
Paul Mackerras 已提交
1576
    global rowoffsets rowidlist
1577
    global displayorder
1578
    global canv colormap linespc
P
Paul Mackerras 已提交
1579
    global numcommits commitrow
P
Paul Mackerras 已提交
1580

P
Paul Mackerras 已提交
1581 1582 1583 1584 1585 1586 1587 1588 1589
    set ranges [rowranges $id]
    set downarrow 1
    if {[info exists commitrow($id)] && $commitrow($id) < $numcommits} {
	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 已提交
1590 1591 1592
    if {$startrow == $row} return
    assigncolor $id
    set coords {}
1593
    set col [lsearch -exact [lindex $rowidlist $row] $id]
P
Paul Mackerras 已提交
1594 1595 1596 1597 1598 1599 1600
    if {$col < 0} {
	puts "oops: drawline: id $id not on row $row"
	return
    }
    set lasto {}
    set ns 0
    while {1} {
1601
	set o [lindex $rowoffsets $row $col]
P
Paul Mackerras 已提交
1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615
	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
1616 1617 1618 1619 1620 1621 1622 1623 1624
    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} {
1625
		lappend coords [xc $row [expr {$col - 1}]] [yc $row]
1626
	    } elseif {$ccol > $col + 1} {
1627
		lappend coords [xc $row [expr {$col + 1}]] [yc $row]
1628 1629 1630 1631 1632
	    }
	    lappend coords $x $y
	}
    }
    if {[llength $coords] < 4} return
P
Paul Mackerras 已提交
1633
    if {$downarrow} {
1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652
	# 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 已提交
1653
    set arrow [expr {2 * ($i > 0) + $downarrow}]
1654
    set arrow [lindex {none first last both} $arrow]
1655
    set t [$canv create line $coords -width [linewidth $id] \
P
Paul Mackerras 已提交
1656 1657 1658 1659 1660
	       -fill $colormap($id) -tags lines.$id -arrow $arrow]
    $canv lower $t
    bindline $t $id
}

1661
proc drawparentlinks {id row col olds} {
P
Paul Mackerras 已提交
1662
    global rowidlist canv colormap
P
Paul Mackerras 已提交
1663 1664 1665 1666 1667

    set row2 [expr {$row + 1}]
    set x [xc $row $col]
    set y [yc $row]
    set y2 [yc $row2]
1668
    set ids [lindex $rowidlist $row2]
P
Paul Mackerras 已提交
1669 1670 1671
    # rmx = right-most X coord used
    set rmx 0
    foreach p $olds {
1672 1673 1674 1675 1676 1677 1678 1679 1680
	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 已提交
1681 1682 1683
	set ranges [rowranges $p]
	if {$ranges ne {} && $row2 == [lindex $ranges 0]
	    && $row2 < [lindex $ranges 1]} {
1684 1685 1686
	    # drawlineseg will do this one for us
	    continue
	}
P
Paul Mackerras 已提交
1687 1688 1689 1690 1691 1692 1693 1694 1695
	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
1696
	set t [$canv create line $coords -width [linewidth $p] \
P
Paul Mackerras 已提交
1697 1698 1699 1700 1701 1702 1703
		   -fill $colormap($p) -tags lines.$p]
	$canv lower $t
	bindline $t $p
    }
    return $rmx
}

1704
proc drawlines {id} {
P
Paul Mackerras 已提交
1705
    global colormap canv
P
Paul Mackerras 已提交
1706
    global idrangedrawn
1707
    global childlist iddrawn commitrow rowidlist
P
Paul Mackerras 已提交
1708 1709

    $canv delete lines.$id
P
Paul Mackerras 已提交
1710
    set nr [expr {[llength [rowranges $id]] / 2}]
P
Paul Mackerras 已提交
1711 1712
    for {set i 0} {$i < $nr} {incr i} {
	if {[info exists idrangedrawn($id,$i)]} {
1713
	    drawlineseg $id $i
P
Paul Mackerras 已提交
1714 1715
	}
    }
1716 1717 1718 1719 1720 1721
    foreach child [lindex $childlist $commitrow($id)] {
	if {[info exists iddrawn($child)]} {
	    set row $commitrow($child)
	    set col [lsearch -exact [lindex $rowidlist $row] $child]
	    if {$col >= 0} {
		drawparentlinks $child $row $col [list $id]
P
Paul Mackerras 已提交
1722 1723 1724 1725 1726 1727 1728 1729 1730 1731
	    }
	}
    }
}

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
1732
    global mainfont namefont canvxmax
P
Paul Mackerras 已提交
1733

1734
    set ofill [expr {[lindex $commitlisted $row]? "blue": "white"}]
P
Paul Mackerras 已提交
1735 1736 1737 1738 1739 1740 1741 1742
    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}
1743
    set xt [xc $row [llength [lindex $rowidlist $row]]]
P
Paul Mackerras 已提交
1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763
    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]
    set linehtag($row) [$canv create text $xt $y -anchor w \
			    -text $headline -font $mainfont ]
    $canv bind $linehtag($row) <Button-3> "rowmenu %X %Y $id"
    set linentag($row) [$canv2 create text 3 $y -anchor w \
			    -text $name -font $namefont]
    set linedtag($row) [$canv3 create text 3 $y -anchor w \
			    -text $date -font $mainfont]
1764 1765 1766 1767 1768
    set xr [expr {$xt + [font measure $mainfont $headline]}]
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
P
Paul Mackerras 已提交
1769 1770 1771
}

proc drawcmitrow {row} {
1772
    global displayorder rowidlist
P
Paul Mackerras 已提交
1773
    global idrangedrawn iddrawn
1774
    global commitinfo parentlist numcommits
P
Paul Mackerras 已提交
1775

1776 1777
    if {$row >= $numcommits} return
    foreach id [lindex $rowidlist $row] {
1778
	if {$id eq {}} continue
P
Paul Mackerras 已提交
1779
	set i -1
P
Paul Mackerras 已提交
1780
	foreach {s e} [rowranges $id] {
P
Paul Mackerras 已提交
1781 1782 1783 1784 1785
	    incr i
	    if {$row < $s} continue
	    if {$e eq {}} break
	    if {$row <= $e} {
		if {$e < $numcommits && ![info exists idrangedrawn($id,$i)]} {
1786
		    drawlineseg $id $i
P
Paul Mackerras 已提交
1787 1788 1789 1790 1791 1792 1793 1794 1795
		    set idrangedrawn($id,$i) 1
		}
		break
	    }
	}
    }

    set id [lindex $displayorder $row]
    if {[info exists iddrawn($id)]} return
1796
    set col [lsearch -exact [lindex $rowidlist $row] $id]
P
Paul Mackerras 已提交
1797 1798 1799 1800 1801
    if {$col < 0} {
	puts "oops, row $row id $id not in list"
	return
    }
    if {![info exists commitinfo($id)]} {
1802
	getcommit $id
P
Paul Mackerras 已提交
1803 1804
    }
    assigncolor $id
1805 1806 1807
    set olds [lindex $parentlist $row]
    if {$olds ne {}} {
	set rmx [drawparentlinks $id $row $col $olds]
P
Paul Mackerras 已提交
1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848
    } 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 已提交
1849 1850 1851 1852 1853 1854 1855 1856 1857
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}]
	}
1858
	if {$e <= $s} continue
P
Paul Mackerras 已提交
1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889
	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]
}

1890
proc assigncolor {id} {
P
Paul Mackerras 已提交
1891
    global colormap colors nextcolor
1892
    global commitrow parentlist children childlist
1893

1894
    if {[info exists colormap($id)]} return
1895
    set ncolors [llength $colors]
1896 1897 1898 1899 1900 1901 1902 1903 1904
    if {[info exists commitrow($id)]} {
	set kids [lindex $childlist $commitrow($id)]
    } elseif {[info exists children($id)]} {
	set kids $children($id)
    } else {
	set kids {}
    }
    if {[llength $kids] == 1} {
	set child [lindex $kids 0]
1905
	if {[info exists colormap($child)]
1906
	    && [llength [lindex $parentlist $commitrow($child)]] == 1} {
1907 1908
	    set colormap($id) $colormap($child)
	    return
1909
	}
1910 1911
    }
    set badcolors {}
P
Paul Mackerras 已提交
1912 1913 1914 1915 1916 1917
    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
1918
	}
P
Paul Mackerras 已提交
1919 1920 1921
	if {[info exists colormap($x)]
	    && [lsearch -exact $badcolors $colormap($x)] < 0} {
	    lappend badcolors $colormap($x)
1922 1923
	}
    }
P
Paul Mackerras 已提交
1924 1925
    if {[llength $badcolors] >= $ncolors} {
	set badcolors $origbad
1926
    }
P
Paul Mackerras 已提交
1927
    set origbad $badcolors
1928
    if {[llength $badcolors] < $ncolors - 1} {
1929
	foreach child $kids {
1930 1931 1932 1933
	    if {[info exists colormap($child)]
		&& [lsearch -exact $badcolors $colormap($child)] < 0} {
		lappend badcolors $colormap($child)
	    }
1934 1935 1936 1937
	    foreach p [lindex $parentlist $commitrow($child)] {
		if {[info exists colormap($p)]
		    && [lsearch -exact $badcolors $colormap($p)] < 0} {
		    lappend badcolors $colormap($p)
1938 1939 1940 1941 1942 1943
		}
	    }
	}
	if {[llength $badcolors] >= $ncolors} {
	    set badcolors $origbad
	}
1944 1945 1946 1947 1948
    }
    for {set i 0} {$i <= $ncolors} {incr i} {
	set c [lindex $colors $nextcolor]
	if {[incr nextcolor] >= $ncolors} {
	    set nextcolor 0
1949
	}
1950
	if {[lsearch -exact $badcolors $c]} break
1951
    }
1952
    set colormap($id) $c
1953 1954
}

1955 1956 1957 1958 1959 1960
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"
1961
    $canv bind $t <Button-1> "lineclick %x %y $id 1"
1962 1963
}

1964
proc drawtags {id x xt y1} {
1965
    global idtags idheads idotherrefs
1966
    global linespc lthickness
P
Paul Mackerras 已提交
1967
    global canv mainfont commitrow rowtextx
1968 1969 1970

    set marks {}
    set ntags 0
1971
    set nheads 0
1972 1973 1974 1975 1976 1977
    if {[info exists idtags($id)]} {
	set marks $idtags($id)
	set ntags [llength $marks]
    }
    if {[info exists idheads($id)]} {
	set marks [concat $marks $idheads($id)]
1978 1979 1980 1981
	set nheads [llength $idheads($id)]
    }
    if {[info exists idotherrefs($id)]} {
	set marks [concat $marks $idotherrefs($id)]
1982 1983 1984 1985 1986 1987
    }
    if {$marks eq {}} {
	return $xt
    }

    set delta [expr {int(0.5 * ($linespc - $lthickness))}]
J
Jeff Hobbs 已提交
1988 1989
    set yt [expr {$y1 - 0.5 * $linespc}]
    set yb [expr {$yt + $linespc - 1}]
1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001
    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 已提交
2002 2003
	set xl [expr {$x + $delta}]
	set xr [expr {$x + $delta + $wid + $lthickness}]
2004 2005
	if {[incr ntags -1] >= 0} {
	    # draw a tag
J
Jeff Hobbs 已提交
2006 2007
	    set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
		       $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
2008 2009
		       -width 1 -outline black -fill yellow -tags tag.$id]
	    $canv bind $t <1> [list showtag $tag 1]
P
Paul Mackerras 已提交
2010
	    set rowtextx($commitrow($id)) [expr {$xr + $linespc}]
2011
	} else {
2012 2013 2014 2015 2016 2017
	    # draw a head or other ref
	    if {[incr nheads -1] >= 0} {
		set col green
	    } else {
		set col "#ddddff"
	    }
J
Jeff Hobbs 已提交
2018
	    set xl [expr {$xl - $delta/2}]
2019
	    $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
2020
		-width 1 -outline black -fill $col -tags tag.$id
2021
	}
2022 2023 2024 2025 2026
	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]
	}
2027 2028 2029 2030
    }
    return $xt
}

2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041
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
}
2042 2043

proc finishcommits {} {
P
Paul Mackerras 已提交
2044
    global commitidx phase
2045
    global canv mainfont ctext maincursor textcursor
2046
    global findinprogress pending_select
2047

P
Paul Mackerras 已提交
2048
    if {$commitidx > 0} {
2049 2050
	drawrest
    } else {
2051 2052 2053 2054
	$canv delete all
	$canv create text 3 3 -anchor nw -text "No commits selected" \
	    -font $mainfont -tags textitems
    }
2055 2056 2057 2058
    if {![info exists findinprogress]} {
	. config -cursor $maincursor
	settextcursor $textcursor
    }
P
Paul Mackerras 已提交
2059
    set phase {}
2060
    catch {unset pending_select}
2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071
}

# 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
2072 2073
}

2074
proc drawrest {} {
P
Paul Mackerras 已提交
2075 2076 2077 2078
    global numcommits
    global startmsecs
    global canvy0 numcommits linespc
    global rowlaidout commitidx
2079
    global pending_select
P
Paul Mackerras 已提交
2080 2081 2082 2083 2084 2085

    set row $rowlaidout
    layoutrows $rowlaidout $commitidx 1
    layouttail
    optimize_rows $row 0 $commitidx
    showstuff $commitidx
2086 2087 2088
    if {[info exists pending_select]} {
	selectline 0 1
    }
P
Paul Mackerras 已提交
2089

J
Jeff Hobbs 已提交
2090
    set drawmsecs [expr {[clock clicks -milliseconds] - $startmsecs}]
P
Paul Mackerras 已提交
2091
    #puts "overall $drawmsecs ms for $numcommits commits"
2092 2093
}

2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106
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 已提交
2107 2108
	    lappend matches [list $j [expr {$j+$foundstrlen-1}]]
	    set i [expr {$j + $foundstrlen}]
2109 2110 2111 2112 2113
	}
    }
    return $matches
}

2114 2115
proc dofind {} {
    global findtype findloc findstring markedmatches commitinfo
2116
    global numcommits displayorder linehtag linentag linedtag
2117
    global mainfont namefont canv canv2 canv3 selectedline
P
Paul Mackerras 已提交
2118 2119
    global matchinglines foundstring foundstrlen matchstring
    global commitdata
2120 2121

    stopfindproc
2122
    unmarkmatches
2123
    focus .
2124
    set matchinglines {}
2125 2126 2127 2128
    if {$findloc == "Pickaxe"} {
	findpatches
	return
    }
2129
    if {$findtype == "IgnCase"} {
2130
	set foundstring [string tolower $findstring]
2131
    } else {
2132
	set foundstring $findstring
2133
    }
2134 2135
    set foundstrlen [string length $findstring]
    if {$foundstrlen == 0} return
P
Paul Mackerras 已提交
2136 2137
    regsub -all {[*?\[\\]} $foundstring {\\&} matchstring
    set matchstring "*$matchstring*"
2138 2139 2140 2141
    if {$findloc == "Files"} {
	findfiles
	return
    }
2142 2143 2144 2145 2146 2147
    if {![info exists selectedline]} {
	set oldsel -1
    } else {
	set oldsel $selectedline
    }
    set didsel 0
2148
    set fldtypes {Headline Author Date Committer CDate Comment}
P
Paul Mackerras 已提交
2149
    set l -1
2150 2151
    foreach id $displayorder {
	set d $commitdata($id)
P
Paul Mackerras 已提交
2152 2153 2154 2155 2156 2157 2158 2159 2160 2161
	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)]} {
2162
	    getcommit $id
P
Paul Mackerras 已提交
2163
	}
2164 2165 2166 2167 2168 2169
	set info $commitinfo($id)
	set doesmatch 0
	foreach f $info ty $fldtypes {
	    if {$findloc != "All fields" && $findloc != $ty} {
		continue
	    }
2170
	    set matches [findmatches $f]
2171 2172 2173
	    if {$matches == {}} continue
	    set doesmatch 1
	    if {$ty == "Headline"} {
P
Paul Mackerras 已提交
2174
		drawcmitrow $l
2175 2176
		markmatches $canv $l $f $linehtag($l) $matches $mainfont
	    } elseif {$ty == "Author"} {
P
Paul Mackerras 已提交
2177
		drawcmitrow $l
2178 2179
		markmatches $canv2 $l $f $linentag($l) $matches $namefont
	    } elseif {$ty == "Date"} {
P
Paul Mackerras 已提交
2180
		drawcmitrow $l
2181 2182 2183 2184 2185 2186
		markmatches $canv3 $l $f $linedtag($l) $matches $mainfont
	    }
	}
	if {$doesmatch} {
	    lappend matchinglines $l
	    if {!$didsel && $l > $oldsel} {
2187
		findselectline $l
2188 2189 2190 2191 2192 2193 2194
		set didsel 1
	    }
	}
    }
    if {$matchinglines == {}} {
	bell
    } elseif {!$didsel} {
2195 2196 2197 2198 2199 2200
	findselectline [lindex $matchinglines 0]
    }
}

proc findselectline {l} {
    global findloc commentend ctext
2201
    selectline $l 1
2202 2203 2204 2205 2206 2207
    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 已提交
2208
	    set end [expr {[lindex $match 1] + 1}]
2209 2210
	    $ctext tag add found "1.0 + $start c" "1.0 + $end c"
	}
2211 2212 2213
    }
}

2214
proc findnext {restart} {
2215 2216
    global matchinglines selectedline
    if {![info exists matchinglines]} {
2217 2218 2219
	if {$restart} {
	    dofind
	}
2220 2221 2222 2223 2224
	return
    }
    if {![info exists selectedline]} return
    foreach l $matchinglines {
	if {$l > $selectedline} {
2225
	    findselectline $l
2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244
	    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 != {}} {
2245
	findselectline $prev
2246 2247 2248 2249 2250
    } else {
	bell
    }
}

2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277
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
    }
    if {[info exists findinprogress]} {
	unset findinprogress
2278
	if {$phase eq {}} {
2279
	    . config -cursor $maincursor
2280
	    settextcursor $textcursor
2281 2282 2283 2284 2285 2286 2287
	}
    }
}

proc findpatches {} {
    global findstring selectedline numcommits
    global findprocpid findprocfile
2288
    global finddidsel ctext displayorder findinprogress
2289
    global findinsertpos
2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304

    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
	}
2305
	append inputids [lindex $displayorder $l] "\n"
2306 2307 2308 2309 2310 2311 2312 2313 2314 2315
    }

    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
    }

2316
    set findinsertpos end
2317 2318 2319 2320 2321 2322
    set findprocfile $f
    set findprocpid [pid $f]
    fconfigure $f -blocking 0
    fileevent $f readable readfindproc
    set finddidsel 0
    . config -cursor watch
2323
    settextcursor watch
2324 2325 2326 2327 2328
    set findinprogress 1
}

proc readfindproc {} {
    global findprocfile finddidsel
P
Paul Mackerras 已提交
2329
    global commitrow matchinglines findinsertpos
2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345

    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
    }
P
Paul Mackerras 已提交
2346
    if {![info exists commitrow($id)]} {
2347 2348 2349
	puts stderr "spurious id: $id"
	return
    }
P
Paul Mackerras 已提交
2350
    set l $commitrow($id)
2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368
    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
2369 2370 2371 2372 2373 2374 2375
    if {!$finddidsel} {
	findselectline $l
	set finddidsel 1
    }
}

proc findfiles {} {
2376
    global selectedline numcommits displayorder ctext
2377
    global ffileline finddidsel parentlist
2378
    global findinprogress findstartline findinsertpos
2379
    global treediffs fdiffid fdiffsneeded fdiffpos
2380
    global findmergefiles
2381 2382 2383 2384 2385 2386 2387 2388 2389 2390

    if {$numcommits == 0} return

    if {[info exists selectedline]} {
	set l [expr {$selectedline + 1}]
    } else {
	set l 0
    }
    set ffileline $l
    set findstartline $l
2391 2392 2393
    set diffsneeded {}
    set fdiffsneeded {}
    while 1 {
2394
	set id [lindex $displayorder $l]
2395
	if {$findmergefiles || [llength [lindex $parentlist $l]] == 1} {
2396 2397 2398
	    if {![info exists treediffs($id)]} {
		append diffsneeded "$id\n"
		lappend fdiffsneeded $id
2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414
	    }
	}
	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
	}
2415
	catch {unset fdiffid}
2416 2417 2418 2419 2420 2421 2422
	set fdiffpos 0
	fconfigure $df -blocking 0
	fileevent $df readable [list readfilediffs $df]
    }

    set finddidsel 0
    set findinsertpos end
2423
    set id [lindex $displayorder $l]
2424
    . config -cursor watch
2425
    settextcursor watch
2426
    set findinprogress 1
2427
    findcont
2428 2429 2430 2431
    update
}

proc readfilediffs {df} {
2432
    global findid fdiffid fdiffs
2433 2434 2435 2436 2437 2438 2439 2440 2441

    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"
2442 2443
	    } elseif {[info exists findid]} {
		set id $findid
2444 2445
		stopfindproc
		bell
2446
		error_popup "Couldn't find diffs for $id"
2447 2448 2449 2450
	    }
	}
	return
    }
2451
    if {[regexp {^([0-9a-f]{40})$} $line match id]} {
2452 2453
	# start of a new string of diffs
	donefilediff
2454
	set fdiffid $id
2455 2456 2457 2458 2459 2460 2461
	set fdiffs {}
    } elseif {[string match ":*" $line]} {
	lappend fdiffs [lindex $line 5]
    }
}

proc donefilediff {} {
2462
    global fdiffid fdiffs treediffs findid
2463 2464
    global fdiffsneeded fdiffpos

2465 2466
    if {[info exists fdiffid]} {
	while {[lindex $fdiffsneeded $fdiffpos] ne $fdiffid
2467 2468 2469
	       && $fdiffpos < [llength $fdiffsneeded]} {
	    # git-diff-tree doesn't output anything for a commit
	    # which doesn't change anything
2470 2471 2472 2473
	    set nullid [lindex $fdiffsneeded $fdiffpos]
	    set treediffs($nullid) {}
	    if {[info exists findid] && $nullid eq $findid} {
		unset findid
2474
		findcont
2475 2476 2477 2478 2479
	    }
	    incr fdiffpos
	}
	incr fdiffpos

2480 2481
	if {![info exists treediffs($fdiffid)]} {
	    set treediffs($fdiffid) $fdiffs
2482
	}
2483 2484
	if {[info exists findid] && $fdiffid eq $findid} {
	    unset findid
2485
	    findcont
2486 2487
	}
    }
2488 2489
}

2490
proc findcont {} {
2491
    global findid treediffs parentlist
2492
    global ffileline findstartline finddidsel
2493
    global displayorder numcommits matchinglines findinprogress
2494 2495 2496
    global findmergefiles

    set l $ffileline
2497 2498 2499
    while {1} {
	set id [lindex $displayorder $l]
	if {$findmergefiles || [llength [lindex $parentlist $l]] == 1} {
2500 2501
	    if {![info exists treediffs($id)]} {
		set findid $id
2502 2503 2504 2505
		set ffileline $l
		return
	    }
	    set doesmatch 0
2506
	    foreach f $treediffs($id) {
2507 2508 2509 2510 2511 2512 2513
		set x [findmatches $f]
		if {$x != {}} {
		    set doesmatch 1
		    break
		}
	    }
	    if {$doesmatch} {
2514
		insertmatch $l $id
2515 2516
	    }
	}
2517 2518
	if {[incr l] >= $numcommits} {
	    set l 0
2519
	}
2520
	if {$l == $findstartline} break
2521 2522 2523 2524 2525 2526 2527 2528 2529 2530
    }
    stopfindproc
    if {!$finddidsel} {
	bell
    }
}

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

P
Paul Mackerras 已提交
2533
    drawcmitrow $l
2534 2535 2536 2537 2538 2539
    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
2540 2541 2542 2543 2544 2545 2546 2547 2548
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 已提交
2549 2550 2551 2552
	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 \
2553 2554 2555 2556 2557 2558
		   -outline {} -tags matches -fill yellow]
	$canv lower $t
    }
}

proc unmarkmatches {} {
2559
    global matchinglines findids
2560 2561
    allcanvs delete matches
    catch {unset matchinglines}
2562
    catch {unset findids}
2563 2564
}

2565
proc selcanvline {w x y} {
2566
    global canv canvy0 ctext linespc
P
Paul Mackerras 已提交
2567
    global rowtextx
2568
    set ymax [lindex [$canv cget -scrollregion] 3]
2569
    if {$ymax == {}} return
2570 2571 2572 2573 2574 2575
    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
    }
2576 2577 2578
    if {$w eq $canv} {
	if {![info exists rowtextx($l)] || $x < $rowtextx($l)} return
    }
2579
    unmarkmatches
2580
    selectline $l 1
2581 2582
}

2583 2584 2585 2586 2587 2588 2589 2590 2591
proc commit_descriptor {p} {
    global commitinfo
    set l "..."
    if {[info exists commitinfo($p)]} {
	set l [lindex $commitinfo($p) 0]
    }
    return "$p ($l)"
}

2592 2593 2594
# append some text to the ctext widget, and make any SHA1 ID
# that we know about be a clickable link.
proc appendwithlinks {text} {
P
Paul Mackerras 已提交
2595
    global ctext commitrow linknum
2596 2597 2598 2599 2600 2601 2602 2603 2604

    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]
P
Paul Mackerras 已提交
2605
	if {![info exists commitrow($linkid)]} continue
2606 2607 2608
	incr e
	$ctext tag add link "$start + $s c" "$start + $e c"
	$ctext tag add link$linknum "$start + $s c" "$start + $e c"
P
Paul Mackerras 已提交
2609
	$ctext tag bind link$linknum <1> [list selectline $commitrow($linkid) 1]
2610 2611 2612 2613 2614 2615 2616
	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 }
}

2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632
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}]
}

2633
proc selectline {l isnew} {
2634
    global canv canv2 canv3 ctext commitinfo selectedline
2635
    global displayorder linehtag linentag linedtag
2636
    global canvy0 linespc parentlist childlist
2637
    global cflist currentid sha1entry
P
Paul Mackerras 已提交
2638
    global commentend idtags linknum
2639
    global mergemax numcommits pending_select
2640

2641
    catch {unset pending_select}
2642
    $canv delete hover
2643
    normalline
2644
    if {$l < 0 || $l >= $numcommits} return
2645
    set y [expr {$canvy0 + $l * $linespc}]
2646
    set ymax [lindex [$canv cget -scrollregion] 3]
2647 2648
    set ytop [expr {$y - $linespc - 1}]
    set ybot [expr {$y + $linespc + 1}]
2649
    set wnow [$canv yview]
J
Jeff Hobbs 已提交
2650 2651
    set wtop [expr {[lindex $wnow 0] * $ymax}]
    set wbot [expr {[lindex $wnow 1] * $ymax}]
2652 2653
    set wh [expr {$wbot - $wtop}]
    set newtop $wtop
2654
    if {$ytop < $wtop} {
2655 2656 2657 2658 2659 2660 2661
	if {$ybot < $wtop} {
	    set newtop [expr {$y - $wh / 2.0}]
	} else {
	    set newtop $ytop
	    if {$newtop > $wtop - $linespc} {
		set newtop [expr {$wtop - $linespc}]
	    }
2662
	}
2663 2664 2665 2666 2667 2668 2669 2670
    } 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}]
	    }
2671
	}
2672 2673 2674 2675 2676
    }
    if {$newtop != $wtop} {
	if {$newtop < 0} {
	    set newtop 0
	}
J
Jeff Hobbs 已提交
2677
	allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
P
Paul Mackerras 已提交
2678
	drawvisible
2679
    }
2680

P
Paul Mackerras 已提交
2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694
    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

2695 2696
    if {$isnew} {
	addtohistory [list selectline $l 0]
2697 2698
    }

2699 2700
    set selectedline $l

2701
    set id [lindex $displayorder $l]
2702
    set currentid $id
2703 2704 2705 2706 2707
    $sha1entry delete 0 end
    $sha1entry insert 0 $id
    $sha1entry selection from 0
    $sha1entry selection to end

2708
    $ctext conf -state normal
2709
    $ctext delete 0.0 end
2710
    set linknum 0
2711 2712
    $ctext mark set fmark.0 0.0
    $ctext mark gravity fmark.0 left
2713
    set info $commitinfo($id)
P
Paul Mackerras 已提交
2714 2715 2716 2717
    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"
2718 2719 2720 2721 2722 2723 2724
    if {[info exists idtags($id)]} {
	$ctext insert end "Tags:"
	foreach tag $idtags($id) {
	    $ctext insert end " $tag"
	}
	$ctext insert end "\n"
    }
2725 2726
 
    set comment {}
2727 2728
    set olds [lindex $parentlist $l]
    if {[llength $olds] > 1} {
2729
	set np 0
2730
	foreach p $olds {
2731 2732 2733 2734 2735 2736 2737 2738 2739 2740
	    if {$np >= $mergemax} {
		set tag mmax
	    } else {
		set tag m$np
	    }
	    $ctext insert end "Parent: " $tag
	    appendwithlinks [commit_descriptor $p]
	    incr np
	}
    } else {
2741 2742
	foreach p $olds {
	    append comment "Parent: [commit_descriptor $p]\n"
2743 2744
	}
    }
2745

2746 2747
    foreach c [lindex $childlist $l] {
	append comment "Child:  [commit_descriptor $c]\n"
2748 2749 2750
    }
    append comment "\n"
    append comment [lindex $info 5]
2751 2752

    # make anything that looks like a SHA1 ID be a clickable link
2753
    appendwithlinks $comment
2754

2755
    $ctext tag delete Comments
2756
    $ctext tag remove found 1.0 end
2757
    $ctext conf -state disabled
2758
    set commentend [$ctext index "end - 1c"]
2759 2760

    $cflist delete 0 end
2761
    $cflist insert end "Comments"
2762
    if {[llength $olds] <= 1} {
2763
	startdiff $id
2764
    } else {
2765
	mergediff $id $l
2766 2767 2768
    }
}

2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780
proc selfirstline {} {
    unmarkmatches
    selectline 0 1
}

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

2781 2782 2783
proc selnextline {dir} {
    global selectedline
    if {![info exists selectedline]} return
J
Jeff Hobbs 已提交
2784
    set l [expr {$selectedline + $dir}]
2785
    unmarkmatches
2786 2787 2788
    selectline $l 1
}

2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807
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    
}

2808
proc unselectline {} {
P
Paul Mackerras 已提交
2809
    global selectedline currentid
2810 2811

    catch {unset selectedline}
P
Paul Mackerras 已提交
2812
    catch {unset currentid}
2813 2814 2815 2816
    allcanvs delete secsel
}

proc addtohistory {cmd} {
2817
    global history historyindex curview
2818

2819
    set elt [list $curview $cmd]
2820
    if {$historyindex > 0
2821
	&& [lindex $history [expr {$historyindex - 1}]] == $elt} {
2822 2823 2824 2825
	return
    }

    if {$historyindex < [llength $history]} {
2826
	set history [lreplace $history $historyindex end $elt]
2827
    } else {
2828
	lappend history $elt
2829 2830 2831 2832 2833 2834 2835 2836 2837 2838
    }
    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
}

2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849
proc godo {elt} {
    global curview

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

2850 2851 2852 2853 2854
proc goback {} {
    global history historyindex

    if {$historyindex > 1} {
	incr historyindex -1
2855
	godo [lindex $history [expr {$historyindex - 1}]]
2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866
	.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]} {
2867
	set cmd [lindex $history $historyindex]
2868
	incr historyindex
2869
	godo $cmd
2870 2871 2872 2873 2874
	.ctop.top.bar.leftbut conf -state normal
    }
    if {$historyindex >= [llength $history]} {
	.ctop.top.bar.rightbut conf -state disabled
    }
2875 2876
}

2877 2878
proc mergediff {id l} {
    global diffmergeid diffopts mdifffd
2879
    global difffilestart diffids
2880
    global parentlist
2881

2882
    set diffmergeid $id
2883
    set diffids $id
2884 2885
    catch {unset difffilestart}
    # this doesn't seem to actually affect anything...
2886
    set env(GIT_DIFF_OPTS) $diffopts
2887 2888 2889 2890
    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
2891
    }
2892 2893
    fconfigure $mdf -blocking 0
    set mdifffd($id) $mdf
2894 2895
    set np [llength [lindex $parentlist $l]]
    fileevent $mdf readable [list getmergediffline $mdf $id $np]
2896
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
2897 2898
}

2899 2900
proc getmergediffline {mdf id np} {
    global diffmergeid ctext cflist nextupdate mergemax
2901
    global difffilestart mdifffd
2902

2903
    set n [gets $mdf line]
2904
    if {$n < 0} {
2905 2906
	if {[eof $mdf]} {
	    close $mdf
2907 2908 2909
	}
	return
    }
2910 2911
    if {![info exists diffmergeid] || $id != $diffmergeid
	|| $mdf != $mdifffd($id)} {
2912
	return
2913 2914
    }
    $ctext conf -state normal
2915 2916
    if {[regexp {^diff --cc (.*)} $line match fname]} {
	# start of a new file
2917 2918
	$ctext insert end "\n"
	set here [$ctext index "end - 1c"]
2919 2920 2921 2922 2923 2924
	set i [$cflist index end]
	$ctext mark set fmark.$i $here
	$ctext mark gravity fmark.$i left
	set difffilestart([expr {$i-1}]) $here
	$cflist insert end $fname
	set l [expr {(78 - [string length $fname]) / 2}]
2925
	set pad [string range "----------------------------------------" 1 $l]
2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944
	$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
2945
	    } else {
2946 2947
		set isbad 1
		break
2948
	    }
2949
	}
2950 2951 2952 2953 2954 2955 2956 2957 2958
	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]
2959
	}
2960 2961 2962
	if {$num ne {}} {
	    if {$num >= $mergemax} {
		set num "max"
2963
	    }
2964
	    lappend tags m$num
2965
	}
2966
	$ctext insert end "$line\n" $tags
2967 2968
    }
    $ctext conf -state disabled
2969 2970 2971 2972
    if {[clock clicks -milliseconds] >= $nextupdate} {
	incr nextupdate 100
	fileevent $mdf readable {}
	update
2973
	fileevent $mdf readable [list getmergediffline $mdf $id $np]
2974 2975 2976
    }
}

2977 2978
proc startdiff {ids} {
    global treediffs diffids treepending diffmergeid
2979

2980
    set diffids $ids
2981
    catch {unset diffmergeid}
2982
    if {![info exists treediffs($ids)]} {
2983
	if {![info exists treepending]} {
2984
	    gettreediffs $ids
2985 2986
	}
    } else {
2987
	addtocflist $ids
2988 2989 2990 2991
    }
}

proc addtocflist {ids} {
2992
    global treediffs cflist
2993
    foreach f $treediffs($ids) {
2994 2995
	$cflist insert end $f
    }
2996
    getblobdiffs $ids
2997 2998
}

2999
proc gettreediffs {ids} {
3000
    global treediff treepending
3001
    set treepending $ids
3002
    set treediff {}
3003 3004 3005
    if {[catch \
	 {set gdtf [open [concat | git-diff-tree --no-commit-id -r $ids] r]} \
	]} return
3006
    fconfigure $gdtf -blocking 0
3007
    fileevent $gdtf readable [list gettreediffline $gdtf $ids]
3008 3009
}

3010
proc gettreediffline {gdtf ids} {
3011 3012
    global treediff treediffs treepending diffids diffmergeid

3013 3014 3015 3016
    set n [gets $gdtf line]
    if {$n < 0} {
	if {![eof $gdtf]} return
	close $gdtf
3017
	set treediffs($ids) $treediff
3018
	unset treepending
3019
	if {$ids != $diffids} {
3020 3021
	    if {![info exists diffmergeid]} {
		gettreediffs $diffids
3022
	    }
3023 3024
	} else {
	    addtocflist $ids
3025
	}
3026 3027
	return
    }
3028
    set file [lindex $line 5]
3029
    lappend treediff $file
3030 3031
}

3032
proc getblobdiffs {ids} {
3033
    global diffopts blobdifffd diffids env curdifftag curtagstart
3034
    global difffilestart nextupdate diffinhdr treediffs
3035

3036
    set env(GIT_DIFF_OPTS) $diffopts
3037
    set cmd [concat | git-diff-tree --no-commit-id -r -p -C $ids]
3038
    if {[catch {set bdf [open $cmd r]} err]} {
3039 3040 3041
	puts "error getting diffs: $err"
	return
    }
3042
    set diffinhdr 0
3043
    fconfigure $bdf -blocking 0
3044
    set blobdifffd($ids) $bdf
3045 3046 3047 3048
    set curdifftag Comments
    set curtagstart 0.0
    catch {unset difffilestart}
    fileevent $bdf readable [list getblobdiffline $bdf $diffids]
3049
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
3050 3051
}

3052
proc getblobdiffline {bdf ids} {
3053
    global diffids blobdifffd ctext curdifftag curtagstart
3054 3055
    global diffnexthead diffnextnote difffilestart
    global nextupdate diffinhdr treediffs
3056

3057 3058 3059 3060
    set n [gets $bdf line]
    if {$n < 0} {
	if {[eof $bdf]} {
	    close $bdf
3061
	    if {$ids == $diffids && $bdf == $blobdifffd($ids)} {
3062 3063 3064 3065 3066
		$ctext tag add $curdifftag $curtagstart end
	    }
	}
	return
    }
3067
    if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
3068 3069 3070
	return
    }
    $ctext conf -state normal
3071
    if {[regexp {^diff --git a/(.*) b/(.*)} $line match fname newname]} {
3072 3073 3074 3075
	# start of a new file
	$ctext insert end "\n"
	$ctext tag add $curdifftag $curtagstart end
	set curtagstart [$ctext index "end - 1c"]
3076
	set header $newname
3077
	set here [$ctext index "end - 1c"]
3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093
	set i [lsearch -exact $treediffs($diffids) $fname]
	if {$i >= 0} {
	    set difffilestart($i) $here
	    incr i
	    $ctext mark set fmark.$i $here
	    $ctext mark gravity fmark.$i left
	}
	if {$newname != $fname} {
	    set i [lsearch -exact $treediffs($diffids) $newname]
	    if {$i >= 0} {
		set difffilestart($i) $here
		incr i
		$ctext mark set fmark.$i $here
		$ctext mark gravity fmark.$i left
	    }
	}
3094 3095
	set curdifftag "f:$fname"
	$ctext tag delete $curdifftag
3096
	set l [expr {(78 - [string length $header]) / 2}]
3097
	set pad [string range "----------------------------------------" 1 $l]
3098
	$ctext insert end "$pad $header $pad\n" filesep
3099
	set diffinhdr 1
3100 3101 3102
    } elseif {$diffinhdr && [string compare -length 3 $line "---"] == 0} {
	# do nothing
    } elseif {$diffinhdr && [string compare -length 3 $line "+++"] == 0} {
3103
	set diffinhdr 0
3104 3105
    } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
		   $line match f1l f1c f2l f2c rest]} {
3106
	$ctext insert end "$line\n" hunksep
3107
	set diffinhdr 0
3108 3109 3110 3111 3112 3113 3114
    } 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"
3115
	} elseif {$diffinhdr || $x == "\\"} {
3116 3117
	    # e.g. "\ No newline at end of file"
	    $ctext insert end "$line\n" filesep
3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129
	} 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
3130 3131 3132 3133 3134 3135
    if {[clock clicks -milliseconds] >= $nextupdate} {
	incr nextupdate 100
	fileevent $bdf readable {}
	update
	fileevent $bdf readable "getblobdiffline $bdf {$ids}"
    }
3136 3137
}

3138 3139 3140 3141 3142
proc nextfile {} {
    global difffilestart ctext
    set here [$ctext index @0,0]
    for {set i 0} {[info exists difffilestart($i)]} {incr i} {
	if {[$ctext compare $difffilestart($i) > $here]} {
3143 3144 3145 3146
	    if {![info exists pos]
		|| [$ctext compare $difffilestart($i) < $pos]} {
		set pos $difffilestart($i)
	    }
3147 3148
	}
    }
3149 3150 3151
    if {[info exists pos]} {
	$ctext yview $pos
    }
3152 3153
}

3154
proc listboxsel {} {
3155
    global ctext cflist currentid
3156
    if {![info exists currentid]} return
3157 3158 3159 3160
    set sel [lsort [$cflist curselection]]
    if {$sel eq {}} return
    set first [lindex $sel 0]
    catch {$ctext yview fmark.$first}
3161 3162
}

3163 3164
proc setcoords {} {
    global linespc charspc canvx0 canvy0 mainfont
3165
    global xspc1 xspc2 lthickness
3166

3167 3168
    set linespc [font metrics $mainfont -linespace]
    set charspc [font measure $mainfont "m"]
P
Paul Mackerras 已提交
3169 3170
    set canvy0 [expr {int(3 + 0.5 * $linespc)}]
    set canvx0 [expr {int(3 + 0.5 * $linespc)}]
3171
    set lthickness [expr {int($linespc / 9) + 1}]
3172 3173
    set xspc1(0) $linespc
    set xspc2 $linespc
3174
}
3175

3176
proc redisplay {} {
3177
    global canv
P
Paul Mackerras 已提交
3178 3179 3180 3181 3182 3183
    global selectedline

    set ymax [lindex [$canv cget -scrollregion] 3]
    if {$ymax eq {} || $ymax == 0} return
    set span [$canv yview]
    clear_display
3184
    setcanvscroll
P
Paul Mackerras 已提交
3185 3186 3187 3188
    allcanvs yview moveto [lindex $span 0]
    drawvisible
    if {[info exists selectedline]} {
	selectline $selectedline 0
3189 3190 3191 3192
    }
}

proc incrfont {inc} {
3193
    global mainfont namefont textfont ctext canv phase
3194
    global stopped entries
3195 3196 3197 3198 3199 3200 3201
    unmarkmatches
    set mainfont [lreplace $mainfont 1 1 [expr {[lindex $mainfont 1] + $inc}]]
    set namefont [lreplace $namefont 1 1 [expr {[lindex $namefont 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]
3202 3203 3204
    foreach e $entries {
	$e conf -font $mainfont
    }
3205
    if {$phase eq "getcommits"} {
3206 3207 3208 3209
	$canv itemconf textitems -font $mainfont
    }
    redisplay
}
3210

3211 3212 3213 3214 3215 3216 3217
proc clearsha1 {} {
    global sha1entry sha1string
    if {[string length $sha1string] == 40} {
	$sha1entry delete 0 end
    }
}

3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234
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 {} {
3235
    global sha1string currentid commitrow tagids headids
3236
    global displayorder numcommits
3237

3238 3239 3240 3241
    if {$sha1string == {}
	|| ([info exists currentid] && $sha1string == $currentid)} return
    if {[info exists tagids($sha1string)]} {
	set id $tagids($sha1string)
3242 3243
    } elseif {[info exists headids($sha1string)]} {
	set id $headids($sha1string)
3244 3245
    } else {
	set id [string tolower $sha1string]
3246 3247
	if {[regexp {^[0-9a-f]{4,39}$} $id]} {
	    set matches {}
P
Paul Mackerras 已提交
3248 3249 3250
	    foreach i $displayorder {
		if {[string match $id* $i]} {
		    lappend matches $i
3251 3252 3253 3254 3255 3256 3257 3258 3259 3260
		}
	    }
	    if {$matches ne {}} {
		if {[llength $matches] > 1} {
		    error_popup "Short SHA1 id $id is ambiguous"
		    return
		}
		set id [lindex $matches 0]
	    }
	}
3261
    }
P
Paul Mackerras 已提交
3262 3263
    if {[info exists commitrow($id)]} {
	selectline $commitrow($id) 1
3264 3265
	return
    }
3266
    if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
3267 3268
	set type "SHA1 id"
    } else {
3269
	set type "Tag/Head"
3270 3271 3272 3273
    }
    error_popup "$type $sha1string is not known"
}

3274 3275 3276 3277
proc lineenter {x y id} {
    global hoverx hovery hoverid hovertimer
    global commitinfo canv

P
Paul Mackerras 已提交
3278
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332
    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 已提交
3333
    set t [$canv create text $x $y -anchor nw -text $text -tags hover -font $mainfont]
3334 3335 3336
    $canv raise $t
}

3337
proc clickisonarrow {id y} {
P
Paul Mackerras 已提交
3338
    global lthickness
3339

P
Paul Mackerras 已提交
3340
    set ranges [rowranges $id]
3341
    set thresh [expr {2 * $lthickness + 6}]
P
Paul Mackerras 已提交
3342
    set n [expr {[llength $ranges] - 1}]
3343
    for {set i 1} {$i < $n} {incr i} {
P
Paul Mackerras 已提交
3344
	set row [lindex $ranges $i]
3345 3346
	if {abs([yc $row] - $y) < $thresh} {
	    return $i
3347 3348 3349 3350 3351
	}
    }
    return {}
}

3352
proc arrowjump {id n y} {
P
Paul Mackerras 已提交
3353
    global canv
3354

3355 3356
    # 1 <-> 2, 3 <-> 4, etc...
    set n [expr {(($n - 1) ^ 1) + 1}]
P
Paul Mackerras 已提交
3357
    set row [lindex [rowranges $id] $n]
3358
    set yt [yc $row]
3359 3360 3361 3362 3363 3364 3365 3366
    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
    }
3367
    allcanvs yview moveto $yfrac
3368 3369
}

3370
proc lineclick {x y id isnew} {
3371
    global ctext commitinfo childlist commitrow cflist canv thickerline
3372

P
Paul Mackerras 已提交
3373
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
3374
    unmarkmatches
3375
    unselectline
3376 3377 3378 3379
    normalline
    $canv delete hover
    # draw this line thicker than normal
    set thickerline $id
3380
    drawlines $id
3381
    if {$isnew} {
3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394
	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]
3395
    }
3396 3397 3398
    # fill the details pane with info about this line
    $ctext conf -state normal
    $ctext delete 0.0 end
3399 3400 3401 3402 3403 3404
    $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]
3405
    set info $commitinfo($id)
3406
    $ctext insert end "\n\t[lindex $info 0]\n"
3407
    $ctext insert end "\tAuthor:\t[lindex $info 1]\n"
P
Paul Mackerras 已提交
3408 3409
    set date [formatdate [lindex $info 2]]
    $ctext insert end "\tDate:\t$date\n"
3410 3411
    set kids [lindex $childlist $commitrow($id)]
    if {$kids ne {}} {
3412
	$ctext insert end "\nChildren:"
3413
	set i 0
3414
	foreach child $kids {
3415
	    incr i
P
Paul Mackerras 已提交
3416
	    if {![info exists commitinfo($child)] && ![getcommit $child]} continue
3417
	    set info $commitinfo($child)
3418 3419 3420 3421 3422
	    $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 已提交
3423 3424
	    set date [formatdate [lindex $info 2]]
	    $ctext insert end "\n\tDate:\t$date\n"
3425 3426 3427 3428 3429 3430 3431
	}
    }
    $ctext conf -state disabled

    $cflist delete 0 end
}

3432 3433 3434
proc normalline {} {
    global thickerline
    if {[info exists thickerline]} {
3435
	set id $thickerline
3436
	unset thickerline
3437
	drawlines $id
3438 3439 3440
    }
}

3441
proc selbyid {id} {
P
Paul Mackerras 已提交
3442 3443 3444
    global commitrow
    if {[info exists commitrow($id)]} {
	selectline $commitrow($id) 1
3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456
    }
}

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} {
P
Paul Mackerras 已提交
3457
    global rowctxmenu commitrow selectedline rowmenuid
3458

P
Paul Mackerras 已提交
3459
    if {![info exists selectedline] || $commitrow($id) eq $selectedline} {
3460 3461 3462 3463 3464 3465
	set state disabled
    } else {
	set state normal
    }
    $rowctxmenu entryconfigure 0 -state $state
    $rowctxmenu entryconfigure 1 -state $state
3466
    $rowctxmenu entryconfigure 2 -state $state
3467 3468 3469 3470 3471
    set rowmenuid $id
    tk_popup $rowctxmenu $x $y
}

proc diffvssel {dirn} {
3472
    global rowmenuid selectedline displayorder
3473 3474 3475

    if {![info exists selectedline]} return
    if {$dirn} {
3476
	set oldid [lindex $displayorder $selectedline]
3477 3478 3479
	set newid $rowmenuid
    } else {
	set oldid $rowmenuid
3480
	set newid [lindex $displayorder $selectedline]
3481
    }
3482 3483 3484 3485 3486 3487 3488 3489
    addtohistory [list doseldiff $oldid $newid]
    doseldiff $oldid $newid
}

proc doseldiff {oldid newid} {
    global ctext cflist
    global commitinfo

3490 3491 3492 3493 3494 3495
    $ctext conf -state normal
    $ctext delete 0.0 end
    $ctext mark set fmark.0 0.0
    $ctext mark gravity fmark.0 left
    $cflist delete 0 end
    $cflist insert end "Top"
3496 3497 3498 3499 3500 3501 3502
    $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     "
3503
    $ctext insert end [lindex $commitinfo($oldid) 0]
3504 3505 3506 3507
    $ctext insert end "\n\nTo   "
    $ctext tag bind link1 <1> [list selbyid $newid]
    $ctext insert end $newid [list link link1]
    $ctext insert end "\n     "
3508 3509 3510 3511 3512
    $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
3513
    startdiff [list $oldid $newid]
3514 3515
}

3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528
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"
3529
    grid $top.title - -pady 10
3530
    label $top.from -text "From:"
3531
    entry $top.fromsha1 -width 40 -relief flat
3532 3533 3534
    $top.fromsha1 insert 0 $oldid
    $top.fromsha1 conf -state readonly
    grid $top.from $top.fromsha1 -sticky w
3535
    entry $top.fromhead -width 60 -relief flat
3536 3537 3538 3539
    $top.fromhead insert 0 $oldhead
    $top.fromhead conf -state readonly
    grid x $top.fromhead -sticky w
    label $top.to -text "To:"
3540
    entry $top.tosha1 -width 40 -relief flat
3541 3542 3543
    $top.tosha1 insert 0 $newid
    $top.tosha1 conf -state readonly
    grid $top.to $top.tosha1 -sticky w
3544
    entry $top.tohead -width 60 -relief flat
3545 3546 3547 3548 3549 3550 3551 3552 3553
    $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
3554
    grid $top.flab $top.fname -sticky w
3555 3556 3557 3558 3559 3560 3561
    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
3562
    focus $top.fname
3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600
}

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
}

3601 3602 3603 3604 3605 3606 3607 3608
proc mktag {} {
    global rowmenuid mktagtop commitinfo

    set top .maketag
    set mktagtop $top
    catch {destroy $top}
    toplevel $top
    label $top.title -text "Create tag"
3609
    grid $top.title - -pady 10
3610
    label $top.id -text "ID:"
3611
    entry $top.sha1 -width 40 -relief flat
3612 3613 3614
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
3615
    entry $top.head -width 60 -relief flat
3616 3617 3618 3619
    $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:"
3620
    entry $top.tag -width 60
3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645
    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 {
3646
	set dir [gitdir]
3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657
	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
3658 3659 3660 3661
    redrawtags $id
}

proc redrawtags {id} {
P
Paul Mackerras 已提交
3662
    global canv linehtag commitrow idpos selectedline
3663

P
Paul Mackerras 已提交
3664 3665
    if {![info exists commitrow($id)]} return
    drawcmitrow $commitrow($id)
3666 3667
    $canv delete tag.$id
    set xt [eval drawtags $id $idpos($id)]
P
Paul Mackerras 已提交
3668 3669
    $canv coords $linehtag($commitrow($id)) $xt [lindex $idpos($id) 2]
    if {[info exists selectedline] && $selectedline == $commitrow($id)} {
3670
	selectline $selectedline 0
3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685
    }
}

proc mktagcan {} {
    global mktagtop

    catch {destroy $mktagtop}
    unset mktagtop
}

proc mktaggo {} {
    domktag
    mktagcan
}

3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740
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
}

3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779
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
	}
    }
}

3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798
proc showtag {tag isnew} {
    global ctext cflist tagcontents tagids linknum

    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
    $cflist delete 0 end
}

3799 3800 3801 3802 3803
proc doquit {} {
    global stopped
    set stopped 100
    destroy .
}
3804

3805 3806 3807
proc doprefs {} {
    global maxwidth maxgraphpct diffopts findmergefiles
    global oldprefs prefstop
P
Paul Mackerras 已提交
3808

3809 3810 3811 3812 3813
    set top .gitkprefs
    set prefstop $top
    if {[winfo exists $top]} {
	raise $top
	return
3814
    }
3815 3816
    foreach v {maxwidth maxgraphpct diffopts findmergefiles} {
	set oldprefs($v) [set $v]
P
Paul Mackerras 已提交
3817
    }
3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874
    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 已提交
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 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149
# 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 {}
}

4150 4151 4152
# defaults...
set datemode 0
set diffopts "-U 5 -p"
4153
set wrcomcmd "git-diff-tree --stdin -p --pretty"
4154

4155
set gitencoding {}
4156 4157 4158 4159
catch {
    set gitencoding [exec git-repo-config --get i18n.commitencoding]
}
if {$gitencoding == ""} {
4160 4161 4162 4163 4164
    set gitencoding "utf-8"
}
set tclencoding [tcl_encoding $gitencoding]
if {$tclencoding == {}} {
    puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
4165
}
4166

4167 4168
set mainfont {Helvetica 9}
set textfont {Courier 9}
4169
set uifont {Helvetica 9 bold}
4170
set findmergefiles 0
4171
set maxgraphpct 50
4172
set maxwidth 16
P
Paul Mackerras 已提交
4173
set revlistorder 0
4174
set fastdate 0
P
Paul Mackerras 已提交
4175 4176 4177
set uparrowlen 7
set downarrowlen 7
set mingaplen 30
4178 4179 4180 4181 4182

set colors {green red blue magenta darkgrey brown orange}

catch {source ~/.gitk}

4183
set namefont $mainfont
4184 4185

font create optionfont -family sans-serif -size -12
4186

4187 4188 4189 4190 4191 4192 4193 4194 4195
set revtreeargs {}
foreach arg $argv {
    switch -regexp -- $arg {
	"^$" { }
	"^-d" { set datemode 1 }
	default {
	    lappend revtreeargs $arg
	}
    }
4196
}
4197

P
Paul Mackerras 已提交
4198 4199 4200 4201 4202 4203 4204
# 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
}

4205 4206 4207
set history {}
set historyindex 0

P
Paul Mackerras 已提交
4208 4209
set optim_delay 16

P
Paul Mackerras 已提交
4210 4211 4212 4213
set nextviewnum 1
set curview 0
set viewfiles(0) {}

4214
set stopped 0
4215
set stuffsaved 0
4216
set patchnum 0
4217
setcoords
4218
makewindow
4219
readrefs
4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231

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 已提交
4232 4233 4234 4235 4236 4237 4238 4239 4240
if {$cmdline_files ne {}} {
    # create a view for the files/dirs specified on the command line
    set curview 1
    set nextviewnum 2
    set viewname(1) "Command line"
    set viewfiles(1) $cmdline_files
    .bar.view add command -label $viewname(1) -command {showview 1}
    .bar.view entryconf 2 -state normal
}
4241
getcommits