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

# Copyright (C) 2005 Paul Mackerras.  All rights reserved.
# This program is free software; it may be used, copied, modified
# and distributed under the terms of the GNU General Public Licence,
# either version 2, or (at your option) any later version.

10 11 12 13 14 15 16 17 18
proc gitdir {} {
    global env
    if {[info exists env(GIT_DIR)]} {
	return $env(GIT_DIR)
    } else {
	return ".git"
    }
}

19 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

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

162 163
proc doupdate {reading} {
    global commfd nextupdate numcommits ncmupdate
164

165 166 167
    if {$reading} {
	fileevent $commfd readable {}
    }
168
    update
169 170 171 172 173 174 175 176 177 178 179
    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]
    }
180 181 182
}

proc readcommit {id} {
183
    if {[catch {set contents [exec git-cat-file commit $id]}]} return
184 185
    updatechildren $id {}
    parsecommit $id $contents 0
P
Paul Mackerras 已提交
186 187
}

188
proc updatecommits {rargs} {
P
Paul Mackerras 已提交
189 190
    stopfindproc
    foreach v {children nchildren parents nparents commitlisted
191 192
	colormap selectedline matchinglines treediffs
	mergefilelist currentid rowtextx commitrow
P
Paul Mackerras 已提交
193 194 195 196
	rowidlist rowoffsets idrowranges idrangedrawn iddrawn
	linesegends crossings cornercrossings} {
	global $v
	catch {unset $v}
197
    }
P
Paul Mackerras 已提交
198
    allcanvs delete all
199
    readrefs
P
Paul Mackerras 已提交
200
    getcommits $rargs
201 202
}

203
proc updatechildren {id olds} {
P
Paul Mackerras 已提交
204
    global children nchildren parents nparents
205

206 207 208 209
    if {![info exists nchildren($id)]} {
	set children($id) {}
	set nchildren($id) 0
    }
210 211 212 213 214 215 216 217 218
    set parents($id) $olds
    set nparents($id) [llength $olds]
    foreach p $olds {
	if {![info exists nchildren($p)]} {
	    set children($p) [list $id]
	    set nchildren($p) 1
	} elseif {[lsearch -exact $children($p) $id] < 0} {
	    lappend children($p) $id
	    incr nchildren($p)
P
Paul Mackerras 已提交
219 220
	}
    }
221 222
}

223
proc parsecommit {id contents listed} {
224 225 226 227 228 229 230 231 232
    global commitinfo cdate

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

276 277
proc getcommit {id} {
    global commitdata commitinfo nparents
P
Paul Mackerras 已提交
278

279 280
    if {[info exists commitdata($id)]} {
	parsecommit $id $commitdata($id) 1
P
Paul Mackerras 已提交
281 282 283 284 285 286 287 288 289 290
    } else {
	readcommit $id
	if {![info exists commitinfo($id)]} {
	    set commitinfo($id) {"No commit information available"}
	    set nparents($id) 0
	}
    }
    return 1
}

291
proc readrefs {} {
292
    global tagids idtags headids idheads tagcontents
293
    global otherrefids idotherrefs
294

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

335 336 337 338 339 340 341 342 343
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"
344
    bind $w <Key-Return> "destroy $w"
345 346 347
    tkwait window $w
}

348
proc makewindow {rargs} {
349
    global canv canv2 canv3 linespc charspc ctext cflist textfont
350
    global findtype findtypemenu findloc findstring fstring geometry
351
    global entries sha1entry sha1string sha1but
352
    global maincursor textcursor curtextcursor
353
    global rowctxmenu mergemax
354 355 356 357

    menu .bar
    .bar add cascade -label "File" -menu .bar.file
    menu .bar.file
358
    .bar.file add command -label "Update" -command [list updatecommits $rargs]
359
    .bar.file add command -label "Reread references" -command rereadrefs
360
    .bar.file add command -label "Quit" -command doquit
361 362 363
    menu .bar.edit
    .bar add cascade -label "Edit" -menu .bar.edit
    .bar.edit add command -label "Preferences" -command doprefs
364 365 366 367 368
    menu .bar.help
    .bar add cascade -label "Help" -menu .bar.help
    .bar.help add command -label "About gitk" -command about
    . configure -menu .bar

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

    set sha1entry .ctop.top.bar.sha1
410 411 412 413 414
    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]
415
    pack .ctop.top.bar.sha1label -side left
416 417
    entry $sha1entry -width 40 -font $textfont -textvariable sha1string
    trace add variable sha1string write sha1change
418
    pack $sha1entry -side left -pady 2
419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442

    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

443 444 445
    button .ctop.top.bar.findbut -text "Find" -command dofind
    pack .ctop.top.bar.findbut -side left
    set findstring {}
446
    set fstring .ctop.top.bar.findstring
447
    lappend entries $fstring
448 449
    entry $fstring -width 30 -font $textfont -textvariable findstring
    pack $fstring -side left -expand 1 -fill x
450
    set findtype Exact
451 452
    set findtypemenu [tk_optionMenu .ctop.top.bar.findtype \
			  findtype Exact IgnCase Regexp]
453 454
    set findloc "All fields"
    tk_optionMenu .ctop.top.bar.findloc findloc "All fields" Headline \
455
	Comments Author Committer Files Pickaxe
456 457
    pack .ctop.top.bar.findloc -side right
    pack .ctop.top.bar.findtype -side right
458 459
    # for making sure type==Exact whenever loc==Pickaxe
    trace add variable findloc write findlocchange
460

461 462
    panedwindow .ctop.cdet -orient horizontal
    .ctop add .ctop.cdet
463 464
    frame .ctop.cdet.left
    set ctext .ctop.cdet.left.ctext
465 466
    text $ctext -bg white -state disabled -font $textfont \
	-width $geometry(ctextw) -height $geometry(ctexth) \
467
	-yscrollcommand ".ctop.cdet.left.sb set" -wrap none
468 469 470 471 472
    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

473
    $ctext tag conf filesep -font [concat $textfont bold] -back "#aaaaaa"
474 475 476 477 478 479 480 481
    $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
482 483 484 485 486 487 488 489 490 491 492
    $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"
493
    $ctext tag conf mmax -fore darkgrey
494
    set mergemax 16
495 496 497
    $ctext tag conf mresult -font [concat $textfont bold]
    $ctext tag conf msep -font [concat $textfont bold]
    $ctext tag conf found -back yellow
498

499 500
    frame .ctop.cdet.right
    set cflist .ctop.cdet.right.cfiles
501
    listbox $cflist -bg white -selectmode extended -width $geometry(cflistw) \
502 503 504 505 506
	-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
507
    bind .ctop.cdet <Configure> {resizecdetpanes %W %w}
508

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

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

    set maincursor [. cget -cursor]
    set textcursor [$ctext cget -cursor]
558
    set curtextcursor $textcursor
559

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

P
Paul Mackerras 已提交
571 572 573 574 575
proc scrollcanv {cscroll f0 f1} {
    $cscroll set $f0 $f1
    drawfrac $f0 $f1
}

576 577 578 579
# 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} {
580
    global entries
581 582 583 584 585
    bind . $ev $script
    set escript [bind Entry $ev]
    if {$escript == {}} {
	set escript [bind Entry <Key>]
    }
586 587 588
    foreach e $entries {
	bind $e $ev "$escript; break"
    }
589 590 591
}

# set the focus back to the toplevel for any click outside
592
# the entry widgets
593
proc click {w} {
594 595 596
    global entries
    foreach e $entries {
	if {$w == $e} return
597
    }
598
    focus .
599 600 601 602
}

proc savestuff {w} {
    global canv canv2 canv3 ctext cflist mainfont textfont
603
    global stuffsaved findmergefiles maxgraphpct
604
    global maxwidth
605

606
    if {$stuffsaved} return
607
    if {![winfo viewable .]} return
608 609
    catch {
	set f [open "~/.gitk-new" w]
610 611 612
	puts $f [list set mainfont $mainfont]
	puts $f [list set textfont $textfont]
	puts $f [list set findmergefiles $findmergefiles]
613
	puts $f [list set maxgraphpct $maxgraphpct]
614
	puts $f [list set maxwidth $maxwidth]
615 616
	puts $f "set geometry(width) [winfo width .ctop]"
	puts $f "set geometry(height) [winfo height .ctop]"
J
Jeff Hobbs 已提交
617 618 619 620
	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}]"
621 622 623 624 625 626 627 628 629 630
	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
631 632
}

