gitk 107.2 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 20 21
proc parse_args {rargs} {
    global parsed_args

22
    if {[catch {
23 24
	set parse_args [concat --default HEAD $rargs]
	set parsed_args [split [eval exec git-rev-parse $parse_args] "\n"]
25
    }]} {
26 27 28 29 30 31 32 33 34
	# if git-rev-parse failed for some reason...
	if {$rargs == {}} {
	    set rargs HEAD
	}
	set parsed_args $rargs
    }
    return $parsed_args
}

35
proc start_rev_list {rlargs} {
36
    global startmsecs nextupdate ncmupdate
P
Paul Mackerras 已提交
37
    global commfd leftover tclencoding datemode
38 39

    set startmsecs [clock clicks -milliseconds]
J
Jeff Hobbs 已提交
40
    set nextupdate [expr {$startmsecs + 100}]
41
    set ncmupdate 1
42
    initlayout
P
Paul Mackerras 已提交
43 44 45 46
    set order "--topo-order"
    if {$datemode} {
	set order "--date-order"
    }
47
    if {[catch {
P
Paul Mackerras 已提交
48
	set commfd [open [concat | git-rev-list --header $order \
49
			      --parents --boundary $rlargs] r]
50
    } err]} {
51
	puts stderr "Error executing git-rev-list: $err"
52 53
	exit 1
    }
P
Paul Mackerras 已提交
54
    set leftover {}
55 56 57 58
    fconfigure $commfd -blocking 0 -translation lf
    if {$tclencoding != {}} {
	fconfigure $commfd -encoding $tclencoding
    }
59
    fileevent $commfd readable [list getcommitlines $commfd]
60 61 62 63 64
    . config -cursor watch
    settextcursor watch
}

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

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

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

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

174 175
proc doupdate {reading} {
    global commfd nextupdate numcommits ncmupdate
176

177 178 179
    if {$reading} {
	fileevent $commfd readable {}
    }
180
    update
181 182 183 184 185 186 187 188 189 190 191
    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]
    }
192 193 194
}

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

199
proc updatecommits {rargs} {
P
Paul Mackerras 已提交
200
    stopfindproc
201
    foreach v {colormap selectedline matchinglines treediffs
202
	mergefilelist currentid rowtextx commitrow
P
Paul Mackerras 已提交
203 204 205 206
	rowidlist rowoffsets idrowranges idrangedrawn iddrawn
	linesegends crossings cornercrossings} {
	global $v
	catch {unset $v}
207
    }
P
Paul Mackerras 已提交
208
    allcanvs delete all
209
    readrefs
P
Paul Mackerras 已提交
210
    getcommits $rargs
211 212
}

213
proc parsecommit {id contents listed} {
214 215 216 217 218 219 220 221 222
    global commitinfo cdate

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

266
proc getcommit {id} {
267
    global commitdata commitinfo
P
Paul Mackerras 已提交
268

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

280
proc readrefs {} {
281
    global tagids idtags headids idheads tagcontents
282
    global otherrefids idotherrefs
283

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

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

337
proc makewindow {rargs} {
338
    global canv canv2 canv3 linespc charspc ctext cflist textfont
339
    global findtype findtypemenu findloc findstring fstring geometry
340
    global entries sha1entry sha1string sha1but
341
    global maincursor textcursor curtextcursor
342
    global rowctxmenu mergemax
343 344 345 346

    menu .bar
    .bar add cascade -label "File" -menu .bar.file
    menu .bar.file
347
    .bar.file add command -label "Update" -command [list updatecommits $rargs]
348
    .bar.file add command -label "Reread references" -command rereadrefs
349
    .bar.file add command -label "Quit" -command doquit
350 351 352
    menu .bar.edit
    .bar add cascade -label "Edit" -menu .bar.edit
    .bar.edit add command -label "Preferences" -command doprefs
353 354 355
    menu .bar.help
    .bar add cascade -label "Help" -menu .bar.help
    .bar.help add command -label "About gitk" -command about
356
    .bar.help add command -label "Key bindings" -command keys
357 358
    . configure -menu .bar

359
    if {![info exists geometry(canv1)]} {
J
Jeff Hobbs 已提交
360 361 362 363
	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}]
364 365 366 367
	set geometry(ctextw) 80
	set geometry(ctexth) 30
	set geometry(cflistw) 30
    }
P
Paul Mackerras 已提交
368
    panedwindow .ctop -orient vertical
369 370
    if {[info exists geometry(width)]} {
	.ctop conf -width $geometry(width) -height $geometry(height)
371 372 373
	set texth [expr {$geometry(height) - $geometry(canvh) - 56}]
	set geometry(ctexth) [expr {($texth - 8) /
				    [font metrics $textfont -linespace]}]
374
    }
375 376 377 378 379 380 381 382 383 384
    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
385
    canvas $canv -height $geometry(canvh) -width $geometry(canv1) \
386
	-bg white -bd 0 \
P
Paul Mackerras 已提交
387
	-yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
388 389
    .ctop.top.clist add $canv
    set canv2 .ctop.top.clist.canv2
390
    canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \
391
	-bg white -bd 0 -yscrollincr $linespc
392 393
    .ctop.top.clist add $canv2
    set canv3 .ctop.top.clist.canv3
394
    canvas $canv3 -height $geometry(canvh) -width $geometry(canv3) \
395
	-bg white -bd 0 -yscrollincr $linespc
396
    .ctop.top.clist add $canv3
397
    bind .ctop.top.clist <Configure> {resizeclistpanes %W %w}
398 399

    set sha1entry .ctop.top.bar.sha1
400 401 402 403 404
    set entries $sha1entry
    set sha1but .ctop.top.bar.sha1label
    button $sha1but -text "SHA1 ID: " -state disabled -relief flat \
	-command gotocommit -width 8
    $sha1but conf -disabledforeground [$sha1but cget -foreground]
405
    pack .ctop.top.bar.sha1label -side left
406 407
    entry $sha1entry -width 40 -font $textfont -textvariable sha1string
    trace add variable sha1string write sha1change
408
    pack $sha1entry -side left -pady 2
409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432

    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

433 434 435
    button .ctop.top.bar.findbut -text "Find" -command dofind
    pack .ctop.top.bar.findbut -side left
    set findstring {}
436
    set fstring .ctop.top.bar.findstring
437
    lappend entries $fstring
438 439
    entry $fstring -width 30 -font $textfont -textvariable findstring
    pack $fstring -side left -expand 1 -fill x
440
    set findtype Exact
441 442
    set findtypemenu [tk_optionMenu .ctop.top.bar.findtype \
			  findtype Exact IgnCase Regexp]
443 444
    set findloc "All fields"
    tk_optionMenu .ctop.top.bar.findloc findloc "All fields" Headline \
445
	Comments Author Committer Files Pickaxe
446 447
    pack .ctop.top.bar.findloc -side right
    pack .ctop.top.bar.findtype -side right
448 449
    # for making sure type==Exact whenever loc==Pickaxe
    trace add variable findloc write findlocchange
450

451 452
    panedwindow .ctop.cdet -orient horizontal
    .ctop add .ctop.cdet
453 454
    frame .ctop.cdet.left
    set ctext .ctop.cdet.left.ctext
455 456
    text $ctext -bg white -state disabled -font $textfont \
	-width $geometry(ctextw) -height $geometry(ctexth) \
457
	-yscrollcommand ".ctop.cdet.left.sb set" -wrap none
458 459 460 461 462
    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

463
    $ctext tag conf filesep -font [concat $textfont bold] -back "#aaaaaa"
464 465 466 467 468 469 470 471
    $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
472 473 474 475 476 477 478 479 480 481 482
    $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"
483
    $ctext tag conf mmax -fore darkgrey
484
    set mergemax 16
485 486 487
    $ctext tag conf mresult -font [concat $textfont bold]
    $ctext tag conf msep -font [concat $textfont bold]
    $ctext tag conf found -back yellow
488

489 490
    frame .ctop.cdet.right
    set cflist .ctop.cdet.right.cfiles
491
    listbox $cflist -bg white -selectmode extended -width $geometry(cflistw) \
492 493 494 495 496
	-yscrollcommand ".ctop.cdet.right.sb set"
    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
497
    bind .ctop.cdet <Configure> {resizecdetpanes %W %w}
498

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

501 502
    bindall <1> {selcanvline %W %x %y}
    #bindall <B1-Motion> {selcanvline %W %x %y}
503 504
    bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
    bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
505 506
    bindall <2> "canvscan mark %W %x %y"
    bindall <B2-Motion> "canvscan dragto %W %x %y"
507 508
    bindkey <Home> selfirstline
    bindkey <End> sellastline
509 510
    bind . <Key-Up> "selnextline -1"
    bind . <Key-Down> "selnextline 1"
511 512 513 514 515 516 517 518 519 520
    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"
521 522 523
    bindkey <Key-Delete> "$ctext yview scroll -1 pages"
    bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
    bindkey <Key-space> "$ctext yview scroll 1 pages"
524 525
    bindkey p "selnextline -1"
    bindkey n "selnextline 1"
R
Robert Suetterlin 已提交
526 527 528 529 530 531
    bindkey z "goback"
    bindkey x "goforw"
    bindkey i "selnextline -1"
    bindkey k "selnextline 1"
    bindkey j "goback"
    bindkey l "goforw"
532 533 534
    bindkey b "$ctext yview scroll -1 pages"
    bindkey d "$ctext yview scroll 18 units"
    bindkey u "$ctext yview scroll -18 units"
535 536
    bindkey / {findnext 1}
    bindkey <Key-Return> {findnext 0}
537
    bindkey ? findprev
538
    bindkey f nextfile
539
    bind . <Control-q> doquit
540
    bind . <Control-f> dofind
541
    bind . <Control-g> {findnext 0}
542
    bind . <Control-r> findprev
543 544 545 546
    bind . <Control-equal> {incrfont 1}
    bind . <Control-KP_Add> {incrfont 1}
    bind . <Control-minus> {incrfont -1}
    bind . <Control-KP_Subtract> {incrfont -1}
547
    bind $cflist <<ListboxSelect>> listboxsel
548
    bind . <Destroy> {savestuff %W}
549
    bind . <Button-1> "click %W"
550
    bind $fstring <Key-Return> dofind
551
    bind $sha1entry <Key-Return> gotocommit
552
    bind $sha1entry <<PasteSelection>> clearsha1
553 554 555

    set maincursor [. cget -cursor]
    set textcursor [$ctext cget -cursor]
556
    set curtextcursor $textcursor
557

558 559 560 561 562 563
    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}
564
    $rowctxmenu add command -label "Make patch" -command mkpatch
565
    $rowctxmenu add command -label "Create tag" -command mktag
566
    $rowctxmenu add command -label "Write commit to file" -command writecommit
567 568
}