633 634
proc resizeclistpanes {win w} {
    global oldwidth
635
    if {[info exists oldwidth($win)]} {
636 637 638 639 640 641 642 643 644 645 646 647 648
	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 已提交
649
		set sash1 [expr {$sash0 + 20}]
650 651
	    }
	    if {$sash1 > $w - 10} {
J
Jeff Hobbs 已提交
652
		set sash1 [expr {$w - 10}]
653
		if {$sash0 > $sash1 - 20} {
J
Jeff Hobbs 已提交
654
		    set sash0 [expr {$sash1 - 20}]
655 656 657 658 659 660 661 662 663 664 665
		}
	    }
	}
	$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
666
    if {[info exists oldwidth($win)]} {
667 668 669 670 671 672 673 674 675 676
	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 已提交
677
		set sash0 [expr {$w - 15}]
678 679 680 681 682 683 684
	    }
	}
	$win sash place 0 $sash0 [lindex $s0 1]
    }
    set oldwidth($win) $w
}

685 686 687 688 689 690 691 692 693 694 695 696 697 698
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
}

699 700 701 702 703 704 705 706 707
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 已提交
708
Gitk - a commit viewer for git
709

P
Paul Mackerras 已提交
710
Copyright  2005-2006 Paul Mackerras
711

712
Use and redistribute under the terms of the GNU General Public License} \
713 714 715 716 717 718
	    -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
}

P
Paul Mackerras 已提交
719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776
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
777
    set ids [lindex $rowidlist $row]
P
Paul Mackerras 已提交
778 779 780 781 782
    foreach id $ids {
	incr col
	if {$id eq {}} continue
	if {$col < [llength $ids] - 1 &&
	    [lsearch -exact -start [expr {$col+1}] $ids $id] >= 0} {
783
	    puts "oops: [shortids $id] repeated in row $row col $col: {[shortids [lindex $rowidlist $row]]}"
P
Paul Mackerras 已提交
784
	}
785
	set o [lindex $rowoffsets $row $col]
P
Paul Mackerras 已提交
786 787 788 789 790
	set y $row
	set x $col
	while {$o ne {}} {
	    incr y -1
	    incr x $o
791
	    if {[lindex $rowidlist $y $x] != $id} {
P
Paul Mackerras 已提交
792 793 794
		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} {
795
		    puts "  row $i ids={[shortids [lindex $rowidlist $i]]} offs={[lindex $rowoffsets $i]}"
P
Paul Mackerras 已提交
796 797 798 799
		}
		break
	    }
	    if {!$full} break
800
	    set o [lindex $rowoffsets $y $x]
P
Paul Mackerras 已提交
801 802 803 804 805 806 807 808 809 810
	}
    }
}

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
811
	set off0 [lindex $rowoffsets $y]
P
Paul Mackerras 已提交
812 813
	for {set x0 $x} {1} {incr x0} {
	    if {$x0 >= [llength $off0]} {
814
		set x0 [llength [lindex $rowoffsets [expr {$y-1}]]]
P
Paul Mackerras 已提交
815 816 817 818 819 820 821 822 823
		break
	    }
	    set z [lindex $off0 $x0]
	    if {$z ne {}} {
		incr x0 $z
		break
	    }
	}
	set z [expr {$x0 - $x}]
824 825
	lset rowidlist $y [linsert [lindex $rowidlist $y] $x $oid]
	lset rowoffsets $y [linsert [lindex $rowoffsets $y] $x $z]
P
Paul Mackerras 已提交
826
    }
827 828
    set tmp [lreplace [lindex $rowoffsets $y] $x $x {}]
    lset rowoffsets $y [incrange $tmp [expr {$x+1}] -1]
P
Paul Mackerras 已提交
829 830 831 832 833 834 835
    lappend idrowranges($oid) $y
}

proc initlayout {} {
    global rowidlist rowoffsets displayorder
    global rowlaidout rowoptim
    global idinlist rowchk
836 837
    global commitidx numcommits
    global nextcolor
P
Paul Mackerras 已提交
838

839 840 841 842 843 844
    set commitidx 0
    set numcommits 0
    set displayorder {}
    set nextcolor 0
    set rowidlist {{}}
    set rowoffsets {{}}
P
Paul Mackerras 已提交
845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892
    catch {unset idinlist}
    catch {unset rowchk}
    set rowlaidout 0
    set rowoptim 0
}

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 canvy0 linespc
    global linesegends idrowranges idrangedrawn

893 894 895 896 897
    if {$numcommits == 0} {
	global phase
	set phase "incrdraw"
	allcanvs delete all
    }
P
Paul Mackerras 已提交
898 899 900 901 902 903 904 905 906 907 908 909 910 911 912
    set row $numcommits
    set numcommits $canshow
    allcanvs conf -scrollregion \
	[list 0 0 0 [expr {$canvy0 + ($numcommits - 0.5) * $linespc + 2}]]
    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)]} {
913
			drawlineseg $id $i
P
Paul Mackerras 已提交
914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936
			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
    global nchildren parents nparents
    global idrowranges linesegends
    global commitidx
    global idinlist rowchk

937 938
    set idlist [lindex $rowidlist $row]
    set offs [lindex $rowoffsets $row]
P
Paul Mackerras 已提交
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
    while {$row < $endrow} {
	set id [lindex $displayorder $row]
	set oldolds {}
	set newolds {}
	foreach p $parents($id) {
	    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
964 965 966
			set rm1 [expr {$row - 1}]
			lappend linesegends($rm1) $i
			lappend idrowranges($i) $rm1
P
Paul Mackerras 已提交
967 968 969 970 971 972
			if {[incr nev -1] <= 0} break
			continue
		    }
		    set rowchk($id) [expr {$row + $r}]
		}
	    }
973 974
	    lset rowidlist $row $idlist
	    lset rowoffsets $row $offs
P
Paul Mackerras 已提交
975 976 977 978 979
	}
	set col [lsearch -exact $idlist $id]
	if {$col < 0} {
	    set col [llength $idlist]
	    lappend idlist $id
980
	    lset rowidlist $row $idlist
P
Paul Mackerras 已提交
981 982
	    set z {}
	    if {$nchildren($id) > 0} {
983
		set z [expr {[llength [lindex $rowidlist [expr {$row-1}]]] - $col}]
P
Paul Mackerras 已提交
984 985 986
		unset idinlist($id)
	    }
	    lappend offs $z
987
	    lset rowoffsets $row $offs
P
Paul Mackerras 已提交
988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027
	    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
	}
1028 1029
	lappend rowidlist $idlist
	lappend rowoffsets $offs
P
Paul Mackerras 已提交
1030 1031 1032 1033 1034
    }
    return $row
}

proc addextraid {id row} {
1035
    global displayorder commitrow commitinfo nparents
P
Paul Mackerras 已提交
1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049
    global commitidx

    incr commitidx
    lappend displayorder $id
    set commitrow($id) $row
    readcommit $id
    if {![info exists commitinfo($id)]} {
	set commitinfo($id) {"No commit information available"}
	set nparents($id) 0
    }
}

proc layouttail {} {
    global rowidlist rowoffsets idinlist commitidx
1050
    global idrowranges
P
Paul Mackerras 已提交
1051 1052

    set row $commitidx
1053
    set idlist [lindex $rowidlist $row]
P
Paul Mackerras 已提交
1054 1055 1056 1057 1058 1059 1060 1061 1062
    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]
1063 1064
	lappend rowidlist $idlist
	lappend rowoffsets $offs
P
Paul Mackerras 已提交
1065 1066 1067 1068
    }

    foreach id [array names idinlist] {
	addextraid $id $row
1069 1070
	lset rowidlist $row [list $id]
	lset rowoffsets $row 0
P
Paul Mackerras 已提交
1071 1072 1073
	makeuparrow $id 0 $row 0
	lappend idrowranges($id) $row
	incr row
1074 1075
	lappend rowidlist {}
	lappend rowoffsets {}
P
Paul Mackerras 已提交
1076 1077 1078 1079 1080 1081 1082
    }
}

proc insert_pad {row col npad} {
    global rowidlist rowoffsets

    set pad [ntimes $npad {}]
1083 1084 1085
    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 已提交
1086 1087 1088
}

proc optimize_rows {row col endrow} {
1089
    global rowidlist rowoffsets idrowranges linesegends displayorder
P
Paul Mackerras 已提交
1090 1091

    for {} {$row < $endrow} {incr row} {
1092 1093
	set idlist [lindex $rowidlist $row]
	set offs [lindex $rowoffsets $row]
P
Paul Mackerras 已提交
1094
	set haspad 0
1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105
	set downarrowcols {}
	if {[info exists linesegends($row)]} {
	    set downarrowcols $linesegends($row)
	    if {$col > 0} {
		while {$downarrowcols ne {}} {
		    set i [lsearch -exact $idlist [lindex $downarrowcols 0]]
		    if {$i < 0 || $i >= $col} break
		    set downarrowcols [lrange $downarrowcols 1 end]
		}
	    }
	}
P
Paul Mackerras 已提交
1106 1107 1108 1109 1110 1111 1112 1113 1114 1115
	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}]