569 570 571 572 573 574 575 576 577 578 579 580 581
# 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 已提交
582 583 584 585 586
proc scrollcanv {cscroll f0 f1} {
    $cscroll set $f0 $f1
    drawfrac $f0 $f1
}

587 588 589 590
# 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} {
591
    global entries
592 593 594 595 596
    bind . $ev $script
    set escript [bind Entry $ev]
    if {$escript == {}} {
	set escript [bind Entry <Key>]
    }
597 598 599
    foreach e $entries {
	bind $e $ev "$escript; break"
    }
600 601 602
}

# set the focus back to the toplevel for any click outside
603
# the entry widgets
604
proc click {w} {
605 606 607
    global entries
    foreach e $entries {
	if {$w == $e} return
608
    }
609
    focus .
610 611 612 613
}

proc savestuff {w} {
    global canv canv2 canv3 ctext cflist mainfont textfont
614
    global stuffsaved findmergefiles maxgraphpct
615
    global maxwidth
616

617
    if {$stuffsaved} return
618
    if {![winfo viewable .]} return
619 620
    catch {
	set f [open "~/.gitk-new" w]
621 622 623
	puts $f [list set mainfont $mainfont]
	puts $f [list set textfont $textfont]
	puts $f [list set findmergefiles $findmergefiles]
624
	puts $f [list set maxgraphpct $maxgraphpct]
625
	puts $f [list set maxwidth $maxwidth]
626 627
	puts $f "set geometry(width) [winfo width .ctop]"
	puts $f "set geometry(height) [winfo height .ctop]"
J
Jeff Hobbs 已提交
628 629 630 631
	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}]"
632 633 634 635 636 637 638 639 640 641
	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
642 643
}

644 645
proc resizeclistpanes {win w} {
    global oldwidth
646
    if {[info exists oldwidth($win)]} {
647 648 649 650 651 652 653 654 655 656 657 658 659
	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 已提交
660
		set sash1 [expr {$sash0 + 20}]
661 662
	    }
	    if {$sash1 > $w - 10} {
J
Jeff Hobbs 已提交
663
		set sash1 [expr {$w - 10}]
664
		if {$sash0 > $sash1 - 20} {
J
Jeff Hobbs 已提交
665
		    set sash0 [expr {$sash1 - 20}]
666 667 668 669 670 671 672 673 674 675 676
		}
	    }
	}
	$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
677
    if {[info exists oldwidth($win)]} {
678 679 680 681 682 683 684 685 686 687
	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 已提交
688
		set sash0 [expr {$w - 15}]
689 690 691 692 693 694 695
	    }
	}
	$win sash place 0 $sash0 [lindex $s0 1]
    }
    set oldwidth($win) $w
}

696 697 698 699 700 701 702 703 704 705 706 707 708 709
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
}

710 711 712 713 714 715 716 717 718
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 已提交
719
Gitk - a commit viewer for git
720

P
Paul Mackerras 已提交
721
Copyright  2005-2006 Paul Mackerras
722

723
Use and redistribute under the terms of the GNU General Public License} \
724 725 726 727 728 729
	    -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
}

730 731 732 733 734 735 736 737 738 739 740 741
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
742 743
<Home>		Move to first commit
<End>		Move to last commit
744 745 746 747
<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
748 749 750 751 752 753 754 755
<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
756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778
<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 已提交
779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 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
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} {
    global children commitrow

    if {[info exists commitrow($id)]} {
	set r $commitrow($id)
	if {$l1 <= $r && $r <= $l2} {
	    return [expr {$r - $l1 + 1}]
	}
    }
    foreach c $children($id) {
	if {[info exists commitrow($c)]} {
	    set r $commitrow($c)
	    if {$l1 <= $r && $r <= $l2} {
		return [expr {$r - $l1 + 1}]
	    }
	}
    }
    return 0
}

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

    set col -1
837
    set ids [lindex $rowidlist $row]
P
Paul Mackerras 已提交
838 839 840 841 842
    foreach id $ids {
	incr col
	if {$id eq {}} continue
	if {$col < [llength $ids] - 1 &&
	    [lsearch -exact -start [expr {$col+1}] $ids $id] >= 0} {
843
	    puts "oops: [shortids $id] repeated in row $row col $col: {[shortids [lindex $rowidlist $row]]}"
P
Paul Mackerras 已提交
844
	}
845
	set o [lindex $rowoffsets $row $col]
P
Paul Mackerras 已提交
846 847 848 849 850
	set y $row
	set x $col
	while {$o ne {}} {
	    incr y -1
	    incr x $o
851
	    if {[lindex $rowidlist $y $x] != $id} {
P
Paul Mackerras 已提交
852 853 854
		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} {
855
		    puts "  row $i ids={[shortids [lindex $rowidlist $i]]} offs={[lindex $rowoffsets $i]}"
P
Paul Mackerras 已提交
856 857 858 859
		}
		break
	    }
	    if {!$full} break
860
	    set o [lindex $rowoffsets $y $x]
P
Paul Mackerras 已提交
861 862 863 864 865 866 867 868 869 870
	}
    }
}

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
871
	set off0 [lindex $rowoffsets $y]
P
Paul Mackerras 已提交
872 873
	for {set x0 $x} {1} {incr x0} {
	    if {$x0 >= [llength $off0]} {
874
		set x0 [llength [lindex $rowoffsets [expr {$y-1}]]]
P
Paul Mackerras 已提交
875 876 877 878 879 880 881 882 883
		break
	    }
	    set z [lindex $off0 $x0]
	    if {$z ne {}} {
		incr x0 $z
		break
	    }
	}
	set z [expr {$x0 - $x}]
884 885
	lset rowidlist $y [linsert [lindex $rowidlist $y] $x $oid]
	lset rowoffsets $y [linsert [lindex $rowoffsets $y] $x $z]
P
Paul Mackerras 已提交
886
    }
887 888
    set tmp [lreplace [lindex $rowoffsets $y] $x $x {}]
    lset rowoffsets $y [incrange $tmp [expr {$x+1}] -1]
P
Paul Mackerras 已提交
889 890 891 892
    lappend idrowranges($oid) $y
}

proc initlayout {} {
893
    global rowidlist rowoffsets displayorder commitlisted
P
Paul Mackerras 已提交
894 895
    global rowlaidout rowoptim
    global idinlist rowchk
896
    global commitidx numcommits canvxmax canv
897
    global nextcolor
898
    global parentlist childlist children
P
Paul Mackerras 已提交
899

900 901 902
    set commitidx 0
    set numcommits 0
    set displayorder {}
903 904 905 906
    set commitlisted {}
    set parentlist {}
    set childlist {}
    catch {unset children}
907 908 909
    set nextcolor 0
    set rowidlist {{}}
    set rowoffsets {{}}
P
Paul Mackerras 已提交
910 911 912 913
    catch {unset idinlist}
    catch {unset rowchk}
    set rowlaidout 0
    set rowoptim 0
914 915 916 917 918 919 920 921 922 923
    set canvxmax [$canv cget -width]
}

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 已提交
924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966
}

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} {
	checkcrossings $rowoptim $orow
	optimize_rows $rowoptim 0 $orow
	set rowoptim $orow
    }
    set canshow [expr {$rowoptim - $optim_delay}]
    if {$canshow > $numcommits} {
	showstuff $canshow
    }
}

proc showstuff {canshow} {
    global numcommits
    global linesegends idrowranges idrangedrawn

967 968 969 970 971
    if {$numcommits == 0} {
	global phase
	set phase "incrdraw"
	allcanvs delete all
    }
P
Paul Mackerras 已提交
972 973
    set row $numcommits
    set numcommits $canshow
974
    setcanvscroll
P
Paul Mackerras 已提交
975 976 977 978 979 980 981 982 983 984 985
    set rows [visiblerows]
    set r0 [lindex $rows 0]
    set r1 [lindex $rows 1]
    for {set r $row} {$r < $canshow} {incr r} {
	if {[info exists linesegends($r)]} {
	    foreach id $linesegends($r) {
		set i -1
		foreach {s e} $idrowranges($id) {
		    incr i
		    if {$e ne {} && $e < $numcommits && $s <= $r1 && $e >= $r0
			&& ![info exists idrangedrawn($id,$i)]} {
986
			drawlineseg $id $i
P
Paul Mackerras 已提交
987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004
			set idrangedrawn($id,$i) 1
		    }
		}
	    }
	}
    }
    if {$canshow > $r1} {
	set canshow $r1
    }
    while {$row < $canshow} {
	drawcmitrow $row
	incr row
    }
}

proc layoutrows {row endrow last} {
    global rowidlist rowoffsets displayorder
    global uparrowlen downarrowlen maxwidth mingaplen
1005
    global childlist parentlist
P
Paul Mackerras 已提交
1006 1007 1008 1009
    global idrowranges linesegends
    global commitidx
    global idinlist rowchk

1010 1011
    set idlist [lindex $rowidlist $row]
    set offs [lindex $rowoffsets $row]
P
Paul Mackerras 已提交
1012 1013 1014 1015
    while {$row < $endrow} {
	set id [lindex $displayorder $row]
	set oldolds {}
	set newolds {}
1016
	foreach p [lindex $parentlist $row] {
P
Paul Mackerras 已提交
1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036
	    if {![info exists idinlist($p)]} {
		lappend newolds $p
	    } elseif {!$idinlist($p)} {
		lappend oldolds $p
	    }
	}
	set nev [expr {[llength $idlist] + [llength $newolds]
		       + [llength $oldolds] - $maxwidth + 1}]
	if {$nev > 0} {
	    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
1037 1038 1039
			set rm1 [expr {$row - 1}]
			lappend linesegends($rm1) $i
			lappend idrowranges($i) $rm1
P
Paul Mackerras 已提交
1040 1041 1042 1043 1044 1045
			if {[incr nev -1] <= 0} break
			continue
		    }
		    set rowchk($id) [expr {$row + $r}]
		}
	    }
1046 1047
	    lset rowidlist $row $idlist
	    lset rowoffsets $row $offs
P
Paul Mackerras 已提交
1048 1049 1050 1051 1052
	}
	set col [lsearch -exact $idlist $id]
	if {$col < 0} {
	    set col [llength $idlist]
	    lappend idlist $id
1053
	    lset rowidlist $row $idlist
P
Paul Mackerras 已提交
1054
	    set z {}
1055
	    if {[lindex $childlist $row] ne {}} {
1056
		set z [expr {[llength [lindex $rowidlist [expr {$row-1}]]] - $col}]
P
Paul Mackerras 已提交
1057 1058 1059
		unset idinlist($id)
	    }
	    lappend offs $z
1060
	    lset rowoffsets $row $offs
P
Paul Mackerras 已提交
1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100
	    if {$z ne {}} {
		makeuparrow $id $col $row $z
	    }
	} else {
	    unset idinlist($id)
	}
	if {[info exists idrowranges($id)]} {
	    lappend idrowranges($id) $row
	}
	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
	}
1101 1102
	lappend rowidlist $idlist
	lappend rowoffsets $offs
P
Paul Mackerras 已提交
1103 1104 1105 1106 1107
    }
    return $row
}

proc addextraid {id row} {
1108
    global displayorder commitrow commitinfo
P
Paul Mackerras 已提交
1109
    global commitidx
1110
    global parentlist childlist children
P
Paul Mackerras 已提交
1111 1112 1113

    incr commitidx
    lappend displayorder $id
1114
    lappend parentlist {}
P
Paul Mackerras 已提交
1115 1116 1117 1118
    set commitrow($id) $row
    readcommit $id
    if {![info exists commitinfo($id)]} {
	set commitinfo($id) {"No commit information available"}
1119 1120 1121 1122 1123
    }
    if {[info exists children($id)]} {
	lappend childlist $children($id)
    } else {
	lappend childlist {}
P
Paul Mackerras 已提交
1124 1125 1126 1127 1128
    }
}

proc layouttail {} {
    global rowidlist rowoffsets idinlist commitidx
1129
    global idrowranges
P
Paul Mackerras 已提交
1130 1131

    set row $commitidx
1132
    set idlist [lindex $rowidlist $row]
P
Paul Mackerras 已提交
1133 1134 1135 1136 1137 1138 1139 1140 1141
    while {$idlist ne {}} {
	set col [expr {[llength $idlist] - 1}]
	set id [lindex $idlist $col]
	addextraid $id $row
	unset idinlist($id)
	lappend idrowranges($id) $row
	incr row
	set offs [ntimes $col 0]
	set idlist [lreplace $idlist $col $col]
1142 1143
	lappend rowidlist $idlist
	lappend rowoffsets $offs
P
Paul Mackerras 已提交
1144 1145 1146 1147
    }

    foreach id [array names idinlist] {
	addextraid $id $row
1148 1149
	lset rowidlist $row [list $id]
	lset rowoffsets $row 0
P
Paul Mackerras 已提交
1150 1151 1152
	makeuparrow $id 0 $row 0
	lappend idrowranges($id) $row
	incr row
1153 1154
	lappend rowidlist {}
	lappend rowoffsets {}
P
Paul Mackerras 已提交
1155 1156 1157 1158 1159 1160 1161
    }
}

proc insert_pad {row col npad} {
    global rowidlist rowoffsets

    set pad [ntimes $npad {}]
1162 1163 1164
    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 已提交
1165 1166 1167
}

proc optimize_rows {row col endrow} {
1168
    global rowidlist rowoffsets idrowranges linesegends displayorder
P
Paul Mackerras 已提交
1169 1170

    for {} {$row < $endrow} {incr row} {
1171 1172
	set idlist [lindex $rowidlist $row]
	set offs [lindex $rowoffsets $row]
P
Paul Mackerras 已提交
1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183
	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}]
1184
	    set z0 [lindex $rowoffsets $y0 $x0]
P
Paul Mackerras 已提交
1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200
	    if {$z0 eq {}} {
		set id [lindex $idlist $col]
		if {[info exists idrowranges($id)] &&
		    $y0 > [lindex $idrowranges($id) 0]} {
		    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}]
1201
		set z0 [lindex $rowoffsets $y0 $x0]
P
Paul Mackerras 已提交
1202 1203 1204
	    } elseif {$z > 1 || ($z > 0 && $isarrow)} {
		set npad [expr {$z - 1 + $isarrow}]
		set y1 [expr {$row + 1}]
1205
		set offs2 [lindex $rowoffsets $y1]
P
Paul Mackerras 已提交
1206 1207 1208 1209 1210 1211 1212
		set x1 -1
		foreach z $offs2 {
		    incr x1
		    if {$z eq {} || $x1 + $z < $col} continue
		    if {$x1 + $z > $col} {
			incr npad
		    }
1213
		    lset rowoffsets $y1 [incrange $offs2 $x1 $npad]
P
Paul Mackerras 已提交
1214 1215 1216 1217 1218 1219 1220 1221 1222 1223
		    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
	    }
1224 1225 1226 1227 1228 1229 1230 1231 1232
	    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 已提交
1233 1234 1235 1236 1237 1238 1239
	    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} {
1240
	    set o {}
P
Paul Mackerras 已提交
1241 1242
	    for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
		set o [lindex $offs $col]
1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256
		if {$o eq {}} {
		    # check if this is the link to the first child
		    set id [lindex $idlist $col]
		    if {[info exists idrowranges($id)] &&
			$row == [lindex $idrowranges($id) 0]} {
			# 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 已提交
1257 1258
		if {$o eq {} || $o <= 0} break
	    }
1259
	    if {$o ne {} && [incr col] < [llength $idlist]} {
P
Paul Mackerras 已提交
1260
		set y1 [expr {$row + 1}]
1261
		set offs2 [lindex $rowoffsets $y1]
P
Paul Mackerras 已提交
1262 1263 1264 1265
		set x1 -1
		foreach z $offs2 {
		    incr x1
		    if {$z eq {} || $x1 + $z < $col} continue
1266
		    lset rowoffsets $y1 [incrange $offs2 $x1 1]
P
Paul Mackerras 已提交
1267 1268 1269 1270 1271 1272 1273 1274
		    break
		}
		set idlist [linsert $idlist $col {}]
		set tmp [linsert $offs $col {}]
		incr col
		set offs [incrange $tmp $col -1]
	    }
	}
1275 1276
	lset rowidlist $row $idlist
	lset rowoffsets $row $offs
P
Paul Mackerras 已提交
1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290
	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}]
}

1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301
proc linewidth {id} {
    global thickerline lthickness

    set wid $lthickness
    if {[info exists thickerline] && $id eq $thickerline} {
	set wid [expr {2 * $lthickness}]
    }
    return $wid
}

proc drawlineseg {id i} {
P
Paul Mackerras 已提交
1302
    global rowoffsets rowidlist idrowranges
1303
    global displayorder
1304
    global canv colormap linespc
P
Paul Mackerras 已提交
1305 1306 1307 1308 1309 1310

    set startrow [lindex $idrowranges($id) [expr {2 * $i}]]
    set row [lindex $idrowranges($id) [expr {2 * $i + 1}]]
    if {$startrow == $row} return
    assigncolor $id
    set coords {}
1311
    set col [lsearch -exact [lindex $rowidlist $row] $id]
P
Paul Mackerras 已提交
1312 1313 1314 1315 1316 1317 1318
    if {$col < 0} {
	puts "oops: drawline: id $id not on row $row"
	return
    }
    set lasto {}
    set ns 0
    while {1} {
1319
	set o [lindex $rowoffsets $row $col]
P
Paul Mackerras 已提交
1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333
	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
1334 1335 1336 1337 1338 1339 1340 1341 1342
    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} {
1343
		lappend coords [xc $row [expr {$col - 1}]] [yc $row]
1344
	    } elseif {$ccol > $col + 1} {
1345
		lappend coords [xc $row [expr {$col + 1}]] [yc $row]
1346 1347 1348 1349 1350 1351
	    }
	    lappend coords $x $y
	}
    }
    if {[llength $coords] < 4} return
    set last [expr {[llength $idrowranges($id)] / 2 - 1}]
1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371
    if {$i < $last} {
	# 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]
	    }
	}
    }
1372 1373
    set arrow [expr {2 * ($i > 0) + ($i < $last)}]
    set arrow [lindex {none first last both} $arrow]
1374
    set t [$canv create line $coords -width [linewidth $id] \
P
Paul Mackerras 已提交
1375 1376 1377 1378 1379
	       -fill $colormap($id) -tags lines.$id -arrow $arrow]
    $canv lower $t
    bindline $t $id
}

1380
proc drawparentlinks {id row col olds} {
1381
    global rowidlist canv colormap idrowranges
P
Paul Mackerras 已提交
1382 1383 1384 1385 1386

    set row2 [expr {$row + 1}]
    set x [xc $row $col]
    set y [yc $row]
    set y2 [yc $row2]
1387
    set ids [lindex $rowidlist $row2]
P
Paul Mackerras 已提交
1388 1389 1390
    # rmx = right-most X coord used
    set rmx 0
    foreach p $olds {
1391 1392 1393 1394 1395 1396 1397 1398 1399
	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
	}
1400 1401 1402 1403 1404 1405
	if {[info exists idrowranges($p)] &&
	    $row2 == [lindex $idrowranges($p) 0] &&
	    $row2 < [lindex $idrowranges($p) 1]} {
	    # drawlineseg will do this one for us
	    continue
	}
P
Paul Mackerras 已提交
1406 1407 1408 1409 1410 1411 1412 1413 1414
	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
1415
	set t [$canv create line $coords -width [linewidth $p] \
P
Paul Mackerras 已提交
1416 1417 1418 1419 1420 1421 1422
		   -fill $colormap($p) -tags lines.$p]
	$canv lower $t
	bindline $t $p
    }
    return $rmx
}