1116
	    set z0 [lindex $rowoffsets $y0 $x0]
P
Paul Mackerras 已提交
1117 1118 1119 1120 1121 1122
	    if {$z0 eq {}} {
		set id [lindex $idlist $col]
		if {[info exists idrowranges($id)] &&
		    $y0 > [lindex $idrowranges($id) 0]} {
		    set isarrow 1
		}
1123 1124 1125 1126
	    } elseif {$downarrowcols ne {} &&
		      [lindex $idlist $col] eq [lindex $downarrowcols 0]} {
		set downarrowcols [lrange $downarrowcols 1 end]
		set isarrow 1
P
Paul Mackerras 已提交
1127 1128 1129 1130 1131 1132 1133 1134 1135 1136
	    }
	    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}]
1137
		set z0 [lindex $rowoffsets $y0 $x0]
P
Paul Mackerras 已提交
1138 1139 1140
	    } elseif {$z > 1 || ($z > 0 && $isarrow)} {
		set npad [expr {$z - 1 + $isarrow}]
		set y1 [expr {$row + 1}]
1141
		set offs2 [lindex $rowoffsets $y1]
P
Paul Mackerras 已提交
1142 1143 1144 1145 1146 1147 1148
		set x1 -1
		foreach z $offs2 {
		    incr x1
		    if {$z eq {} || $x1 + $z < $col} continue
		    if {$x1 + $z > $col} {
			incr npad
		    }
1149
		    lset rowoffsets $y1 [incrange $offs2 $x1 $npad]
P
Paul Mackerras 已提交
1150 1151 1152 1153 1154 1155 1156 1157 1158 1159
		    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
	    }
1160 1161 1162 1163 1164 1165 1166 1167 1168
	    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 已提交
1169 1170 1171 1172 1173 1174 1175
	    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} {
1176
	    set o {}
P
Paul Mackerras 已提交
1177 1178
	    for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
		set o [lindex $offs $col]
1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192
		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 已提交
1193 1194
		if {$o eq {} || $o <= 0} break
	    }
1195
	    if {$o ne {} && [incr col] < [llength $idlist]} {
P
Paul Mackerras 已提交
1196
		set y1 [expr {$row + 1}]
1197
		set offs2 [lindex $rowoffsets $y1]
P
Paul Mackerras 已提交
1198 1199 1200 1201
		set x1 -1
		foreach z $offs2 {
		    incr x1
		    if {$z eq {} || $x1 + $z < $col} continue
1202
		    lset rowoffsets $y1 [incrange $offs2 $x1 1]
P
Paul Mackerras 已提交
1203 1204 1205 1206 1207 1208 1209 1210
		    break
		}
		set idlist [linsert $idlist $col {}]
		set tmp [linsert $offs $col {}]
		incr col
		set offs [incrange $tmp $col -1]
	    }
	}
1211 1212
	lset rowidlist $row $idlist
	lset rowoffsets $row $offs
P
Paul Mackerras 已提交
1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226
	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}]
}

1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237
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 已提交
1238
    global rowoffsets rowidlist idrowranges
1239
    global displayorder
1240
    global canv colormap
P
Paul Mackerras 已提交
1241 1242 1243 1244 1245 1246

    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 {}
1247
    set col [lsearch -exact [lindex $rowidlist $row] $id]
P
Paul Mackerras 已提交
1248 1249 1250 1251 1252 1253 1254
    if {$col < 0} {
	puts "oops: drawline: id $id not on row $row"
	return
    }
    set lasto {}
    set ns 0
    while {1} {
1255
	set o [lindex $rowoffsets $row $col]
P
Paul Mackerras 已提交
1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269
	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
1270 1271 1272 1273 1274 1275 1276 1277 1278
    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} {
1279
		lappend coords [xc $row [expr {$col - 1}]] [yc $row]
1280
	    } elseif {$ccol > $col + 1} {
1281
		lappend coords [xc $row [expr {$col + 1}]] [yc $row]
1282 1283 1284 1285 1286 1287 1288 1289
	    }
	    lappend coords $x $y
	}
    }
    if {[llength $coords] < 4} return
    set last [expr {[llength $idrowranges($id)] / 2 - 1}]
    set arrow [expr {2 * ($i > 0) + ($i < $last)}]
    set arrow [lindex {none first last both} $arrow]
1290
    set t [$canv create line $coords -width [linewidth $id] \
P
Paul Mackerras 已提交
1291 1292 1293 1294 1295
	       -fill $colormap($id) -tags lines.$id -arrow $arrow]
    $canv lower $t
    bindline $t $id
}

1296
proc drawparentlinks {id row col olds} {
1297
    global rowidlist canv colormap idrowranges
P
Paul Mackerras 已提交
1298 1299 1300 1301 1302

    set row2 [expr {$row + 1}]
    set x [xc $row $col]
    set y [yc $row]
    set y2 [yc $row2]
1303
    set ids [lindex $rowidlist $row2]
P
Paul Mackerras 已提交
1304 1305 1306
    # rmx = right-most X coord used
    set rmx 0
    foreach p $olds {
1307 1308 1309 1310 1311 1312 1313 1314 1315
	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
	}
1316 1317 1318 1319 1320 1321
	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 已提交
1322 1323 1324 1325 1326 1327 1328 1329 1330
	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
1331
	set t [$canv create line $coords -width [linewidth $p] \
P
Paul Mackerras 已提交
1332 1333 1334 1335 1336 1337 1338
		   -fill $colormap($p) -tags lines.$p]
	$canv lower $t
	bindline $t $p
    }
    return $rmx
}

1339
proc drawlines {id} {
P
Paul Mackerras 已提交
1340 1341 1342 1343 1344 1345 1346 1347
    global colormap canv
    global idrowranges idrangedrawn
    global children iddrawn commitrow rowidlist

    $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)]} {
1348
	    drawlineseg $id $i
P
Paul Mackerras 已提交
1349 1350 1351 1352 1353 1354
	}
    }
    if {[info exists children($id)]} {
	foreach child $children($id) {
	    if {[info exists iddrawn($child)]} {
		set row $commitrow($child)
1355
		set col [lsearch -exact [lindex $rowidlist $row] $child]
P
Paul Mackerras 已提交
1356
		if {$col >= 0} {
1357
		    drawparentlinks $child $row $col [list $id]
P
Paul Mackerras 已提交
1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379
		}
	    }
	}
    }
}

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
    global mainfont namefont

    set ofill [expr {[info exists commitlisted($id)]? "blue": "white"}]
    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}
1380
    set xt [xc $row [llength [lindex $rowidlist $row]]]
P
Paul Mackerras 已提交
1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403
    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]
}

proc drawcmitrow {row} {
1404
    global displayorder rowidlist
P
Paul Mackerras 已提交
1405 1406 1407
    global idrowranges idrangedrawn iddrawn
    global commitinfo commitlisted parents numcommits

1408 1409
    if {$row >= $numcommits} return
    foreach id [lindex $rowidlist $row] {
P
Paul Mackerras 已提交
1410 1411 1412 1413 1414 1415 1416 1417
	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)]} {
1418
		    drawlineseg $id $i
P
Paul Mackerras 已提交
1419 1420 1421 1422 1423 1424 1425 1426 1427
		    set idrangedrawn($id,$i) 1
		}
		break
	    }
	}
    }

    set id [lindex $displayorder $row]
    if {[info exists iddrawn($id)]} return
1428
    set col [lsearch -exact [lindex $rowidlist $row] $id]
P
Paul Mackerras 已提交
1429 1430 1431 1432 1433
    if {$col < 0} {
	puts "oops, row $row id $id not in list"
	return
    }
    if {![info exists commitinfo($id)]} {
1434
	getcommit $id
P
Paul Mackerras 已提交
1435 1436 1437 1438
    }
    assigncolor $id
    if {[info exists commitlisted($id)] && [info exists parents($id)]
	&& $parents($id) ne {}} {
1439
	set rmx [drawparentlinks $id $row $col $parents($id)]
P
Paul Mackerras 已提交
1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480
    } 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}
}

1481
proc assigncolor {id} {
P
Paul Mackerras 已提交
1482
    global colormap colors nextcolor
1483
    global parents nparents children nchildren
1484 1485
    global cornercrossings crossings

1486
    if {[info exists colormap($id)]} return
1487
    set ncolors [llength $colors]
P
Paul Mackerras 已提交
1488
    if {$nchildren($id) == 1} {
1489 1490 1491 1492 1493
	set child [lindex $children($id) 0]
	if {[info exists colormap($child)]
	    && $nparents($child) == 1} {
	    set colormap($id) $colormap($child)
	    return
1494
	}
1495 1496
    }
    set badcolors {}
1497 1498 1499 1500 1501 1502
    if {[info exists cornercrossings($id)]} {
	foreach x $cornercrossings($id) {
	    if {[info exists colormap($x)]
		&& [lsearch -exact $badcolors $colormap($x)] < 0} {
		lappend badcolors $colormap($x)
	    }
1503
	}
1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514
	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)
1515 1516
		}
	    }
1517 1518 1519
	    if {[llength $badcolors] >= $ncolors} {
		set badcolors $origbad
	    }
1520
	}
1521
	set origbad $badcolors
1522
    }
1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540
    if {[llength $badcolors] < $ncolors - 1} {
	foreach child $children($id) {
	    if {[info exists colormap($child)]
		&& [lsearch -exact $badcolors $colormap($child)] < 0} {
		lappend badcolors $colormap($child)
	    }
	    if {[info exists parents($child)]} {
		foreach p $parents($child) {
		    if {[info exists colormap($p)]
			&& [lsearch -exact $badcolors $colormap($p)] < 0} {
			lappend badcolors $colormap($p)
		    }
		}
	    }
	}
	if {[llength $badcolors] >= $ncolors} {
	    set badcolors $origbad
	}
1541 1542 1543 1544 1545
    }
    for {set i 0} {$i <= $ncolors} {incr i} {
	set c [lindex $colors $nextcolor]
	if {[incr nextcolor] >= $ncolors} {
	    set nextcolor 0
1546
	}
1547
	if {[lsearch -exact $badcolors $c]} break
1548
    }
1549
    set colormap($id) $c
1550 1551
}

1552 1553 1554 1555 1556 1557
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"
1558
    $canv bind $t <Button-1> "lineclick %x %y $id 1"
1559 1560
}

1561
proc drawtags {id x xt y1} {
1562
    global idtags idheads idotherrefs
1563
    global linespc lthickness
P
Paul Mackerras 已提交
1564
    global canv mainfont commitrow rowtextx
1565 1566 1567

    set marks {}
    set ntags 0
1568
    set nheads 0
1569 1570 1571 1572 1573 1574
    if {[info exists idtags($id)]} {
	set marks $idtags($id)
	set ntags [llength $marks]
    }
    if {[info exists idheads($id)]} {
	set marks [concat $marks $idheads($id)]
1575 1576 1577 1578
	set nheads [llength $idheads($id)]
    }
    if {[info exists idotherrefs($id)]} {
	set marks [concat $marks $idotherrefs($id)]
1579 1580 1581 1582 1583 1584
    }
    if {$marks eq {}} {
	return $xt
    }

    set delta [expr {int(0.5 * ($linespc - $lthickness))}]
J
Jeff Hobbs 已提交
1585 1586
    set yt [expr {$y1 - 0.5 * $linespc}]
    set yb [expr {$yt + $linespc - 1}]
1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598
    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 已提交
1599 1600
	set xl [expr {$x + $delta}]
	set xr [expr {$x + $delta + $wid + $lthickness}]
1601 1602
	if {[incr ntags -1] >= 0} {
	    # draw a tag
J
Jeff Hobbs 已提交
1603 1604
	    set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
		       $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
1605 1606
		       -width 1 -outline black -fill yellow -tags tag.$id]
	    $canv bind $t <1> [list showtag $tag 1]
P
Paul Mackerras 已提交
1607
	    set rowtextx($commitrow($id)) [expr {$xr + $linespc}]
1608
	} else {
1609 1610 1611 1612 1613 1614
	    # draw a head or other ref
	    if {[incr nheads -1] >= 0} {
		set col green
	    } else {
		set col "#ddddff"
	    }
J
Jeff Hobbs 已提交
1615
	    set xl [expr {$xl - $delta/2}]
1616
	    $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
1617
		-width 1 -outline black -fill $col -tags tag.$id
1618
	}
1619 1620 1621 1622 1623
	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]
	}
1624 1625 1626 1627
    }
    return $xt
}

P
Paul Mackerras 已提交
1628 1629 1630 1631 1632
proc checkcrossings {row endrow} {
    global displayorder parents rowidlist

    for {} {$row < $endrow} {incr row} {
	set id [lindex $displayorder $row]
1633
	set i [lsearch -exact [lindex $rowidlist $row] $id]
P
Paul Mackerras 已提交
1634
	if {$i < 0} continue
1635
	set idlist [lindex $rowidlist [expr {$row+1}]]
P
Paul Mackerras 已提交
1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650
	foreach p $parents($id) {
	    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
1651 1652

    for {set i $lo} {[incr i] < $hi} {} {
1653
	set p [lindex [lindex $rowidlist $row] $i]
1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676
	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
	    }
	}
    }
}

1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687
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
}
1688 1689

proc finishcommits {} {
P
Paul Mackerras 已提交
1690
    global commitidx phase
1691
    global canv mainfont ctext maincursor textcursor
1692
    global findinprogress
1693

P
Paul Mackerras 已提交
1694
    if {$commitidx > 0} {
1695 1696
	drawrest
    } else {
1697 1698 1699 1700
	$canv delete all
	$canv create text 3 3 -anchor nw -text "No commits selected" \
	    -font $mainfont -tags textitems
    }
1701 1702 1703 1704
    if {![info exists findinprogress]} {
	. config -cursor $maincursor
	settextcursor $textcursor
    }
P
Paul Mackerras 已提交
1705
    set phase {}
1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716
}

# 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
1717 1718
}

1719
proc drawrest {} {
P
Paul Mackerras 已提交
1720 1721 1722 1723 1724 1725 1726 1727 1728 1729
    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 已提交
1730

J
Jeff Hobbs 已提交
1731
    set drawmsecs [expr {[clock clicks -milliseconds] - $startmsecs}]
1732
    #puts "overall $drawmsecs ms for $numcommits commits"
1733 1734
}

1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747
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 已提交
1748 1749
	    lappend matches [list $j [expr {$j+$foundstrlen-1}]]
	    set i [expr {$j + $foundstrlen}]
1750 1751 1752 1753 1754
	}
    }
    return $matches
}

1755 1756
proc dofind {} {
    global findtype findloc findstring markedmatches commitinfo
1757
    global numcommits displayorder linehtag linentag linedtag
1758
    global mainfont namefont canv canv2 canv3 selectedline
P
Paul Mackerras 已提交
1759 1760
    global matchinglines foundstring foundstrlen matchstring
    global commitdata
1761 1762

    stopfindproc
1763
    unmarkmatches
1764
    focus .
1765
    set matchinglines {}
1766 1767 1768 1769
    if {$findloc == "Pickaxe"} {
	findpatches
	return
    }
1770
    if {$findtype == "IgnCase"} {
1771
	set foundstring [string tolower $findstring]
1772
    } else {
1773
	set foundstring $findstring
1774
    }
1775 1776
    set foundstrlen [string length $findstring]
    if {$foundstrlen == 0} return
P
Paul Mackerras 已提交
1777 1778
    regsub -all {[*?\[\\]} $foundstring {\\&} matchstring
    set matchstring "*$matchstring*"
1779 1780 1781 1782
    if {$findloc == "Files"} {
	findfiles
	return
    }
1783 1784 1785 1786 1787 1788
    if {![info exists selectedline]} {
	set oldsel -1
    } else {
	set oldsel $selectedline
    }
    set didsel 0
1789
    set fldtypes {Headline Author Date Committer CDate Comment}
P
Paul Mackerras 已提交
1790
    set l -1
1791 1792
    foreach id $displayorder {
	set d $commitdata($id)
P
Paul Mackerras 已提交
1793 1794 1795 1796 1797 1798 1799 1800 1801 1802
	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)]} {
1803
	    getcommit $id
P
Paul Mackerras 已提交
1804
	}
1805 1806 1807 1808 1809 1810
	set info $commitinfo($id)
	set doesmatch 0
	foreach f $info ty $fldtypes {
	    if {$findloc != "All fields" && $findloc != $ty} {
		continue
	    }
1811
	    set matches [findmatches $f]
1812 1813 1814
	    if {$matches == {}} continue
	    set doesmatch 1
	    if {$ty == "Headline"} {
P
Paul Mackerras 已提交
1815
		drawcmitrow $l
1816 1817
		markmatches $canv $l $f $linehtag($l) $matches $mainfont
	    } elseif {$ty == "Author"} {
P
Paul Mackerras 已提交
1818
		drawcmitrow $l
1819 1820
		markmatches $canv2 $l $f $linentag($l) $matches $namefont
	    } elseif {$ty == "Date"} {
P
Paul Mackerras 已提交
1821
		drawcmitrow $l
1822 1823 1824 1825 1826 1827
		markmatches $canv3 $l $f $linedtag($l) $matches $mainfont
	    }
	}
	if {$doesmatch} {
	    lappend matchinglines $l
	    if {!$didsel && $l > $oldsel} {
1828
		findselectline $l
1829 1830 1831 1832 1833 1834 1835
		set didsel 1
	    }
	}
    }
    if {$matchinglines == {}} {
	bell
    } elseif {!$didsel} {
1836 1837 1838 1839 1840 1841
	findselectline [lindex $matchinglines 0]
    }
}