1423
proc drawlines {id} {
P
Paul Mackerras 已提交
1424 1425
    global colormap canv
    global idrowranges idrangedrawn
1426
    global childlist iddrawn commitrow rowidlist
P
Paul Mackerras 已提交
1427 1428 1429 1430 1431

    $canv delete lines.$id
    set nr [expr {[llength $idrowranges($id)] / 2}]
    for {set i 0} {$i < $nr} {incr i} {
	if {[info exists idrangedrawn($id,$i)]} {
1432
	    drawlineseg $id $i
P
Paul Mackerras 已提交
1433 1434
	}
    }
1435 1436 1437 1438 1439 1440
    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 已提交
1441 1442 1443 1444 1445 1446 1447 1448 1449 1450
	    }
	}
    }
}

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

1453
    set ofill [expr {[lindex $commitlisted $row]? "blue": "white"}]
P
Paul Mackerras 已提交
1454 1455 1456 1457 1458 1459 1460 1461
    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}
1462
    set xt [xc $row [llength [lindex $rowidlist $row]]]
P
Paul Mackerras 已提交
1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482
    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]
1483 1484 1485 1486 1487
    set xr [expr {$xt + [font measure $mainfont $headline]}]
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
P
Paul Mackerras 已提交
1488 1489 1490
}

proc drawcmitrow {row} {
1491
    global displayorder rowidlist
P
Paul Mackerras 已提交
1492
    global idrowranges idrangedrawn iddrawn
1493
    global commitinfo commitlisted parentlist numcommits
P
Paul Mackerras 已提交
1494

1495 1496
    if {$row >= $numcommits} return
    foreach id [lindex $rowidlist $row] {
P
Paul Mackerras 已提交
1497 1498 1499 1500 1501 1502 1503 1504
	if {![info exists idrowranges($id)]} continue
	set i -1
	foreach {s e} $idrowranges($id) {
	    incr i
	    if {$row < $s} continue
	    if {$e eq {}} break
	    if {$row <= $e} {
		if {$e < $numcommits && ![info exists idrangedrawn($id,$i)]} {
1505
		    drawlineseg $id $i
P
Paul Mackerras 已提交
1506 1507 1508 1509 1510 1511 1512 1513 1514
		    set idrangedrawn($id,$i) 1
		}
		break
	    }
	}
    }

    set id [lindex $displayorder $row]
    if {[info exists iddrawn($id)]} return
1515
    set col [lsearch -exact [lindex $rowidlist $row] $id]
P
Paul Mackerras 已提交
1516 1517 1518 1519 1520
    if {$col < 0} {
	puts "oops, row $row id $id not in list"
	return
    }
    if {![info exists commitinfo($id)]} {
1521
	getcommit $id
P
Paul Mackerras 已提交
1522 1523
    }
    assigncolor $id
1524 1525 1526
    set olds [lindex $parentlist $row]
    if {$olds ne {}} {
	set rmx [drawparentlinks $id $row $col $olds]
P
Paul Mackerras 已提交
1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567
    } 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}
}

1568
proc assigncolor {id} {
P
Paul Mackerras 已提交
1569
    global colormap colors nextcolor
1570
    global commitrow parentlist children childlist
1571 1572
    global cornercrossings crossings

1573
    if {[info exists colormap($id)]} return
1574
    set ncolors [llength $colors]
1575 1576 1577 1578 1579 1580 1581 1582 1583
    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]
1584
	if {[info exists colormap($child)]
1585
	    && [llength [lindex $parentlist $commitrow($child)]] == 1} {
1586 1587
	    set colormap($id) $colormap($child)
	    return
1588
	}
1589 1590
    }
    set badcolors {}
1591 1592 1593 1594 1595 1596
    if {[info exists cornercrossings($id)]} {
	foreach x $cornercrossings($id) {
	    if {[info exists colormap($x)]
		&& [lsearch -exact $badcolors $colormap($x)] < 0} {
		lappend badcolors $colormap($x)
	    }
1597
	}
1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608
	if {[llength $badcolors] >= $ncolors} {
	    set badcolors {}
	}
    }
    set origbad $badcolors
    if {[llength $badcolors] < $ncolors - 1} {
	if {[info exists crossings($id)]} {
	    foreach x $crossings($id) {
		if {[info exists colormap($x)]
		    && [lsearch -exact $badcolors $colormap($x)] < 0} {
		    lappend badcolors $colormap($x)
1609 1610
		}
	    }
1611 1612 1613
	    if {[llength $badcolors] >= $ncolors} {
		set badcolors $origbad
	    }
1614
	}
1615
	set origbad $badcolors
1616
    }
1617
    if {[llength $badcolors] < $ncolors - 1} {
1618
	foreach child $kids {
1619 1620 1621 1622
	    if {[info exists colormap($child)]
		&& [lsearch -exact $badcolors $colormap($child)] < 0} {
		lappend badcolors $colormap($child)
	    }
1623 1624 1625 1626
	    foreach p [lindex $parentlist $commitrow($child)] {
		if {[info exists colormap($p)]
		    && [lsearch -exact $badcolors $colormap($p)] < 0} {
		    lappend badcolors $colormap($p)
1627 1628 1629 1630 1631 1632
		}
	    }
	}
	if {[llength $badcolors] >= $ncolors} {
	    set badcolors $origbad
	}
1633 1634 1635 1636 1637
    }
    for {set i 0} {$i <= $ncolors} {incr i} {
	set c [lindex $colors $nextcolor]
	if {[incr nextcolor] >= $ncolors} {
	    set nextcolor 0
1638
	}
1639
	if {[lsearch -exact $badcolors $c]} break
1640
    }
1641
    set colormap($id) $c
1642 1643
}

1644 1645 1646 1647 1648 1649
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"
1650
    $canv bind $t <Button-1> "lineclick %x %y $id 1"
1651 1652
}

1653
proc drawtags {id x xt y1} {
1654
    global idtags idheads idotherrefs
1655
    global linespc lthickness
P
Paul Mackerras 已提交
1656
    global canv mainfont commitrow rowtextx
1657 1658 1659

    set marks {}
    set ntags 0
1660
    set nheads 0
1661 1662 1663 1664 1665 1666
    if {[info exists idtags($id)]} {
	set marks $idtags($id)
	set ntags [llength $marks]
    }
    if {[info exists idheads($id)]} {
	set marks [concat $marks $idheads($id)]
1667 1668 1669 1670
	set nheads [llength $idheads($id)]
    }
    if {[info exists idotherrefs($id)]} {
	set marks [concat $marks $idotherrefs($id)]
1671 1672 1673 1674 1675 1676
    }
    if {$marks eq {}} {
	return $xt
    }

    set delta [expr {int(0.5 * ($linespc - $lthickness))}]
J
Jeff Hobbs 已提交
1677 1678
    set yt [expr {$y1 - 0.5 * $linespc}]
    set yb [expr {$yt + $linespc - 1}]
1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690
    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 已提交
1691 1692
	set xl [expr {$x + $delta}]
	set xr [expr {$x + $delta + $wid + $lthickness}]
1693 1694
	if {[incr ntags -1] >= 0} {
	    # draw a tag
J
Jeff Hobbs 已提交
1695 1696
	    set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
		       $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
1697 1698
		       -width 1 -outline black -fill yellow -tags tag.$id]
	    $canv bind $t <1> [list showtag $tag 1]
P
Paul Mackerras 已提交
1699
	    set rowtextx($commitrow($id)) [expr {$xr + $linespc}]
1700
	} else {
1701 1702 1703 1704 1705 1706
	    # draw a head or other ref
	    if {[incr nheads -1] >= 0} {
		set col green
	    } else {
		set col "#ddddff"
	    }
J
Jeff Hobbs 已提交
1707
	    set xl [expr {$xl - $delta/2}]
1708
	    $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
1709
		-width 1 -outline black -fill $col -tags tag.$id
1710
	}
1711 1712 1713 1714 1715
	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]
	}
1716 1717 1718 1719
    }
    return $xt
}

P
Paul Mackerras 已提交
1720
proc checkcrossings {row endrow} {
1721
    global displayorder parentlist rowidlist
P
Paul Mackerras 已提交
1722 1723 1724

    for {} {$row < $endrow} {incr row} {
	set id [lindex $displayorder $row]
1725
	set i [lsearch -exact [lindex $rowidlist $row] $id]
P
Paul Mackerras 已提交
1726
	if {$i < 0} continue
1727
	set idlist [lindex $rowidlist [expr {$row+1}]]
1728
	foreach p [lindex $parentlist $row] {
P
Paul Mackerras 已提交
1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742
	    set j [lsearch -exact $idlist $p]
	    if {$j > 0} {
		if {$j < $i - 1} {
		    notecrossings $row $p $j $i [expr {$j+1}]
		} elseif {$j > $i + 1} {
		    notecrossings $row $p $i $j [expr {$j-1}]
		}
	    }
	}
    }
}

proc notecrossings {row id lo hi corner} {
    global rowidlist crossings cornercrossings
1743 1744

    for {set i $lo} {[incr i] < $hi} {} {
1745
	set p [lindex [lindex $rowidlist $row] $i]
1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768
	if {$p == {}} continue
	if {$i == $corner} {
	    if {![info exists cornercrossings($id)]
		|| [lsearch -exact $cornercrossings($id) $p] < 0} {
		lappend cornercrossings($id) $p
	    }
	    if {![info exists cornercrossings($p)]
		|| [lsearch -exact $cornercrossings($p) $id] < 0} {
		lappend cornercrossings($p) $id
	    }
	} else {
	    if {![info exists crossings($id)]
		|| [lsearch -exact $crossings($id) $p] < 0} {
		lappend crossings($id) $p
	    }
	    if {![info exists crossings($p)]
		|| [lsearch -exact $crossings($p) $id] < 0} {
		lappend crossings($p) $id
	    }
	}
    }
}

1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779
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
}
1780 1781

proc finishcommits {} {
P
Paul Mackerras 已提交
1782
    global commitidx phase
1783
    global canv mainfont ctext maincursor textcursor
1784
    global findinprogress
1785

P
Paul Mackerras 已提交
1786
    if {$commitidx > 0} {
1787 1788
	drawrest
    } else {
1789 1790 1791 1792
	$canv delete all
	$canv create text 3 3 -anchor nw -text "No commits selected" \
	    -font $mainfont -tags textitems
    }
1793 1794 1795 1796
    if {![info exists findinprogress]} {
	. config -cursor $maincursor
	settextcursor $textcursor
    }
P
Paul Mackerras 已提交
1797
    set phase {}
1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808
}

# 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
1809 1810
}

1811
proc drawrest {} {
P
Paul Mackerras 已提交
1812 1813 1814 1815 1816 1817 1818 1819 1820 1821
    global numcommits
    global startmsecs
    global canvy0 numcommits linespc
    global rowlaidout commitidx

    set row $rowlaidout
    layoutrows $rowlaidout $commitidx 1
    layouttail
    optimize_rows $row 0 $commitidx
    showstuff $commitidx
P
Paul Mackerras 已提交
1822

J
Jeff Hobbs 已提交
1823
    set drawmsecs [expr {[clock clicks -milliseconds] - $startmsecs}]
1824
    #puts "overall $drawmsecs ms for $numcommits commits"
1825 1826
}

1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839
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 已提交
1840 1841
	    lappend matches [list $j [expr {$j+$foundstrlen-1}]]
	    set i [expr {$j + $foundstrlen}]
1842 1843 1844 1845 1846
	}
    }
    return $matches
}

1847 1848
proc dofind {} {
    global findtype findloc findstring markedmatches commitinfo
1849
    global numcommits displayorder linehtag linentag linedtag
1850
    global mainfont namefont canv canv2 canv3 selectedline
P
Paul Mackerras 已提交
1851 1852
    global matchinglines foundstring foundstrlen matchstring
    global commitdata
1853 1854

    stopfindproc
1855
    unmarkmatches
1856
    focus .
1857
    set matchinglines {}
1858 1859 1860 1861
    if {$findloc == "Pickaxe"} {
	findpatches
	return
    }
1862
    if {$findtype == "IgnCase"} {
1863
	set foundstring [string tolower $findstring]
1864
    } else {
1865
	set foundstring $findstring
1866
    }
1867 1868
    set foundstrlen [string length $findstring]
    if {$foundstrlen == 0} return
P
Paul Mackerras 已提交
1869 1870
    regsub -all {[*?\[\\]} $foundstring {\\&} matchstring
    set matchstring "*$matchstring*"
1871 1872 1873 1874
    if {$findloc == "Files"} {
	findfiles
	return
    }
1875 1876 1877 1878 1879 1880
    if {![info exists selectedline]} {
	set oldsel -1
    } else {
	set oldsel $selectedline
    }
    set didsel 0
1881
    set fldtypes {Headline Author Date Committer CDate Comment}
P
Paul Mackerras 已提交
1882
    set l -1
1883 1884
    foreach id $displayorder {
	set d $commitdata($id)
P
Paul Mackerras 已提交
1885 1886 1887 1888 1889 1890 1891 1892 1893 1894
	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)]} {
1895
	    getcommit $id
P
Paul Mackerras 已提交
1896
	}
1897 1898 1899 1900 1901 1902
	set info $commitinfo($id)
	set doesmatch 0
	foreach f $info ty $fldtypes {
	    if {$findloc != "All fields" && $findloc != $ty} {
		continue
	    }
1903
	    set matches [findmatches $f]
1904 1905 1906
	    if {$matches == {}} continue
	    set doesmatch 1
	    if {$ty == "Headline"} {
P
Paul Mackerras 已提交
1907
		drawcmitrow $l
1908 1909
		markmatches $canv $l $f $linehtag($l) $matches $mainfont
	    } elseif {$ty == "Author"} {
P
Paul Mackerras 已提交
1910
		drawcmitrow $l
1911 1912
		markmatches $canv2 $l $f $linentag($l) $matches $namefont
	    } elseif {$ty == "Date"} {
P
Paul Mackerras 已提交
1913
		drawcmitrow $l
1914 1915 1916 1917 1918 1919
		markmatches $canv3 $l $f $linedtag($l) $matches $mainfont
	    }
	}
	if {$doesmatch} {
	    lappend matchinglines $l
	    if {!$didsel && $l > $oldsel} {
1920
		findselectline $l
1921 1922 1923 1924 1925 1926 1927
		set didsel 1
	    }
	}
    }
    if {$matchinglines == {}} {
	bell
    } elseif {!$didsel} {
1928 1929 1930 1931 1932 1933
	findselectline [lindex $matchinglines 0]
    }
}

proc findselectline {l} {
    global findloc commentend ctext
1934
    selectline $l 1
1935 1936 1937 1938 1939 1940
    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 已提交
1941
	    set end [expr {[lindex $match 1] + 1}]
1942 1943
	    $ctext tag add found "1.0 + $start c" "1.0 + $end c"
	}
1944 1945 1946
    }
}

1947
proc findnext {restart} {
1948 1949
    global matchinglines selectedline
    if {![info exists matchinglines]} {
1950 1951 1952
	if {$restart} {
	    dofind
	}
1953 1954 1955 1956 1957
	return
    }
    if {![info exists selectedline]} return
    foreach l $matchinglines {
	if {$l > $selectedline} {
1958
	    findselectline $l
1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977
	    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 != {}} {
1978
	findselectline $prev
1979 1980 1981 1982 1983
    } else {
	bell
    }
}

1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012
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
	if {$phase != "incrdraw"} {
	    . config -cursor $maincursor
2013
	    settextcursor $textcursor
2014 2015 2016 2017 2018 2019 2020
	}
    }
}

proc findpatches {} {
    global findstring selectedline numcommits
    global findprocpid findprocfile
2021
    global finddidsel ctext displayorder findinprogress
2022
    global findinsertpos
2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037

    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
	}
2038
	append inputids [lindex $displayorder $l] "\n"
2039 2040 2041 2042 2043 2044 2045 2046 2047 2048
    }

    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
    }

2049
    set findinsertpos end
2050 2051 2052 2053 2054 2055
    set findprocfile $f
    set findprocpid [pid $f]
    fconfigure $f -blocking 0
    fileevent $f readable readfindproc
    set finddidsel 0
    . config -cursor watch
2056
    settextcursor watch
2057 2058 2059 2060 2061
    set findinprogress 1
}

proc readfindproc {} {
    global findprocfile finddidsel
P
Paul Mackerras 已提交
2062
    global commitrow matchinglines findinsertpos
2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078

    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 已提交
2079
    if {![info exists commitrow($id)]} {
2080 2081 2082
	puts stderr "spurious id: $id"
	return
    }
P
Paul Mackerras 已提交
2083
    set l $commitrow($id)
2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101
    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
2102 2103 2104 2105 2106 2107 2108
    if {!$finddidsel} {
	findselectline $l
	set finddidsel 1
    }
}

proc findfiles {} {
2109
    global selectedline numcommits displayorder ctext
2110
    global ffileline finddidsel parentlist
2111
    global findinprogress findstartline findinsertpos
2112
    global treediffs fdiffid fdiffsneeded fdiffpos
2113
    global findmergefiles
2114 2115 2116 2117 2118 2119 2120 2121 2122 2123

    if {$numcommits == 0} return

    if {[info exists selectedline]} {
	set l [expr {$selectedline + 1}]
    } else {
	set l 0
    }
    set ffileline $l
    set findstartline $l
2124 2125 2126
    set diffsneeded {}
    set fdiffsneeded {}
    while 1 {
2127
	set id [lindex $displayorder $l]
2128
	if {$findmergefiles || [llength [lindex $parentlist $l]] == 1} {
2129 2130 2131
	    if {![info exists treediffs($id)]} {
		append diffsneeded "$id\n"
		lappend fdiffsneeded $id
2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147
	    }
	}
	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
	}
2148
	catch {unset fdiffid}
2149 2150 2151 2152 2153 2154 2155
	set fdiffpos 0
	fconfigure $df -blocking 0
	fileevent $df readable [list readfilediffs $df]
    }

    set finddidsel 0
    set findinsertpos end
2156
    set id [lindex $displayorder $l]
2157
    . config -cursor watch
2158
    settextcursor watch
2159
    set findinprogress 1
2160
    findcont
2161 2162 2163 2164
    update
}

proc readfilediffs {df} {
2165
    global findid fdiffid fdiffs
2166 2167 2168 2169 2170 2171 2172 2173 2174

    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"
2175 2176
	    } elseif {[info exists findid]} {
		set id $findid
2177 2178
		stopfindproc
		bell
2179
		error_popup "Couldn't find diffs for $id"
2180 2181 2182 2183
	    }
	}
	return
    }
2184
    if {[regexp {^([0-9a-f]{40})$} $line match id]} {
2185 2186
	# start of a new string of diffs
	donefilediff
2187
	set fdiffid $id
2188 2189 2190 2191 2192 2193 2194
	set fdiffs {}
    } elseif {[string match ":*" $line]} {
	lappend fdiffs [lindex $line 5]
    }
}

proc donefilediff {} {
2195
    global fdiffid fdiffs treediffs findid
2196 2197
    global fdiffsneeded fdiffpos

2198 2199
    if {[info exists fdiffid]} {
	while {[lindex $fdiffsneeded $fdiffpos] ne $fdiffid
2200 2201 2202
	       && $fdiffpos < [llength $fdiffsneeded]} {
	    # git-diff-tree doesn't output anything for a commit
	    # which doesn't change anything
2203 2204 2205 2206
	    set nullid [lindex $fdiffsneeded $fdiffpos]
	    set treediffs($nullid) {}
	    if {[info exists findid] && $nullid eq $findid} {
		unset findid
2207
		findcont
2208 2209 2210 2211 2212
	    }
	    incr fdiffpos
	}
	incr fdiffpos

2213 2214
	if {![info exists treediffs($fdiffid)]} {
	    set treediffs($fdiffid) $fdiffs
2215
	}
2216 2217
	if {[info exists findid] && $fdiffid eq $findid} {
	    unset findid
2218
	    findcont
2219 2220
	}
    }
2221 2222
}