proc findselectline {l} {
    global findloc commentend ctext
1842
    selectline $l 1
1843 1844 1845 1846 1847 1848
    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 已提交
1849
	    set end [expr {[lindex $match 1] + 1}]
1850 1851
	    $ctext tag add found "1.0 + $start c" "1.0 + $end c"
	}
1852 1853 1854
    }
}

1855
proc findnext {restart} {
1856 1857
    global matchinglines selectedline
    if {![info exists matchinglines]} {
1858 1859 1860
	if {$restart} {
	    dofind
	}
1861 1862 1863 1864 1865
	return
    }
    if {![info exists selectedline]} return
    foreach l $matchinglines {
	if {$l > $selectedline} {
1866
	    findselectline $l
1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885
	    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 != {}} {
1886
	findselectline $prev
1887 1888 1889 1890 1891
    } else {
	bell
    }
}

1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920
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
1921
	    settextcursor $textcursor
1922 1923 1924 1925 1926 1927 1928
	}
    }
}

proc findpatches {} {
    global findstring selectedline numcommits
    global findprocpid findprocfile
1929
    global finddidsel ctext displayorder findinprogress
1930
    global findinsertpos
1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945

    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
	}
1946
	append inputids [lindex $displayorder $l] "\n"
1947 1948 1949 1950 1951 1952 1953 1954 1955 1956
    }

    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
    }

1957
    set findinsertpos end
1958 1959 1960 1961 1962 1963
    set findprocfile $f
    set findprocpid [pid $f]
    fconfigure $f -blocking 0
    fileevent $f readable readfindproc
    set finddidsel 0
    . config -cursor watch
1964
    settextcursor watch
1965 1966 1967 1968 1969
    set findinprogress 1
}

proc readfindproc {} {
    global findprocfile finddidsel
P
Paul Mackerras 已提交
1970
    global commitrow matchinglines findinsertpos
1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986

    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 已提交
1987
    if {![info exists commitrow($id)]} {
1988 1989 1990
	puts stderr "spurious id: $id"
	return
    }
P
Paul Mackerras 已提交
1991
    set l $commitrow($id)
1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
    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
2010 2011 2012 2013 2014 2015 2016
    if {!$finddidsel} {
	findselectline $l
	set finddidsel 1
    }
}

proc findfiles {} {
2017
    global selectedline numcommits displayorder ctext
2018 2019
    global ffileline finddidsel parents nparents
    global findinprogress findstartline findinsertpos
2020
    global treediffs fdiffid fdiffsneeded fdiffpos
2021
    global findmergefiles
2022 2023 2024 2025 2026 2027 2028 2029 2030 2031

    if {$numcommits == 0} return

    if {[info exists selectedline]} {
	set l [expr {$selectedline + 1}]
    } else {
	set l 0
    }
    set ffileline $l
    set findstartline $l
2032 2033 2034
    set diffsneeded {}
    set fdiffsneeded {}
    while 1 {
2035
	set id [lindex $displayorder $l]
2036
	if {$findmergefiles || $nparents($id) == 1} {
2037 2038 2039
	    if {![info exists treediffs($id)]} {
		append diffsneeded "$id\n"
		lappend fdiffsneeded $id
2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055
	    }
	}
	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
	}
2056
	catch {unset fdiffid}
2057 2058 2059 2060 2061 2062 2063
	set fdiffpos 0
	fconfigure $df -blocking 0
	fileevent $df readable [list readfilediffs $df]
    }

    set finddidsel 0
    set findinsertpos end
2064
    set id [lindex $displayorder $l]
2065
    . config -cursor watch
2066
    settextcursor watch
2067
    set findinprogress 1
2068
    findcont $id
2069 2070 2071 2072
    update
}

proc readfilediffs {df} {
2073
    global findid fdiffid fdiffs
2074 2075 2076 2077 2078 2079 2080 2081 2082

    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"
2083 2084
	    } elseif {[info exists findid]} {
		set id $findid
2085 2086
		stopfindproc
		bell
2087
		error_popup "Couldn't find diffs for $id"
2088 2089 2090 2091
	    }
	}
	return
    }
2092
    if {[regexp {^([0-9a-f]{40})$} $line match id]} {
2093 2094
	# start of a new string of diffs
	donefilediff
2095
	set fdiffid $id
2096 2097 2098 2099 2100 2101 2102
	set fdiffs {}
    } elseif {[string match ":*" $line]} {
	lappend fdiffs [lindex $line 5]
    }
}

proc donefilediff {} {
2103
    global fdiffid fdiffs treediffs findid
2104 2105
    global fdiffsneeded fdiffpos

2106 2107
    if {[info exists fdiffid]} {
	while {[lindex $fdiffsneeded $fdiffpos] ne $fdiffid
2108 2109 2110
	       && $fdiffpos < [llength $fdiffsneeded]} {
	    # git-diff-tree doesn't output anything for a commit
	    # which doesn't change anything
2111 2112 2113 2114 2115
	    set nullid [lindex $fdiffsneeded $fdiffpos]
	    set treediffs($nullid) {}
	    if {[info exists findid] && $nullid eq $findid} {
		unset findid
		findcont $nullid
2116 2117 2118 2119 2120
	    }
	    incr fdiffpos
	}
	incr fdiffpos

2121 2122
	if {![info exists treediffs($fdiffid)]} {
	    set treediffs($fdiffid) $fdiffs
2123
	}
2124 2125 2126
	if {[info exists findid] && $fdiffid eq $findid} {
	    unset findid
	    findcont $fdiffid
2127 2128
	}
    }
2129 2130
}

2131 2132
proc findcont {id} {
    global findid treediffs parents nparents
2133
    global ffileline findstartline finddidsel
2134
    global displayorder numcommits matchinglines findinprogress
2135 2136 2137 2138 2139
    global findmergefiles

    set l $ffileline
    while 1 {
	if {$findmergefiles || $nparents($id) == 1} {
2140 2141
	    if {![info exists treediffs($id)]} {
		set findid $id
2142 2143 2144 2145
		set ffileline $l
		return
	    }
	    set doesmatch 0
2146
	    foreach f $treediffs($id) {
2147 2148 2149 2150 2151 2152 2153
		set x [findmatches $f]
		if {$x != {}} {
		    set doesmatch 1
		    break
		}
	    }
	    if {$doesmatch} {
2154
		insertmatch $l $id
2155 2156
	    }
	}
2157 2158
	if {[incr l] >= $numcommits} {
	    set l 0
2159
	}
2160
	if {$l == $findstartline} break
2161
	set id [lindex $displayorder $l]
2162 2163 2164 2165 2166 2167 2168 2169 2170 2171
    }
    stopfindproc
    if {!$finddidsel} {
	bell
    }
}

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

P
Paul Mackerras 已提交
2174
    drawcmitrow $l
2175 2176 2177 2178 2179 2180
    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
2181 2182 2183 2184 2185 2186 2187 2188 2189
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 已提交
2190 2191 2192 2193
	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 \
2194 2195 2196 2197 2198 2199
		   -outline {} -tags matches -fill yellow]
	$canv lower $t
    }
}

proc unmarkmatches {} {
2200
    global matchinglines findids
2201 2202
    allcanvs delete matches
    catch {unset matchinglines}
2203
    catch {unset findids}
2204 2205
}

2206
proc selcanvline {w x y} {
2207
    global canv canvy0 ctext linespc
P
Paul Mackerras 已提交
2208
    global rowtextx
2209
    set ymax [lindex [$canv cget -scrollregion] 3]
2210
    if {$ymax == {}} return
2211 2212 2213 2214 2215 2216
    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
    }
2217 2218 2219
    if {$w eq $canv} {
	if {![info exists rowtextx($l)] || $x < $rowtextx($l)} return
    }
2220
    unmarkmatches
2221
    selectline $l 1
2222 2223
}

2224 2225 2226 2227 2228 2229 2230 2231 2232
proc commit_descriptor {p} {
    global commitinfo
    set l "..."
    if {[info exists commitinfo($p)]} {
	set l [lindex $commitinfo($p) 0]
    }
    return "$p ($l)"
}

2233 2234 2235
# 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 已提交
2236
    global ctext commitrow linknum
2237 2238 2239 2240 2241 2242 2243 2244 2245

    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 已提交
2246
	if {![info exists commitrow($linkid)]} continue
2247 2248 2249
	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 已提交
2250
	$ctext tag bind link$linknum <1> [list selectline $commitrow($linkid) 1]