2223
proc findcont {id} {
2224
    global findid treediffs parentlist
2225
    global ffileline findstartline finddidsel
2226
    global displayorder numcommits matchinglines findinprogress
2227 2228 2229
    global findmergefiles

    set l $ffileline
2230 2231 2232
    while {1} {
	set id [lindex $displayorder $l]
	if {$findmergefiles || [llength [lindex $parentlist $l]] == 1} {
2233 2234
	    if {![info exists treediffs($id)]} {
		set findid $id
2235 2236 2237 2238
		set ffileline $l
		return
	    }
	    set doesmatch 0
2239
	    foreach f $treediffs($id) {
2240 2241 2242 2243 2244 2245 2246
		set x [findmatches $f]
		if {$x != {}} {
		    set doesmatch 1
		    break
		}
	    }
	    if {$doesmatch} {
2247
		insertmatch $l $id
2248 2249
	    }
	}
2250 2251
	if {[incr l] >= $numcommits} {
	    set l 0
2252
	}
2253
	if {$l == $findstartline} break
2254 2255 2256 2257 2258 2259 2260 2261 2262 2263
    }
    stopfindproc
    if {!$finddidsel} {
	bell
    }
}

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

P
Paul Mackerras 已提交
2266
    drawcmitrow $l
2267 2268 2269 2270 2271 2272
    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
2273 2274 2275 2276 2277 2278 2279 2280 2281
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 已提交
2282 2283 2284 2285
	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 \
2286 2287 2288 2289 2290 2291
		   -outline {} -tags matches -fill yellow]
	$canv lower $t
    }
}

proc unmarkmatches {} {
2292
    global matchinglines findids
2293 2294
    allcanvs delete matches
    catch {unset matchinglines}
2295
    catch {unset findids}
2296 2297
}

2298
proc selcanvline {w x y} {
2299
    global canv canvy0 ctext linespc
P
Paul Mackerras 已提交
2300
    global rowtextx
2301
    set ymax [lindex [$canv cget -scrollregion] 3]
2302
    if {$ymax == {}} return
2303 2304 2305 2306 2307 2308
    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
    }
2309 2310 2311
    if {$w eq $canv} {
	if {![info exists rowtextx($l)] || $x < $rowtextx($l)} return
    }
2312
    unmarkmatches
2313
    selectline $l 1
2314 2315
}

2316 2317 2318 2319 2320 2321 2322 2323 2324
proc commit_descriptor {p} {
    global commitinfo
    set l "..."
    if {[info exists commitinfo($p)]} {
	set l [lindex $commitinfo($p) 0]
    }
    return "$p ($l)"
}

2325 2326 2327
# 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 已提交
2328
    global ctext commitrow linknum
2329 2330 2331 2332 2333 2334 2335 2336 2337

    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 已提交
2338
	if {![info exists commitrow($linkid)]} continue
2339 2340 2341
	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 已提交
2342
	$ctext tag bind link$linknum <1> [list selectline $commitrow($linkid) 1]
2343 2344 2345 2346 2347 2348 2349
	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 }
}

2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365
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}]
}

2366
proc selectline {l isnew} {
2367
    global canv canv2 canv3 ctext commitinfo selectedline
2368
    global displayorder linehtag linentag linedtag
2369
    global canvy0 linespc parentlist childlist
2370
    global cflist currentid sha1entry
P
Paul Mackerras 已提交
2371
    global commentend idtags linknum
2372
    global mergemax numcommits
2373

2374
    $canv delete hover
2375
    normalline
2376
    if {$l < 0 || $l >= $numcommits} return
2377
    set y [expr {$canvy0 + $l * $linespc}]
2378
    set ymax [lindex [$canv cget -scrollregion] 3]
2379 2380
    set ytop [expr {$y - $linespc - 1}]
    set ybot [expr {$y + $linespc + 1}]
2381
    set wnow [$canv yview]
J
Jeff Hobbs 已提交
2382 2383
    set wtop [expr {[lindex $wnow 0] * $ymax}]
    set wbot [expr {[lindex $wnow 1] * $ymax}]
2384 2385
    set wh [expr {$wbot - $wtop}]
    set newtop $wtop
2386
    if {$ytop < $wtop} {
2387 2388 2389 2390 2391 2392 2393
	if {$ybot < $wtop} {
	    set newtop [expr {$y - $wh / 2.0}]
	} else {
	    set newtop $ytop
	    if {$newtop > $wtop - $linespc} {
		set newtop [expr {$wtop - $linespc}]
	    }
2394
	}
2395 2396 2397 2398 2399 2400 2401 2402
    } 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}]
	    }
2403
	}
2404 2405 2406 2407 2408
    }
    if {$newtop != $wtop} {
	if {$newtop < 0} {
	    set newtop 0
	}
J
Jeff Hobbs 已提交
2409
	allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
P
Paul Mackerras 已提交
2410
	drawvisible
2411
    }
2412

P
Paul Mackerras 已提交
2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426
    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

2427 2428
    if {$isnew} {
	addtohistory [list selectline $l 0]
2429 2430
    }

2431 2432
    set selectedline $l

2433
    set id [lindex $displayorder $l]
2434
    set currentid $id
2435 2436 2437 2438 2439
    $sha1entry delete 0 end
    $sha1entry insert 0 $id
    $sha1entry selection from 0
    $sha1entry selection to end

2440
    $ctext conf -state normal
2441
    $ctext delete 0.0 end
2442
    set linknum 0
2443 2444
    $ctext mark set fmark.0 0.0
    $ctext mark gravity fmark.0 left
2445
    set info $commitinfo($id)
P
Paul Mackerras 已提交
2446 2447 2448 2449
    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"
2450 2451 2452 2453 2454 2455 2456
    if {[info exists idtags($id)]} {
	$ctext insert end "Tags:"
	foreach tag $idtags($id) {
	    $ctext insert end " $tag"
	}
	$ctext insert end "\n"
    }
2457 2458
 
    set comment {}
2459 2460
    set olds [lindex $parentlist $l]
    if {[llength $olds] > 1} {
2461
	set np 0
2462
	foreach p $olds {
2463 2464 2465 2466 2467 2468 2469 2470 2471 2472
	    if {$np >= $mergemax} {
		set tag mmax
	    } else {
		set tag m$np
	    }
	    $ctext insert end "Parent: " $tag
	    appendwithlinks [commit_descriptor $p]
	    incr np
	}
    } else {
2473 2474
	foreach p $olds {
	    append comment "Parent: [commit_descriptor $p]\n"
2475 2476
	}
    }
2477

2478 2479
    foreach c [lindex $childlist $l] {
	append comment "Child:  [commit_descriptor $c]\n"
2480 2481 2482
    }
    append comment "\n"
    append comment [lindex $info 5]
2483 2484

    # make anything that looks like a SHA1 ID be a clickable link
2485
    appendwithlinks $comment
2486

2487
    $ctext tag delete Comments
2488
    $ctext tag remove found 1.0 end
2489
    $ctext conf -state disabled
2490
    set commentend [$ctext index "end - 1c"]
2491 2492

    $cflist delete 0 end
2493
    $cflist insert end "Comments"
2494
    if {[llength $olds] <= 1} {
2495
	startdiff $id
2496
    } else {
2497
	mergediff $id $l
2498 2499 2500
    }
}

2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512
proc selfirstline {} {
    unmarkmatches
    selectline 0 1
}

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

2513 2514 2515
proc selnextline {dir} {
    global selectedline
    if {![info exists selectedline]} return
J
Jeff Hobbs 已提交
2516
    set l [expr {$selectedline + $dir}]
2517
    unmarkmatches
2518 2519 2520
    selectline $l 1
}

2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539
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    
}

2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568
proc unselectline {} {
    global selectedline

    catch {unset selectedline}
    allcanvs delete secsel
}

proc addtohistory {cmd} {
    global history historyindex

    if {$historyindex > 0
	&& [lindex $history [expr {$historyindex - 1}]] == $cmd} {
	return
    }

    if {$historyindex < [llength $history]} {
	set history [lreplace $history $historyindex end $cmd]
    } else {
	lappend history $cmd
    }
    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
}

2569 2570 2571 2572 2573
proc goback {} {
    global history historyindex

    if {$historyindex > 1} {
	incr historyindex -1
2574 2575
	set cmd [lindex $history [expr {$historyindex - 1}]]
	eval $cmd
2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586
	.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]} {
2587
	set cmd [lindex $history $historyindex]
2588
	incr historyindex
2589
	eval $cmd
2590 2591 2592 2593 2594
	.ctop.top.bar.leftbut conf -state normal
    }
    if {$historyindex >= [llength $history]} {
	.ctop.top.bar.rightbut conf -state disabled
    }
2595 2596
}

2597 2598
proc mergediff {id l} {
    global diffmergeid diffopts mdifffd
2599
    global difffilestart diffids
2600
    global parentlist
2601

2602
    set diffmergeid $id
2603
    set diffids $id
2604 2605
    catch {unset difffilestart}
    # this doesn't seem to actually affect anything...
2606
    set env(GIT_DIFF_OPTS) $diffopts
2607 2608 2609 2610
    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
2611
    }
2612 2613
    fconfigure $mdf -blocking 0
    set mdifffd($id) $mdf
2614 2615
    set np [llength [lindex $parentlist $l]]
    fileevent $mdf readable [list getmergediffline $mdf $id $np]
2616
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
2617 2618
}

2619 2620
proc getmergediffline {mdf id np} {
    global diffmergeid ctext cflist nextupdate mergemax
2621
    global difffilestart mdifffd
2622

2623
    set n [gets $mdf line]
2624
    if {$n < 0} {
2625 2626
	if {[eof $mdf]} {
	    close $mdf
2627 2628 2629
	}
	return
    }
2630 2631
    if {![info exists diffmergeid] || $id != $diffmergeid
	|| $mdf != $mdifffd($id)} {
2632
	return
2633 2634
    }
    $ctext conf -state normal
2635 2636
    if {[regexp {^diff --cc (.*)} $line match fname]} {
	# start of a new file
2637 2638
	$ctext insert end "\n"
	set here [$ctext index "end - 1c"]
2639 2640 2641 2642 2643 2644
	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}]