2251 2252 2253 2254 2255 2256 2257
	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 }
}

2258
proc selectline {l isnew} {
2259
    global canv canv2 canv3 ctext commitinfo selectedline
2260
    global displayorder linehtag linentag linedtag
2261
    global canvy0 linespc parents nparents children
2262
    global cflist currentid sha1entry
P
Paul Mackerras 已提交
2263
    global commentend idtags linknum
2264
    global mergemax numcommits
2265

2266
    $canv delete hover
2267
    normalline
2268
    if {$l < 0 || $l >= $numcommits} return
2269
    set y [expr {$canvy0 + $l * $linespc}]
2270
    set ymax [lindex [$canv cget -scrollregion] 3]
2271 2272
    set ytop [expr {$y - $linespc - 1}]
    set ybot [expr {$y + $linespc + 1}]
2273
    set wnow [$canv yview]
J
Jeff Hobbs 已提交
2274 2275
    set wtop [expr {[lindex $wnow 0] * $ymax}]
    set wbot [expr {[lindex $wnow 1] * $ymax}]
2276 2277
    set wh [expr {$wbot - $wtop}]
    set newtop $wtop
2278
    if {$ytop < $wtop} {
2279 2280 2281 2282 2283 2284 2285
	if {$ybot < $wtop} {
	    set newtop [expr {$y - $wh / 2.0}]
	} else {
	    set newtop $ytop
	    if {$newtop > $wtop - $linespc} {
		set newtop [expr {$wtop - $linespc}]
	    }
2286
	}
2287 2288 2289 2290 2291 2292 2293 2294
    } 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}]
	    }
2295
	}
2296 2297 2298 2299 2300
    }
    if {$newtop != $wtop} {
	if {$newtop < 0} {
	    set newtop 0
	}
J
Jeff Hobbs 已提交
2301
	allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
P
Paul Mackerras 已提交
2302
	drawvisible
2303
    }
2304

P
Paul Mackerras 已提交
2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318
    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

2319 2320
    if {$isnew} {
	addtohistory [list selectline $l 0]
2321 2322
    }

2323 2324
    set selectedline $l

2325
    set id [lindex $displayorder $l]
2326
    set currentid $id
2327 2328 2329 2330 2331
    $sha1entry delete 0 end
    $sha1entry insert 0 $id
    $sha1entry selection from 0
    $sha1entry selection to end

2332
    $ctext conf -state normal
2333
    $ctext delete 0.0 end
2334
    set linknum 0
2335 2336
    $ctext mark set fmark.0 0.0
    $ctext mark gravity fmark.0 left
2337
    set info $commitinfo($id)
P
Paul Mackerras 已提交
2338 2339 2340 2341
    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"
2342 2343 2344 2345 2346 2347 2348
    if {[info exists idtags($id)]} {
	$ctext insert end "Tags:"
	foreach tag $idtags($id) {
	    $ctext insert end " $tag"
	}
	$ctext insert end "\n"
    }
2349 2350
 
    set comment {}
2351 2352
    if {$nparents($id) > 1} {
	set np 0
2353
	foreach p $parents($id) {
2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367
	    if {$np >= $mergemax} {
		set tag mmax
	    } else {
		set tag m$np
	    }
	    $ctext insert end "Parent: " $tag
	    appendwithlinks [commit_descriptor $p]
	    incr np
	}
    } else {
	if {[info exists parents($id)]} {
	    foreach p $parents($id) {
		append comment "Parent: [commit_descriptor $p]\n"
	    }
2368 2369
	}
    }
2370

2371 2372 2373
    if {[info exists children($id)]} {
	foreach c $children($id) {
	    append comment "Child:  [commit_descriptor $c]\n"
2374 2375 2376 2377
	}
    }
    append comment "\n"
    append comment [lindex $info 5]
2378 2379

    # make anything that looks like a SHA1 ID be a clickable link
2380
    appendwithlinks $comment
2381

2382
    $ctext tag delete Comments
2383
    $ctext tag remove found 1.0 end
2384
    $ctext conf -state disabled
2385
    set commentend [$ctext index "end - 1c"]
2386 2387

    $cflist delete 0 end
2388
    $cflist insert end "Comments"
2389
    if {$nparents($id) <= 1} {
2390
	startdiff $id
2391
    } else {
2392 2393 2394 2395 2396 2397 2398
	mergediff $id
    }
}

proc selnextline {dir} {
    global selectedline
    if {![info exists selectedline]} return
J
Jeff Hobbs 已提交
2399
    set l [expr {$selectedline + $dir}]
2400
    unmarkmatches
2401 2402 2403
    selectline $l 1
}

2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432
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
}

2433 2434 2435 2436 2437
proc goback {} {
    global history historyindex

    if {$historyindex > 1} {
	incr historyindex -1
2438 2439
	set cmd [lindex $history [expr {$historyindex - 1}]]
	eval $cmd
2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450
	.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]} {
2451
	set cmd [lindex $history $historyindex]
2452
	incr historyindex
2453
	eval $cmd
2454 2455 2456 2457 2458
	.ctop.top.bar.leftbut conf -state normal
    }
    if {$historyindex >= [llength $history]} {
	.ctop.top.bar.rightbut conf -state disabled
    }
2459 2460
}

2461
proc mergediff {id} {
2462
    global parents diffmergeid diffopts mdifffd
2463
    global difffilestart diffids
2464

2465
    set diffmergeid $id
2466
    set diffids $id
2467 2468
    catch {unset difffilestart}
    # this doesn't seem to actually affect anything...
2469
    set env(GIT_DIFF_OPTS) $diffopts
2470 2471 2472 2473
    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
2474
    }
2475 2476 2477 2478
    fconfigure $mdf -blocking 0
    set mdifffd($id) $mdf
    fileevent $mdf readable [list getmergediffline $mdf $id]
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
2479 2480
}

2481 2482
proc getmergediffline {mdf id} {
    global diffmergeid ctext cflist nextupdate nparents mergemax
2483
    global difffilestart mdifffd
2484

2485
    set n [gets $mdf line]
2486
    if {$n < 0} {
2487 2488
	if {[eof $mdf]} {
	    close $mdf
2489 2490 2491
	}
	return
    }
2492 2493
    if {![info exists diffmergeid] || $id != $diffmergeid
	|| $mdf != $mdifffd($id)} {
2494
	return
2495 2496
    }
    $ctext conf -state normal
2497 2498
    if {[regexp {^diff --cc (.*)} $line match fname]} {
	# start of a new file
2499 2500
	$ctext insert end "\n"
	set here [$ctext index "end - 1c"]
2501 2502 2503 2504 2505 2506
	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}]
2507
	set pad [string range "----------------------------------------" 1 $l]
2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527
	$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 np $nparents($id)
	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
2528
	    } else {
2529 2530
		set isbad 1
		break
2531
	    }
2532
	}
2533 2534 2535 2536 2537 2538 2539 2540 2541
	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]
2542
	}
2543 2544 2545
	if {$num ne {}} {
	    if {$num >= $mergemax} {
		set num "max"
2546
	    }
2547
	    lappend tags m$num
2548
	}
2549
	$ctext insert end "$line\n" $tags
2550 2551
    }
    $ctext conf -state disabled
2552 2553 2554 2555 2556
    if {[clock clicks -milliseconds] >= $nextupdate} {
	incr nextupdate 100
	fileevent $mdf readable {}
	update
	fileevent $mdf readable [list getmergediffline $mdf $id]
2557 2558 2559
    }
}

2560 2561
proc startdiff {ids} {
    global treediffs diffids treepending diffmergeid
2562

2563
    set diffids $ids
2564
    catch {unset diffmergeid}
2565
    if {![info exists treediffs($ids)]} {
2566
	if {![info exists treepending]} {
2567
	    gettreediffs $ids
2568 2569
	}
    } else {
2570
	addtocflist $ids
2571 2572 2573 2574
    }
}

proc addtocflist {ids} {
2575
    global treediffs cflist
2576
    foreach f $treediffs($ids) {
2577 2578
	$cflist insert end $f
    }
2579
    getblobdiffs $ids
2580 2581
}

2582
proc gettreediffs {ids} {
2583
    global treediff parents treepending
2584
    set treepending $ids
2585
    set treediff {}
2586 2587 2588
    if {[catch \
	 {set gdtf [open [concat | git-diff-tree --no-commit-id -r $ids] r]} \
	]} return
2589
    fconfigure $gdtf -blocking 0
2590
    fileevent $gdtf readable [list gettreediffline $gdtf $ids]
2591 2592
}

2593
proc gettreediffline {gdtf ids} {
2594 2595
    global treediff treediffs treepending diffids diffmergeid

2596 2597 2598 2599
    set n [gets $gdtf line]
    if {$n < 0} {
	if {![eof $gdtf]} return
	close $gdtf
2600
	set treediffs($ids) $treediff
2601
	unset treepending
2602
	if {$ids != $diffids} {
2603 2604
	    if {![info exists diffmergeid]} {
		gettreediffs $diffids
2605
	    }
2606 2607
	} else {
	    addtocflist $ids
2608
	}
2609 2610
	return
    }
2611
    set file [lindex $line 5]
2612
    lappend treediff $file
2613 2614
}

2615
proc getblobdiffs {ids} {
2616
    global diffopts blobdifffd diffids env curdifftag curtagstart
2617
    global difffilestart nextupdate diffinhdr treediffs
2618

2619
    set env(GIT_DIFF_OPTS) $diffopts
2620
    set cmd [concat | git-diff-tree --no-commit-id -r -p -C $ids]
2621
    if {[catch {set bdf [open $cmd r]} err]} {
2622 2623 2624
	puts "error getting diffs: $err"
	return
    }
2625
    set diffinhdr 0
2626
    fconfigure $bdf -blocking 0
2627
    set blobdifffd($ids) $bdf
2628 2629 2630 2631
    set curdifftag Comments
    set curtagstart 0.0
    catch {unset difffilestart}
    fileevent $bdf readable [list getblobdiffline $bdf $diffids]
2632
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
2633 2634
}

2635
proc getblobdiffline {bdf ids} {
2636
    global diffids blobdifffd ctext curdifftag curtagstart
2637 2638
    global diffnexthead diffnextnote difffilestart
    global nextupdate diffinhdr treediffs
2639

2640 2641 2642 2643
    set n [gets $bdf line]
    if {$n < 0} {
	if {[eof $bdf]} {
	    close $bdf
2644
	    if {$ids == $diffids && $bdf == $blobdifffd($ids)} {
2645 2646 2647 2648 2649
		$ctext tag add $curdifftag $curtagstart end
	    }
	}
	return
    }
2650
    if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
2651 2652 2653
	return
    }
    $ctext conf -state normal
2654
    if {[regexp {^diff --git a/(.*) b/(.*)} $line match fname newname]} {
2655 2656 2657 2658
	# start of a new file
	$ctext insert end "\n"
	$ctext tag add $curdifftag $curtagstart end
	set curtagstart [$ctext index "end - 1c"]
2659
	set header $newname
2660
	set here [$ctext index "end - 1c"]
2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676
	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
	    }
	}
2677 2678
	set curdifftag "f:$fname"
	$ctext tag delete $curdifftag
2679
	set l [expr {(78 - [string length $header]) / 2}]
2680
	set pad [string range "----------------------------------------" 1 $l]
2681
	$ctext insert end "$pad $header $pad\n" filesep
2682
	set diffinhdr 1
2683 2684 2685
    } elseif {$diffinhdr && [string compare -length 3 $line "---"] == 0} {
	# do nothing
    } elseif {$diffinhdr && [string compare -length 3 $line "+++"] == 0} {
2686
	set diffinhdr 0
2687 2688
    } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
		   $line match f1l f1c f2l f2c rest]} {
2689
	$ctext insert end "$line\n" hunksep
2690
	set diffinhdr 0
2691 2692 2693 2694 2695 2696 2697
    } 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"
2698
	} elseif {$diffinhdr || $x == "\\"} {
2699 2700
	    # e.g. "\ No newline at end of file"
	    $ctext insert end "$line\n" filesep
2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712
	} 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
2713 2714 2715 2716 2717 2718
    if {[clock clicks -milliseconds] >= $nextupdate} {
	incr nextupdate 100
	fileevent $bdf readable {}
	update
	fileevent $bdf readable "getblobdiffline $bdf {$ids}"
    }
2719 2720
}

2721 2722 2723 2724 2725
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]} {
2726 2727 2728 2729
	    if {![info exists pos]
		|| [$ctext compare $difffilestart($i) < $pos]} {
		set pos $difffilestart($i)
	    }
2730 2731
	}
    }
2732 2733 2734
    if {[info exists pos]} {
	$ctext yview $pos
    }
2735 2736
}

2737
proc listboxsel {} {
2738
    global ctext cflist currentid
2739
    if {![info exists currentid]} return
2740 2741 2742 2743
    set sel [lsort [$cflist curselection]]
    if {$sel eq {}} return
    set first [lindex $sel 0]
    catch {$ctext yview fmark.$first}
2744 2745
}

2746 2747
proc setcoords {} {
    global linespc charspc canvx0 canvy0 mainfont
2748
    global xspc1 xspc2 lthickness
2749

2750 2751
    set linespc [font metrics $mainfont -linespace]
    set charspc [font measure $mainfont "m"]
P
Paul Mackerras 已提交
2752 2753
    set canvy0 [expr {int(3 + 0.5 * $linespc)}]
    set canvx0 [expr {int(3 + 0.5 * $linespc)}]
2754
    set lthickness [expr {int($linespc / 9) + 1}]
2755 2756
    set xspc1(0) $linespc
    set xspc2 $linespc
2757
}
2758

2759
proc redisplay {} {
P
Paul Mackerras 已提交
2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772
    global canv canvy0 linespc numcommits
    global selectedline

    set ymax [lindex [$canv cget -scrollregion] 3]
    if {$ymax eq {} || $ymax == 0} return
    set span [$canv yview]
    clear_display
    allcanvs conf -scrollregion \
	[list 0 0 0 [expr {$canvy0 + ($numcommits - 0.5) * $linespc + 2}]]
    allcanvs yview moveto [lindex $span 0]
    drawvisible
    if {[info exists selectedline]} {
	selectline $selectedline 0
2773 2774 2775 2776
    }
}

proc incrfont {inc} {
2777
    global mainfont namefont textfont ctext canv phase
2778
    global stopped entries
2779 2780 2781 2782 2783 2784 2785
    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]
2786 2787 2788
    foreach e $entries {
	$e conf -font $mainfont
    }
2789 2790 2791 2792 2793
    if {$phase == "getcommits"} {
	$canv itemconf textitems -font $mainfont
    }
    redisplay
}
2794

2795 2796 2797 2798 2799 2800 2801
proc clearsha1 {} {
    global sha1entry sha1string
    if {[string length $sha1string] == 40} {
	$sha1entry delete 0 end
    }
}

2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818
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 {} {
P
Paul Mackerras 已提交
2819
    global sha1string currentid commitrow tagids
2820
    global displayorder numcommits
2821

2822 2823 2824 2825 2826 2827
    if {$sha1string == {}
	|| ([info exists currentid] && $sha1string == $currentid)} return
    if {[info exists tagids($sha1string)]} {
	set id $tagids($sha1string)
    } else {
	set id [string tolower $sha1string]
2828 2829
	if {[regexp {^[0-9a-f]{4,39}$} $id]} {
	    set matches {}
P
Paul Mackerras 已提交
2830 2831 2832
	    foreach i $displayorder {
		if {[string match $id* $i]} {
		    lappend matches $i
2833 2834 2835 2836 2837 2838 2839 2840 2841 2842
		}
	    }
	    if {$matches ne {}} {
		if {[llength $matches] > 1} {
		    error_popup "Short SHA1 id $id is ambiguous"
		    return
		}
		set id [lindex $matches 0]
	    }
	}
2843
    }
P
Paul Mackerras 已提交
2844 2845
    if {[info exists commitrow($id)]} {
	selectline $commitrow($id) 1
2846 2847
	return
    }
2848
    if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
2849 2850 2851 2852 2853 2854 2855
	set type "SHA1 id"
    } else {
	set type "Tag"
    }
    error_popup "$type $sha1string is not known"
}

2856 2857 2858 2859
proc lineenter {x y id} {
    global hoverx hovery hoverid hovertimer
    global commitinfo canv

P
Paul Mackerras 已提交
2860
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914
    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 已提交
2915
    set t [$canv create text $x $y -anchor nw -text $text -tags hover -font $mainfont]
2916 2917 2918
    $canv raise $t
}

2919
proc clickisonarrow {id y} {
2920
    global lthickness idrowranges
2921 2922

    set thresh [expr {2 * $lthickness + 6}]
2923 2924 2925 2926 2927
    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
2928 2929 2930 2931 2932
	}
    }
    return {}
}

2933 2934
proc arrowjump {id n y} {
    global idrowranges canv
2935

2936 2937 2938 2939
    # 1 <-> 2, 3 <-> 4, etc...
    set n [expr {(($n - 1) ^ 1) + 1}]
    set row [lindex $idrowranges($id) $n]
    set yt [yc $row]
2940 2941 2942 2943 2944 2945 2946 2947
    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
    }
2948
    allcanvs yview moveto $yfrac
2949 2950
}