2645
	set pad [string range "----------------------------------------" 1 $l]
2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664
	$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
2665
	    } else {
2666 2667
		set isbad 1
		break
2668
	    }
2669
	}
2670 2671 2672 2673 2674 2675 2676 2677 2678
	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]
2679
	}
2680 2681 2682
	if {$num ne {}} {
	    if {$num >= $mergemax} {
		set num "max"
2683
	    }
2684
	    lappend tags m$num
2685
	}
2686
	$ctext insert end "$line\n" $tags
2687 2688
    }
    $ctext conf -state disabled
2689 2690 2691 2692 2693
    if {[clock clicks -milliseconds] >= $nextupdate} {
	incr nextupdate 100
	fileevent $mdf readable {}
	update
	fileevent $mdf readable [list getmergediffline $mdf $id]
2694 2695 2696
    }
}

2697 2698
proc startdiff {ids} {
    global treediffs diffids treepending diffmergeid
2699

2700
    set diffids $ids
2701
    catch {unset diffmergeid}
2702
    if {![info exists treediffs($ids)]} {
2703
	if {![info exists treepending]} {
2704
	    gettreediffs $ids
2705 2706
	}
    } else {
2707
	addtocflist $ids
2708 2709 2710 2711
    }
}

proc addtocflist {ids} {
2712
    global treediffs cflist
2713
    foreach f $treediffs($ids) {
2714 2715
	$cflist insert end $f
    }
2716
    getblobdiffs $ids
2717 2718
}

2719
proc gettreediffs {ids} {
2720
    global treediff treepending
2721
    set treepending $ids
2722
    set treediff {}
2723 2724 2725
    if {[catch \
	 {set gdtf [open [concat | git-diff-tree --no-commit-id -r $ids] r]} \
	]} return
2726
    fconfigure $gdtf -blocking 0
2727
    fileevent $gdtf readable [list gettreediffline $gdtf $ids]
2728 2729
}

2730
proc gettreediffline {gdtf ids} {
2731 2732
    global treediff treediffs treepending diffids diffmergeid

2733 2734 2735 2736
    set n [gets $gdtf line]
    if {$n < 0} {
	if {![eof $gdtf]} return
	close $gdtf
2737
	set treediffs($ids) $treediff
2738
	unset treepending
2739
	if {$ids != $diffids} {
2740 2741
	    if {![info exists diffmergeid]} {
		gettreediffs $diffids
2742
	    }
2743 2744
	} else {
	    addtocflist $ids
2745
	}
2746 2747
	return
    }
2748
    set file [lindex $line 5]
2749
    lappend treediff $file
2750 2751
}

2752
proc getblobdiffs {ids} {
2753
    global diffopts blobdifffd diffids env curdifftag curtagstart
2754
    global difffilestart nextupdate diffinhdr treediffs
2755

2756
    set env(GIT_DIFF_OPTS) $diffopts
2757
    set cmd [concat | git-diff-tree --no-commit-id -r -p -C $ids]
2758
    if {[catch {set bdf [open $cmd r]} err]} {
2759 2760 2761
	puts "error getting diffs: $err"
	return
    }
2762
    set diffinhdr 0
2763
    fconfigure $bdf -blocking 0
2764
    set blobdifffd($ids) $bdf
2765 2766 2767 2768
    set curdifftag Comments
    set curtagstart 0.0
    catch {unset difffilestart}
    fileevent $bdf readable [list getblobdiffline $bdf $diffids]
2769
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
2770 2771
}

2772
proc getblobdiffline {bdf ids} {
2773
    global diffids blobdifffd ctext curdifftag curtagstart
2774 2775
    global diffnexthead diffnextnote difffilestart
    global nextupdate diffinhdr treediffs
2776

2777 2778 2779 2780
    set n [gets $bdf line]
    if {$n < 0} {
	if {[eof $bdf]} {
	    close $bdf
2781
	    if {$ids == $diffids && $bdf == $blobdifffd($ids)} {
2782 2783 2784 2785 2786
		$ctext tag add $curdifftag $curtagstart end
	    }
	}
	return
    }
2787
    if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
2788 2789 2790
	return
    }
    $ctext conf -state normal
2791
    if {[regexp {^diff --git a/(.*) b/(.*)} $line match fname newname]} {
2792 2793 2794 2795
	# start of a new file
	$ctext insert end "\n"
	$ctext tag add $curdifftag $curtagstart end
	set curtagstart [$ctext index "end - 1c"]
2796
	set header $newname
2797
	set here [$ctext index "end - 1c"]
2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813
	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
	    }
	}
2814 2815
	set curdifftag "f:$fname"
	$ctext tag delete $curdifftag
2816
	set l [expr {(78 - [string length $header]) / 2}]
2817
	set pad [string range "----------------------------------------" 1 $l]
2818
	$ctext insert end "$pad $header $pad\n" filesep
2819
	set diffinhdr 1
2820 2821 2822
    } elseif {$diffinhdr && [string compare -length 3 $line "---"] == 0} {
	# do nothing
    } elseif {$diffinhdr && [string compare -length 3 $line "+++"] == 0} {
2823
	set diffinhdr 0
2824 2825
    } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
		   $line match f1l f1c f2l f2c rest]} {
2826
	$ctext insert end "$line\n" hunksep
2827
	set diffinhdr 0
2828 2829 2830 2831 2832 2833 2834
    } 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"
2835
	} elseif {$diffinhdr || $x == "\\"} {
2836 2837
	    # e.g. "\ No newline at end of file"
	    $ctext insert end "$line\n" filesep
2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849
	} 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
2850 2851 2852 2853 2854 2855
    if {[clock clicks -milliseconds] >= $nextupdate} {
	incr nextupdate 100
	fileevent $bdf readable {}
	update
	fileevent $bdf readable "getblobdiffline $bdf {$ids}"
    }
2856 2857
}

2858 2859 2860 2861 2862
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]} {
2863 2864 2865 2866
	    if {![info exists pos]
		|| [$ctext compare $difffilestart($i) < $pos]} {
		set pos $difffilestart($i)
	    }
2867 2868
	}
    }
2869 2870 2871
    if {[info exists pos]} {
	$ctext yview $pos
    }
2872 2873
}

2874
proc listboxsel {} {
2875
    global ctext cflist currentid
2876
    if {![info exists currentid]} return
2877 2878 2879 2880
    set sel [lsort [$cflist curselection]]
    if {$sel eq {}} return
    set first [lindex $sel 0]
    catch {$ctext yview fmark.$first}
2881 2882
}

2883 2884
proc setcoords {} {
    global linespc charspc canvx0 canvy0 mainfont
2885
    global xspc1 xspc2 lthickness
2886

2887 2888
    set linespc [font metrics $mainfont -linespace]
    set charspc [font measure $mainfont "m"]
P
Paul Mackerras 已提交
2889 2890
    set canvy0 [expr {int(3 + 0.5 * $linespc)}]
    set canvx0 [expr {int(3 + 0.5 * $linespc)}]
2891
    set lthickness [expr {int($linespc / 9) + 1}]
2892 2893
    set xspc1(0) $linespc
    set xspc2 $linespc
2894
}
2895

2896
proc redisplay {} {
2897
    global canv
P
Paul Mackerras 已提交
2898 2899 2900 2901 2902 2903
    global selectedline

    set ymax [lindex [$canv cget -scrollregion] 3]
    if {$ymax eq {} || $ymax == 0} return
    set span [$canv yview]
    clear_display
2904
    setcanvscroll
P
Paul Mackerras 已提交
2905 2906 2907 2908
    allcanvs yview moveto [lindex $span 0]
    drawvisible
    if {[info exists selectedline]} {
	selectline $selectedline 0
2909 2910 2911 2912
    }
}

proc incrfont {inc} {
2913
    global mainfont namefont textfont ctext canv phase
2914
    global stopped entries
2915 2916 2917 2918 2919 2920 2921
    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]
2922 2923 2924
    foreach e $entries {
	$e conf -font $mainfont
    }
2925 2926 2927 2928 2929
    if {$phase == "getcommits"} {
	$canv itemconf textitems -font $mainfont
    }
    redisplay
}
2930

2931 2932 2933 2934 2935 2936 2937
proc clearsha1 {} {
    global sha1entry sha1string
    if {[string length $sha1string] == 40} {
	$sha1entry delete 0 end
    }
}

2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954
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 {} {
2955
    global sha1string currentid commitrow tagids headids
2956
    global displayorder numcommits
2957

2958 2959 2960 2961
    if {$sha1string == {}
	|| ([info exists currentid] && $sha1string == $currentid)} return
    if {[info exists tagids($sha1string)]} {
	set id $tagids($sha1string)
2962 2963
    } elseif {[info exists headids($sha1string)]} {
	set id $headids($sha1string)
2964 2965
    } else {
	set id [string tolower $sha1string]
2966 2967
	if {[regexp {^[0-9a-f]{4,39}$} $id]} {
	    set matches {}
P
Paul Mackerras 已提交
2968 2969 2970
	    foreach i $displayorder {
		if {[string match $id* $i]} {
		    lappend matches $i
2971 2972 2973 2974 2975 2976 2977 2978 2979 2980
		}
	    }
	    if {$matches ne {}} {
		if {[llength $matches] > 1} {
		    error_popup "Short SHA1 id $id is ambiguous"
		    return
		}
		set id [lindex $matches 0]
	    }
	}
2981
    }
P
Paul Mackerras 已提交
2982 2983
    if {[info exists commitrow($id)]} {
	selectline $commitrow($id) 1
2984 2985
	return
    }
2986
    if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
2987 2988
	set type "SHA1 id"
    } else {
2989
	set type "Tag/Head"
2990 2991 2992 2993
    }
    error_popup "$type $sha1string is not known"
}

2994 2995 2996 2997
proc lineenter {x y id} {
    global hoverx hovery hoverid hovertimer
    global commitinfo canv

P
Paul Mackerras 已提交
2998
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052
    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 已提交
3053
    set t [$canv create text $x $y -anchor nw -text $text -tags hover -font $mainfont]
3054 3055 3056
    $canv raise $t
}

3057
proc clickisonarrow {id y} {
3058
    global lthickness idrowranges
3059 3060

    set thresh [expr {2 * $lthickness + 6}]
3061 3062 3063 3064 3065
    set n [expr {[llength $idrowranges($id)] - 1}]
    for {set i 1} {$i < $n} {incr i} {
	set row [lindex $idrowranges($id) $i]
	if {abs([yc $row] - $y) < $thresh} {
	    return $i
3066 3067 3068 3069 3070
	}
    }
    return {}
}

3071 3072
proc arrowjump {id n y} {
    global idrowranges canv
3073

3074 3075 3076 3077
    # 1 <-> 2, 3 <-> 4, etc...
    set n [expr {(($n - 1) ^ 1) + 1}]
    set row [lindex $idrowranges($id) $n]
    set yt [yc $row]
3078 3079 3080 3081 3082 3083 3084 3085
    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
    }
3086
    allcanvs yview moveto $yfrac
3087 3088
}

3089
proc lineclick {x y id isnew} {
3090
    global ctext commitinfo childlist commitrow cflist canv thickerline
3091

P
Paul Mackerras 已提交
3092
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
3093
    unmarkmatches
3094
    unselectline
3095 3096 3097 3098
    normalline
    $canv delete hover
    # draw this line thicker than normal
    set thickerline $id
3099
    drawlines $id
3100
    if {$isnew} {
3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113
	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]
3114
    }
3115 3116 3117
    # fill the details pane with info about this line
    $ctext conf -state normal
    $ctext delete 0.0 end
3118 3119 3120 3121 3122 3123
    $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]
3124
    set info $commitinfo($id)
3125
    $ctext insert end "\n\t[lindex $info 0]\n"
3126
    $ctext insert end "\tAuthor:\t[lindex $info 1]\n"
P
Paul Mackerras 已提交
3127 3128
    set date [formatdate [lindex $info 2]]
    $ctext insert end "\tDate:\t$date\n"
3129 3130
    set kids [lindex $childlist $commitrow($id)]
    if {$kids ne {}} {
3131
	$ctext insert end "\nChildren:"
3132
	set i 0
3133
	foreach child $kids {
3134
	    incr i
P
Paul Mackerras 已提交
3135
	    if {![info exists commitinfo($child)] && ![getcommit $child]} continue
3136
	    set info $commitinfo($child)
3137 3138 3139 3140 3141
	    $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 已提交
3142 3143
	    set date [formatdate [lindex $info 2]]
	    $ctext insert end "\n\tDate:\t$date\n"
3144 3145 3146 3147 3148 3149 3150
	}
    }
    $ctext conf -state disabled

    $cflist delete 0 end
}

3151 3152 3153
proc normalline {} {
    global thickerline
    if {[info exists thickerline]} {
3154
	set id $thickerline
3155
	unset thickerline
3156
	drawlines $id
3157 3158 3159
    }
}

3160
proc selbyid {id} {
P
Paul Mackerras 已提交
3161 3162 3163
    global commitrow
    if {[info exists commitrow($id)]} {
	selectline $commitrow($id) 1
3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175
    }
}

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 已提交
3176
    global rowctxmenu commitrow selectedline rowmenuid
3177

P
Paul Mackerras 已提交
3178
    if {![info exists selectedline] || $commitrow($id) eq $selectedline} {
3179 3180 3181 3182 3183 3184
	set state disabled
    } else {
	set state normal
    }
    $rowctxmenu entryconfigure 0 -state $state
    $rowctxmenu entryconfigure 1 -state $state
3185
    $rowctxmenu entryconfigure 2 -state $state
3186 3187 3188 3189 3190
    set rowmenuid $id
    tk_popup $rowctxmenu $x $y
}

proc diffvssel {dirn} {
3191
    global rowmenuid selectedline displayorder
3192 3193 3194

    if {![info exists selectedline]} return
    if {$dirn} {
3195
	set oldid [lindex $displayorder $selectedline]
3196 3197 3198
	set newid $rowmenuid
    } else {
	set oldid $rowmenuid
3199
	set newid [lindex $displayorder $selectedline]
3200
    }
3201 3202 3203 3204 3205 3206 3207 3208
    addtohistory [list doseldiff $oldid $newid]
    doseldiff $oldid $newid
}

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

3209 3210 3211 3212 3213 3214
    $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"
3215 3216 3217 3218 3219 3220 3221
    $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     "
3222
    $ctext insert end [lindex $commitinfo($oldid) 0]
3223 3224 3225 3226
    $ctext insert end "\n\nTo   "
    $ctext tag bind link1 <1> [list selbyid $newid]
    $ctext insert end $newid [list link link1]
    $ctext insert end "\n     "
3227 3228 3229 3230 3231
    $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
3232
    startdiff [list $oldid $newid]
3233 3234
}

3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247
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"
3248
    grid $top.title - -pady 10
3249
    label $top.from -text "From:"
3250
    entry $top.fromsha1 -width 40 -relief flat
3251 3252 3253
    $top.fromsha1 insert 0 $oldid
    $top.fromsha1 conf -state readonly
    grid $top.from $top.fromsha1 -sticky w
3254
    entry $top.fromhead -width 60 -relief flat
3255 3256 3257 3258
    $top.fromhead insert 0 $oldhead
    $top.fromhead conf -state readonly
    grid x $top.fromhead -sticky w
    label $top.to -text "To:"
3259
    entry $top.tosha1 -width 40 -relief flat
3260 3261 3262
    $top.tosha1 insert 0 $newid
    $top.tosha1 conf -state readonly
    grid $top.to $top.tosha1 -sticky w
3263
    entry $top.tohead -width 60 -relief flat
3264 3265 3266 3267 3268 3269 3270 3271 3272
    $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
3273
    grid $top.flab $top.fname -sticky w
3274 3275 3276 3277 3278 3279 3280
    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
3281
    focus $top.fname
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
}

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
}

3320 3321 3322 3323 3324 3325 3326 3327
proc mktag {} {
    global rowmenuid mktagtop commitinfo

    set top .maketag
    set mktagtop $top
    catch {destroy $top}
    toplevel $top
    label $top.title -text "Create tag"
3328
    grid $top.title - -pady 10
3329
    label $top.id -text "ID:"
3330
    entry $top.sha1 -width 40 -relief flat
3331 3332 3333
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
3334
    entry $top.head -width 60 -relief flat
3335 3336 3337 3338
    $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:"
3339
    entry $top.tag -width 60
3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364
    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 {
3365
	set dir [gitdir]
3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376
	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
3377 3378 3379 3380
    redrawtags $id
}

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

P
Paul Mackerras 已提交
3383 3384
    if {![info exists commitrow($id)]} return
    drawcmitrow $commitrow($id)
3385 3386
    $canv delete tag.$id
    set xt [eval drawtags $id $idpos($id)]
P
Paul Mackerras 已提交
3387 3388
    $canv coords $linehtag($commitrow($id)) $xt [lindex $idpos($id) 2]
    if {[info exists selectedline] && $selectedline == $commitrow($id)} {
3389
	selectline $selectedline 0
3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404
    }
}

proc mktagcan {} {
    global mktagtop

    catch {destroy $mktagtop}
    unset mktagtop
}

proc mktaggo {} {
    domktag
    mktagcan
}

3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459
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
}

3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498
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
	}
    }
}

3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517
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
}

3518 3519 3520 3521 3522
proc doquit {} {
    global stopped
    set stopped 100
    destroy .
}
3523

3524 3525 3526
proc doprefs {} {
    global maxwidth maxgraphpct diffopts findmergefiles
    global oldprefs prefstop
P
Paul Mackerras 已提交
3527

3528 3529 3530 3531 3532
    set top .gitkprefs
    set prefstop $top
    if {[winfo exists $top]} {
	raise $top
	return
3533
    }
3534 3535
    foreach v {maxwidth maxgraphpct diffopts findmergefiles} {
	set oldprefs($v) [set $v]
P
Paul Mackerras 已提交
3536
    }
3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 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
    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 已提交
3594 3595
}

3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 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 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 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 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 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868
# 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 {}
}

3869 3870 3871
# defaults...
set datemode 0
set diffopts "-U 5 -p"
3872
set wrcomcmd "git-diff-tree --stdin -p --pretty"
3873

3874
set gitencoding {}
3875 3876 3877 3878
catch {
    set gitencoding [exec git-repo-config --get i18n.commitencoding]
}
if {$gitencoding == ""} {
3879 3880 3881 3882 3883
    set gitencoding "utf-8"
}
set tclencoding [tcl_encoding $gitencoding]
if {$tclencoding == {}} {
    puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
3884
}
3885

3886 3887
set mainfont {Helvetica 9}
set textfont {Courier 9}
3888
set findmergefiles 0
3889
set maxgraphpct 50
3890
set maxwidth 16
P
Paul Mackerras 已提交
3891
set revlistorder 0
3892
set fastdate 0
P
Paul Mackerras 已提交
3893 3894 3895
set uparrowlen 7
set downarrowlen 7
set mingaplen 30
3896 3897 3898 3899 3900

set colors {green red blue magenta darkgrey brown orange}

catch {source ~/.gitk}

3901
set namefont $mainfont
3902 3903

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

3905 3906 3907 3908 3909 3910 3911 3912 3913
set revtreeargs {}
foreach arg $argv {
    switch -regexp -- $arg {
	"^$" { }
	"^-d" { set datemode 1 }
	default {
	    lappend revtreeargs $arg
	}
    }
3914
}
3915

P
Paul Mackerras 已提交
3916 3917 3918 3919 3920 3921 3922
# 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
}

3923 3924 3925
set history {}
set historyindex 0

P
Paul Mackerras 已提交
3926 3927
set optim_delay 16

3928
set stopped 0
3929
set stuffsaved 0
3930
set patchnum 0
3931
setcoords
3932
makewindow $revtreeargs
3933
readrefs
3934
getcommits $revtreeargs