2951
proc lineclick {x y id isnew} {
2952
    global ctext commitinfo children cflist canv thickerline
2953

P
Paul Mackerras 已提交
2954
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
2955
    unmarkmatches
2956
    unselectline
2957 2958 2959 2960
    normalline
    $canv delete hover
    # draw this line thicker than normal
    set thickerline $id
2961
    drawlines $id
2962
    if {$isnew} {
2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975
	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]
2976
    }
2977 2978 2979
    # fill the details pane with info about this line
    $ctext conf -state normal
    $ctext delete 0.0 end
2980 2981 2982 2983 2984 2985
    $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]
2986
    set info $commitinfo($id)
2987
    $ctext insert end "\n\t[lindex $info 0]\n"
2988
    $ctext insert end "\tAuthor:\t[lindex $info 1]\n"
P
Paul Mackerras 已提交
2989 2990
    set date [formatdate [lindex $info 2]]
    $ctext insert end "\tDate:\t$date\n"
2991 2992
    if {[info exists children($id)]} {
	$ctext insert end "\nChildren:"
2993
	set i 0
2994
	foreach child $children($id) {
2995
	    incr i
P
Paul Mackerras 已提交
2996
	    if {![info exists commitinfo($child)] && ![getcommit $child]} continue
2997
	    set info $commitinfo($child)
2998 2999 3000 3001 3002
	    $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 已提交
3003 3004
	    set date [formatdate [lindex $info 2]]
	    $ctext insert end "\n\tDate:\t$date\n"
3005 3006 3007 3008 3009 3010 3011
	}
    }
    $ctext conf -state disabled

    $cflist delete 0 end
}

3012 3013 3014
proc normalline {} {
    global thickerline
    if {[info exists thickerline]} {
3015
	set id $thickerline
3016
	unset thickerline
3017
	drawlines $id
3018 3019 3020
    }
}

3021
proc selbyid {id} {
P
Paul Mackerras 已提交
3022 3023 3024
    global commitrow
    if {[info exists commitrow($id)]} {
	selectline $commitrow($id) 1
3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036
    }
}

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

P
Paul Mackerras 已提交
3039
    if {![info exists selectedline] || $commitrow($id) eq $selectedline} {
3040 3041 3042 3043 3044 3045
	set state disabled
    } else {
	set state normal
    }
    $rowctxmenu entryconfigure 0 -state $state
    $rowctxmenu entryconfigure 1 -state $state
3046
    $rowctxmenu entryconfigure 2 -state $state
3047 3048 3049 3050 3051
    set rowmenuid $id
    tk_popup $rowctxmenu $x $y
}

proc diffvssel {dirn} {
3052
    global rowmenuid selectedline displayorder
3053 3054 3055

    if {![info exists selectedline]} return
    if {$dirn} {
3056
	set oldid [lindex $displayorder $selectedline]
3057 3058 3059
	set newid $rowmenuid
    } else {
	set oldid $rowmenuid
3060
	set newid [lindex $displayorder $selectedline]
3061
    }
3062 3063 3064 3065 3066 3067 3068 3069
    addtohistory [list doseldiff $oldid $newid]
    doseldiff $oldid $newid
}

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

3070 3071 3072 3073 3074 3075
    $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"
3076 3077 3078 3079 3080 3081 3082
    $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     "
3083
    $ctext insert end [lindex $commitinfo($oldid) 0]
3084 3085 3086 3087
    $ctext insert end "\n\nTo   "
    $ctext tag bind link1 <1> [list selbyid $newid]
    $ctext insert end $newid [list link link1]
    $ctext insert end "\n     "
3088 3089 3090 3091 3092
    $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
3093
    startdiff [list $oldid $newid]
3094 3095
}

3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108
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"
3109
    grid $top.title - -pady 10
3110
    label $top.from -text "From:"
3111
    entry $top.fromsha1 -width 40 -relief flat
3112 3113 3114
    $top.fromsha1 insert 0 $oldid
    $top.fromsha1 conf -state readonly
    grid $top.from $top.fromsha1 -sticky w
3115
    entry $top.fromhead -width 60 -relief flat
3116 3117 3118 3119
    $top.fromhead insert 0 $oldhead
    $top.fromhead conf -state readonly
    grid x $top.fromhead -sticky w
    label $top.to -text "To:"
3120
    entry $top.tosha1 -width 40 -relief flat
3121 3122 3123
    $top.tosha1 insert 0 $newid
    $top.tosha1 conf -state readonly
    grid $top.to $top.tosha1 -sticky w
3124
    entry $top.tohead -width 60 -relief flat
3125 3126 3127 3128 3129 3130 3131 3132 3133
    $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
3134
    grid $top.flab $top.fname -sticky w
3135 3136 3137 3138 3139 3140 3141
    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
3142
    focus $top.fname
3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180
}

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
}

3181 3182 3183 3184 3185 3186 3187 3188
proc mktag {} {
    global rowmenuid mktagtop commitinfo

    set top .maketag
    set mktagtop $top
    catch {destroy $top}
    toplevel $top
    label $top.title -text "Create tag"
3189
    grid $top.title - -pady 10
3190
    label $top.id -text "ID:"
3191
    entry $top.sha1 -width 40 -relief flat
3192 3193 3194
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
3195
    entry $top.head -width 60 -relief flat
3196 3197 3198 3199
    $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:"
3200
    entry $top.tag -width 60
3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225
    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 {
3226
	set dir [gitdir]
3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237
	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
3238 3239 3240 3241
    redrawtags $id
}

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

P
Paul Mackerras 已提交
3244 3245
    if {![info exists commitrow($id)]} return
    drawcmitrow $commitrow($id)
3246 3247
    $canv delete tag.$id
    set xt [eval drawtags $id $idpos($id)]
P
Paul Mackerras 已提交
3248 3249
    $canv coords $linehtag($commitrow($id)) $xt [lindex $idpos($id) 2]
    if {[info exists selectedline] && $selectedline == $commitrow($id)} {
3250
	selectline $selectedline 0
3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265
    }
}

proc mktagcan {} {
    global mktagtop

    catch {destroy $mktagtop}
    unset mktagtop
}

proc mktaggo {} {
    domktag
    mktagcan
}

3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320
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
}

3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360
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
    global tagids headids otherrefids

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

3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379
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
}

3380 3381 3382 3383 3384
proc doquit {} {
    global stopped
    set stopped 100
    destroy .
}
3385

3386 3387 3388
proc doprefs {} {
    global maxwidth maxgraphpct diffopts findmergefiles
    global oldprefs prefstop
P
Paul Mackerras 已提交
3389

3390 3391 3392 3393 3394
    set top .gitkprefs
    set prefstop $top
    if {[winfo exists $top]} {
	raise $top
	return
3395
    }
3396 3397
    foreach v {maxwidth maxgraphpct diffopts findmergefiles} {
	set oldprefs($v) [set $v]
P
Paul Mackerras 已提交
3398
    }
3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455
    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 已提交
3456 3457
}

3458 3459 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 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 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 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
# 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 {}
}

3731 3732 3733
# defaults...
set datemode 0
set diffopts "-U 5 -p"
3734
set wrcomcmd "git-diff-tree --stdin -p --pretty"
3735

3736
set gitencoding {}
3737 3738 3739 3740
catch {
    set gitencoding [exec git-repo-config --get i18n.commitencoding]
}
if {$gitencoding == ""} {
3741 3742 3743 3744 3745
    set gitencoding "utf-8"
}
set tclencoding [tcl_encoding $gitencoding]
if {$tclencoding == {}} {
    puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
3746
}
3747

3748 3749
set mainfont {Helvetica 9}
set textfont {Courier 9}
3750
set findmergefiles 0
3751
set maxgraphpct 50
3752
set maxwidth 16
P
Paul Mackerras 已提交
3753
set revlistorder 0
3754
set fastdate 0
P
Paul Mackerras 已提交
3755 3756 3757
set uparrowlen 7
set downarrowlen 7
set mingaplen 30
3758 3759 3760 3761 3762

set colors {green red blue magenta darkgrey brown orange}

catch {source ~/.gitk}

3763
set namefont $mainfont
3764 3765

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

3767 3768 3769 3770 3771 3772 3773 3774 3775
set revtreeargs {}
foreach arg $argv {
    switch -regexp -- $arg {
	"^$" { }
	"^-d" { set datemode 1 }
	default {
	    lappend revtreeargs $arg
	}
    }
3776
}
3777

P
Paul Mackerras 已提交
3778 3779 3780 3781 3782 3783 3784
# 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
}

3785 3786 3787
set history {}
set historyindex 0

P
Paul Mackerras 已提交
3788 3789
set optim_delay 16

3790
set stopped 0
3791
set stuffsaved 0
3792
set patchnum 0
3793
setcoords
3794
makewindow $revtreeargs
3795
readrefs
3796
getcommits $revtreeargs