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

P
Paul Mackerras 已提交
5
# Copyright (C) 2005-2006 Paul Mackerras.  All rights reserved.
6 7 8 9
# 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
proc gitdir {} {
    global env
    if {[info exists env(GIT_DIR)]} {
	return $env(GIT_DIR)
    } else {
15
	return [exec git rev-parse --git-dir]
16 17 18
    }
}

19
proc start_rev_list {view} {
20
    global startmsecs nextupdate
P
Paul Mackerras 已提交
21
    global commfd leftover tclencoding datemode
22
    global viewargs viewfiles commitidx
23 24

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

52
proc stop_rev_list {} {
53
    global commfd curview
54

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

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

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

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

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

197
proc doupdate {} {
198
    global commfd nextupdate numcommits
199

200 201
    foreach v [array names commfd] {
	fileevent $commfd($v) readable {}
202
    }
203
    update
204
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
205 206 207
    foreach v [array names commfd] {
	set fd $commfd($v)
	fileevent $fd readable [list getcommitlines $fd $v]
208
    }
209 210 211
}

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

P
Paul Mackerras 已提交
216
proc updatecommits {} {
217
    global viewdata curview phase displayorder
218
    global children commitrow selectedline thickerline
P
Paul Mackerras 已提交
219

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

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

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

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

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

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

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

P
Paul Mackerras 已提交
362
proc show_error {w top msg} {
363 364
    message $w.m -text $msg -justify center -aspect 400
    pack $w.m -side top -fill x -padx 20 -pady 20
P
Paul Mackerras 已提交
365
    button $w.ok -text OK -command "destroy $top"
366
    pack $w.ok -side bottom -fill x
P
Paul Mackerras 已提交
367 368 369
    bind $top <Visibility> "grab $top; focus $top"
    bind $top <Key-Return> "destroy $top"
    tkwait window $top
370 371
}

372 373 374 375
proc error_popup msg {
    set w .error
    toplevel $w
    wm transient $w .
P
Paul Mackerras 已提交
376
    show_error $w $w $msg
377 378
}

379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395
proc confirm_popup msg {
    global confirm_ok
    set confirm_ok 0
    set w .confirm
    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 "set confirm_ok 1; destroy $w"
    pack $w.ok -side left -fill x
    button $w.cancel -text Cancel -command "destroy $w"
    pack $w.cancel -side right -fill x
    bind $w <Visibility> "grab $w; focus $w"
    tkwait window $w
    return $confirm_ok
}

396
proc makewindow {} {
397 398
    global canv canv2 canv3 linespc charspc ctext cflist
    global textfont mainfont uifont
399
    global findtype findtypemenu findloc findstring fstring geometry
400
    global entries sha1entry sha1string sha1but
401
    global maincursor textcursor curtextcursor
402
    global rowctxmenu mergemax wrapcomment
403
    global highlight_files gdttype
404
    global searchstring sstring
405
    global bgcolor fgcolor bglist fglist diffcolors
406
    global headctxmenu
407 408 409

    menu .bar
    .bar add cascade -label "File" -menu .bar.file
410
    .bar configure -font $uifont
411
    menu .bar.file
P
Paul Mackerras 已提交
412
    .bar.file add command -label "Update" -command updatecommits
413
    .bar.file add command -label "Reread references" -command rereadrefs
414
    .bar.file add command -label "Quit" -command doquit
415
    .bar.file configure -font $uifont
416 417 418
    menu .bar.edit
    .bar add cascade -label "Edit" -menu .bar.edit
    .bar.edit add command -label "Preferences" -command doprefs
419
    .bar.edit configure -font $uifont
420

421
    menu .bar.view -font $uifont
P
Paul Mackerras 已提交
422
    .bar add cascade -label "View" -menu .bar.view
423 424 425
    .bar.view add command -label "New view..." -command {newview 0}
    .bar.view add command -label "Edit view..." -command editview \
	-state disabled
P
Paul Mackerras 已提交
426 427
    .bar.view add command -label "Delete view" -command delview -state disabled
    .bar.view add separator
428 429
    .bar.view add radiobutton -label "All files" -command {showview 0} \
	-variable selectedview -value 0
430

431 432 433
    menu .bar.help
    .bar add cascade -label "Help" -menu .bar.help
    .bar.help add command -label "About gitk" -command about
434
    .bar.help add command -label "Key bindings" -command keys
435
    .bar.help configure -font $uifont
436 437
    . configure -menu .bar

438
    # the gui has upper and lower half, parts of a paned window.
P
Paul Mackerras 已提交
439
    panedwindow .ctop -orient vertical
440 441

    # possibly use assumed geometry
442
    if {![info exists geometry(pwsash0)]} {
443 444 445 446
        set geometry(topheight) [expr {15 * $linespc}]
        set geometry(topwidth) [expr {80 * $charspc}]
        set geometry(botheight) [expr {15 * $linespc}]
        set geometry(botwidth) [expr {50 * $charspc}]
447 448
        set geometry(pwsash0) "[expr {40 * $charspc}] 2"
        set geometry(pwsash1) "[expr {60 * $charspc}] 2"
449 450 451 452 453 454 455 456 457 458
    }

    # the upper half will have a paned window, a scroll bar to the right, and some stuff below
    frame .tf -height $geometry(topheight) -width $geometry(topwidth)
    frame .tf.histframe
    panedwindow .tf.histframe.pwclist -orient horizontal -sashpad 0 -handlesize 4

    # create three canvases
    set cscroll .tf.histframe.csb
    set canv .tf.histframe.pwclist.canv
459
    canvas $canv \
460
	-background $bgcolor -bd 0 \
P
Paul Mackerras 已提交
461
	-yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
462 463
    .tf.histframe.pwclist add $canv
    set canv2 .tf.histframe.pwclist.canv2
464
    canvas $canv2 \
465
	-background $bgcolor -bd 0 -yscrollincr $linespc
466 467
    .tf.histframe.pwclist add $canv2
    set canv3 .tf.histframe.pwclist.canv3
468
    canvas $canv3 \
469
	-background $bgcolor -bd 0 -yscrollincr $linespc
470
    .tf.histframe.pwclist add $canv3
471 472
    eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0)
    eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1)
473 474 475 476 477

    # a scroll bar to rule them
    scrollbar $cscroll -command {allcanvs yview} -highlightthickness 0
    pack $cscroll -side right -fill y
    bind .tf.histframe.pwclist <Configure> {resizeclistpanes %W %w}
478
    lappend bglist $canv $canv2 $canv3
479
    pack .tf.histframe.pwclist -fill both -expand 1 -side left
480

481 482 483 484 485
    # we have two button bars at bottom of top frame. Bar 1
    frame .tf.bar
    frame .tf.lbar -height 15

    set sha1entry .tf.bar.sha1
486
    set entries $sha1entry
487
    set sha1but .tf.bar.sha1label
488
    button $sha1but -text "SHA1 ID: " -state disabled -relief flat \
489
	-command gotocommit -width 8 -font $uifont
490
    $sha1but conf -disabledforeground [$sha1but cget -foreground]
491
    pack .tf.bar.sha1label -side left
492 493
    entry $sha1entry -width 40 -font $textfont -textvariable sha1string
    trace add variable sha1string write sha1change
494
    pack $sha1entry -side left -pady 2
495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511

    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};
    }
512
    button .tf.bar.leftbut -image bm-left -command goback \
513
	-state disabled -width 26
514 515
    pack .tf.bar.leftbut -side left -fill y
    button .tf.bar.rightbut -image bm-right -command goforw \
516
	-state disabled -width 26
517
    pack .tf.bar.rightbut -side left -fill y
518

519 520
    button .tf.bar.findbut -text "Find" -command dofind -font $uifont
    pack .tf.bar.findbut -side left
521
    set findstring {}
522
    set fstring .tf.bar.findstring
523
    lappend entries $fstring
524
    entry $fstring -width 30 -font $textfont -textvariable findstring
525
    trace add variable findstring write find_change
526
    pack $fstring -side left -expand 1 -fill x -in .tf.bar
527
    set findtype Exact
528 529
    set findtypemenu [tk_optionMenu .tf.bar.findtype \
		      findtype Exact IgnCase Regexp]
530
    trace add variable findtype write find_change
531 532
    .tf.bar.findtype configure -font $uifont
    .tf.bar.findtype.menu configure -font $uifont
533
    set findloc "All fields"
534
    tk_optionMenu .tf.bar.findloc findloc "All fields" Headline \
535 536
	Comments Author Committer
    trace add variable findloc write find_change
537 538 539 540 541 542 543 544 545
    .tf.bar.findloc configure -font $uifont
    .tf.bar.findloc.menu configure -font $uifont
    pack .tf.bar.findloc -side right
    pack .tf.bar.findtype -side right

    # build up the bottom bar of upper window
    label .tf.lbar.flabel -text "Highlight:  Commits " \
    -font $uifont
    pack .tf.lbar.flabel -side left -fill y
546
    set gdttype "touching paths:"
547 548
    set gm [tk_optionMenu .tf.lbar.gdttype gdttype "touching paths:" \
	"adding/removing string:"]
549 550
    trace add variable gdttype write hfiles_change
    $gm conf -font $uifont
551 552 553
    .tf.lbar.gdttype conf -font $uifont
    pack .tf.lbar.gdttype -side left -fill y
    entry .tf.lbar.fent -width 25 -font $textfont \
554 555
	-textvariable highlight_files
    trace add variable highlight_files write hfiles_change
556 557 558 559
    lappend entries .tf.lbar.fent
    pack .tf.lbar.fent -side left -fill x -expand 1
    label .tf.lbar.vlabel -text " OR in view" -font $uifont
    pack .tf.lbar.vlabel -side left -fill y
560
    global viewhlmenu selectedhlview
561
    set viewhlmenu [tk_optionMenu .tf.lbar.vhl selectedhlview None]
562
    $viewhlmenu entryconf None -command delvhighlight
563
    $viewhlmenu conf -font $uifont
564 565 566 567
    .tf.lbar.vhl conf -font $uifont
    pack .tf.lbar.vhl -side left -fill y
    label .tf.lbar.rlabel -text " OR " -font $uifont
    pack .tf.lbar.rlabel -side left -fill y
568
    global highlight_related
569 570
    set m [tk_optionMenu .tf.lbar.relm highlight_related None \
	"Descendent" "Not descendent" "Ancestor" "Not ancestor"]
571
    $m conf -font $uifont
572
    .tf.lbar.relm conf -font $uifont
573
    trace add variable highlight_related write vrel_change
574 575 576 577 578 579 580
    pack .tf.lbar.relm -side left -fill y

    # Finish putting the upper half of the viewer together
    pack .tf.lbar -in .tf -side bottom -fill x
    pack .tf.bar -in .tf -side bottom -fill x
    pack .tf.histframe -fill both -side top -expand 1
    .ctop add .tf
581 582
    .ctop paneconfigure .tf -height $geometry(topheight)
    .ctop paneconfigure .tf -width $geometry(topwidth)
583 584 585 586 587 588 589 590 591 592 593 594 595 596 597

    # now build up the bottom
    panedwindow .pwbottom -orient horizontal

    # lower left, a text box over search bar, scroll bar to the right
    # if we know window height, then that will set the lower text height, otherwise
    # we set lower text height which will drive window height
    if {[info exists geometry(main)]} {
        frame .bleft -width $geometry(botwidth)
    } else {
        frame .bleft -width $geometry(botwidth) -height $geometry(botheight)
    }
    frame .bleft.top

    button .bleft.top.search -text "Search" -command dosearch \
598
	-font $uifont
599 600
    pack .bleft.top.search -side left -padx 5
    set sstring .bleft.top.sstring
601 602 603 604
    entry $sstring -width 20 -font $textfont -textvariable searchstring
    lappend entries $sstring
    trace add variable searchstring write incrsearch
    pack $sstring -side left -expand 1 -fill x
605
    set ctext .bleft.ctext
606 607
    text $ctext -background $bgcolor -foreground $fgcolor \
	-state disabled -font $textfont \
608
	-yscrollcommand scrolltext -wrap none
609 610 611
    scrollbar .bleft.sb -command "$ctext yview"
    pack .bleft.top -side top -fill x
    pack .bleft.sb -side right -fill y
612
    pack $ctext -side left -fill both -expand 1
613 614
    lappend bglist $ctext
    lappend fglist $ctext
615

616
    $ctext tag conf comment -wrap $wrapcomment
617
    $ctext tag conf filesep -font [concat $textfont bold] -back "#aaaaaa"
618 619 620
    $ctext tag conf hunksep -fore [lindex $diffcolors 2]
    $ctext tag conf d0 -fore [lindex $diffcolors 0]
    $ctext tag conf d1 -fore [lindex $diffcolors 1]
621 622 623 624 625
    $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
626 627 628 629 630 631 632 633 634 635 636
    $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"
637
    $ctext tag conf mmax -fore darkgrey
638
    set mergemax 16
639 640 641
    $ctext tag conf mresult -font [concat $textfont bold]
    $ctext tag conf msep -font [concat $textfont bold]
    $ctext tag conf found -back yellow
642

643
    .pwbottom add .bleft
644
    .pwbottom paneconfigure .bleft -width $geometry(botwidth)
645 646 647 648 649

    # lower right
    frame .bright
    frame .bright.mode
    radiobutton .bright.mode.patch -text "Patch" \
P
Paul Mackerras 已提交
650
	-command reselectline -variable cmitmode -value "patch"
651
    .bright.mode.patch configure -font $uifont
652
    radiobutton .bright.mode.tree -text "Tree" \
P
Paul Mackerras 已提交
653
	-command reselectline -variable cmitmode -value "tree"
654
    .bright.mode.tree configure -font $uifont
655 656 657
    grid .bright.mode.patch .bright.mode.tree -sticky ew
    pack .bright.mode -side top -fill x
    set cflist .bright.cfiles
658
    set indent [font measure $mainfont "nn"]
659
    text $cflist \
660 661
	-background $bgcolor -foreground $fgcolor \
	-font $mainfont \
662
	-tabs [list $indent [expr {2 * $indent}]] \
663
	-yscrollcommand ".bright.sb set" \
664 665
	-cursor [. cget -cursor] \
	-spacing1 1 -spacing3 1
666 667
    lappend bglist $cflist
    lappend fglist $cflist
668 669
    scrollbar .bright.sb -command "$cflist yview"
    pack .bright.sb -side right -fill y
670
    pack $cflist -side left -fill both -expand 1
671 672
    $cflist tag configure highlight \
	-background [$cflist cget -selectbackground]
673
    $cflist tag configure bold -font [concat $mainfont bold]
674

675 676
    .pwbottom add .bright
    .ctop add .pwbottom
677

678 679 680 681 682 683 684
    # restore window position if known
    if {[info exists geometry(main)]} {
        wm geometry . "$geometry(main)"
    }

    bind .pwbottom <Configure> {resizecdetpanes %W %w}
    pack .ctop -fill both -expand 1
685 686
    bindall <1> {selcanvline %W %x %y}
    #bindall <B1-Motion> {selcanvline %W %x %y}
687 688
    bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
    bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
689 690
    bindall <2> "canvscan mark %W %x %y"
    bindall <B2-Motion> "canvscan dragto %W %x %y"
691 692
    bindkey <Home> selfirstline
    bindkey <End> sellastline
693 694
    bind . <Key-Up> "selnextline -1"
    bind . <Key-Down> "selnextline 1"
695 696
    bind . <Shift-Key-Up> "next_highlight -1"
    bind . <Shift-Key-Down> "next_highlight 1"
697 698 699 700 701 702 703 704 705 706
    bindkey <Key-Right> "goforw"
    bindkey <Key-Left> "goback"
    bind . <Key-Prior> "selnextpage -1"
    bind . <Key-Next> "selnextpage 1"
    bind . <Control-Home> "allcanvs yview moveto 0.0"
    bind . <Control-End> "allcanvs yview moveto 1.0"
    bind . <Control-Key-Up> "allcanvs yview scroll -1 units"
    bind . <Control-Key-Down> "allcanvs yview scroll 1 units"
    bind . <Control-Key-Prior> "allcanvs yview scroll -1 pages"
    bind . <Control-Key-Next> "allcanvs yview scroll 1 pages"
707 708 709
    bindkey <Key-Delete> "$ctext yview scroll -1 pages"
    bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
    bindkey <Key-space> "$ctext yview scroll 1 pages"
710 711
    bindkey p "selnextline -1"
    bindkey n "selnextline 1"
R
Robert Suetterlin 已提交
712 713 714 715 716 717
    bindkey z "goback"
    bindkey x "goforw"
    bindkey i "selnextline -1"
    bindkey k "selnextline 1"
    bindkey j "goback"
    bindkey l "goforw"
718 719 720
    bindkey b "$ctext yview scroll -1 pages"
    bindkey d "$ctext yview scroll 18 units"
    bindkey u "$ctext yview scroll -18 units"
721 722
    bindkey / {findnext 1}
    bindkey <Key-Return> {findnext 0}
723
    bindkey ? findprev
724
    bindkey f nextfile
725
    bindkey <F5> updatecommits
726
    bind . <Control-q> doquit
727
    bind . <Control-f> dofind
728
    bind . <Control-g> {findnext 0}
729
    bind . <Control-r> dosearchback
730
    bind . <Control-s> dosearch
731 732 733 734
    bind . <Control-equal> {incrfont 1}
    bind . <Control-KP_Add> {incrfont 1}
    bind . <Control-minus> {incrfont -1}
    bind . <Control-KP_Subtract> {incrfont -1}
735
    wm protocol . WM_DELETE_WINDOW doquit
736
    bind . <Button-1> "click %W"
737
    bind $fstring <Key-Return> dofind
738
    bind $sha1entry <Key-Return> gotocommit
739
    bind $sha1entry <<PasteSelection>> clearsha1
740 741
    bind $cflist <1> {sel_flist %W %x %y; break}
    bind $cflist <B1-Motion> {sel_flist %W %x %y; break}
P
Paul Mackerras 已提交
742
    bind $cflist <ButtonRelease-1> {treeclick %W %x %y}
743 744 745

    set maincursor [. cget -cursor]
    set textcursor [$ctext cget -cursor]
746
    set curtextcursor $textcursor
747

748 749 750 751 752 753
    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}
754
    $rowctxmenu add command -label "Make patch" -command mkpatch
755
    $rowctxmenu add command -label "Create tag" -command mktag
756
    $rowctxmenu add command -label "Write commit to file" -command writecommit
757
    $rowctxmenu add command -label "Create new branch" -command mkbranch
758 759
    $rowctxmenu add command -label "Cherry-pick this commit" \
	-command cherrypick
760 761 762 763 764 765 766

    set headctxmenu .headctxmenu
    menu $headctxmenu -tearoff 0
    $headctxmenu add command -label "Check out this branch" \
	-command cobranch
    $headctxmenu add command -label "Remove this branch" \
	-command rmbranch
767 768
}

769 770 771 772 773 774 775 776 777 778 779 780 781
# mouse-2 makes all windows scan vertically, but only the one
# the cursor is in scans horizontally
proc canvscan {op w x y} {
    global canv canv2 canv3
    foreach c [list $canv $canv2 $canv3] {
	if {$c == $w} {
	    $c scan $op $x $y
	} else {
	    $c scan $op 0 $y
	}
    }
}

P
Paul Mackerras 已提交
782 783 784
proc scrollcanv {cscroll f0 f1} {
    $cscroll set $f0 $f1
    drawfrac $f0 $f1
785
    flushhighlights
P
Paul Mackerras 已提交
786 787
}

788 789 790 791
# 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} {
792
    global entries
793 794 795 796 797
    bind . $ev $script
    set escript [bind Entry $ev]
    if {$escript == {}} {
	set escript [bind Entry <Key>]
    }
798 799 800
    foreach e $entries {
	bind $e $ev "$escript; break"
    }
801 802 803
}

# set the focus back to the toplevel for any click outside
804
# the entry widgets
805
proc click {w} {
806 807 808
    global entries
    foreach e $entries {
	if {$w == $e} return
809
    }
810
    focus .
811 812 813
}

proc savestuff {w} {
814
    global canv canv2 canv3 ctext cflist mainfont textfont uifont
815
    global stuffsaved findmergefiles maxgraphpct
P
Paul Mackerras 已提交
816
    global maxwidth showneartags
817
    global viewname viewfiles viewargs viewperm nextviewnum
818
    global cmitmode wrapcomment
819
    global colors bgcolor fgcolor diffcolors
820

821
    if {$stuffsaved} return
822
    if {![winfo viewable .]} return
823 824
    catch {
	set f [open "~/.gitk-new" w]
825 826
	puts $f [list set mainfont $mainfont]
	puts $f [list set textfont $textfont]
827
	puts $f [list set uifont $uifont]
828
	puts $f [list set findmergefiles $findmergefiles]
829
	puts $f [list set maxgraphpct $maxgraphpct]
830
	puts $f [list set maxwidth $maxwidth]
P
Paul Mackerras 已提交
831
	puts $f [list set cmitmode $cmitmode]
832
	puts $f [list set wrapcomment $wrapcomment]
P
Paul Mackerras 已提交
833
	puts $f [list set showneartags $showneartags]
834 835 836 837
	puts $f [list set bgcolor $bgcolor]
	puts $f [list set fgcolor $fgcolor]
	puts $f [list set colors $colors]
	puts $f [list set diffcolors $diffcolors]
838

839
	puts $f "set geometry(main) [wm geometry .]"
840 841
	puts $f "set geometry(topwidth) [winfo width .tf]"
	puts $f "set geometry(topheight) [winfo height .tf]"
842 843
        puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\""
        puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\""
844 845 846
	puts $f "set geometry(botwidth) [winfo width .bleft]"
	puts $f "set geometry(botheight) [winfo height .bleft]"

847 848 849
	puts -nonewline $f "set permviews {"
	for {set v 0} {$v < $nextviewnum} {incr v} {
	    if {$viewperm($v)} {
850
		puts $f "{[list $viewname($v) $viewfiles($v) $viewargs($v)]}"
851 852 853
	    }
	}
	puts $f "}"
854 855 856 857
	close $f
	file rename -force "~/.gitk-new" "~/.gitk"
    }
    set stuffsaved 1
858 859
}

860 861
proc resizeclistpanes {win w} {
    global oldwidth
862
    if {[info exists oldwidth($win)]} {
863 864 865 866 867 868 869 870 871 872 873 874 875
	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 已提交
876
		set sash1 [expr {$sash0 + 20}]
877 878
	    }
	    if {$sash1 > $w - 10} {
J
Jeff Hobbs 已提交
879
		set sash1 [expr {$w - 10}]
880
		if {$sash0 > $sash1 - 20} {
J
Jeff Hobbs 已提交
881
		    set sash0 [expr {$sash1 - 20}]
882 883 884 885 886 887 888 889 890 891 892
		}
	    }
	}
	$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
893
    if {[info exists oldwidth($win)]} {
894 895 896 897 898 899 900 901 902 903
	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 已提交
904
		set sash0 [expr {$w - 15}]
905 906 907 908 909 910 911
	    }
	}
	$win sash place 0 $sash0 [lindex $s0 1]
    }
    set oldwidth($win) $w
}

912 913 914 915 916 917 918 919 920 921 922 923 924 925
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
}

926
proc about {} {
927
    global uifont
928 929 930 931 932 933 934 935
    set w .about
    if {[winfo exists $w]} {
	raise $w
	return
    }
    toplevel $w
    wm title $w "About gitk"
    message $w.m -text {
P
Paul Mackerras 已提交
936
Gitk - a commit viewer for git
937

P
Paul Mackerras 已提交
938
Copyright  2005-2006 Paul Mackerras
939

940
Use and redistribute under the terms of the GNU General Public License} \
941 942
	    -justify center -aspect 400 -border 2 -bg white -relief groove
    pack $w.m -side top -fill x -padx 2 -pady 2
943
    $w.m configure -font $uifont
944
    button $w.ok -text Close -command "destroy $w" -default active
945
    pack $w.ok -side bottom
946
    $w.ok configure -font $uifont
947 948 949
    bind $w <Visibility> "focus $w.ok"
    bind $w <Key-Escape> "destroy $w"
    bind $w <Key-Return> "destroy $w"
950 951
}

952
proc keys {} {
953
    global uifont
954 955 956 957 958 959 960 961 962 963 964
    set w .keys
    if {[winfo exists $w]} {
	raise $w
	return
    }
    toplevel $w
    wm title $w "Gitk key bindings"
    message $w.m -text {
Gitk key bindings:

<Ctrl-Q>		Quit
965 966
<Home>		Move to first commit
<End>		Move to last commit
967 968 969 970
<Up>, p, i	Move up one commit
<Down>, n, k	Move down one commit
<Left>, z, j	Go back in history list
<Right>, x, l	Go forward in history list
971 972 973 974 975 976 977 978
<PageUp>	Move up one page in commit list
<PageDown>	Move down one page in commit list
<Ctrl-Home>	Scroll to top of commit list
<Ctrl-End>	Scroll to bottom of commit list
<Ctrl-Up>	Scroll commit list up one line
<Ctrl-Down>	Scroll commit list down one line
<Ctrl-PageUp>	Scroll commit list up one page
<Ctrl-PageDown>	Scroll commit list down one page
979 980
<Shift-Up>	Move to previous highlighted line
<Shift-Down>	Move to next highlighted line
981 982 983 984 985 986 987 988 989 990 991
<Delete>, b	Scroll diff view up one page
<Backspace>	Scroll diff view up one page
<Space>		Scroll diff view down one page
u		Scroll diff view up 18 lines
d		Scroll diff view down 18 lines
<Ctrl-F>		Find
<Ctrl-G>		Move to next find hit
<Return>	Move to next find hit
/		Move to next find hit, or redo find
?		Move to previous find hit
f		Scroll diff view to next file
992 993
<Ctrl-S>		Search for next hit in diff view
<Ctrl-R>		Search for previous hit in diff view
994 995 996 997
<Ctrl-KP+>	Increase font size
<Ctrl-plus>	Increase font size
<Ctrl-KP->	Decrease font size
<Ctrl-minus>	Decrease font size
998
<F5>		Update
999
} \
1000 1001
	    -justify left -bg white -border 2 -relief groove
    pack $w.m -side top -fill both -padx 2 -pady 2
1002
    $w.m configure -font $uifont
1003
    button $w.ok -text Close -command "destroy $w" -default active
1004
    pack $w.ok -side bottom
1005
    $w.ok configure -font $uifont
1006 1007 1008
    bind $w <Visibility> "focus $w.ok"
    bind $w <Key-Escape> "destroy $w"
    bind $w <Key-Return> "destroy $w"
1009 1010
}

1011 1012
# Procedures for manipulating the file list window at the
# bottom right of the overall window.
P
Paul Mackerras 已提交
1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065

proc treeview {w l openlevs} {
    global treecontents treediropen treeheight treeparent treeindex

    set ix 0
    set treeindex() 0
    set lev 0
    set prefix {}
    set prefixend -1
    set prefendstack {}
    set htstack {}
    set ht 0
    set treecontents() {}
    $w conf -state normal
    foreach f $l {
	while {[string range $f 0 $prefixend] ne $prefix} {
	    if {$lev <= $openlevs} {
		$w mark set e:$treeindex($prefix) "end -1c"
		$w mark gravity e:$treeindex($prefix) left
	    }
	    set treeheight($prefix) $ht
	    incr ht [lindex $htstack end]
	    set htstack [lreplace $htstack end end]
	    set prefixend [lindex $prefendstack end]
	    set prefendstack [lreplace $prefendstack end end]
	    set prefix [string range $prefix 0 $prefixend]
	    incr lev -1
	}
	set tail [string range $f [expr {$prefixend+1}] end]
	while {[set slash [string first "/" $tail]] >= 0} {
	    lappend htstack $ht
	    set ht 0
	    lappend prefendstack $prefixend
	    incr prefixend [expr {$slash + 1}]
	    set d [string range $tail 0 $slash]
	    lappend treecontents($prefix) $d
	    set oldprefix $prefix
	    append prefix $d
	    set treecontents($prefix) {}
	    set treeindex($prefix) [incr ix]
	    set treeparent($prefix) $oldprefix
	    set tail [string range $tail [expr {$slash+1}] end]
	    if {$lev <= $openlevs} {
		set ht 1
		set treediropen($prefix) [expr {$lev < $openlevs}]
		set bm [expr {$lev == $openlevs? "tri-rt": "tri-dn"}]
		$w mark set d:$ix "end -1c"
		$w mark gravity d:$ix left
		set str "\n"
		for {set i 0} {$i < $lev} {incr i} {append str "\t"}
		$w insert end $str
		$w image create end -align center -image $bm -padx 1 \
		    -name a:$ix
1066
		$w insert end $d [highlight_tag $prefix]
P
Paul Mackerras 已提交
1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077
		$w mark set s:$ix "end -1c"
		$w mark gravity s:$ix left
	    }
	    incr lev
	}
	if {$tail ne {}} {
	    if {$lev <= $openlevs} {
		incr ht
		set str "\n"
		for {set i 0} {$i < $lev} {incr i} {append str "\t"}
		$w insert end $str
1078
		$w insert end $tail [highlight_tag $f]
P
Paul Mackerras 已提交
1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114
	    }
	    lappend treecontents($prefix) $tail
	}
    }
    while {$htstack ne {}} {
	set treeheight($prefix) $ht
	incr ht [lindex $htstack end]
	set htstack [lreplace $htstack end end]
    }
    $w conf -state disabled
}

proc linetoelt {l} {
    global treeheight treecontents

    set y 2
    set prefix {}
    while {1} {
	foreach e $treecontents($prefix) {
	    if {$y == $l} {
		return "$prefix$e"
	    }
	    set n 1
	    if {[string index $e end] eq "/"} {
		set n $treeheight($prefix$e)
		if {$y + $n > $l} {
		    append prefix $e
		    incr y
		    break
		}
	    }
	    incr y $n
	}
    }
}

1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130
proc highlight_tree {y prefix} {
    global treeheight treecontents cflist

    foreach e $treecontents($prefix) {
	set path $prefix$e
	if {[highlight_tag $path] ne {}} {
	    $cflist tag add bold $y.0 "$y.0 lineend"
	}
	incr y
	if {[string index $e end] eq "/" && $treeheight($path) > 1} {
	    set y [highlight_tree $y $path]
	}
    }
    return $y
}

P
Paul Mackerras 已提交
1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163
proc treeclosedir {w dir} {
    global treediropen treeheight treeparent treeindex

    set ix $treeindex($dir)
    $w conf -state normal
    $w delete s:$ix e:$ix
    set treediropen($dir) 0
    $w image configure a:$ix -image tri-rt
    $w conf -state disabled
    set n [expr {1 - $treeheight($dir)}]
    while {$dir ne {}} {
	incr treeheight($dir) $n
	set dir $treeparent($dir)
    }
}

proc treeopendir {w dir} {
    global treediropen treeheight treeparent treecontents treeindex

    set ix $treeindex($dir)
    $w conf -state normal
    $w image configure a:$ix -image tri-dn
    $w mark set e:$ix s:$ix
    $w mark gravity e:$ix right
    set lev 0
    set str "\n"
    set n [llength $treecontents($dir)]
    for {set x $dir} {$x ne {}} {set x $treeparent($x)} {
	incr lev
	append str "\t"
	incr treeheight($x) $n
    }
    foreach e $treecontents($dir) {
1164
	set de $dir$e
P
Paul Mackerras 已提交
1165 1166 1167 1168 1169 1170 1171 1172
	if {[string index $e end] eq "/"} {
	    set iy $treeindex($de)
	    $w mark set d:$iy e:$ix
	    $w mark gravity d:$iy left
	    $w insert e:$ix $str
	    set treediropen($de) 0
	    $w image create e:$ix -align center -image tri-rt -padx 1 \
		-name a:$iy
1173
	    $w insert e:$ix $e [highlight_tag $de]
P
Paul Mackerras 已提交
1174 1175 1176 1177 1178
	    $w mark set s:$iy e:$ix
	    $w mark gravity s:$iy left
	    set treeheight($de) 1
	} else {
	    $w insert e:$ix $str
1179
	    $w insert e:$ix $e [highlight_tag $de]
P
Paul Mackerras 已提交
1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258
	}
    }
    $w mark gravity e:$ix left
    $w conf -state disabled
    set treediropen($dir) 1
    set top [lindex [split [$w index @0,0] .] 0]
    set ht [$w cget -height]
    set l [lindex [split [$w index s:$ix] .] 0]
    if {$l < $top} {
	$w yview $l.0
    } elseif {$l + $n + 1 > $top + $ht} {
	set top [expr {$l + $n + 2 - $ht}]
	if {$l < $top} {
	    set top $l
	}
	$w yview $top.0
    }
}

proc treeclick {w x y} {
    global treediropen cmitmode ctext cflist cflist_top

    if {$cmitmode ne "tree"} return
    if {![info exists cflist_top]} return
    set l [lindex [split [$w index "@$x,$y"] "."] 0]
    $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
    $cflist tag add highlight $l.0 "$l.0 lineend"
    set cflist_top $l
    if {$l == 1} {
	$ctext yview 1.0
	return
    }
    set e [linetoelt $l]
    if {[string index $e end] ne "/"} {
	showfile $e
    } elseif {$treediropen($e)} {
	treeclosedir $w $e
    } else {
	treeopendir $w $e
    }
}

proc setfilelist {id} {
    global treefilelist cflist

    treeview $cflist $treefilelist($id) 0
}

image create bitmap tri-rt -background black -foreground blue -data {
    #define tri-rt_width 13
    #define tri-rt_height 13
    static unsigned char tri-rt_bits[] = {
       0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x00, 0x70, 0x00, 0xf0, 0x00,
       0xf0, 0x01, 0xf0, 0x00, 0x70, 0x00, 0x30, 0x00, 0x10, 0x00, 0x00, 0x00,
       0x00, 0x00};
} -maskdata {
    #define tri-rt-mask_width 13
    #define tri-rt-mask_height 13
    static unsigned char tri-rt-mask_bits[] = {
       0x08, 0x00, 0x18, 0x00, 0x38, 0x00, 0x78, 0x00, 0xf8, 0x00, 0xf8, 0x01,
       0xf8, 0x03, 0xf8, 0x01, 0xf8, 0x00, 0x78, 0x00, 0x38, 0x00, 0x18, 0x00,
       0x08, 0x00};
}
image create bitmap tri-dn -background black -foreground blue -data {
    #define tri-dn_width 13
    #define tri-dn_height 13
    static unsigned char tri-dn_bits[] = {
       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x07, 0xf8, 0x03,
       0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
       0x00, 0x00};
} -maskdata {
    #define tri-dn-mask_width 13
    #define tri-dn-mask_height 13
    static unsigned char tri-dn-mask_bits[] = {
       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0xfe, 0x0f, 0xfc, 0x07,
       0xf8, 0x03, 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
       0x00, 0x00};
}

1259
proc init_flist {first} {
1260
    global cflist cflist_top selectedline difffilestart
1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274

    $cflist conf -state normal
    $cflist delete 0.0 end
    if {$first ne {}} {
	$cflist insert end $first
	set cflist_top 1
	$cflist tag add highlight 1.0 "1.0 lineend"
    } else {
	catch {unset cflist_top}
    }
    $cflist conf -state disabled
    set difffilestart {}
}

1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286
proc highlight_tag {f} {
    global highlight_paths

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

proc highlight_filelist {} {
1287
    global cmitmode cflist
1288

1289 1290
    $cflist conf -state normal
    if {$cmitmode ne "tree"} {
1291 1292 1293 1294 1295 1296 1297
	set end [lindex [split [$cflist index end] .] 0]
	for {set l 2} {$l < $end} {incr l} {
	    set line [$cflist get $l.0 "$l.0 lineend"]
	    if {[highlight_tag $line] ne {}} {
		$cflist tag add bold $l.0 "$l.0 lineend"
	    }
	}
1298 1299
    } else {
	highlight_tree 2 {}
1300
    }
1301
    $cflist conf -state disabled
1302 1303 1304
}

proc unhighlight_filelist {} {
1305
    global cflist
1306

1307 1308 1309
    $cflist conf -state normal
    $cflist tag remove bold 1.0 end
    $cflist conf -state disabled
1310 1311
}

P
Paul Mackerras 已提交
1312
proc add_flist {fl} {
1313
    global cflist
1314

1315 1316 1317 1318
    $cflist conf -state normal
    foreach f $fl {
	$cflist insert end "\n"
	$cflist insert end $f [highlight_tag $f]
1319
    }
1320
    $cflist conf -state disabled
1321 1322 1323
}

proc sel_flist {w x y} {
1324
    global ctext difffilestart cflist cflist_top cmitmode
1325

P
Paul Mackerras 已提交
1326
    if {$cmitmode eq "tree"} return
1327 1328
    if {![info exists cflist_top]} return
    set l [lindex [split [$w index "@$x,$y"] "."] 0]
1329 1330 1331
    $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
    $cflist tag add highlight $l.0 "$l.0 lineend"
    set cflist_top $l
P
Paul Mackerras 已提交
1332 1333 1334 1335
    if {$l == 1} {
	$ctext yview 1.0
    } else {
	catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
1336 1337 1338
    }
}

1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432
# Functions for adding and removing shell-type quoting

proc shellquote {str} {
    if {![string match "*\['\"\\ \t]*" $str]} {
	return $str
    }
    if {![string match "*\['\"\\]*" $str]} {
	return "\"$str\""
    }
    if {![string match "*'*" $str]} {
	return "'$str'"
    }
    return "\"[string map {\" \\\" \\ \\\\} $str]\""
}

proc shellarglist {l} {
    set str {}
    foreach a $l {
	if {$str ne {}} {
	    append str " "
	}
	append str [shellquote $a]
    }
    return $str
}

proc shelldequote {str} {
    set ret {}
    set used -1
    while {1} {
	incr used
	if {![regexp -start $used -indices "\['\"\\\\ \t]" $str first]} {
	    append ret [string range $str $used end]
	    set used [string length $str]
	    break
	}
	set first [lindex $first 0]
	set ch [string index $str $first]
	if {$first > $used} {
	    append ret [string range $str $used [expr {$first - 1}]]
	    set used $first
	}
	if {$ch eq " " || $ch eq "\t"} break
	incr used
	if {$ch eq "'"} {
	    set first [string first "'" $str $used]
	    if {$first < 0} {
		error "unmatched single-quote"
	    }
	    append ret [string range $str $used [expr {$first - 1}]]
	    set used $first
	    continue
	}
	if {$ch eq "\\"} {
	    if {$used >= [string length $str]} {
		error "trailing backslash"
	    }
	    append ret [string index $str $used]
	    continue
	}
	# here ch == "\""
	while {1} {
	    if {![regexp -start $used -indices "\[\"\\\\]" $str first]} {
		error "unmatched double-quote"
	    }
	    set first [lindex $first 0]
	    set ch [string index $str $first]
	    if {$first > $used} {
		append ret [string range $str $used [expr {$first - 1}]]
		set used $first
	    }
	    if {$ch eq "\""} break
	    incr used
	    append ret [string index $str $used]
	    incr used
	}
    }
    return [list $used $ret]
}

proc shellsplit {str} {
    set l {}
    while {1} {
	set str [string trimleft $str]
	if {$str eq {}} break
	set dq [shelldequote $str]
	set n [lindex $dq 0]
	set word [lindex $dq 1]
	set str [string range $str $n end]
	lappend l $word
    }
    return $l
}

1433 1434
# Code to implement multiple views

1435 1436
proc newview {ishighlight} {
    global nextviewnum newviewname newviewperm uifont newishighlight
1437
    global newviewargs revtreeargs
P
Paul Mackerras 已提交
1438

1439
    set newishighlight $ishighlight
P
Paul Mackerras 已提交
1440 1441 1442 1443 1444
    set top .gitkview
    if {[winfo exists $top]} {
	raise $top
	return
    }
1445 1446
    set newviewname($nextviewnum) "View $nextviewnum"
    set newviewperm($nextviewnum) 0
1447
    set newviewargs($nextviewnum) [shellarglist $revtreeargs]
1448
    vieweditor $top $nextviewnum "Gitk view definition"
1449 1450 1451 1452 1453
}

proc editview {} {
    global curview
    global viewname viewperm newviewname newviewperm
1454
    global viewargs newviewargs
1455 1456 1457 1458 1459 1460 1461 1462

    set top .gitkvedit-$curview
    if {[winfo exists $top]} {
	raise $top
	return
    }
    set newviewname($curview) $viewname($curview)
    set newviewperm($curview) $viewperm($curview)
1463
    set newviewargs($curview) [shellarglist $viewargs($curview)]
1464 1465 1466 1467 1468 1469 1470
    vieweditor $top $curview "Gitk: edit view $viewname($curview)"
}

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

P
Paul Mackerras 已提交
1471
    toplevel $top
1472
    wm title $top $title
1473
    label $top.nl -text "Name" -font $uifont
1474
    entry $top.name -width 20 -textvariable newviewname($n) -font $uifont
1475
    grid $top.nl $top.name -sticky w -pady 5
1476 1477
    checkbutton $top.perm -text "Remember this view" -variable newviewperm($n) \
	-font $uifont
1478
    grid $top.perm - -pady 5 -sticky w
1479
    message $top.al -aspect 1000 -font $uifont \
1480
	-text "Commits to include (arguments to git rev-list):"
1481 1482
    grid $top.al - -sticky w -pady 5
    entry $top.args -width 50 -textvariable newviewargs($n) \
1483
	-background white -font $uifont
1484 1485
    grid $top.args - -sticky ew -padx 5
    message $top.l -aspect 1000 -font $uifont \
1486 1487
	-text "Enter files and directories to include, one per line:"
    grid $top.l - -sticky w
1488
    text $top.t -width 40 -height 10 -background white -font $uifont
1489 1490 1491 1492 1493 1494 1495 1496
    if {[info exists viewfiles($n)]} {
	foreach f $viewfiles($n) {
	    $top.t insert end $f
	    $top.t insert end "\n"
	}
	$top.t delete {end - 1c} end
	$top.t mark set insert 0.0
    }
1497
    grid $top.t - -sticky ew -padx 5
P
Paul Mackerras 已提交
1498
    frame $top.buts
1499 1500 1501 1502
    button $top.buts.ok -text "OK" -command [list newviewok $top $n] \
	-font $uifont
    button $top.buts.can -text "Cancel" -command [list destroy $top] \
	-font $uifont
P
Paul Mackerras 已提交
1503 1504 1505 1506 1507 1508 1509
    grid $top.buts.ok $top.buts.can
    grid columnconfigure $top.buts 0 -weight 1 -uniform a
    grid columnconfigure $top.buts 1 -weight 1 -uniform a
    grid $top.buts - -pady 10 -sticky ew
    focus $top.t
}

1510
proc doviewmenu {m first cmd op argv} {
1511 1512 1513
    set nmenu [$m index end]
    for {set i $first} {$i <= $nmenu} {incr i} {
	if {[$m entrycget $i -command] eq $cmd} {
1514
	    eval $m $op $i $argv
1515
	    break
1516 1517
	}
    }
1518 1519 1520
}

proc allviewmenus {n op args} {
1521 1522
    global viewhlmenu

1523
    doviewmenu .bar.view 5 [list showview $n] $op $args
1524
    doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
1525 1526 1527
}

proc newviewok {top n} {
1528
    global nextviewnum newviewperm newviewname newishighlight
1529
    global viewname viewfiles viewperm selectedview curview
1530
    global viewargs newviewargs viewhlmenu
P
Paul Mackerras 已提交
1531

1532 1533 1534 1535 1536 1537 1538 1539
    if {[catch {
	set newargs [shellsplit $newviewargs($n)]
    } err]} {
	error_popup "Error in commit selection arguments: $err"
	wm raise $top
	focus $top
	return
    }
P
Paul Mackerras 已提交
1540
    set files {}
1541
    foreach f [split [$top.t get 0.0 end] "\n"] {
P
Paul Mackerras 已提交
1542 1543 1544 1545 1546
	set ft [string trim $f]
	if {$ft ne {}} {
	    lappend files $ft
	}
    }
1547 1548 1549 1550 1551 1552
    if {![info exists viewfiles($n)]} {
	# creating a new view
	incr nextviewnum
	set viewname($n) $newviewname($n)
	set viewperm($n) $newviewperm($n)
	set viewfiles($n) $files
1553
	set viewargs($n) $newargs
1554 1555 1556 1557
	addviewmenu $n
	if {!$newishighlight} {
	    after idle showview $n
	} else {
1558
	    after idle addvhighlight $n
1559
	}
1560 1561 1562 1563 1564
    } else {
	# editing an existing view
	set viewperm($n) $newviewperm($n)
	if {$newviewname($n) ne $viewname($n)} {
	    set viewname($n) $newviewname($n)
1565
	    doviewmenu .bar.view 5 [list showview $n] \
1566 1567 1568
		entryconf [list -label $viewname($n)]
	    doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
		entryconf [list -label $viewname($n) -value $viewname($n)]
1569
	}
1570
	if {$files ne $viewfiles($n) || $newargs ne $viewargs($n)} {
1571
	    set viewfiles($n) $files
1572
	    set viewargs($n) $newargs
1573 1574 1575 1576 1577 1578
	    if {$curview == $n} {
		after idle updatecommits
	    }
	}
    }
    catch {destroy $top}
P
Paul Mackerras 已提交
1579 1580 1581
}

proc delview {} {
1582
    global curview viewdata viewperm hlview selectedhlview
P
Paul Mackerras 已提交
1583 1584

    if {$curview == 0} return
1585 1586 1587 1588
    if {[info exists hlview] && $hlview == $curview} {
	set selectedhlview None
	unset hlview
    }
1589
    allviewmenus $curview delete
P
Paul Mackerras 已提交
1590
    set viewdata($curview) {}
1591
    set viewperm($curview) 0
P
Paul Mackerras 已提交
1592 1593 1594
    showview 0
}

1595
proc addviewmenu {n} {
1596
    global viewname viewhlmenu
1597 1598 1599

    .bar.view add radiobutton -label $viewname($n) \
	-command [list showview $n] -variable selectedview -value $n
1600 1601
    $viewhlmenu add radiobutton -label $viewname($n) \
	-command [list addvhighlight $n] -variable selectedhlview
1602 1603
}

1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622
proc flatten {var} {
    global $var

    set ret {}
    foreach i [array names $var] {
	lappend ret $i [set $var\($i\)]
    }
    return $ret
}

proc unflatten {var l} {
    global $var

    catch {unset $var}
    foreach {i v} $l {
	set $var\($i\) $v
    }
}

P
Paul Mackerras 已提交
1623 1624 1625
proc showview {n} {
    global curview viewdata viewfiles
    global displayorder parentlist childlist rowidlist rowoffsets
1626
    global colormap rowtextx commitrow nextcolor canvxmax
P
Paul Mackerras 已提交
1627 1628 1629
    global numcommits rowrangelist commitlisted idrowranges
    global selectedline currentid canv canvy0
    global matchinglines treediffs
1630
    global pending_select phase
1631
    global commitidx rowlaidout rowoptim linesegends
1632
    global commfd nextupdate
1633
    global selectedview
1634
    global vparentlist vchildlist vdisporder vcmitlisted
1635
    global hlview selectedhlview
P
Paul Mackerras 已提交
1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652

    if {$n == $curview} return
    set selid {}
    if {[info exists selectedline]} {
	set selid $currentid
	set y [yc $selectedline]
	set ymax [lindex [$canv cget -scrollregion] 3]
	set span [$canv yview]
	set ytop [expr {[lindex $span 0] * $ymax}]
	set ybot [expr {[lindex $span 1] * $ymax}]
	if {$ytop < $y && $y < $ybot} {
	    set yscreen [expr {$y - $ytop}]
	} else {
	    set yscreen [expr {($ybot - $ytop) / 2}]
	}
    }
    unselectline
1653
    normalline
P
Paul Mackerras 已提交
1654
    stopfindproc
1655
    if {$curview >= 0} {
1656 1657 1658 1659
	set vparentlist($curview) $parentlist
	set vchildlist($curview) $childlist
	set vdisporder($curview) $displayorder
	set vcmitlisted($curview) $commitlisted
1660 1661
	if {$phase ne {}} {
	    set viewdata($curview) \
1662 1663 1664
		[list $phase $rowidlist $rowoffsets $rowrangelist \
		     [flatten idrowranges] [flatten idinlist] \
		     $rowlaidout $rowoptim $numcommits $linesegends]
1665 1666
	} elseif {![info exists viewdata($curview)]
		  || [lindex $viewdata($curview) 0] ne {}} {
1667
	    set viewdata($curview) \
1668
		[list {} $rowidlist $rowoffsets $rowrangelist]
1669
	}
P
Paul Mackerras 已提交
1670 1671 1672 1673
    }
    catch {unset matchinglines}
    catch {unset treediffs}
    clear_display
1674 1675 1676 1677
    if {[info exists hlview] && $hlview == $n} {
	unset hlview
	set selectedhlview None
    }
P
Paul Mackerras 已提交
1678 1679

    set curview $n
1680
    set selectedview $n
1681 1682
    .bar.view entryconf Edit* -state [expr {$n == 0? "disabled": "normal"}]
    .bar.view entryconf Delete* -state [expr {$n == 0? "disabled": "normal"}]
P
Paul Mackerras 已提交
1683 1684

    if {![info exists viewdata($n)]} {
1685
	set pending_select $selid
1686
	getcommits
P
Paul Mackerras 已提交
1687 1688 1689
	return
    }

1690 1691
    set v $viewdata($n)
    set phase [lindex $v 0]
1692 1693 1694 1695 1696 1697 1698
    set displayorder $vdisporder($n)
    set parentlist $vparentlist($n)
    set childlist $vchildlist($n)
    set commitlisted $vcmitlisted($n)
    set rowidlist [lindex $v 1]
    set rowoffsets [lindex $v 2]
    set rowrangelist [lindex $v 3]
1699 1700 1701 1702
    if {$phase eq {}} {
	set numcommits [llength $displayorder]
	catch {unset idrowranges}
    } else {
1703 1704 1705 1706 1707 1708
	unflatten idrowranges [lindex $v 4]
	unflatten idinlist [lindex $v 5]
	set rowlaidout [lindex $v 6]
	set rowoptim [lindex $v 7]
	set numcommits [lindex $v 8]
	set linesegends [lindex $v 9]
1709 1710
    }

P
Paul Mackerras 已提交
1711 1712
    catch {unset colormap}
    catch {unset rowtextx}
1713 1714
    set nextcolor 0
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
1715 1716 1717 1718 1719
    set curview $n
    set row 0
    setcanvscroll
    set yf 0
    set row 0
1720 1721
    if {$selid ne {} && [info exists commitrow($n,$selid)]} {
	set row $commitrow($n,$selid)
P
Paul Mackerras 已提交
1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732
	# try to get the selected row in the same position on the screen
	set ymax [lindex [$canv cget -scrollregion] 3]
	set ytop [expr {[yc $row] - $yscreen}]
	if {$ytop < 0} {
	    set ytop 0
	}
	set yf [expr {$ytop * 1.0 / $ymax}]
    }
    allcanvs yview moveto $yf
    drawvisible
    selectline $row 0
1733
    if {$phase ne {}} {
1734
	if {$phase eq "getcommits"} {
1735
	    show_status "Reading commits..."
1736
	}
1737
	if {[info exists commfd($n)]} {
1738
	    layoutmore {}
1739 1740 1741
	} else {
	    finishcommits
	}
1742 1743
    } elseif {$numcommits == 0} {
	show_status "No commits selected"
1744
    }
P
Paul Mackerras 已提交
1745 1746
}

1747 1748 1749
# Stuff relating to the highlighting facility

proc ishighlighted {row} {
1750
    global vhighlights fhighlights nhighlights rhighlights
1751 1752 1753 1754 1755 1756 1757 1758 1759 1760

    if {[info exists nhighlights($row)] && $nhighlights($row) > 0} {
	return $nhighlights($row)
    }
    if {[info exists vhighlights($row)] && $vhighlights($row) > 0} {
	return $vhighlights($row)
    }
    if {[info exists fhighlights($row)] && $fhighlights($row) > 0} {
	return $fhighlights($row)
    }
1761 1762 1763
    if {[info exists rhighlights($row)] && $rhighlights($row) > 0} {
	return $rhighlights($row)
    }
1764 1765 1766 1767
    return 0
}

proc bolden {row font} {
1768
    global canv linehtag selectedline boldrows
1769

1770
    lappend boldrows $row
1771
    $canv itemconf $linehtag($row) -font $font
1772
    if {[info exists selectedline] && $row == $selectedline} {
1773 1774 1775 1776 1777 1778 1779 1780 1781
	$canv delete secsel
	set t [eval $canv create rect [$canv bbox $linehtag($row)] \
		   -outline {{}} -tags secsel \
		   -fill [$canv cget -selectbackground]]
	$canv lower $t
    }
}

proc bolden_name {row font} {
1782
    global canv2 linentag selectedline boldnamerows
1783

1784
    lappend boldnamerows $row
1785
    $canv2 itemconf $linentag($row) -font $font
1786
    if {[info exists selectedline] && $row == $selectedline} {
1787 1788 1789 1790 1791 1792 1793 1794
	$canv2 delete secsel
	set t [eval $canv2 create rect [$canv2 bbox $linentag($row)] \
		   -outline {{}} -tags secsel \
		   -fill [$canv2 cget -selectbackground]]
	$canv2 lower $t
    }
}

1795 1796
proc unbolden {} {
    global mainfont boldrows
1797

1798 1799
    set stillbold {}
    foreach row $boldrows {
1800 1801
	if {![ishighlighted $row]} {
	    bolden $row $mainfont
1802 1803
	} else {
	    lappend stillbold $row
1804 1805
	}
    }
1806
    set boldrows $stillbold
1807 1808 1809 1810
}

proc addvhighlight {n} {
    global hlview curview viewdata vhl_done vhighlights commitidx
1811 1812

    if {[info exists hlview]} {
1813
	delvhighlight
1814 1815 1816 1817 1818 1819 1820 1821 1822
    }
    set hlview $n
    if {$n != $curview && ![info exists viewdata($n)]} {
	set viewdata($n) [list getcommits {{}} {{}} {} {} {} 0 0 0 {}]
	set vparentlist($n) {}
	set vchildlist($n) {}
	set vdisporder($n) {}
	set vcmitlisted($n) {}
	start_rev_list $n
1823 1824 1825 1826
    }
    set vhl_done $commitidx($hlview)
    if {$vhl_done > 0} {
	drawvisible
1827 1828 1829
    }
}

1830 1831
proc delvhighlight {} {
    global hlview vhighlights
1832 1833 1834

    if {![info exists hlview]} return
    unset hlview
1835 1836
    catch {unset vhighlights}
    unbolden
1837 1838
}

1839 1840 1841
proc vhighlightmore {} {
    global hlview vhl_done commitidx vhighlights
    global displayorder vdisporder curview mainfont
1842 1843 1844 1845 1846 1847 1848 1849

    set font [concat $mainfont bold]
    set max $commitidx($hlview)
    if {$hlview == $curview} {
	set disp $displayorder
    } else {
	set disp $vdisporder($hlview)
    }
1850 1851 1852 1853
    set vr [visiblerows]
    set r0 [lindex $vr 0]
    set r1 [lindex $vr 1]
    for {set i $vhl_done} {$i < $max} {incr i} {
1854 1855 1856
	set id [lindex $disp $i]
	if {[info exists commitrow($curview,$id)]} {
	    set row $commitrow($curview,$id)
1857 1858 1859
	    if {$r0 <= $row && $row <= $r1} {
		if {![highlighted $row]} {
		    bolden $row $font
1860
		}
1861
		set vhighlights($row) 1
1862 1863 1864
	    }
	}
    }
1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882
    set vhl_done $max
}

proc askvhighlight {row id} {
    global hlview vhighlights commitrow iddrawn mainfont

    if {[info exists commitrow($hlview,$id)]} {
	if {[info exists iddrawn($id)] && ![ishighlighted $row]} {
	    bolden $row [concat $mainfont bold]
	}
	set vhighlights($row) 1
    } else {
	set vhighlights($row) 0
    }
}

proc hfiles_change {name ix op} {
    global highlight_files filehighlight fhighlights fh_serial
1883
    global mainfont highlight_paths
1884 1885 1886 1887 1888

    if {[info exists filehighlight]} {
	# delete previous highlights
	catch {close $filehighlight}
	unset filehighlight
1889 1890
	catch {unset fhighlights}
	unbolden
1891
	unhighlight_filelist
1892
    }
1893
    set highlight_paths {}
1894 1895 1896 1897 1898 1899 1900
    after cancel do_file_hl $fh_serial
    incr fh_serial
    if {$highlight_files ne {}} {
	after 300 do_file_hl $fh_serial
    }
}

1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914
proc makepatterns {l} {
    set ret {}
    foreach e $l {
	set ee [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} $e]
	if {[string index $ee end] eq "/"} {
	    lappend ret "$ee*"
	} else {
	    lappend ret $ee
	    lappend ret "$ee/*"
	}
    }
    return $ret
}

1915
proc do_file_hl {serial} {
1916
    global highlight_files filehighlight highlight_paths gdttype fhl_list
1917

1918 1919 1920 1921 1922 1923 1924 1925
    if {$gdttype eq "touching paths:"} {
	if {[catch {set paths [shellsplit $highlight_files]}]} return
	set highlight_paths [makepatterns $paths]
	highlight_filelist
	set gdtargs [concat -- $paths]
    } else {
	set gdtargs [list "-S$highlight_files"]
    }
1926
    set cmd [concat | git diff-tree -r -s --stdin $gdtargs]
1927 1928 1929
    set filehighlight [open $cmd r+]
    fconfigure $filehighlight -blocking 0
    fileevent $filehighlight readable readfhighlight
1930
    set fhl_list {}
1931 1932 1933 1934 1935
    drawvisible
    flushhighlights
}

proc flushhighlights {} {
1936
    global filehighlight fhl_list
1937 1938

    if {[info exists filehighlight]} {
1939
	lappend fhl_list {}
1940 1941 1942 1943 1944 1945
	puts $filehighlight ""
	flush $filehighlight
    }
}

proc askfilehighlight {row id} {
1946
    global filehighlight fhighlights fhl_list
1947

1948 1949
    lappend fhl_list $id
    set fhighlights($row) -1
1950 1951 1952 1953 1954
    puts $filehighlight $id
}

proc readfhighlight {} {
    global filehighlight fhighlights commitrow curview mainfont iddrawn
1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965
    global fhl_list

    while {[gets $filehighlight line] >= 0} {
	set line [string trim $line]
	set i [lsearch -exact $fhl_list $line]
	if {$i < 0} continue
	for {set j 0} {$j < $i} {incr j} {
	    set id [lindex $fhl_list $j]
	    if {[info exists commitrow($curview,$id)]} {
		set fhighlights($commitrow($curview,$id)) 0
	    }
1966
	}
1967 1968 1969 1970 1971 1972 1973 1974
	set fhl_list [lrange $fhl_list [expr {$i+1}] end]
	if {$line eq {}} continue
	if {![info exists commitrow($curview,$line)]} continue
	set row $commitrow($curview,$line)
	if {[info exists iddrawn($line)] && ![ishighlighted $row]} {
	    bolden $row [concat $mainfont bold]
	}
	set fhighlights($row) 1
1975
    }
1976 1977
    if {[eof $filehighlight]} {
	# strange...
1978
	puts "oops, git diff-tree died"
1979 1980
	catch {close $filehighlight}
	unset filehighlight
1981
    }
1982
    next_hlcont
1983 1984
}

1985
proc find_change {name ix op} {
1986
    global nhighlights mainfont boldnamerows
1987
    global findstring findpattern findtype
1988 1989

    # delete previous highlights, if any
1990 1991
    foreach row $boldnamerows {
	bolden_name $row $mainfont
1992
    }
1993 1994 1995
    set boldnamerows {}
    catch {unset nhighlights}
    unbolden
1996 1997 1998 1999
    if {$findtype ne "Regexp"} {
	set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
		   $findstring]
	set findpattern "*$e*"
2000 2001 2002 2003
    }
    drawvisible
}

2004 2005 2006
proc askfindhighlight {row id} {
    global nhighlights commitinfo iddrawn mainfont
    global findstring findtype findloc findpattern
2007 2008 2009 2010

    if {![info exists commitinfo($id)]} {
	getcommit $id
    }
2011
    set info $commitinfo($id)
2012
    set isbold 0
2013 2014 2015 2016
    set fldtypes {Headline Author Date Committer CDate Comments}
    foreach f $info ty $fldtypes {
	if {$findloc ne "All fields" && $findloc ne $ty} {
	    continue
2017
	}
2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030
	if {$findtype eq "Regexp"} {
	    set doesmatch [regexp $findstring $f]
	} elseif {$findtype eq "IgnCase"} {
	    set doesmatch [string match -nocase $findpattern $f]
	} else {
	    set doesmatch [string match $findpattern $f]
	}
	if {$doesmatch} {
	    if {$ty eq "Author"} {
		set isbold 2
	    } else {
		set isbold 1
	    }
2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041
	}
    }
    if {[info exists iddrawn($id)]} {
	if {$isbold && ![ishighlighted $row]} {
	    bolden $row [concat $mainfont bold]
	}
	if {$isbold >= 2} {
	    bolden_name $row [concat $mainfont bold]
	}
    }
    set nhighlights($row) $isbold
2042 2043
}

2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070
proc vrel_change {name ix op} {
    global highlight_related

    rhighlight_none
    if {$highlight_related ne "None"} {
	after idle drawvisible
    }
}

# prepare for testing whether commits are descendents or ancestors of a
proc rhighlight_sel {a} {
    global descendent desc_todo ancestor anc_todo
    global highlight_related rhighlights

    catch {unset descendent}
    set desc_todo [list $a]
    catch {unset ancestor}
    set anc_todo [list $a]
    if {$highlight_related ne "None"} {
	rhighlight_none
	after idle drawvisible
    }
}

proc rhighlight_none {} {
    global rhighlights

2071 2072
    catch {unset rhighlights}
    unbolden
2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169
}

proc is_descendent {a} {
    global curview children commitrow descendent desc_todo

    set v $curview
    set la $commitrow($v,$a)
    set todo $desc_todo
    set leftover {}
    set done 0
    for {set i 0} {$i < [llength $todo]} {incr i} {
	set do [lindex $todo $i]
	if {$commitrow($v,$do) < $la} {
	    lappend leftover $do
	    continue
	}
	foreach nk $children($v,$do) {
	    if {![info exists descendent($nk)]} {
		set descendent($nk) 1
		lappend todo $nk
		if {$nk eq $a} {
		    set done 1
		}
	    }
	}
	if {$done} {
	    set desc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
	    return
	}
    }
    set descendent($a) 0
    set desc_todo $leftover
}

proc is_ancestor {a} {
    global curview parentlist commitrow ancestor anc_todo

    set v $curview
    set la $commitrow($v,$a)
    set todo $anc_todo
    set leftover {}
    set done 0
    for {set i 0} {$i < [llength $todo]} {incr i} {
	set do [lindex $todo $i]
	if {![info exists commitrow($v,$do)] || $commitrow($v,$do) > $la} {
	    lappend leftover $do
	    continue
	}
	foreach np [lindex $parentlist $commitrow($v,$do)] {
	    if {![info exists ancestor($np)]} {
		set ancestor($np) 1
		lappend todo $np
		if {$np eq $a} {
		    set done 1
		}
	    }
	}
	if {$done} {
	    set anc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
	    return
	}
    }
    set ancestor($a) 0
    set anc_todo $leftover
}

proc askrelhighlight {row id} {
    global descendent highlight_related iddrawn mainfont rhighlights
    global selectedline ancestor

    if {![info exists selectedline]} return
    set isbold 0
    if {$highlight_related eq "Descendent" ||
	$highlight_related eq "Not descendent"} {
	if {![info exists descendent($id)]} {
	    is_descendent $id
	}
	if {$descendent($id) == ($highlight_related eq "Descendent")} {
	    set isbold 1
	}
    } elseif {$highlight_related eq "Ancestor" ||
	      $highlight_related eq "Not ancestor"} {
	if {![info exists ancestor($id)]} {
	    is_ancestor $id
	}
	if {$ancestor($id) == ($highlight_related eq "Ancestor")} {
	    set isbold 1
	}
    }
    if {[info exists iddrawn($id)]} {
	if {$isbold && ![ishighlighted $row]} {
	    bolden $row [concat $mainfont bold]
	}
    }
    set rhighlights($row) $isbold
}

2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244
proc next_hlcont {} {
    global fhl_row fhl_dirn displayorder numcommits
    global vhighlights fhighlights nhighlights rhighlights
    global hlview filehighlight findstring highlight_related

    if {![info exists fhl_dirn] || $fhl_dirn == 0} return
    set row $fhl_row
    while {1} {
	if {$row < 0 || $row >= $numcommits} {
	    bell
	    set fhl_dirn 0
	    return
	}
	set id [lindex $displayorder $row]
	if {[info exists hlview]} {
	    if {![info exists vhighlights($row)]} {
		askvhighlight $row $id
	    }
	    if {$vhighlights($row) > 0} break
	}
	if {$findstring ne {}} {
	    if {![info exists nhighlights($row)]} {
		askfindhighlight $row $id
	    }
	    if {$nhighlights($row) > 0} break
	}
	if {$highlight_related ne "None"} {
	    if {![info exists rhighlights($row)]} {
		askrelhighlight $row $id
	    }
	    if {$rhighlights($row) > 0} break
	}
	if {[info exists filehighlight]} {
	    if {![info exists fhighlights($row)]} {
		# ask for a few more while we're at it...
		set r $row
		for {set n 0} {$n < 100} {incr n} {
		    if {![info exists fhighlights($r)]} {
			askfilehighlight $r [lindex $displayorder $r]
		    }
		    incr r $fhl_dirn
		    if {$r < 0 || $r >= $numcommits} break
		}
		flushhighlights
	    }
	    if {$fhighlights($row) < 0} {
		set fhl_row $row
		return
	    }
	    if {$fhighlights($row) > 0} break
	}
	incr row $fhl_dirn
    }
    set fhl_dirn 0
    selectline $row 1
}

proc next_highlight {dirn} {
    global selectedline fhl_row fhl_dirn
    global hlview filehighlight findstring highlight_related

    if {![info exists selectedline]} return
    if {!([info exists hlview] || $findstring ne {} ||
	  $highlight_related ne "None" || [info exists filehighlight])} return
    set fhl_row [expr {$selectedline + $dirn}]
    set fhl_dirn $dirn
    next_hlcont
}

proc cancel_next_highlight {} {
    global fhl_dirn

    set fhl_dirn 0
}

2245 2246
# Graph layout functions

P
Paul Mackerras 已提交
2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281
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} {
2282
    global children commitrow childlist curview
P
Paul Mackerras 已提交
2283

2284 2285
    if {[info exists commitrow($curview,$id)]} {
	set r $commitrow($curview,$id)
P
Paul Mackerras 已提交
2286 2287 2288
	if {$l1 <= $r && $r <= $l2} {
	    return [expr {$r - $l1 + 1}]
	}
2289 2290
	set kids [lindex $childlist $r]
    } else {
2291
	set kids $children($curview,$id)
P
Paul Mackerras 已提交
2292
    }
2293
    foreach c $kids {
2294
	set r $commitrow($curview,$c)
2295 2296
	if {$l1 <= $r && $r <= $l2} {
	    return [expr {$r - $l1 + 1}]
P
Paul Mackerras 已提交
2297 2298 2299 2300 2301 2302 2303 2304 2305
	}
    }
    return 0
}

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

    set col -1
2306
    set ids [lindex $rowidlist $row]
P
Paul Mackerras 已提交
2307 2308 2309 2310 2311
    foreach id $ids {
	incr col
	if {$id eq {}} continue
	if {$col < [llength $ids] - 1 &&
	    [lsearch -exact -start [expr {$col+1}] $ids $id] >= 0} {
2312
	    puts "oops: [shortids $id] repeated in row $row col $col: {[shortids [lindex $rowidlist $row]]}"
P
Paul Mackerras 已提交
2313
	}
2314
	set o [lindex $rowoffsets $row $col]
P
Paul Mackerras 已提交
2315 2316 2317 2318 2319
	set y $row
	set x $col
	while {$o ne {}} {
	    incr y -1
	    incr x $o
2320
	    if {[lindex $rowidlist $y $x] != $id} {
P
Paul Mackerras 已提交
2321 2322 2323
		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} {
2324
		    puts "  row $i ids={[shortids [lindex $rowidlist $i]]} offs={[lindex $rowoffsets $i]}"
P
Paul Mackerras 已提交
2325 2326 2327 2328
		}
		break
	    }
	    if {!$full} break
2329
	    set o [lindex $rowoffsets $y $x]
P
Paul Mackerras 已提交
2330 2331 2332 2333 2334 2335 2336 2337 2338 2339
	}
    }
}

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
2340
	set off0 [lindex $rowoffsets $y]
P
Paul Mackerras 已提交
2341 2342
	for {set x0 $x} {1} {incr x0} {
	    if {$x0 >= [llength $off0]} {
2343
		set x0 [llength [lindex $rowoffsets [expr {$y-1}]]]
P
Paul Mackerras 已提交
2344 2345 2346 2347 2348 2349 2350 2351 2352
		break
	    }
	    set z [lindex $off0 $x0]
	    if {$z ne {}} {
		incr x0 $z
		break
	    }
	}
	set z [expr {$x0 - $x}]
2353 2354
	lset rowidlist $y [linsert [lindex $rowidlist $y] $x $oid]
	lset rowoffsets $y [linsert [lindex $rowoffsets $y] $x $z]
P
Paul Mackerras 已提交
2355
    }
2356 2357
    set tmp [lreplace [lindex $rowoffsets $y] $x $x {}]
    lset rowoffsets $y [incrange $tmp [expr {$x+1}] -1]
P
Paul Mackerras 已提交
2358 2359 2360 2361
    lappend idrowranges($oid) $y
}

proc initlayout {} {
2362
    global rowidlist rowoffsets displayorder commitlisted
P
Paul Mackerras 已提交
2363
    global rowlaidout rowoptim
P
Paul Mackerras 已提交
2364
    global idinlist rowchk rowrangelist idrowranges
2365
    global numcommits canvxmax canv
2366
    global nextcolor
2367
    global parentlist childlist children
2368
    global colormap rowtextx
P
Paul Mackerras 已提交
2369
    global linesegends
P
Paul Mackerras 已提交
2370

2371 2372
    set numcommits 0
    set displayorder {}
2373 2374 2375
    set commitlisted {}
    set parentlist {}
    set childlist {}
2376
    set rowrangelist {}
2377 2378 2379
    set nextcolor 0
    set rowidlist {{}}
    set rowoffsets {{}}
P
Paul Mackerras 已提交
2380 2381 2382 2383
    catch {unset idinlist}
    catch {unset rowchk}
    set rowlaidout 0
    set rowoptim 0
2384
    set canvxmax [$canv cget -width]
P
Paul Mackerras 已提交
2385 2386 2387
    catch {unset colormap}
    catch {unset rowtextx}
    catch {unset idrowranges}
2388
    set linesegends {}
2389 2390 2391 2392 2393 2394 2395 2396 2397
}

proc setcanvscroll {} {
    global canv canv2 canv3 numcommits linespc canvxmax canvy0

    set ymax [expr {$canvy0 + ($numcommits - 0.5) * $linespc + 2}]
    $canv conf -scrollregion [list 0 0 $canvxmax $ymax]
    $canv2 conf -scrollregion [list 0 0 0 $ymax]
    $canv3 conf -scrollregion [list 0 0 0 $ymax]
P
Paul Mackerras 已提交
2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418
}

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

2419
proc layoutmore {tmax} {
P
Paul Mackerras 已提交
2420
    global rowlaidout rowoptim commitidx numcommits optim_delay
2421
    global uparrowlen curview
P
Paul Mackerras 已提交
2422

2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450
    while {1} {
	if {$rowoptim - $optim_delay > $numcommits} {
	    showstuff [expr {$rowoptim - $optim_delay}]
	} elseif {$rowlaidout - $uparrowlen - 1 > $rowoptim} {
	    set nr [expr {$rowlaidout - $uparrowlen - 1 - $rowoptim}]
	    if {$nr > 100} {
		set nr 100
	    }
	    optimize_rows $rowoptim 0 [expr {$rowoptim + $nr}]
	    incr rowoptim $nr
	} elseif {$commitidx($curview) > $rowlaidout} {
	    set nr [expr {$commitidx($curview) - $rowlaidout}]
	    # may need to increase this threshold if uparrowlen or
	    # mingaplen are increased...
	    if {$nr > 150} {
		set nr 150
	    }
	    set row $rowlaidout
	    set rowlaidout [layoutrows $row [expr {$row + $nr}] 0]
	    if {$rowlaidout == $row} {
		return 0
	    }
	} else {
	    return 0
	}
	if {$tmax ne {} && [clock clicks -milliseconds] >= $tmax} {
	    return 1
	}
P
Paul Mackerras 已提交
2451 2452 2453 2454
    }
}

proc showstuff {canshow} {
2455
    global numcommits commitrow pending_select selectedline
2456
    global linesegends idrowranges idrangedrawn curview
P
Paul Mackerras 已提交
2457

2458 2459 2460 2461 2462
    if {$numcommits == 0} {
	global phase
	set phase "incrdraw"
	allcanvs delete all
    }
P
Paul Mackerras 已提交
2463 2464
    set row $numcommits
    set numcommits $canshow
2465
    setcanvscroll
P
Paul Mackerras 已提交
2466 2467 2468
    set rows [visiblerows]
    set r0 [lindex $rows 0]
    set r1 [lindex $rows 1]
2469
    set selrow -1
P
Paul Mackerras 已提交
2470
    for {set r $row} {$r < $canshow} {incr r} {
2471 2472 2473 2474 2475 2476 2477 2478
	foreach id [lindex $linesegends [expr {$r+1}]] {
	    set i -1
	    foreach {s e} [rowranges $id] {
		incr i
		if {$e ne {} && $e < $numcommits && $s <= $r1 && $e >= $r0
		    && ![info exists idrangedrawn($id,$i)]} {
		    drawlineseg $id $i
		    set idrangedrawn($id,$i) 1
P
Paul Mackerras 已提交
2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489
		}
	    }
	}
    }
    if {$canshow > $r1} {
	set canshow $r1
    }
    while {$row < $canshow} {
	drawcmitrow $row
	incr row
    }
2490
    if {[info exists pending_select] &&
2491 2492 2493
	[info exists commitrow($curview,$pending_select)] &&
	$commitrow($curview,$pending_select) < $numcommits} {
	selectline $commitrow($curview,$pending_select) 1
2494
    }
2495 2496 2497
    if {![info exists selectedline] && ![info exists pending_select]} {
	selectline 0 1
    }
P
Paul Mackerras 已提交
2498 2499 2500 2501 2502
}

proc layoutrows {row endrow last} {
    global rowidlist rowoffsets displayorder
    global uparrowlen downarrowlen maxwidth mingaplen
2503
    global childlist parentlist
P
Paul Mackerras 已提交
2504
    global idrowranges linesegends
2505
    global commitidx curview
P
Paul Mackerras 已提交
2506
    global idinlist rowchk rowrangelist
P
Paul Mackerras 已提交
2507

2508 2509
    set idlist [lindex $rowidlist $row]
    set offs [lindex $rowoffsets $row]
P
Paul Mackerras 已提交
2510 2511 2512 2513
    while {$row < $endrow} {
	set id [lindex $displayorder $row]
	set oldolds {}
	set newolds {}
2514
	foreach p [lindex $parentlist $row] {
P
Paul Mackerras 已提交
2515 2516 2517 2518 2519 2520
	    if {![info exists idinlist($p)]} {
		lappend newolds $p
	    } elseif {!$idinlist($p)} {
		lappend oldolds $p
	    }
	}
2521
	set lse {}
P
Paul Mackerras 已提交
2522 2523 2524
	set nev [expr {[llength $idlist] + [llength $newolds]
		       + [llength $oldolds] - $maxwidth + 1}]
	if {$nev > 0} {
2525 2526
	    if {!$last &&
		$row + $uparrowlen + $mingaplen >= $commitidx($curview)} break
P
Paul Mackerras 已提交
2527 2528 2529 2530 2531 2532 2533 2534 2535 2536
	    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
2537
			set rm1 [expr {$row - 1}]
2538
			lappend lse $i
2539
			lappend idrowranges($i) $rm1
P
Paul Mackerras 已提交
2540 2541 2542 2543 2544 2545
			if {[incr nev -1] <= 0} break
			continue
		    }
		    set rowchk($id) [expr {$row + $r}]
		}
	    }
2546 2547
	    lset rowidlist $row $idlist
	    lset rowoffsets $row $offs
P
Paul Mackerras 已提交
2548
	}
2549
	lappend linesegends $lse
P
Paul Mackerras 已提交
2550 2551 2552 2553
	set col [lsearch -exact $idlist $id]
	if {$col < 0} {
	    set col [llength $idlist]
	    lappend idlist $id
2554
	    lset rowidlist $row $idlist
P
Paul Mackerras 已提交
2555
	    set z {}
2556
	    if {[lindex $childlist $row] ne {}} {
2557
		set z [expr {[llength [lindex $rowidlist [expr {$row-1}]]] - $col}]
P
Paul Mackerras 已提交
2558 2559 2560
		unset idinlist($id)
	    }
	    lappend offs $z
2561
	    lset rowoffsets $row $offs
P
Paul Mackerras 已提交
2562 2563 2564 2565 2566 2567
	    if {$z ne {}} {
		makeuparrow $id $col $row $z
	    }
	} else {
	    unset idinlist($id)
	}
2568
	set ranges {}
P
Paul Mackerras 已提交
2569
	if {[info exists idrowranges($id)]} {
2570
	    set ranges $idrowranges($id)
2571 2572
	    lappend ranges $row
	    unset idrowranges($id)
P
Paul Mackerras 已提交
2573
	}
2574
	lappend rowrangelist $ranges
P
Paul Mackerras 已提交
2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605
	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
	}
2606 2607
	lappend rowidlist $idlist
	lappend rowoffsets $offs
P
Paul Mackerras 已提交
2608 2609 2610 2611 2612
    }
    return $row
}

proc addextraid {id row} {
2613
    global displayorder commitrow commitinfo
2614
    global commitidx commitlisted
2615
    global parentlist childlist children curview
P
Paul Mackerras 已提交
2616

2617
    incr commitidx($curview)
P
Paul Mackerras 已提交
2618
    lappend displayorder $id
2619
    lappend commitlisted 0
2620
    lappend parentlist {}
2621
    set commitrow($curview,$id) $row
P
Paul Mackerras 已提交
2622 2623 2624
    readcommit $id
    if {![info exists commitinfo($id)]} {
	set commitinfo($id) {"No commit information available"}
2625
    }
2626 2627
    if {![info exists children($curview,$id)]} {
	set children($curview,$id) {}
P
Paul Mackerras 已提交
2628
    }
2629
    lappend childlist $children($curview,$id)
P
Paul Mackerras 已提交
2630 2631 2632
}

proc layouttail {} {
2633
    global rowidlist rowoffsets idinlist commitidx curview
P
Paul Mackerras 已提交
2634
    global idrowranges rowrangelist
P
Paul Mackerras 已提交
2635

2636
    set row $commitidx($curview)
2637
    set idlist [lindex $rowidlist $row]
P
Paul Mackerras 已提交
2638 2639 2640 2641 2642 2643
    while {$idlist ne {}} {
	set col [expr {[llength $idlist] - 1}]
	set id [lindex $idlist $col]
	addextraid $id $row
	unset idinlist($id)
	lappend idrowranges($id) $row
P
Paul Mackerras 已提交
2644
	lappend rowrangelist $idrowranges($id)
2645
	unset idrowranges($id)
P
Paul Mackerras 已提交
2646 2647 2648
	incr row
	set offs [ntimes $col 0]
	set idlist [lreplace $idlist $col $col]
2649 2650
	lappend rowidlist $idlist
	lappend rowoffsets $offs
P
Paul Mackerras 已提交
2651 2652 2653 2654
    }

    foreach id [array names idinlist] {
	addextraid $id $row
2655 2656
	lset rowidlist $row [list $id]
	lset rowoffsets $row 0
P
Paul Mackerras 已提交
2657 2658
	makeuparrow $id 0 $row 0
	lappend idrowranges($id) $row
P
Paul Mackerras 已提交
2659
	lappend rowrangelist $idrowranges($id)
2660
	unset idrowranges($id)
P
Paul Mackerras 已提交
2661
	incr row
2662 2663
	lappend rowidlist {}
	lappend rowoffsets {}
P
Paul Mackerras 已提交
2664 2665 2666 2667 2668 2669 2670
    }
}

proc insert_pad {row col npad} {
    global rowidlist rowoffsets

    set pad [ntimes $npad {}]
2671 2672 2673
    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 已提交
2674 2675 2676
}

proc optimize_rows {row col endrow} {
P
Paul Mackerras 已提交
2677
    global rowidlist rowoffsets idrowranges displayorder
P
Paul Mackerras 已提交
2678 2679

    for {} {$row < $endrow} {incr row} {
2680 2681
	set idlist [lindex $rowidlist $row]
	set offs [lindex $rowoffsets $row]
P
Paul Mackerras 已提交
2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692
	set haspad 0
	for {} {$col < [llength $offs]} {incr col} {
	    if {[lindex $idlist $col] eq {}} {
		set haspad 1
		continue
	    }
	    set z [lindex $offs $col]
	    if {$z eq {}} continue
	    set isarrow 0
	    set x0 [expr {$col + $z}]
	    set y0 [expr {$row - 1}]
2693
	    set z0 [lindex $rowoffsets $y0 $x0]
P
Paul Mackerras 已提交
2694 2695
	    if {$z0 eq {}} {
		set id [lindex $idlist $col]
2696 2697
		set ranges [rowranges $id]
		if {$ranges ne {} && $y0 > [lindex $ranges 0]} {
P
Paul Mackerras 已提交
2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709
		    set isarrow 1
		}
	    }
	    if {$z < -1 || ($z < 0 && $isarrow)} {
		set npad [expr {-1 - $z + $isarrow}]
		set offs [incrange $offs $col $npad]
		insert_pad $y0 $x0 $npad
		if {$y0 > 0} {
		    optimize_rows $y0 $x0 $row
		}
		set z [lindex $offs $col]
		set x0 [expr {$col + $z}]
2710
		set z0 [lindex $rowoffsets $y0 $x0]
P
Paul Mackerras 已提交
2711 2712 2713
	    } elseif {$z > 1 || ($z > 0 && $isarrow)} {
		set npad [expr {$z - 1 + $isarrow}]
		set y1 [expr {$row + 1}]
2714
		set offs2 [lindex $rowoffsets $y1]
P
Paul Mackerras 已提交
2715 2716 2717 2718 2719 2720 2721
		set x1 -1
		foreach z $offs2 {
		    incr x1
		    if {$z eq {} || $x1 + $z < $col} continue
		    if {$x1 + $z > $col} {
			incr npad
		    }
2722
		    lset rowoffsets $y1 [incrange $offs2 $x1 $npad]
P
Paul Mackerras 已提交
2723 2724 2725 2726 2727 2728 2729 2730 2731 2732
		    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
	    }
2733 2734 2735 2736 2737 2738 2739 2740 2741
	    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 已提交
2742 2743 2744 2745 2746 2747 2748
	    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} {
2749
	    set o {}
P
Paul Mackerras 已提交
2750 2751
	    for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
		set o [lindex $offs $col]
2752 2753 2754
		if {$o eq {}} {
		    # check if this is the link to the first child
		    set id [lindex $idlist $col]
2755 2756
		    set ranges [rowranges $id]
		    if {$ranges ne {} && $row == [lindex $ranges 0]} {
2757 2758 2759 2760 2761 2762 2763 2764 2765
			# 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 已提交
2766 2767
		if {$o eq {} || $o <= 0} break
	    }
2768
	    if {$o ne {} && [incr col] < [llength $idlist]} {
P
Paul Mackerras 已提交
2769
		set y1 [expr {$row + 1}]
2770
		set offs2 [lindex $rowoffsets $y1]
P
Paul Mackerras 已提交
2771 2772 2773 2774
		set x1 -1
		foreach z $offs2 {
		    incr x1
		    if {$z eq {} || $x1 + $z < $col} continue
2775
		    lset rowoffsets $y1 [incrange $offs2 $x1 1]
P
Paul Mackerras 已提交
2776 2777 2778 2779 2780 2781 2782 2783
		    break
		}
		set idlist [linsert $idlist $col {}]
		set tmp [linsert $offs $col {}]
		incr col
		set offs [incrange $tmp $col -1]
	    }
	}
2784 2785
	lset rowidlist $row $idlist
	lset rowoffsets $row $offs
P
Paul Mackerras 已提交
2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799
	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}]
}

2800 2801 2802 2803 2804 2805 2806 2807 2808 2809
proc linewidth {id} {
    global thickerline lthickness

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

P
Paul Mackerras 已提交
2810
proc rowranges {id} {
2811
    global phase idrowranges commitrow rowlaidout rowrangelist curview
P
Paul Mackerras 已提交
2812 2813

    set ranges {}
2814
    if {$phase eq {} ||
2815 2816 2817
	([info exists commitrow($curview,$id)]
	 && $commitrow($curview,$id) < $rowlaidout)} {
	set ranges [lindex $rowrangelist $commitrow($curview,$id)]
P
Paul Mackerras 已提交
2818 2819 2820 2821 2822 2823
    } elseif {[info exists idrowranges($id)]} {
	set ranges $idrowranges($id)
    }
    return $ranges
}

2824
proc drawlineseg {id i} {
P
Paul Mackerras 已提交
2825
    global rowoffsets rowidlist
2826
    global displayorder
2827
    global canv colormap linespc
2828
    global numcommits commitrow curview
P
Paul Mackerras 已提交
2829

P
Paul Mackerras 已提交
2830 2831
    set ranges [rowranges $id]
    set downarrow 1
2832 2833
    if {[info exists commitrow($curview,$id)]
	&& $commitrow($curview,$id) < $numcommits} {
P
Paul Mackerras 已提交
2834 2835 2836 2837 2838 2839
	set downarrow [expr {$i < [llength $ranges] / 2 - 1}]
    } else {
	set downarrow 1
    }
    set startrow [lindex $ranges [expr {2 * $i}]]
    set row [lindex $ranges [expr {2 * $i + 1}]]
P
Paul Mackerras 已提交
2840 2841 2842
    if {$startrow == $row} return
    assigncolor $id
    set coords {}
2843
    set col [lsearch -exact [lindex $rowidlist $row] $id]
P
Paul Mackerras 已提交
2844 2845 2846 2847 2848 2849 2850
    if {$col < 0} {
	puts "oops: drawline: id $id not on row $row"
	return
    }
    set lasto {}
    set ns 0
    while {1} {
2851
	set o [lindex $rowoffsets $row $col]
P
Paul Mackerras 已提交
2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865
	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
2866 2867 2868 2869 2870 2871 2872 2873 2874
    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} {
2875
		lappend coords [xc $row [expr {$col - 1}]] [yc $row]
2876
	    } elseif {$ccol > $col + 1} {
2877
		lappend coords [xc $row [expr {$col + 1}]] [yc $row]
2878 2879 2880 2881 2882
	    }
	    lappend coords $x $y
	}
    }
    if {[llength $coords] < 4} return
P
Paul Mackerras 已提交
2883
    if {$downarrow} {
2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902
	# This line has an arrow at the lower end: check if the arrow is
	# on a diagonal segment, and if so, work around the Tk 8.4
	# refusal to draw arrows on diagonal lines.
	set x0 [lindex $coords 0]
	set x1 [lindex $coords 2]
	if {$x0 != $x1} {
	    set y0 [lindex $coords 1]
	    set y1 [lindex $coords 3]
	    if {$y0 - $y1 <= 2 * $linespc && $x1 == [lindex $coords 4]} {
		# we have a nearby vertical segment, just trim off the diag bit
		set coords [lrange $coords 2 end]
	    } else {
		set slope [expr {($x0 - $x1) / ($y0 - $y1)}]
		set xi [expr {$x0 - $slope * $linespc / 2}]
		set yi [expr {$y0 - $linespc / 2}]
		set coords [lreplace $coords 0 1 $xi $y0 $xi $yi]
	    }
	}
    }
P
Paul Mackerras 已提交
2903
    set arrow [expr {2 * ($i > 0) + $downarrow}]
2904
    set arrow [lindex {none first last both} $arrow]
2905
    set t [$canv create line $coords -width [linewidth $id] \
P
Paul Mackerras 已提交
2906 2907 2908 2909 2910
	       -fill $colormap($id) -tags lines.$id -arrow $arrow]
    $canv lower $t
    bindline $t $id
}

2911
proc drawparentlinks {id row col olds} {
P
Paul Mackerras 已提交
2912
    global rowidlist canv colormap
P
Paul Mackerras 已提交
2913 2914 2915 2916 2917

    set row2 [expr {$row + 1}]
    set x [xc $row $col]
    set y [yc $row]
    set y2 [yc $row2]
2918
    set ids [lindex $rowidlist $row2]
P
Paul Mackerras 已提交
2919 2920 2921
    # rmx = right-most X coord used
    set rmx 0
    foreach p $olds {
2922 2923 2924 2925 2926 2927 2928 2929 2930
	set i [lsearch -exact $ids $p]
	if {$i < 0} {
	    puts "oops, parent $p of $id not in list"
	    continue
	}
	set x2 [xc $row2 $i]
	if {$x2 > $rmx} {
	    set rmx $x2
	}
P
Paul Mackerras 已提交
2931 2932 2933
	set ranges [rowranges $p]
	if {$ranges ne {} && $row2 == [lindex $ranges 0]
	    && $row2 < [lindex $ranges 1]} {
2934 2935 2936
	    # drawlineseg will do this one for us
	    continue
	}
P
Paul Mackerras 已提交
2937 2938 2939 2940 2941 2942 2943 2944 2945
	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
2946
	set t [$canv create line $coords -width [linewidth $p] \
P
Paul Mackerras 已提交
2947 2948 2949 2950 2951 2952 2953
		   -fill $colormap($p) -tags lines.$p]
	$canv lower $t
	bindline $t $p
    }
    return $rmx
}

2954
proc drawlines {id} {
P
Paul Mackerras 已提交
2955
    global colormap canv
P
Paul Mackerras 已提交
2956
    global idrangedrawn
2957
    global children iddrawn commitrow rowidlist curview
P
Paul Mackerras 已提交
2958 2959

    $canv delete lines.$id
P
Paul Mackerras 已提交
2960
    set nr [expr {[llength [rowranges $id]] / 2}]
P
Paul Mackerras 已提交
2961 2962
    for {set i 0} {$i < $nr} {incr i} {
	if {[info exists idrangedrawn($id,$i)]} {
2963
	    drawlineseg $id $i
P
Paul Mackerras 已提交
2964 2965
	}
    }
2966
    foreach child $children($curview,$id) {
2967
	if {[info exists iddrawn($child)]} {
2968
	    set row $commitrow($curview,$child)
2969 2970 2971
	    set col [lsearch -exact [lindex $rowidlist $row] $child]
	    if {$col >= 0} {
		drawparentlinks $child $row $col [list $id]
P
Paul Mackerras 已提交
2972 2973 2974 2975 2976 2977
	    }
	}
    }
}

proc drawcmittext {id row col rmx} {
2978
    global linespc canv canv2 canv3 canvy0 fgcolor
P
Paul Mackerras 已提交
2979 2980 2981
    global commitlisted commitinfo rowidlist
    global rowtextx idpos idtags idheads idotherrefs
    global linehtag linentag linedtag
2982
    global mainfont canvxmax boldrows boldnamerows fgcolor
P
Paul Mackerras 已提交
2983

2984
    set ofill [expr {[lindex $commitlisted $row]? "blue": "white"}]
P
Paul Mackerras 已提交
2985 2986 2987 2988 2989
    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}] \
2990
	       -fill $ofill -outline $fgcolor -width 1 -tags circle]
P
Paul Mackerras 已提交
2991 2992
    $canv raise $t
    $canv bind $t <1> {selcanvline {} %x %y}
2993
    set xt [xc $row [llength [lindex $rowidlist $row]]]
P
Paul Mackerras 已提交
2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006
    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]
3007
    set font $mainfont
3008 3009 3010
    set nfont $mainfont
    set isbold [ishighlighted $row]
    if {$isbold > 0} {
3011
	lappend boldrows $row
3012
	lappend font bold
3013
	if {$isbold > 1} {
3014
	    lappend boldnamerows $row
3015 3016
	    lappend nfont bold
	}
3017
    }
3018 3019
    set linehtag($row) [$canv create text $xt $y -anchor w -fill $fgcolor \
			    -text $headline -font $font -tags text]
P
Paul Mackerras 已提交
3020
    $canv bind $linehtag($row) <Button-3> "rowmenu %X %Y $id"
3021 3022 3023 3024
    set linentag($row) [$canv2 create text 3 $y -anchor w -fill $fgcolor \
			    -text $name -font $nfont -tags text]
    set linedtag($row) [$canv3 create text 3 $y -anchor w -fill $fgcolor \
			    -text $date -font $mainfont -tags text]
3025 3026 3027 3028 3029
    set xr [expr {$xt + [font measure $mainfont $headline]}]
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
P
Paul Mackerras 已提交
3030 3031 3032
}

proc drawcmitrow {row} {
3033
    global displayorder rowidlist
P
Paul Mackerras 已提交
3034
    global idrangedrawn iddrawn
3035
    global commitinfo parentlist numcommits
3036
    global filehighlight fhighlights findstring nhighlights
3037
    global hlview vhighlights
3038
    global highlight_related rhighlights
P
Paul Mackerras 已提交
3039

3040 3041
    if {$row >= $numcommits} return
    foreach id [lindex $rowidlist $row] {
3042
	if {$id eq {}} continue
P
Paul Mackerras 已提交
3043
	set i -1
P
Paul Mackerras 已提交
3044
	foreach {s e} [rowranges $id] {
P
Paul Mackerras 已提交
3045 3046 3047 3048 3049
	    incr i
	    if {$row < $s} continue
	    if {$e eq {}} break
	    if {$row <= $e} {
		if {$e < $numcommits && ![info exists idrangedrawn($id,$i)]} {
3050
		    drawlineseg $id $i
P
Paul Mackerras 已提交
3051 3052 3053 3054 3055 3056 3057 3058
		    set idrangedrawn($id,$i) 1
		}
		break
	    }
	}
    }

    set id [lindex $displayorder $row]
3059 3060 3061 3062 3063 3064
    if {[info exists hlview] && ![info exists vhighlights($row)]} {
	askvhighlight $row $id
    }
    if {[info exists filehighlight] && ![info exists fhighlights($row)]} {
	askfilehighlight $row $id
    }
3065 3066
    if {$findstring ne {} && ![info exists nhighlights($row)]} {
	askfindhighlight $row $id
3067
    }
3068 3069 3070
    if {$highlight_related ne "None" && ![info exists rhighlights($row)]} {
	askrelhighlight $row $id
    }
P
Paul Mackerras 已提交
3071
    if {[info exists iddrawn($id)]} return
3072
    set col [lsearch -exact [lindex $rowidlist $row] $id]
P
Paul Mackerras 已提交
3073 3074 3075 3076 3077
    if {$col < 0} {
	puts "oops, row $row id $id not in list"
	return
    }
    if {![info exists commitinfo($id)]} {
3078
	getcommit $id
P
Paul Mackerras 已提交
3079 3080
    }
    assigncolor $id
3081 3082 3083
    set olds [lindex $parentlist $row]
    if {$olds ne {}} {
	set rmx [drawparentlinks $id $row $col $olds]
P
Paul Mackerras 已提交
3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118
    } 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
3119
    global vhighlights fhighlights nhighlights rhighlights
P
Paul Mackerras 已提交
3120 3121 3122 3123

    allcanvs delete all
    catch {unset iddrawn}
    catch {unset idrangedrawn}
3124 3125 3126
    catch {unset vhighlights}
    catch {unset fhighlights}
    catch {unset nhighlights}
3127
    catch {unset rhighlights}
P
Paul Mackerras 已提交
3128 3129
}

P
Paul Mackerras 已提交
3130 3131 3132 3133 3134 3135 3136 3137 3138
proc findcrossings {id} {
    global rowidlist parentlist numcommits rowoffsets displayorder

    set cross {}
    set ccross {}
    foreach {s e} [rowranges $id] {
	if {$e >= $numcommits} {
	    set e [expr {$numcommits - 1}]
	}
3139
	if {$e <= $s} continue
P
Paul Mackerras 已提交
3140 3141 3142 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
	set x [lsearch -exact [lindex $rowidlist $e] $id]
	if {$x < 0} {
	    puts "findcrossings: oops, no [shortids $id] in row $e"
	    continue
	}
	for {set row $e} {[incr row -1] >= $s} {} {
	    set olds [lindex $parentlist $row]
	    set kid [lindex $displayorder $row]
	    set kidx [lsearch -exact [lindex $rowidlist $row] $kid]
	    if {$kidx < 0} continue
	    set nextrow [lindex $rowidlist [expr {$row + 1}]]
	    foreach p $olds {
		set px [lsearch -exact $nextrow $p]
		if {$px < 0} continue
		if {($kidx < $x && $x < $px) || ($px < $x && $x < $kidx)} {
		    if {[lsearch -exact $ccross $p] >= 0} continue
		    if {$x == $px + ($kidx < $px? -1: 1)} {
			lappend ccross $p
		    } elseif {[lsearch -exact $cross $p] < 0} {
			lappend cross $p
		    }
		}
	    }
	    set inc [lindex $rowoffsets $row $x]
	    if {$inc eq {}} break
	    incr x $inc
	}
    }
    return [concat $ccross {{}} $cross]
}

3171
proc assigncolor {id} {
P
Paul Mackerras 已提交
3172
    global colormap colors nextcolor
3173
    global commitrow parentlist children children curview
3174

3175
    if {[info exists colormap($id)]} return
3176
    set ncolors [llength $colors]
3177 3178
    if {[info exists children($curview,$id)]} {
	set kids $children($curview,$id)
3179 3180 3181 3182 3183
    } else {
	set kids {}
    }
    if {[llength $kids] == 1} {
	set child [lindex $kids 0]
3184
	if {[info exists colormap($child)]
3185
	    && [llength [lindex $parentlist $commitrow($curview,$child)]] == 1} {
3186 3187
	    set colormap($id) $colormap($child)
	    return
3188
	}
3189 3190
    }
    set badcolors {}
P
Paul Mackerras 已提交
3191 3192 3193 3194 3195 3196
    set origbad {}
    foreach x [findcrossings $id] {
	if {$x eq {}} {
	    # delimiter between corner crossings and other crossings
	    if {[llength $badcolors] >= $ncolors - 1} break
	    set origbad $badcolors
3197
	}
P
Paul Mackerras 已提交
3198 3199 3200
	if {[info exists colormap($x)]
	    && [lsearch -exact $badcolors $colormap($x)] < 0} {
	    lappend badcolors $colormap($x)
3201 3202
	}
    }
P
Paul Mackerras 已提交
3203 3204
    if {[llength $badcolors] >= $ncolors} {
	set badcolors $origbad
3205
    }
P
Paul Mackerras 已提交
3206
    set origbad $badcolors
3207
    if {[llength $badcolors] < $ncolors - 1} {
3208
	foreach child $kids {
3209 3210 3211 3212
	    if {[info exists colormap($child)]
		&& [lsearch -exact $badcolors $colormap($child)] < 0} {
		lappend badcolors $colormap($child)
	    }
3213
	    foreach p [lindex $parentlist $commitrow($curview,$child)] {
3214 3215 3216
		if {[info exists colormap($p)]
		    && [lsearch -exact $badcolors $colormap($p)] < 0} {
		    lappend badcolors $colormap($p)
3217 3218 3219 3220 3221 3222
		}
	    }
	}
	if {[llength $badcolors] >= $ncolors} {
	    set badcolors $origbad
	}
3223 3224 3225 3226 3227
    }
    for {set i 0} {$i <= $ncolors} {incr i} {
	set c [lindex $colors $nextcolor]
	if {[incr nextcolor] >= $ncolors} {
	    set nextcolor 0
3228
	}
3229
	if {[lsearch -exact $badcolors $c]} break
3230
    }
3231
    set colormap($id) $c
3232 3233
}

3234 3235 3236 3237 3238 3239
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"
3240
    $canv bind $t <Button-1> "lineclick %x %y $id 1"
3241 3242
}

3243
proc drawtags {id x xt y1} {
3244
    global idtags idheads idotherrefs mainhead
3245
    global linespc lthickness
3246
    global canv mainfont commitrow rowtextx curview fgcolor bgcolor
3247 3248 3249

    set marks {}
    set ntags 0
3250
    set nheads 0
3251 3252 3253 3254 3255 3256
    if {[info exists idtags($id)]} {
	set marks $idtags($id)
	set ntags [llength $marks]
    }
    if {[info exists idheads($id)]} {
	set marks [concat $marks $idheads($id)]
3257 3258 3259 3260
	set nheads [llength $idheads($id)]
    }
    if {[info exists idotherrefs($id)]} {
	set marks [concat $marks $idotherrefs($id)]
3261 3262 3263 3264 3265 3266
    }
    if {$marks eq {}} {
	return $xt
    }

    set delta [expr {int(0.5 * ($linespc - $lthickness))}]
J
Jeff Hobbs 已提交
3267 3268
    set yt [expr {$y1 - 0.5 * $linespc}]
    set yb [expr {$yt + $linespc - 1}]
3269 3270
    set xvals {}
    set wvals {}
3271
    set i -1
3272
    foreach tag $marks {
3273 3274 3275 3276 3277 3278
	incr i
	if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} {
	    set wid [font measure [concat $mainfont bold] $tag]
	} else {
	    set wid [font measure $mainfont $tag]
	}
3279 3280 3281 3282 3283 3284 3285 3286
	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 已提交
3287 3288
	set xl [expr {$x + $delta}]
	set xr [expr {$x + $delta + $wid + $lthickness}]
3289
	set font $mainfont
3290 3291
	if {[incr ntags -1] >= 0} {
	    # draw a tag
J
Jeff Hobbs 已提交
3292 3293
	    set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
		       $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
3294 3295
		       -width 1 -outline black -fill yellow -tags tag.$id]
	    $canv bind $t <1> [list showtag $tag 1]
3296
	    set rowtextx($commitrow($curview,$id)) [expr {$xr + $linespc}]
3297
	} else {
3298 3299 3300
	    # draw a head or other ref
	    if {[incr nheads -1] >= 0} {
		set col green
3301 3302 3303
		if {$tag eq $mainhead} {
		    lappend font bold
		}
3304 3305 3306
	    } else {
		set col "#ddddff"
	    }
J
Jeff Hobbs 已提交
3307
	    set xl [expr {$xl - $delta/2}]
3308
	    $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
3309
		-width 1 -outline black -fill $col -tags tag.$id
3310 3311 3312 3313 3314 3315 3316 3317
	    if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
	        set rwid [font measure $mainfont $remoteprefix]
		set xi [expr {$x + 1}]
		set yti [expr {$yt + 1}]
		set xri [expr {$x + $rwid}]
		$canv create polygon $xi $yti $xri $yti $xri $yb $xi $yb \
			-width 0 -fill "#ffddaa" -tags tag.$id
	    }
3318
	}
3319
	set t [$canv create text $xl $y1 -anchor w -text $tag -fill $fgcolor \
3320
		   -font $font -tags [list tag.$id text]]
3321 3322
	if {$ntags >= 0} {
	    $canv bind $t <1> [list showtag $tag 1]
3323 3324
	} elseif {$nheads >= 0} {
	    $canv bind $t <Button-3> [list headmenu %X %Y $id $tag]
3325
	}
3326 3327 3328 3329
    }
    return $xt
}

3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340
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
}
3341

3342
proc show_status {msg} {
3343
    global canv mainfont fgcolor
3344 3345

    clear_display
3346 3347
    $canv create text 3 3 -anchor nw -text $msg -font $mainfont \
	-tags text -fill $fgcolor
3348 3349
}

3350
proc finishcommits {} {
3351
    global commitidx phase curview
P
Paul Mackerras 已提交
3352
    global pending_select
3353

3354
    if {$commitidx($curview) > 0} {
3355 3356
	drawrest
    } else {
3357
	show_status "No commits selected"
3358
    }
P
Paul Mackerras 已提交
3359
    set phase {}
3360
    catch {unset pending_select}
3361 3362
}

3363
# Insert a new commit as the child of the commit on row $row.
3364 3365 3366 3367 3368 3369
# The new commit will be displayed on row $row and the commits
# on that row and below will move down one row.
proc insertrow {row newcmit} {
    global displayorder parentlist childlist commitlisted
    global commitrow curview rowidlist rowoffsets numcommits
    global rowrangelist idrowranges rowlaidout rowoptim numcommits
3370
    global linesegends selectedline
3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382

    if {$row >= $numcommits} {
	puts "oops, inserting new row $row but only have $numcommits rows"
	return
    }
    set p [lindex $displayorder $row]
    set displayorder [linsert $displayorder $row $newcmit]
    set parentlist [linsert $parentlist $row $p]
    set kids [lindex $childlist $row]
    lappend kids $newcmit
    lset childlist $row $kids
    set childlist [linsert $childlist $row {}]
3383
    set commitlisted [linsert $commitlisted $row 1]
3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458
    set l [llength $displayorder]
    for {set r $row} {$r < $l} {incr r} {
	set id [lindex $displayorder $r]
	set commitrow($curview,$id) $r
    }

    set idlist [lindex $rowidlist $row]
    set offs [lindex $rowoffsets $row]
    set newoffs {}
    foreach x $idlist {
	if {$x eq {} || ($x eq $p && [llength $kids] == 1)} {
	    lappend newoffs {}
	} else {
	    lappend newoffs 0
	}
    }
    if {[llength $kids] == 1} {
	set col [lsearch -exact $idlist $p]
	lset idlist $col $newcmit
    } else {
	set col [llength $idlist]
	lappend idlist $newcmit
	lappend offs {}
	lset rowoffsets $row $offs
    }
    set rowidlist [linsert $rowidlist $row $idlist]
    set rowoffsets [linsert $rowoffsets [expr {$row+1}] $newoffs]

    set rowrangelist [linsert $rowrangelist $row {}]
    set l [llength $rowrangelist]
    for {set r 0} {$r < $l} {incr r} {
	set ranges [lindex $rowrangelist $r]
	if {$ranges ne {} && [lindex $ranges end] >= $row} {
	    set newranges {}
	    foreach x $ranges {
		if {$x >= $row} {
		    lappend newranges [expr {$x + 1}]
		} else {
		    lappend newranges $x
		}
	    }
	    lset rowrangelist $r $newranges
	}
    }
    if {[llength $kids] > 1} {
	set rp1 [expr {$row + 1}]
	set ranges [lindex $rowrangelist $rp1]
	if {$ranges eq {}} {
	    set ranges [list $row $rp1]
	} elseif {[lindex $ranges end-1] == $rp1} {
	    lset ranges end-1 $row
	}
	lset rowrangelist $rp1 $ranges
    }
    foreach id [array names idrowranges] {
	set ranges $idrowranges($id)
	if {$ranges ne {} && [lindex $ranges end] >= $row} {
	    set newranges {}
	    foreach x $ranges {
		if {$x >= $row} {
		    lappend newranges [expr {$x + 1}]
		} else {
		    lappend newranges $x
		}
	    }
	    set idrowranges($id) $newranges
	}
    }

    set linesegends [linsert $linesegends $row {}]

    incr rowlaidout
    incr rowoptim
    incr numcommits

3459 3460 3461
    if {[info exists selectedline] && $selectedline >= $row} {
	incr selectedline
    }
3462 3463 3464
    redisplay
}

3465 3466 3467 3468 3469 3470 3471 3472 3473
# 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
3474 3475
}

3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495
proc nowbusy {what} {
    global isbusy

    if {[array names isbusy] eq {}} {
	. config -cursor watch
	settextcursor watch
    }
    set isbusy($what) 1
}

proc notbusy {what} {
    global isbusy maincursor textcursor

    catch {unset isbusy($what)}
    if {[array names isbusy] eq {}} {
	. config -cursor $maincursor
	settextcursor $textcursor
    }
}

3496
proc drawrest {} {
P
Paul Mackerras 已提交
3497
    global startmsecs
3498
    global rowlaidout commitidx curview
3499
    global pending_select
P
Paul Mackerras 已提交
3500 3501

    set row $rowlaidout
3502
    layoutrows $rowlaidout $commitidx($curview) 1
P
Paul Mackerras 已提交
3503
    layouttail
3504 3505
    optimize_rows $row 0 $commitidx($curview)
    showstuff $commitidx($curview)
3506 3507 3508
    if {[info exists pending_select]} {
	selectline 0 1
    }
P
Paul Mackerras 已提交
3509

J
Jeff Hobbs 已提交
3510
    set drawmsecs [expr {[clock clicks -milliseconds] - $startmsecs}]
P
Paul Mackerras 已提交
3511
    #global numcommits
3512
    #puts "overall $drawmsecs ms for $numcommits commits"
3513 3514
}

3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527
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 已提交
3528 3529
	    lappend matches [list $j [expr {$j+$foundstrlen-1}]]
	    set i [expr {$j + $foundstrlen}]
3530 3531 3532 3533 3534
	}
    }
    return $matches
}

3535 3536
proc dofind {} {
    global findtype findloc findstring markedmatches commitinfo
3537
    global numcommits displayorder linehtag linentag linedtag
3538
    global mainfont canv canv2 canv3 selectedline
P
Paul Mackerras 已提交
3539 3540
    global matchinglines foundstring foundstrlen matchstring
    global commitdata
3541 3542

    stopfindproc
3543
    unmarkmatches
3544
    cancel_next_highlight
3545
    focus .
3546 3547
    set matchinglines {}
    if {$findtype == "IgnCase"} {
3548
	set foundstring [string tolower $findstring]
3549
    } else {
3550
	set foundstring $findstring
3551
    }
3552 3553
    set foundstrlen [string length $findstring]
    if {$foundstrlen == 0} return
P
Paul Mackerras 已提交
3554 3555
    regsub -all {[*?\[\\]} $foundstring {\\&} matchstring
    set matchstring "*$matchstring*"
3556 3557 3558 3559 3560 3561
    if {![info exists selectedline]} {
	set oldsel -1
    } else {
	set oldsel $selectedline
    }
    set didsel 0
3562
    set fldtypes {Headline Author Date Committer CDate Comments}
P
Paul Mackerras 已提交
3563
    set l -1
3564 3565
    foreach id $displayorder {
	set d $commitdata($id)
P
Paul Mackerras 已提交
3566 3567 3568 3569 3570 3571 3572 3573 3574 3575
	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)]} {
3576
	    getcommit $id
P
Paul Mackerras 已提交
3577
	}
3578 3579 3580 3581 3582 3583
	set info $commitinfo($id)
	set doesmatch 0
	foreach f $info ty $fldtypes {
	    if {$findloc != "All fields" && $findloc != $ty} {
		continue
	    }
3584
	    set matches [findmatches $f]
3585 3586 3587
	    if {$matches == {}} continue
	    set doesmatch 1
	    if {$ty == "Headline"} {
P
Paul Mackerras 已提交
3588
		drawcmitrow $l
3589 3590
		markmatches $canv $l $f $linehtag($l) $matches $mainfont
	    } elseif {$ty == "Author"} {
P
Paul Mackerras 已提交
3591
		drawcmitrow $l
3592
		markmatches $canv2 $l $f $linentag($l) $matches $mainfont
3593
	    } elseif {$ty == "Date"} {
P
Paul Mackerras 已提交
3594
		drawcmitrow $l
3595 3596 3597 3598 3599 3600
		markmatches $canv3 $l $f $linedtag($l) $matches $mainfont
	    }
	}
	if {$doesmatch} {
	    lappend matchinglines $l
	    if {!$didsel && $l > $oldsel} {
3601
		findselectline $l
3602 3603 3604 3605 3606 3607 3608
		set didsel 1
	    }
	}
    }
    if {$matchinglines == {}} {
	bell
    } elseif {!$didsel} {
3609 3610 3611 3612 3613 3614
	findselectline [lindex $matchinglines 0]
    }
}

proc findselectline {l} {
    global findloc commentend ctext
3615
    selectline $l 1
3616 3617 3618 3619 3620 3621
    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 已提交
3622
	    set end [expr {[lindex $match 1] + 1}]
3623 3624
	    $ctext tag add found "1.0 + $start c" "1.0 + $end c"
	}
3625 3626 3627
    }
}

3628
proc findnext {restart} {
3629 3630
    global matchinglines selectedline
    if {![info exists matchinglines]} {
3631 3632 3633
	if {$restart} {
	    dofind
	}
3634 3635 3636 3637 3638
	return
    }
    if {![info exists selectedline]} return
    foreach l $matchinglines {
	if {$l > $selectedline} {
3639
	    findselectline $l
3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658
	    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 != {}} {
3659
	findselectline $prev
3660 3661 3662 3663 3664
    } else {
	bell
    }
}

3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677
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
    }
3678 3679
    catch {unset findinprogress}
    notbusy find
3680 3681 3682 3683 3684
}

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

P
Paul Mackerras 已提交
3687
    drawcmitrow $l
3688 3689 3690 3691 3692 3693
    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
3694 3695 3696 3697 3698 3699 3700 3701 3702
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 已提交
3703 3704 3705 3706
	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 \
3707 3708 3709 3710 3711 3712
		   -outline {} -tags matches -fill yellow]
	$canv lower $t
    }
}

proc unmarkmatches {} {
3713
    global matchinglines findids
3714 3715
    allcanvs delete matches
    catch {unset matchinglines}
3716
    catch {unset findids}
3717 3718
}

3719
proc selcanvline {w x y} {
3720
    global canv canvy0 ctext linespc
P
Paul Mackerras 已提交
3721
    global rowtextx
3722
    set ymax [lindex [$canv cget -scrollregion] 3]
3723
    if {$ymax == {}} return
3724 3725 3726 3727 3728 3729
    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
    }
3730 3731 3732
    if {$w eq $canv} {
	if {![info exists rowtextx($l)] || $x < $rowtextx($l)} return
    }
3733
    unmarkmatches
3734
    selectline $l 1
3735 3736
}

3737 3738
proc commit_descriptor {p} {
    global commitinfo
3739 3740 3741
    if {![info exists commitinfo($p)]} {
	getcommit $p
    }
3742
    set l "..."
3743
    if {[llength $commitinfo($p)] > 1} {
3744 3745
	set l [lindex $commitinfo($p) 0]
    }
P
Paul Mackerras 已提交
3746
    return "$p ($l)\n"
3747 3748
}

3749 3750
# append some text to the ctext widget, and make any SHA1 ID
# that we know about be a clickable link.
3751
proc appendwithlinks {text tags} {
3752
    global ctext commitrow linknum curview
3753 3754

    set start [$ctext index "end - 1c"]
3755
    $ctext insert end $text $tags
3756 3757 3758 3759 3760
    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]
3761
	if {![info exists commitrow($curview,$linkid)]} continue
3762 3763 3764
	incr e
	$ctext tag add link "$start + $s c" "$start + $e c"
	$ctext tag add link$linknum "$start + $s c" "$start + $e c"
3765 3766
	$ctext tag bind link$linknum <1> \
	    [list selectline $commitrow($curview,$linkid) 1]
3767 3768 3769 3770 3771 3772 3773
	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 }
}

3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789
proc viewnextline {dir} {
    global canv linespc

    $canv delete hover
    set ymax [lindex [$canv cget -scrollregion] 3]
    set wnow [$canv yview]
    set wtop [expr {[lindex $wnow 0] * $ymax}]
    set newtop [expr {$wtop + $dir * $linespc}]
    if {$newtop < 0} {
	set newtop 0
    } elseif {$newtop > $ymax} {
	set newtop $ymax
    }
    allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
}

3790 3791
# add a list of tag or branch names at position pos
# returns the number of names inserted
3792 3793
proc appendrefs {pos tags var} {
    global ctext commitrow linknum curview $var
P
Paul Mackerras 已提交
3794

3795 3796 3797
    if {[catch {$ctext index $pos}]} {
	return 0
    }
3798
    set tags [lsort $tags]
P
Paul Mackerras 已提交
3799 3800
    set sep {}
    foreach tag $tags {
3801
	set id [set $var\($tag\)]
P
Paul Mackerras 已提交
3802 3803 3804
	set lk link$linknum
	incr linknum
	$ctext insert $pos $sep
3805
	$ctext insert $pos $tag $lk
P
Paul Mackerras 已提交
3806 3807 3808 3809 3810 3811 3812 3813 3814 3815
	$ctext tag conf $lk -foreground blue
	if {[info exists commitrow($curview,$id)]} {
	    $ctext tag bind $lk <1> \
		[list selectline $commitrow($curview,$id) 1]
	    $ctext tag conf $lk -underline 1
	    $ctext tag bind $lk <Enter> { %W configure -cursor hand2 }
	    $ctext tag bind $lk <Leave> { %W configure -cursor $curtextcursor }
	}
	set sep ", "
    }
3816
    return [llength $tags]
P
Paul Mackerras 已提交
3817 3818
}

3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830
proc taglist {ids} {
    global idtags

    set tags {}
    foreach id $ids {
	foreach tag $idtags($id) {
	    lappend tags $tag
	}
    }
    return $tags
}

P
Paul Mackerras 已提交
3831 3832 3833
# called when we have finished computing the nearby tags
proc dispneartags {} {
    global selectedline currentid ctext anc_tags desc_tags showneartags
3834
    global desc_heads
P
Paul Mackerras 已提交
3835 3836 3837 3838

    if {![info exists selectedline] || !$showneartags} return
    set id $currentid
    $ctext conf -state normal
3839
    if {[info exists desc_heads($id)]} {
3840
	if {[appendrefs branch $desc_heads($id) headids] > 1} {
3841 3842 3843
	    $ctext insert "branch -2c" "es"
	}
    }
P
Paul Mackerras 已提交
3844
    if {[info exists anc_tags($id)]} {
3845
	appendrefs follows [taglist $anc_tags($id)] tagids
P
Paul Mackerras 已提交
3846 3847
    }
    if {[info exists desc_tags($id)]} {
3848
	appendrefs precedes [taglist $desc_tags($id)] tagids
P
Paul Mackerras 已提交
3849 3850 3851 3852
    }
    $ctext conf -state disabled
}

3853
proc selectline {l isnew} {
3854
    global canv canv2 canv3 ctext commitinfo selectedline
3855
    global displayorder linehtag linentag linedtag
3856
    global canvy0 linespc parentlist childlist
3857
    global currentid sha1entry
P
Paul Mackerras 已提交
3858
    global commentend idtags linknum
3859
    global mergemax numcommits pending_select
3860
    global cmitmode desc_tags anc_tags showneartags allcommits desc_heads
3861

3862
    catch {unset pending_select}
3863
    $canv delete hover
3864
    normalline
3865
    cancel_next_highlight
3866
    if {$l < 0 || $l >= $numcommits} return
3867
    set y [expr {$canvy0 + $l * $linespc}]
3868
    set ymax [lindex [$canv cget -scrollregion] 3]
3869 3870
    set ytop [expr {$y - $linespc - 1}]
    set ybot [expr {$y + $linespc + 1}]
3871
    set wnow [$canv yview]
J
Jeff Hobbs 已提交
3872 3873
    set wtop [expr {[lindex $wnow 0] * $ymax}]
    set wbot [expr {[lindex $wnow 1] * $ymax}]
3874 3875
    set wh [expr {$wbot - $wtop}]
    set newtop $wtop
3876
    if {$ytop < $wtop} {
3877 3878 3879 3880 3881 3882 3883
	if {$ybot < $wtop} {
	    set newtop [expr {$y - $wh / 2.0}]
	} else {
	    set newtop $ytop
	    if {$newtop > $wtop - $linespc} {
		set newtop [expr {$wtop - $linespc}]
	    }
3884
	}
3885 3886 3887 3888 3889 3890 3891 3892
    } 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}]
	    }
3893
	}
3894 3895 3896 3897 3898
    }
    if {$newtop != $wtop} {
	if {$newtop < 0} {
	    set newtop 0
	}
J
Jeff Hobbs 已提交
3899
	allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
P
Paul Mackerras 已提交
3900
	drawvisible
3901
    }
3902

P
Paul Mackerras 已提交
3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916
    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

3917 3918
    if {$isnew} {
	addtohistory [list selectline $l 0]
3919 3920
    }

3921 3922
    set selectedline $l

3923
    set id [lindex $displayorder $l]
3924
    set currentid $id
3925 3926 3927 3928
    $sha1entry delete 0 end
    $sha1entry insert 0 $id
    $sha1entry selection from 0
    $sha1entry selection to end
3929
    rhighlight_sel $id
3930

3931
    $ctext conf -state normal
3932
    clear_ctext
3933
    set linknum 0
3934
    set info $commitinfo($id)
P
Paul Mackerras 已提交
3935 3936 3937 3938
    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"
3939 3940 3941 3942 3943 3944 3945
    if {[info exists idtags($id)]} {
	$ctext insert end "Tags:"
	foreach tag $idtags($id) {
	    $ctext insert end " $tag"
	}
	$ctext insert end "\n"
    }
3946

3947
    set headers {}
3948 3949
    set olds [lindex $parentlist $l]
    if {[llength $olds] > 1} {
3950
	set np 0
3951
	foreach p $olds {
3952 3953 3954 3955 3956 3957
	    if {$np >= $mergemax} {
		set tag mmax
	    } else {
		set tag m$np
	    }
	    $ctext insert end "Parent: " $tag
3958
	    appendwithlinks [commit_descriptor $p] {}
3959 3960 3961
	    incr np
	}
    } else {
3962
	foreach p $olds {
P
Paul Mackerras 已提交
3963
	    append headers "Parent: [commit_descriptor $p]"
3964 3965
	}
    }
3966

3967
    foreach c [lindex $childlist $l] {
P
Paul Mackerras 已提交
3968
	append headers "Child:  [commit_descriptor $c]"
3969
    }
3970 3971

    # make anything that looks like a SHA1 ID be a clickable link
3972
    appendwithlinks $headers {}
P
Paul Mackerras 已提交
3973 3974 3975 3976
    if {$showneartags} {
	if {![info exists allcommits]} {
	    getallcommits
	}
3977 3978 3979 3980
	$ctext insert end "Branch: "
	$ctext mark set branch "end -1c"
	$ctext mark gravity branch left
	if {[info exists desc_heads($id)]} {
3981
	    if {[appendrefs branch $desc_heads($id) headids] > 1} {
3982 3983 3984 3985 3986
		# turn "Branch" into "Branches"
		$ctext insert "branch -2c" "es"
	    }
	}
	$ctext insert end "\nFollows: "
P
Paul Mackerras 已提交
3987 3988 3989
	$ctext mark set follows "end -1c"
	$ctext mark gravity follows left
	if {[info exists anc_tags($id)]} {
3990
	    appendrefs follows [taglist $anc_tags($id)] tagids
P
Paul Mackerras 已提交
3991 3992 3993 3994 3995
	}
	$ctext insert end "\nPrecedes: "
	$ctext mark set precedes "end -1c"
	$ctext mark gravity precedes left
	if {[info exists desc_tags($id)]} {
3996
	    appendrefs precedes [taglist $desc_tags($id)] tagids
P
Paul Mackerras 已提交
3997 3998 3999 4000
	}
	$ctext insert end "\n"
    }
    $ctext insert end "\n"
4001
    appendwithlinks [lindex $info 5] {comment}
4002

4003
    $ctext tag delete Comments
4004
    $ctext tag remove found 1.0 end
4005
    $ctext conf -state disabled
4006
    set commentend [$ctext index "end - 1c"]
4007

4008
    init_flist "Comments"
P
Paul Mackerras 已提交
4009 4010 4011
    if {$cmitmode eq "tree"} {
	gettree $id
    } elseif {[llength $olds] <= 1} {
4012
	startdiff $id
4013
    } else {
4014
	mergediff $id $l
4015 4016 4017
    }
}

4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029
proc selfirstline {} {
    unmarkmatches
    selectline 0 1
}

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

4030 4031 4032
proc selnextline {dir} {
    global selectedline
    if {![info exists selectedline]} return
J
Jeff Hobbs 已提交
4033
    set l [expr {$selectedline + $dir}]
4034
    unmarkmatches
4035 4036 4037
    selectline $l 1
}

4038 4039 4040 4041 4042 4043 4044 4045
proc selnextpage {dir} {
    global canv linespc selectedline numcommits

    set lpp [expr {([winfo height $canv] - 2) / $linespc}]
    if {$lpp < 1} {
	set lpp 1
    }
    allcanvs yview scroll [expr {$dir * $lpp}] units
4046
    drawvisible
4047 4048 4049 4050 4051 4052 4053 4054
    if {![info exists selectedline]} return
    set l [expr {$selectedline + $dir * $lpp}]
    if {$l < 0} {
	set l 0
    } elseif {$l >= $numcommits} {
        set l [expr $numcommits - 1]
    }
    unmarkmatches
4055
    selectline $l 1
4056 4057
}

4058
proc unselectline {} {
P
Paul Mackerras 已提交
4059
    global selectedline currentid
4060 4061

    catch {unset selectedline}
P
Paul Mackerras 已提交
4062
    catch {unset currentid}
4063
    allcanvs delete secsel
4064
    rhighlight_none
4065
    cancel_next_highlight
4066 4067
}

P
Paul Mackerras 已提交
4068 4069 4070 4071 4072 4073 4074 4075
proc reselectline {} {
    global selectedline

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

4076
proc addtohistory {cmd} {
4077
    global history historyindex curview
4078

4079
    set elt [list $curview $cmd]
4080
    if {$historyindex > 0
4081
	&& [lindex $history [expr {$historyindex - 1}]] == $elt} {
4082 4083 4084 4085
	return
    }

    if {$historyindex < [llength $history]} {
4086
	set history [lreplace $history $historyindex end $elt]
4087
    } else {
4088
	lappend history $elt
4089 4090 4091
    }
    incr historyindex
    if {$historyindex > 1} {
4092
	.tf.bar.leftbut conf -state normal
4093
    } else {
4094
	.tf.bar.leftbut conf -state disabled
4095
    }
4096
    .tf.bar.rightbut conf -state disabled
4097 4098
}

4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109
proc godo {elt} {
    global curview

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

4110 4111 4112 4113 4114
proc goback {} {
    global history historyindex

    if {$historyindex > 1} {
	incr historyindex -1
4115
	godo [lindex $history [expr {$historyindex - 1}]]
4116
	.tf.bar.rightbut conf -state normal
4117 4118
    }
    if {$historyindex <= 1} {
4119
	.tf.bar.leftbut conf -state disabled
4120 4121 4122 4123 4124 4125 4126
    }
}

proc goforw {} {
    global history historyindex

    if {$historyindex < [llength $history]} {
4127
	set cmd [lindex $history $historyindex]
4128
	incr historyindex
4129
	godo $cmd
4130
	.tf.bar.leftbut conf -state normal
4131 4132
    }
    if {$historyindex >= [llength $history]} {
4133
	.tf.bar.rightbut conf -state disabled
4134
    }
4135 4136
}

P
Paul Mackerras 已提交
4137 4138 4139 4140 4141 4142 4143
proc gettree {id} {
    global treefilelist treeidlist diffids diffmergeid treepending

    set diffids $id
    catch {unset diffmergeid}
    if {![info exists treefilelist($id)]} {
	if {![info exists treepending]} {
4144
	    if {[catch {set gtf [open [concat | git ls-tree -r $id] r]}]} {
P
Paul Mackerras 已提交
4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191
		return
	    }
	    set treepending $id
	    set treefilelist($id) {}
	    set treeidlist($id) {}
	    fconfigure $gtf -blocking 0
	    fileevent $gtf readable [list gettreeline $gtf $id]
	}
    } else {
	setfilelist $id
    }
}

proc gettreeline {gtf id} {
    global treefilelist treeidlist treepending cmitmode diffids

    while {[gets $gtf line] >= 0} {
	if {[lindex $line 1] ne "blob"} continue
	set sha1 [lindex $line 2]
	set fname [lindex $line 3]
	lappend treefilelist($id) $fname
	lappend treeidlist($id) $sha1
    }
    if {![eof $gtf]} return
    close $gtf
    unset treepending
    if {$cmitmode ne "tree"} {
	if {![info exists diffmergeid]} {
	    gettreediffs $diffids
	}
    } elseif {$id ne $diffids} {
	gettree $diffids
    } else {
	setfilelist $id
    }
}

proc showfile {f} {
    global treefilelist treeidlist diffids
    global ctext commentend

    set i [lsearch -exact $treefilelist($diffids) $f]
    if {$i < 0} {
	puts "oops, $f not in list for id $diffids"
	return
    }
    set blob [lindex $treeidlist($diffids) $i]
4192
    if {[catch {set bf [open [concat | git cat-file blob $blob] r]} err]} {
P
Paul Mackerras 已提交
4193 4194 4195 4196 4197 4198
	puts "oops, error reading blob $blob: $err"
	return
    }
    fconfigure $bf -blocking 0
    fileevent $bf readable [list getblobline $bf $diffids]
    $ctext config -state normal
4199
    clear_ctext $commentend
P
Paul Mackerras 已提交
4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224
    $ctext insert end "\n"
    $ctext insert end "$f\n" filesep
    $ctext config -state disabled
    $ctext yview $commentend
}

proc getblobline {bf id} {
    global diffids cmitmode ctext

    if {$id ne $diffids || $cmitmode ne "tree"} {
	catch {close $bf}
	return
    }
    $ctext config -state normal
    while {[gets $bf line] >= 0} {
	$ctext insert end "$line\n"
    }
    if {[eof $bf]} {
	# delete last newline
	$ctext delete "end - 2c" "end - 1c"
	close $bf
    }
    $ctext config -state disabled
}

4225 4226
proc mergediff {id l} {
    global diffmergeid diffopts mdifffd
4227
    global diffids
4228
    global parentlist
4229

4230
    set diffmergeid $id
4231
    set diffids $id
4232
    # this doesn't seem to actually affect anything...
4233
    set env(GIT_DIFF_OPTS) $diffopts
4234
    set cmd [concat | git diff-tree --no-commit-id --cc $id]
4235 4236 4237
    if {[catch {set mdf [open $cmd r]} err]} {
	error_popup "Error getting merge diffs: $err"
	return
4238
    }
4239 4240
    fconfigure $mdf -blocking 0
    set mdifffd($id) $mdf
4241 4242
    set np [llength [lindex $parentlist $l]]
    fileevent $mdf readable [list getmergediffline $mdf $id $np]
4243
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
4244 4245
}

4246 4247
proc getmergediffline {mdf id np} {
    global diffmergeid ctext cflist nextupdate mergemax
4248
    global difffilestart mdifffd
4249

4250
    set n [gets $mdf line]
4251
    if {$n < 0} {
4252 4253
	if {[eof $mdf]} {
	    close $mdf
4254 4255 4256
	}
	return
    }
4257 4258
    if {![info exists diffmergeid] || $id != $diffmergeid
	|| $mdf != $mdifffd($id)} {
4259
	return
4260 4261
    }
    $ctext conf -state normal
4262 4263
    if {[regexp {^diff --cc (.*)} $line match fname]} {
	# start of a new file
4264 4265
	$ctext insert end "\n"
	set here [$ctext index "end - 1c"]
4266
	lappend difffilestart $here
P
Paul Mackerras 已提交
4267
	add_flist [list $fname]
4268
	set l [expr {(78 - [string length $fname]) / 2}]
4269
	set pad [string range "----------------------------------------" 1 $l]
4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288
	$ctext insert end "$pad $fname $pad\n" filesep
    } elseif {[regexp {^@@} $line]} {
	$ctext insert end "$line\n" hunksep
    } elseif {[regexp {^[0-9a-f]{40}$} $line] || [regexp {^index} $line]} {
	# do nothing
    } else {
	# parse the prefix - one ' ', '-' or '+' for each parent
	set spaces {}
	set minuses {}
	set pluses {}
	set isbad 0
	for {set j 0} {$j < $np} {incr j} {
	    set c [string range $line $j $j]
	    if {$c == " "} {
		lappend spaces $j
	    } elseif {$c == "-"} {
		lappend minuses $j
	    } elseif {$c == "+"} {
		lappend pluses $j
4289
	    } else {
4290 4291
		set isbad 1
		break
4292
	    }
4293
	}
4294 4295 4296 4297 4298 4299 4300 4301 4302
	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]
4303
	}
4304 4305 4306
	if {$num ne {}} {
	    if {$num >= $mergemax} {
		set num "max"
4307
	    }
4308
	    lappend tags m$num
4309
	}
4310
	$ctext insert end "$line\n" $tags
4311 4312
    }
    $ctext conf -state disabled
4313 4314 4315 4316
    if {[clock clicks -milliseconds] >= $nextupdate} {
	incr nextupdate 100
	fileevent $mdf readable {}
	update
4317
	fileevent $mdf readable [list getmergediffline $mdf $id $np]
4318 4319 4320
    }
}

4321 4322
proc startdiff {ids} {
    global treediffs diffids treepending diffmergeid
4323

4324
    set diffids $ids
4325
    catch {unset diffmergeid}
4326
    if {![info exists treediffs($ids)]} {
4327
	if {![info exists treepending]} {
4328
	    gettreediffs $ids
4329 4330
	}
    } else {
4331
	addtocflist $ids
4332 4333 4334 4335
    }
}

proc addtocflist {ids} {
4336
    global treediffs cflist
P
Paul Mackerras 已提交
4337
    add_flist $treediffs($ids)
4338
    getblobdiffs $ids
4339 4340
}

4341
proc gettreediffs {ids} {
4342
    global treediff treepending
4343
    set treepending $ids
4344
    set treediff {}
4345
    if {[catch \
4346
	 {set gdtf [open [concat | git diff-tree --no-commit-id -r $ids] r]} \
4347
	]} return
4348
    fconfigure $gdtf -blocking 0
4349
    fileevent $gdtf readable [list gettreediffline $gdtf $ids]
4350 4351
}

4352
proc gettreediffline {gdtf ids} {
4353
    global treediff treediffs treepending diffids diffmergeid
P
Paul Mackerras 已提交
4354
    global cmitmode
4355

4356 4357 4358 4359
    set n [gets $gdtf line]
    if {$n < 0} {
	if {![eof $gdtf]} return
	close $gdtf
4360
	set treediffs($ids) $treediff
4361
	unset treepending
P
Paul Mackerras 已提交
4362 4363 4364
	if {$cmitmode eq "tree"} {
	    gettree $diffids
	} elseif {$ids != $diffids} {
4365 4366
	    if {![info exists diffmergeid]} {
		gettreediffs $diffids
4367
	    }
4368 4369
	} else {
	    addtocflist $ids
4370
	}
4371 4372
	return
    }
4373
    set file [lindex $line 5]
4374
    lappend treediff $file
4375 4376
}

4377
proc getblobdiffs {ids} {
4378
    global diffopts blobdifffd diffids env curdifftag curtagstart
4379
    global nextupdate diffinhdr treediffs
4380

4381
    set env(GIT_DIFF_OPTS) $diffopts
4382
    set cmd [concat | git diff-tree --no-commit-id -r -p -C $ids]
4383
    if {[catch {set bdf [open $cmd r]} err]} {
4384 4385 4386
	puts "error getting diffs: $err"
	return
    }
4387
    set diffinhdr 0
4388
    fconfigure $bdf -blocking 0
4389
    set blobdifffd($ids) $bdf
4390 4391 4392
    set curdifftag Comments
    set curtagstart 0.0
    fileevent $bdf readable [list getblobdiffline $bdf $diffids]
4393
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
4394 4395
}

4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408
proc setinlist {var i val} {
    global $var

    while {[llength [set $var]] < $i} {
	lappend $var {}
    }
    if {[llength [set $var]] == $i} {
	lappend $var $val
    } else {
	lset $var $i $val
    }
}

4409
proc getblobdiffline {bdf ids} {
4410
    global diffids blobdifffd ctext curdifftag curtagstart
4411 4412
    global diffnexthead diffnextnote difffilestart
    global nextupdate diffinhdr treediffs
4413

4414 4415 4416 4417
    set n [gets $bdf line]
    if {$n < 0} {
	if {[eof $bdf]} {
	    close $bdf
4418
	    if {$ids == $diffids && $bdf == $blobdifffd($ids)} {
4419 4420 4421 4422 4423
		$ctext tag add $curdifftag $curtagstart end
	    }
	}
	return
    }
4424
    if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
4425 4426 4427
	return
    }
    $ctext conf -state normal
4428
    if {[regexp {^diff --git a/(.*) b/(.*)} $line match fname newname]} {
4429 4430 4431
	# start of a new file
	$ctext insert end "\n"
	$ctext tag add $curdifftag $curtagstart end
4432
	set here [$ctext index "end - 1c"]
4433 4434
	set curtagstart $here
	set header $newname
4435 4436 4437 4438 4439 4440 4441 4442 4443
	set i [lsearch -exact $treediffs($ids) $fname]
	if {$i >= 0} {
	    setinlist difffilestart $i $here
	}
	if {$newname ne $fname} {
	    set i [lsearch -exact $treediffs($ids) $newname]
	    if {$i >= 0} {
		setinlist difffilestart $i $here
	    }
4444
	}
4445 4446
	set curdifftag "f:$fname"
	$ctext tag delete $curdifftag
4447
	set l [expr {(78 - [string length $header]) / 2}]
4448
	set pad [string range "----------------------------------------" 1 $l]
4449
	$ctext insert end "$pad $header $pad\n" filesep
4450
	set diffinhdr 1
4451 4452 4453
    } elseif {$diffinhdr && [string compare -length 3 $line "---"] == 0} {
	# do nothing
    } elseif {$diffinhdr && [string compare -length 3 $line "+++"] == 0} {
4454
	set diffinhdr 0
4455 4456
    } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
		   $line match f1l f1c f2l f2c rest]} {
4457
	$ctext insert end "$line\n" hunksep
4458
	set diffinhdr 0
4459 4460 4461 4462 4463 4464 4465
    } 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"
4466
	} elseif {$diffinhdr || $x == "\\"} {
4467 4468
	    # e.g. "\ No newline at end of file"
	    $ctext insert end "$line\n" filesep
4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480
	} 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
4481 4482 4483 4484 4485 4486
    if {[clock clicks -milliseconds] >= $nextupdate} {
	incr nextupdate 100
	fileevent $bdf readable {}
	update
	fileevent $bdf readable "getblobdiffline $bdf {$ids}"
    }
4487 4488
}

4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502
proc prevfile {} {
    global difffilestart ctext
    set prev [lindex $difffilestart 0]
    set here [$ctext index @0,0]
    foreach loc $difffilestart {
	if {[$ctext compare $loc >= $here]} {
	    $ctext yview $prev
	    return
	}
	set prev $loc
    }
    $ctext yview $prev
}

4503 4504 4505
proc nextfile {} {
    global difffilestart ctext
    set here [$ctext index @0,0]
4506 4507 4508
    foreach loc $difffilestart {
	if {[$ctext compare $loc > $here]} {
	    $ctext yview $loc
4509
	    return
4510 4511
	}
    }
4512 4513
}

4514 4515 4516
proc clear_ctext {{first 1.0}} {
    global ctext smarktop smarkbot

4517 4518 4519
    set l [lindex [split $first .] 0]
    if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} {
	set smarktop $l
4520
    }
4521 4522
    if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} {
	set smarkbot $l
4523 4524 4525 4526 4527
    }
    $ctext delete $first end
}

proc incrsearch {name ix op} {
4528
    global ctext searchstring searchdirn
4529 4530

    $ctext tag remove found 1.0 end
4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541
    if {[catch {$ctext index anchor}]} {
	# no anchor set, use start of selection, or of visible area
	set sel [$ctext tag ranges sel]
	if {$sel ne {}} {
	    $ctext mark set anchor [lindex $sel 0]
	} elseif {$searchdirn eq "-forwards"} {
	    $ctext mark set anchor @0,0
	} else {
	    $ctext mark set anchor @0,[winfo height $ctext]
	}
    }
4542
    if {$searchstring ne {}} {
4543 4544 4545 4546
	set here [$ctext search $searchdirn -- $searchstring anchor]
	if {$here ne {}} {
	    $ctext see $here
	}
4547 4548 4549 4550 4551
	searchmarkvisible 1
    }
}

proc dosearch {} {
4552
    global sstring ctext searchstring searchdirn
4553 4554 4555

    focus $sstring
    $sstring icursor end
4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599
    set searchdirn -forwards
    if {$searchstring ne {}} {
	set sel [$ctext tag ranges sel]
	if {$sel ne {}} {
	    set start "[lindex $sel 0] + 1c"
	} elseif {[catch {set start [$ctext index anchor]}]} {
	    set start "@0,0"
	}
	set match [$ctext search -count mlen -- $searchstring $start]
	$ctext tag remove sel 1.0 end
	if {$match eq {}} {
	    bell
	    return
	}
	$ctext see $match
	set mend "$match + $mlen c"
	$ctext tag add sel $match $mend
	$ctext mark unset anchor
    }
}

proc dosearchback {} {
    global sstring ctext searchstring searchdirn

    focus $sstring
    $sstring icursor end
    set searchdirn -backwards
    if {$searchstring ne {}} {
	set sel [$ctext tag ranges sel]
	if {$sel ne {}} {
	    set start [lindex $sel 0]
	} elseif {[catch {set start [$ctext index anchor]}]} {
	    set start @0,[winfo height $ctext]
	}
	set match [$ctext search -backwards -count ml -- $searchstring $start]
	$ctext tag remove sel 1.0 end
	if {$match eq {}} {
	    bell
	    return
	}
	$ctext see $match
	set mend "$match + $ml c"
	$ctext tag add sel $match $mend
	$ctext mark unset anchor
4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637
    }
}

proc searchmark {first last} {
    global ctext searchstring

    set mend $first.0
    while {1} {
	set match [$ctext search -count mlen -- $searchstring $mend $last.end]
	if {$match eq {}} break
	set mend "$match + $mlen c"
	$ctext tag add found $match $mend
    }
}

proc searchmarkvisible {doall} {
    global ctext smarktop smarkbot

    set topline [lindex [split [$ctext index @0,0] .] 0]
    set botline [lindex [split [$ctext index @0,[winfo height $ctext]] .] 0]
    if {$doall || $botline < $smarktop || $topline > $smarkbot} {
	# no overlap with previous
	searchmark $topline $botline
	set smarktop $topline
	set smarkbot $botline
    } else {
	if {$topline < $smarktop} {
	    searchmark $topline [expr {$smarktop-1}]
	    set smarktop $topline
	}
	if {$botline > $smarkbot} {
	    searchmark [expr {$smarkbot+1}] $botline
	    set smarkbot $botline
	}
    }
}

proc scrolltext {f0 f1} {
4638
    global searchstring
4639

4640
    .bleft.sb set $f0 $f1
4641 4642 4643 4644 4645
    if {$searchstring ne {}} {
	searchmarkvisible 0
    }
}

4646 4647
proc setcoords {} {
    global linespc charspc canvx0 canvy0 mainfont
4648
    global xspc1 xspc2 lthickness
4649

4650 4651
    set linespc [font metrics $mainfont -linespace]
    set charspc [font measure $mainfont "m"]
P
Paul Mackerras 已提交
4652 4653
    set canvy0 [expr {int(3 + 0.5 * $linespc)}]
    set canvx0 [expr {int(3 + 0.5 * $linespc)}]
4654
    set lthickness [expr {int($linespc / 9) + 1}]
4655 4656
    set xspc1(0) $linespc
    set xspc2 $linespc
4657
}
4658

4659
proc redisplay {} {
4660
    global canv
P
Paul Mackerras 已提交
4661 4662 4663 4664 4665 4666
    global selectedline

    set ymax [lindex [$canv cget -scrollregion] 3]
    if {$ymax eq {} || $ymax == 0} return
    set span [$canv yview]
    clear_display
4667
    setcanvscroll
P
Paul Mackerras 已提交
4668 4669 4670 4671
    allcanvs yview moveto [lindex $span 0]
    drawvisible
    if {[info exists selectedline]} {
	selectline $selectedline 0
4672
	allcanvs yview moveto [lindex $span 0]
4673 4674 4675 4676
    }
}

proc incrfont {inc} {
4677
    global mainfont textfont ctext canv phase
4678
    global stopped entries
4679 4680 4681 4682 4683 4684
    unmarkmatches
    set mainfont [lreplace $mainfont 1 1 [expr {[lindex $mainfont 1] + $inc}]]
    set textfont [lreplace $textfont 1 1 [expr {[lindex $textfont 1] + $inc}]]
    setcoords
    $ctext conf -font $textfont
    $ctext tag conf filesep -font [concat $textfont bold]
4685 4686 4687
    foreach e $entries {
	$e conf -font $mainfont
    }
4688
    if {$phase eq "getcommits"} {
4689 4690 4691 4692
	$canv itemconf textitems -font $mainfont
    }
    redisplay
}
4693

4694 4695 4696 4697 4698 4699 4700
proc clearsha1 {} {
    global sha1entry sha1string
    if {[string length $sha1string] == 40} {
	$sha1entry delete 0 end
    }
}

4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717
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 {} {
4718
    global sha1string currentid commitrow tagids headids
4719
    global displayorder numcommits curview
4720

4721 4722 4723 4724
    if {$sha1string == {}
	|| ([info exists currentid] && $sha1string == $currentid)} return
    if {[info exists tagids($sha1string)]} {
	set id $tagids($sha1string)
4725 4726
    } elseif {[info exists headids($sha1string)]} {
	set id $headids($sha1string)
4727 4728
    } else {
	set id [string tolower $sha1string]
4729 4730
	if {[regexp {^[0-9a-f]{4,39}$} $id]} {
	    set matches {}
P
Paul Mackerras 已提交
4731 4732 4733
	    foreach i $displayorder {
		if {[string match $id* $i]} {
		    lappend matches $i
4734 4735 4736 4737 4738 4739 4740 4741 4742 4743
		}
	    }
	    if {$matches ne {}} {
		if {[llength $matches] > 1} {
		    error_popup "Short SHA1 id $id is ambiguous"
		    return
		}
		set id [lindex $matches 0]
	    }
	}
4744
    }
4745 4746
    if {[info exists commitrow($curview,$id)]} {
	selectline $commitrow($curview,$id) 1
4747 4748
	return
    }
4749
    if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
4750 4751
	set type "SHA1 id"
    } else {
4752
	set type "Tag/Head"
4753 4754 4755 4756
    }
    error_popup "$type $sha1string is not known"
}

4757 4758 4759 4760
proc lineenter {x y id} {
    global hoverx hovery hoverid hovertimer
    global commitinfo canv

P
Paul Mackerras 已提交
4761
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
4762 4763 4764 4765 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815
    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
4816 4817
    set t [$canv create text $x $y -anchor nw -text $text -tags hover \
	       -font $mainfont]
4818 4819 4820
    $canv raise $t
}

4821
proc clickisonarrow {id y} {
P
Paul Mackerras 已提交
4822
    global lthickness
4823

P
Paul Mackerras 已提交
4824
    set ranges [rowranges $id]
4825
    set thresh [expr {2 * $lthickness + 6}]
P
Paul Mackerras 已提交
4826
    set n [expr {[llength $ranges] - 1}]
4827
    for {set i 1} {$i < $n} {incr i} {
P
Paul Mackerras 已提交
4828
	set row [lindex $ranges $i]
4829 4830
	if {abs([yc $row] - $y) < $thresh} {
	    return $i
4831 4832 4833 4834 4835
	}
    }
    return {}
}

4836
proc arrowjump {id n y} {
P
Paul Mackerras 已提交
4837
    global canv
4838

4839 4840
    # 1 <-> 2, 3 <-> 4, etc...
    set n [expr {(($n - 1) ^ 1) + 1}]
P
Paul Mackerras 已提交
4841
    set row [lindex [rowranges $id] $n]
4842
    set yt [yc $row]
4843 4844 4845 4846 4847 4848 4849 4850
    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
    }
4851
    allcanvs yview moveto $yfrac
4852 4853
}

4854
proc lineclick {x y id isnew} {
4855
    global ctext commitinfo children canv thickerline curview
4856

P
Paul Mackerras 已提交
4857
    if {![info exists commitinfo($id)] && ![getcommit $id]} return
4858
    unmarkmatches
4859
    unselectline
4860 4861 4862 4863
    normalline
    $canv delete hover
    # draw this line thicker than normal
    set thickerline $id
4864
    drawlines $id
4865
    if {$isnew} {
4866 4867 4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878
	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]
4879
    }
4880 4881
    # fill the details pane with info about this line
    $ctext conf -state normal
4882
    clear_ctext
4883 4884 4885 4886 4887 4888
    $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]
4889
    set info $commitinfo($id)
4890
    $ctext insert end "\n\t[lindex $info 0]\n"
4891
    $ctext insert end "\tAuthor:\t[lindex $info 1]\n"
P
Paul Mackerras 已提交
4892 4893
    set date [formatdate [lindex $info 2]]
    $ctext insert end "\tDate:\t$date\n"
4894
    set kids $children($curview,$id)
4895
    if {$kids ne {}} {
4896
	$ctext insert end "\nChildren:"
4897
	set i 0
4898
	foreach child $kids {
4899
	    incr i
P
Paul Mackerras 已提交
4900
	    if {![info exists commitinfo($child)] && ![getcommit $child]} continue
4901
	    set info $commitinfo($child)
4902 4903 4904 4905 4906
	    $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 已提交
4907 4908
	    set date [formatdate [lindex $info 2]]
	    $ctext insert end "\n\tDate:\t$date\n"
4909 4910 4911
	}
    }
    $ctext conf -state disabled
4912
    init_flist {}
4913 4914
}

4915 4916 4917
proc normalline {} {
    global thickerline
    if {[info exists thickerline]} {
4918
	set id $thickerline
4919
	unset thickerline
4920
	drawlines $id
4921 4922 4923
    }
}

4924
proc selbyid {id} {
4925 4926 4927
    global commitrow curview
    if {[info exists commitrow($curview,$id)]} {
	selectline $commitrow($curview,$id) 1
4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939
    }
}

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

4942 4943
    if {![info exists selectedline]
	|| $commitrow($curview,$id) eq $selectedline} {
4944 4945 4946 4947
	set state disabled
    } else {
	set state normal
    }
4948 4949 4950
    $rowctxmenu entryconfigure "Diff this*" -state $state
    $rowctxmenu entryconfigure "Diff selected*" -state $state
    $rowctxmenu entryconfigure "Make patch" -state $state
4951 4952 4953 4954 4955
    set rowmenuid $id
    tk_popup $rowctxmenu $x $y
}

proc diffvssel {dirn} {
4956
    global rowmenuid selectedline displayorder
4957 4958 4959

    if {![info exists selectedline]} return
    if {$dirn} {
4960
	set oldid [lindex $displayorder $selectedline]
4961 4962 4963
	set newid $rowmenuid
    } else {
	set oldid $rowmenuid
4964
	set newid [lindex $displayorder $selectedline]
4965
    }
4966 4967 4968 4969 4970
    addtohistory [list doseldiff $oldid $newid]
    doseldiff $oldid $newid
}

proc doseldiff {oldid newid} {
4971
    global ctext
4972 4973
    global commitinfo

4974
    $ctext conf -state normal
4975
    clear_ctext
4976
    init_flist "Top"
4977 4978 4979 4980 4981 4982 4983
    $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     "
4984
    $ctext insert end [lindex $commitinfo($oldid) 0]
4985 4986 4987 4988
    $ctext insert end "\n\nTo   "
    $ctext tag bind link1 <1> [list selbyid $newid]
    $ctext insert end $newid [list link link1]
    $ctext insert end "\n     "
4989 4990 4991 4992 4993
    $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
4994
    startdiff [list $oldid $newid]
4995 4996
}

4997 4998 4999 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009
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"
5010
    grid $top.title - -pady 10
5011
    label $top.from -text "From:"
5012
    entry $top.fromsha1 -width 40 -relief flat
5013 5014 5015
    $top.fromsha1 insert 0 $oldid
    $top.fromsha1 conf -state readonly
    grid $top.from $top.fromsha1 -sticky w
5016
    entry $top.fromhead -width 60 -relief flat
5017 5018 5019 5020
    $top.fromhead insert 0 $oldhead
    $top.fromhead conf -state readonly
    grid x $top.fromhead -sticky w
    label $top.to -text "To:"
5021
    entry $top.tosha1 -width 40 -relief flat
5022 5023 5024
    $top.tosha1 insert 0 $newid
    $top.tosha1 conf -state readonly
    grid $top.to $top.tosha1 -sticky w
5025
    entry $top.tohead -width 60 -relief flat
5026 5027 5028 5029 5030 5031 5032 5033 5034
    $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
5035
    grid $top.flab $top.fname -sticky w
5036 5037 5038 5039 5040 5041 5042
    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
5043
    focus $top.fname
5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058 5059 5060 5061 5062 5063 5064 5065 5066 5067
}

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]
5068
    if {[catch {exec git diff-tree -p $oldid $newid >$fname &} err]} {
5069 5070 5071 5072 5073 5074 5075 5076 5077 5078 5079 5080 5081
	error_popup "Error creating patch: $err"
    }
    catch {destroy $patchtop}
    unset patchtop
}

proc mkpatchcan {} {
    global patchtop

    catch {destroy $patchtop}
    unset patchtop
}

5082 5083 5084 5085 5086 5087 5088 5089
proc mktag {} {
    global rowmenuid mktagtop commitinfo

    set top .maketag
    set mktagtop $top
    catch {destroy $top}
    toplevel $top
    label $top.title -text "Create tag"
5090
    grid $top.title - -pady 10
5091
    label $top.id -text "ID:"
5092
    entry $top.sha1 -width 40 -relief flat
5093 5094 5095
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
5096
    entry $top.head -width 60 -relief flat
5097 5098 5099 5100
    $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:"
5101
    entry $top.tag -width 60
5102 5103 5104 5105 5106 5107 5108 5109 5110 5111 5112 5113 5114 5115 5116 5117 5118 5119 5120 5121 5122 5123 5124 5125 5126
    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 {
5127
	set dir [gitdir]
5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138
	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
5139
    redrawtags $id
5140
    addedtag $id
5141 5142 5143
}

proc redrawtags {id} {
5144
    global canv linehtag commitrow idpos selectedline curview
5145
    global mainfont canvxmax
5146

5147 5148
    if {![info exists commitrow($curview,$id)]} return
    drawcmitrow $commitrow($curview,$id)
5149 5150
    $canv delete tag.$id
    set xt [eval drawtags $id $idpos($id)]
5151
    $canv coords $linehtag($commitrow($curview,$id)) $xt [lindex $idpos($id) 2]
P
Paul Mackerras 已提交
5152 5153 5154 5155 5156 5157
    set text [$canv itemcget $linehtag($commitrow($curview,$id)) -text]
    set xr [expr {$xt + [font measure $mainfont $text]}]
    if {$xr > $canvxmax} {
	set canvxmax $xr
	setcanvscroll
    }
5158 5159
    if {[info exists selectedline]
	&& $selectedline == $commitrow($curview,$id)} {
5160
	selectline $selectedline 0
5161 5162 5163 5164 5165 5166 5167 5168 5169 5170 5171 5172 5173 5174 5175
    }
}

proc mktagcan {} {
    global mktagtop

    catch {destroy $mktagtop}
    unset mktagtop
}

proc mktaggo {} {
    domktag
    mktagcan
}

5176 5177 5178 5179 5180 5181 5182 5183 5184 5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226 5227 5228 5229 5230
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
}

5231 5232 5233 5234 5235 5236 5237 5238 5239 5240 5241 5242 5243 5244 5245 5246 5247 5248 5249 5250 5251 5252 5253 5254 5255 5256 5257 5258 5259 5260 5261 5262 5263 5264 5265 5266 5267 5268 5269 5270 5271 5272 5273 5274
proc mkbranch {} {
    global rowmenuid mkbrtop

    set top .makebranch
    catch {destroy $top}
    toplevel $top
    label $top.title -text "Create new branch"
    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
    label $top.nlab -text "Name:"
    entry $top.name -width 40
    grid $top.nlab $top.name -sticky w
    frame $top.buts
    button $top.buts.go -text "Create" -command [list mkbrgo $top]
    button $top.buts.can -text "Cancel" -command "catch {destroy $top}"
    grid $top.buts.go $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.name
}

proc mkbrgo {top} {
    global headids idheads

    set name [$top.name get]
    set id [$top.sha1 get]
    if {$name eq {}} {
	error_popup "Please specify a name for the new branch"
	return
    }
    catch {destroy $top}
    nowbusy newbranch
    update
    if {[catch {
	exec git branch $name $id
    } err]} {
	notbusy newbranch
	error_popup $err
    } else {
5275
	addedhead $id $name
5276 5277 5278 5279 5280 5281
	# XXX should update list of heads displayed for selected commit
	notbusy newbranch
	redrawtags $id
    }
}

5282 5283 5284 5285 5286 5287 5288 5289 5290 5291 5292 5293 5294 5295 5296 5297 5298 5299 5300 5301 5302 5303 5304 5305 5306 5307 5308 5309 5310 5311 5312 5313 5314 5315 5316 5317 5318 5319 5320 5321 5322 5323 5324 5325
proc cherrypick {} {
    global rowmenuid curview commitrow
    global mainhead desc_heads anc_tags desc_tags allparents allchildren

    if {[info exists desc_heads($rowmenuid)]
	&& [lsearch -exact $desc_heads($rowmenuid) $mainhead] >= 0} {
	set ok [confirm_popup "Commit [string range $rowmenuid 0 7] is already\
			included in branch $mainhead -- really re-apply it?"]
	if {!$ok} return
    }
    nowbusy cherrypick
    update
    set oldhead [exec git rev-parse HEAD]
    # Unfortunately git-cherry-pick writes stuff to stderr even when
    # no error occurs, and exec takes that as an indication of error...
    if {[catch {exec sh -c "git cherry-pick -r $rowmenuid 2>&1"} err]} {
	notbusy cherrypick
	error_popup $err
	return
    }
    set newhead [exec git rev-parse HEAD]
    if {$newhead eq $oldhead} {
	notbusy cherrypick
	error_popup "No changes committed"
	return
    }
    set allparents($newhead) $oldhead
    lappend allchildren($oldhead) $newhead
    set desc_heads($newhead) $mainhead
    if {[info exists anc_tags($oldhead)]} {
	set anc_tags($newhead) $anc_tags($oldhead)
    }
    set desc_tags($newhead) {}
    if {[info exists commitrow($curview,$oldhead)]} {
	insertrow $commitrow($curview,$oldhead) $newhead
	if {$mainhead ne {}} {
	    movedhead $newhead $mainhead
	}
	redrawtags $oldhead
	redrawtags $newhead
    }
    notbusy cherrypick
}

5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337 5338 5339 5340 5341 5342 5343 5344 5345 5346 5347 5348
# context menu for a head
proc headmenu {x y id head} {
    global headmenuid headmenuhead headctxmenu

    set headmenuid $id
    set headmenuhead $head
    tk_popup $headctxmenu $x $y
}

proc cobranch {} {
    global headmenuid headmenuhead mainhead headids

    # check the tree is clean first??
    set oldmainhead $mainhead
    nowbusy checkout
    update
    if {[catch {
	exec git checkout $headmenuhead
    } err]} {
	notbusy checkout
	error_popup $err
    } else {
	notbusy checkout
5349
	set mainhead $headmenuhead
5350 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364 5365 5366
	if {[info exists headids($oldmainhead)]} {
	    redrawtags $headids($oldmainhead)
	}
	redrawtags $headmenuid
    }
}

proc rmbranch {} {
    global desc_heads headmenuid headmenuhead mainhead
    global headids idheads

    set head $headmenuhead
    set id $headmenuid
    if {$head eq $mainhead} {
	error_popup "Cannot delete the currently checked-out branch"
	return
    }
5367
    if {$desc_heads($id) eq $head} {
5368 5369 5370 5371 5372 5373 5374 5375 5376 5377 5378
	# the stuff on this branch isn't on any other branch
	if {![confirm_popup "The commits on branch $head aren't on any other\
			branch.\nReally delete branch $head?"]} return
    }
    nowbusy rmbranch
    update
    if {[catch {exec git branch -D $head} err]} {
	notbusy rmbranch
	error_popup $err
	return
    }
5379
    removedhead $id $head
5380 5381 5382 5383
    redrawtags $id
    notbusy rmbranch
}

P
Paul Mackerras 已提交
5384 5385
# Stuff for finding nearby tags
proc getallcommits {} {
5386
    global allcstart allcommits allcfd allids
5387

5388
    set allids {}
P
Paul Mackerras 已提交
5389
    set fd [open [concat | git rev-list --all --topo-order --parents] r]
5390
    set allcfd $fd
P
Paul Mackerras 已提交
5391 5392 5393 5394 5395 5396
    fconfigure $fd -blocking 0
    set allcommits "reading"
    nowbusy allcommits
    restartgetall $fd
}

5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410
proc discardallcommits {} {
    global allparents allchildren allcommits allcfd
    global desc_tags anc_tags alldtags tagisdesc allids desc_heads

    if {![info exists allcommits]} return
    if {$allcommits eq "reading"} {
	catch {close $allcfd}
    }
    foreach v {allcommits allchildren allparents allids desc_tags anc_tags
		alldtags tagisdesc desc_heads} {
	catch {unset $v}
    }
}

P
Paul Mackerras 已提交
5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423 5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440
proc restartgetall {fd} {
    global allcstart

    fileevent $fd readable [list getallclines $fd]
    set allcstart [clock clicks -milliseconds]
}

proc combine_dtags {l1 l2} {
    global tagisdesc notfirstd

    set res [lsort -unique [concat $l1 $l2]]
    for {set i 0} {$i < [llength $res]} {incr i} {
	set x [lindex $res $i]
	for {set j [expr {$i+1}]} {$j < [llength $res]} {} {
	    set y [lindex $res $j]
	    if {[info exists tagisdesc($x,$y)]} {
		if {$tagisdesc($x,$y) > 0} {
		    # x is a descendent of y, exclude x
		    set res [lreplace $res $i $i]
		    incr i -1
		    break
		} else {
		    # y is a descendent of x, exclude y
		    set res [lreplace $res $j $j]
		}
	    } else {
		# no relation, keep going
		incr j
	    }
	}
5441
    }
P
Paul Mackerras 已提交
5442 5443 5444 5445 5446 5447 5448 5449 5450 5451 5452 5453 5454 5455 5456 5457 5458 5459 5460 5461 5462 5463 5464 5465 5466 5467
    return $res
}

proc combine_atags {l1 l2} {
    global tagisdesc

    set res [lsort -unique [concat $l1 $l2]]
    for {set i 0} {$i < [llength $res]} {incr i} {
	set x [lindex $res $i]
	for {set j [expr {$i+1}]} {$j < [llength $res]} {} {
	    set y [lindex $res $j]
	    if {[info exists tagisdesc($x,$y)]} {
		if {$tagisdesc($x,$y) < 0} {
		    # x is an ancestor of y, exclude x
		    set res [lreplace $res $i $i]
		    incr i -1
		    break
		} else {
		    # y is an ancestor of x, exclude y
		    set res [lreplace $res $j $j]
		}
	    } else {
		# no relation, keep going
		incr j
	    }
	}
5468
    }
P
Paul Mackerras 已提交
5469 5470 5471
    return $res
}

5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 5486 5487 5488 5489 5490 5491 5492 5493 5494 5495 5496 5497 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507 5508
proc forward_pass {id children} {
    global idtags desc_tags idheads desc_heads alldtags tagisdesc

    set dtags {}
    set dheads {}
    foreach child $children {
	if {[info exists idtags($child)]} {
	    set ctags [list $child]
	} else {
	    set ctags $desc_tags($child)
	}
	if {$dtags eq {}} {
	    set dtags $ctags
	} elseif {$ctags ne $dtags} {
	    set dtags [combine_dtags $dtags $ctags]
	}
	set cheads $desc_heads($child)
	if {$dheads eq {}} {
	    set dheads $cheads
	} elseif {$cheads ne $dheads} {
	    set dheads [lsort -unique [concat $dheads $cheads]]
	}
    }
    set desc_tags($id) $dtags
    if {[info exists idtags($id)]} {
	set adt $dtags
	foreach tag $dtags {
	    set adt [concat $adt $alldtags($tag)]
	}
	set adt [lsort -unique $adt]
	set alldtags($id) $adt
	foreach tag $adt {
	    set tagisdesc($id,$tag) -1
	    set tagisdesc($tag,$id) 1
	}
    }
    if {[info exists idheads($id)]} {
5509
	set dheads [concat $dheads $idheads($id)]
5510 5511 5512 5513
    }
    set desc_heads($id) $dheads
}

P
Paul Mackerras 已提交
5514 5515
proc getallclines {fd} {
    global allparents allchildren allcommits allcstart
5516
    global desc_tags anc_tags idtags tagisdesc allids
5517
    global idheads travindex
P
Paul Mackerras 已提交
5518 5519 5520 5521 5522 5523 5524 5525 5526 5527 5528 5529 5530

    while {[gets $fd line] >= 0} {
	set id [lindex $line 0]
	lappend allids $id
	set olds [lrange $line 1 end]
	set allparents($id) $olds
	if {![info exists allchildren($id)]} {
	    set allchildren($id) {}
	}
	foreach p $olds {
	    lappend allchildren($p) $id
	}
	# compute nearest tagged descendents as we go
5531
	# also compute descendent heads
5532
	forward_pass $id $allchildren($id)
P
Paul Mackerras 已提交
5533 5534 5535 5536 5537 5538 5539
	if {[clock clicks -milliseconds] - $allcstart >= 50} {
	    fileevent $fd readable {}
	    after idle restartgetall $fd
	    return
	}
    }
    if {[eof $fd]} {
5540 5541 5542
	set travindex [llength $allids]
	set allcommits "traversing"
	after idle restartatags
P
Paul Mackerras 已提交
5543 5544 5545 5546 5547 5548 5549 5550
	if {[catch {close $fd} err]} {
	    error_popup "Error reading full commit graph: $err.\n\
			 Results may be incomplete."
	}
    }
}

# walk backward through the tree and compute nearest tagged ancestors
5551 5552
proc restartatags {} {
    global allids allparents idtags anc_tags travindex
P
Paul Mackerras 已提交
5553 5554

    set t0 [clock clicks -milliseconds]
5555
    set i $travindex
P
Paul Mackerras 已提交
5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 5569 5570 5571 5572
    while {[incr i -1] >= 0} {
	set id [lindex $allids $i]
	set atags {}
	foreach p $allparents($id) {
	    if {[info exists idtags($p)]} {
		set ptags [list $p]
	    } else {
		set ptags $anc_tags($p)
	    }
	    if {$atags eq {}} {
		set atags $ptags
	    } elseif {$ptags ne $atags} {
		set atags [combine_atags $atags $ptags]
	    }
	}
	set anc_tags($id) $atags
	if {[clock clicks -milliseconds] - $t0 >= 50} {
5573 5574
	    set travindex $i
	    after idle restartatags
P
Paul Mackerras 已提交
5575 5576
	    return
	}
5577
    }
P
Paul Mackerras 已提交
5578
    set allcommits "done"
5579
    set travindex 0
P
Paul Mackerras 已提交
5580 5581
    notbusy allcommits
    dispneartags
5582 5583
}

5584 5585 5586 5587 5588 5589 5590 5591 5592 5593 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 5604 5605 5606 5607 5608 5609 5610 5611 5612 5613 5614 5615 5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 5628 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638 5639 5640 5641 5642 5643 5644 5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 5656 5657 5658 5659
# update the desc_tags and anc_tags arrays for a new tag just added
proc addedtag {id} {
    global desc_tags anc_tags allparents allchildren allcommits
    global idtags tagisdesc alldtags

    if {![info exists desc_tags($id)]} return
    set adt $desc_tags($id)
    foreach t $desc_tags($id) {
	set adt [concat $adt $alldtags($t)]
    }
    set adt [lsort -unique $adt]
    set alldtags($id) $adt
    foreach t $adt {
	set tagisdesc($id,$t) -1
	set tagisdesc($t,$id) 1
    }
    if {[info exists anc_tags($id)]} {
	set todo $anc_tags($id)
	while {$todo ne {}} {
	    set do [lindex $todo 0]
	    set todo [lrange $todo 1 end]
	    if {[info exists tagisdesc($id,$do)]} continue
	    set tagisdesc($do,$id) -1
	    set tagisdesc($id,$do) 1
	    if {[info exists anc_tags($do)]} {
		set todo [concat $todo $anc_tags($do)]
	    }
	}
    }

    set lastold $desc_tags($id)
    set lastnew [list $id]
    set nup 0
    set nch 0
    set todo $allparents($id)
    while {$todo ne {}} {
	set do [lindex $todo 0]
	set todo [lrange $todo 1 end]
	if {![info exists desc_tags($do)]} continue
	if {$desc_tags($do) ne $lastold} {
	    set lastold $desc_tags($do)
	    set lastnew [combine_dtags $lastold [list $id]]
	    incr nch
	}
	if {$lastold eq $lastnew} continue
	set desc_tags($do) $lastnew
	incr nup
	if {![info exists idtags($do)]} {
	    set todo [concat $todo $allparents($do)]
	}
    }

    if {![info exists anc_tags($id)]} return
    set lastold $anc_tags($id)
    set lastnew [list $id]
    set nup 0
    set nch 0
    set todo $allchildren($id)
    while {$todo ne {}} {
	set do [lindex $todo 0]
	set todo [lrange $todo 1 end]
	if {![info exists anc_tags($do)]} continue
	if {$anc_tags($do) ne $lastold} {
	    set lastold $anc_tags($do)
	    set lastnew [combine_atags $lastold [list $id]]
	    incr nch
	}
	if {$lastold eq $lastnew} continue
	set anc_tags($do) $lastnew
	incr nup
	if {![info exists idtags($do)]} {
	    set todo [concat $todo $allchildren($do)]
	}
    }
}

5660
# update the desc_heads array for a new head just added
5661 5662 5663 5664 5665
proc addedhead {hid head} {
    global desc_heads allparents headids idheads

    set headids($head) $hid
    lappend idheads($hid) $head
5666 5667 5668 5669 5670 5671

    set todo [list $hid]
    while {$todo ne {}} {
	set do [lindex $todo 0]
	set todo [lrange $todo 1 end]
	if {![info exists desc_heads($do)] ||
5672
	    [lsearch -exact $desc_heads($do) $head] >= 0} continue
5673
	set oldheads $desc_heads($do)
5674
	lappend desc_heads($do) $head
5675 5676 5677 5678 5679 5680 5681 5682 5683 5684 5685 5686
	set heads $desc_heads($do)
	while {1} {
	    set p $allparents($do)
	    if {[llength $p] != 1 || ![info exists desc_heads($p)] ||
		$desc_heads($p) ne $oldheads} break
	    set do $p
	    set desc_heads($do) $heads
	}
	set todo [concat $todo $p]
    }
}

5687
# update the desc_heads array for a head just removed
5688 5689 5690 5691 5692 5693 5694 5695 5696 5697 5698 5699
proc removedhead {hid head} {
    global desc_heads allparents headids idheads

    unset headids($head)
    if {$idheads($hid) eq $head} {
	unset idheads($hid)
    } else {
	set i [lsearch -exact $idheads($hid) $head]
	if {$i >= 0} {
	    set idheads($hid) [lreplace $idheads($hid) $i $i]
	}
    }
5700 5701 5702 5703 5704 5705

    set todo [list $hid]
    while {$todo ne {}} {
	set do [lindex $todo 0]
	set todo [lrange $todo 1 end]
	if {![info exists desc_heads($do)]} continue
5706
	set i [lsearch -exact $desc_heads($do) $head]
5707 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717 5718 5719 5720
	if {$i < 0} continue
	set oldheads $desc_heads($do)
	set heads [lreplace $desc_heads($do) $i $i]
	while {1} {
	    set desc_heads($do) $heads
	    set p $allparents($do)
	    if {[llength $p] != 1 || ![info exists desc_heads($p)] ||
		$desc_heads($p) ne $oldheads} break
	    set do $p
	}
	set todo [concat $todo $p]
    }
}

5721 5722 5723 5724 5725 5726 5727 5728 5729 5730 5731 5732 5733 5734 5735 5736 5737
# update things for a head moved to a child of its previous location
proc movedhead {id name} {
    global headids idheads

    set oldid $headids($name)
    set headids($name) $id
    if {$idheads($oldid) eq $name} {
	unset idheads($oldid)
    } else {
	set i [lsearch -exact $idheads($oldid) $name]
	if {$i >= 0} {
	    set idheads($oldid) [lreplace $idheads($oldid) $i $i]
	}
    }
    lappend idheads($id) $name
}

5738 5739 5740 5741 5742 5743 5744 5745 5746 5747 5748 5749 5750 5751 5752 5753 5754 5755 5756 5757 5758 5759
proc changedrefs {} {
    global desc_heads desc_tags anc_tags allcommits allids
    global allchildren allparents idtags travindex

    if {![info exists allcommits]} return
    catch {unset desc_heads}
    catch {unset desc_tags}
    catch {unset anc_tags}
    catch {unset alldtags}
    catch {unset tagisdesc}
    foreach id $allids {
	forward_pass $id $allchildren($id)
    }
    if {$allcommits ne "reading"} {
	set travindex [llength $allids]
	if {$allcommits ne "traversing"} {
	    set allcommits "traversing"
	    after idle restartatags
	}
    }
}

5760
proc rereadrefs {} {
5761
    global idtags idheads idotherrefs mainhead
5762 5763 5764 5765 5766 5767 5768 5769

    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]
	}
    }
5770
    set oldmainhead $mainhead
5771
    readrefs
5772
    changedrefs
5773 5774 5775 5776
    set refids [lsort -unique [concat $refids [array names idtags] \
			[array names idheads] [array names idotherrefs]]]
    foreach id $refids {
	set v [listrefs $id]
5777 5778 5779
	if {![info exists ref($id)] || $ref($id) != $v ||
	    ($id eq $oldmainhead && $id ne $mainhead) ||
	    ($id eq $mainhead && $id ne $oldmainhead)} {
5780 5781 5782 5783 5784
	    redrawtags $id
	}
    }
}

5785 5786 5787 5788 5789 5790 5791 5792 5793 5794 5795 5796 5797 5798 5799 5800 5801 5802
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]
}

5803
proc showtag {tag isnew} {
5804
    global ctext tagcontents tagids linknum
5805 5806 5807 5808 5809

    if {$isnew} {
	addtohistory [list showtag $tag 0]
    }
    $ctext conf -state normal
5810
    clear_ctext
5811 5812 5813 5814 5815 5816
    set linknum 0
    if {[info exists tagcontents($tag)]} {
	set text $tagcontents($tag)
    } else {
	set text "Tag: $tag\nId:  $tagids($tag)"
    }
5817
    appendwithlinks $text {}
5818
    $ctext conf -state disabled
5819
    init_flist {}
5820 5821
}

5822 5823 5824
proc doquit {} {
    global stopped
    set stopped 100
5825
    savestuff .
5826 5827
    destroy .
}
5828

5829
proc doprefs {} {
5830
    global maxwidth maxgraphpct diffopts
P
Paul Mackerras 已提交
5831
    global oldprefs prefstop showneartags
5832
    global bgcolor fgcolor ctext diffcolors
5833
    global uifont
P
Paul Mackerras 已提交
5834

5835 5836 5837 5838 5839
    set top .gitkprefs
    set prefstop $top
    if {[winfo exists $top]} {
	raise $top
	return
5840
    }
P
Paul Mackerras 已提交
5841
    foreach v {maxwidth maxgraphpct diffopts showneartags} {
5842
	set oldprefs($v) [set $v]
P
Paul Mackerras 已提交
5843
    }
5844 5845 5846
    toplevel $top
    wm title $top "Gitk preferences"
    label $top.ldisp -text "Commit list display options"
5847
    $top.ldisp configure -font $uifont
5848 5849 5850 5851 5852 5853 5854 5855 5856 5857
    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
5858

5859
    label $top.ddisp -text "Diff display options"
5860
    $top.ddisp configure -font $uifont
5861 5862 5863 5864 5865
    grid $top.ddisp - -sticky w -pady 10
    label $top.diffoptl -text "Options for diff program" \
	-font optionfont
    entry $top.diffopt -width 20 -textvariable diffopts
    grid x $top.diffoptl $top.diffopt -sticky w
P
Paul Mackerras 已提交
5866 5867 5868 5869 5870
    frame $top.ntag
    label $top.ntag.l -text "Display nearby tags" -font optionfont
    checkbutton $top.ntag.b -variable showneartags
    pack $top.ntag.b $top.ntag.l -side left
    grid x $top.ntag -sticky w
5871 5872

    label $top.cdisp -text "Colors: press to choose"
5873
    $top.cdisp configure -font $uifont
5874 5875 5876 5877 5878 5879 5880 5881 5882 5883 5884 5885 5886 5887 5888 5889 5890 5891 5892 5893 5894 5895 5896 5897 5898 5899
    grid $top.cdisp - -sticky w -pady 10
    label $top.bg -padx 40 -relief sunk -background $bgcolor
    button $top.bgbut -text "Background" -font optionfont \
	-command [list choosecolor bgcolor 0 $top.bg background setbg]
    grid x $top.bgbut $top.bg -sticky w
    label $top.fg -padx 40 -relief sunk -background $fgcolor
    button $top.fgbut -text "Foreground" -font optionfont \
	-command [list choosecolor fgcolor 0 $top.fg foreground setfg]
    grid x $top.fgbut $top.fg -sticky w
    label $top.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]
    button $top.diffoldbut -text "Diff: old lines" -font optionfont \
	-command [list choosecolor diffcolors 0 $top.diffold "diff old lines" \
		      [list $ctext tag conf d0 -foreground]]
    grid x $top.diffoldbut $top.diffold -sticky w
    label $top.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1]
    button $top.diffnewbut -text "Diff: new lines" -font optionfont \
	-command [list choosecolor diffcolors 1 $top.diffnew "diff new lines" \
		      [list $ctext tag conf d1 -foreground]]
    grid x $top.diffnewbut $top.diffnew -sticky w
    label $top.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2]
    button $top.hunksepbut -text "Diff: hunk header" -font optionfont \
	-command [list choosecolor diffcolors 2 $top.hunksep \
		      "diff hunk header" \
		      [list $ctext tag conf hunksep -foreground]]
    grid x $top.hunksepbut $top.hunksep -sticky w

5900
    frame $top.buts
5901
    button $top.buts.ok -text "OK" -command prefsok -default active
5902
    $top.buts.ok configure -font $uifont
5903
    button $top.buts.can -text "Cancel" -command prefscan -default normal
5904
    $top.buts.can configure -font $uifont
5905 5906 5907 5908
    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
5909
    bind $top <Visibility> "focus $top.buts.ok"
5910 5911
}

5912 5913 5914 5915 5916 5917 5918 5919 5920 5921 5922 5923 5924 5925 5926 5927 5928 5929 5930 5931 5932 5933 5934 5935 5936 5937 5938 5939 5940
proc choosecolor {v vi w x cmd} {
    global $v

    set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \
	       -title "Gitk: choose color for $x"]
    if {$c eq {}} return
    $w conf -background $c
    lset $v $vi $c
    eval $cmd $c
}

proc setbg {c} {
    global bglist

    foreach w $bglist {
	$w conf -background $c
    }
}

proc setfg {c} {
    global fglist canv

    foreach w $fglist {
	$w conf -foreground $c
    }
    allcanvs itemconf text -fill $c
    $canv itemconf circle -outline $c
}

5941
proc prefscan {} {
5942
    global maxwidth maxgraphpct diffopts
P
Paul Mackerras 已提交
5943
    global oldprefs prefstop showneartags
5944

P
Paul Mackerras 已提交
5945
    foreach v {maxwidth maxgraphpct diffopts showneartags} {
5946 5947 5948 5949 5950 5951 5952 5953
	set $v $oldprefs($v)
    }
    catch {destroy $prefstop}
    unset prefstop
}

proc prefsok {} {
    global maxwidth maxgraphpct
P
Paul Mackerras 已提交
5954
    global oldprefs prefstop showneartags
5955 5956 5957 5958 5959 5960

    catch {destroy $prefstop}
    unset prefstop
    if {$maxwidth != $oldprefs(maxwidth)
	|| $maxgraphpct != $oldprefs(maxgraphpct)} {
	redisplay
P
Paul Mackerras 已提交
5961 5962
    } elseif {$showneartags != $oldprefs(showneartags)} {
	reselectline
5963 5964 5965 5966 5967
    }
}

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

5970 5971 5972 5973 5974 5975 5976 5977 5978 5979 5980 5981 5982 5983 5984 5985 5986 5987 5988 5989 5990 5991 5992 5993 5994 5995 5996 5997 5998 5999 6000 6001 6002 6003 6004 6005 6006 6007 6008 6009 6010 6011 6012 6013 6014 6015 6016 6017 6018 6019 6020 6021 6022 6023 6024 6025 6026 6027 6028 6029 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042 6043 6044 6045 6046 6047 6048 6049 6050 6051 6052 6053 6054 6055 6056 6057 6058 6059 6060 6061 6062 6063 6064 6065 6066 6067 6068 6069 6070 6071 6072 6073 6074 6075 6076 6077 6078 6079 6080 6081 6082 6083 6084 6085 6086 6087 6088 6089 6090 6091 6092 6093 6094 6095 6096 6097 6098 6099 6100 6101 6102 6103 6104 6105 6106 6107 6108 6109 6110 6111 6112 6113 6114 6115 6116 6117 6118 6119 6120 6121 6122 6123 6124 6125 6126 6127 6128 6129 6130 6131 6132 6133 6134 6135 6136 6137 6138 6139 6140 6141 6142 6143 6144 6145 6146 6147 6148 6149 6150 6151 6152 6153 6154 6155 6156 6157 6158 6159 6160 6161 6162 6163 6164 6165 6166 6167 6168 6169 6170 6171 6172 6173 6174 6175 6176 6177 6178 6179 6180 6181 6182 6183 6184 6185 6186 6187 6188 6189 6190 6191 6192 6193 6194 6195 6196 6197 6198 6199 6200 6201 6202 6203 6204 6205 6206 6207 6208 6209 6210 6211 6212 6213 6214 6215 6216 6217 6218 6219 6220 6221 6222 6223 6224 6225 6226 6227 6228 6229 6230 6231 6232 6233 6234 6235 6236 6237 6238 6239 6240 6241 6242
# 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 {}
}

6243 6244 6245
# defaults...
set datemode 0
set diffopts "-U 5 -p"
6246
set wrcomcmd "git diff-tree --stdin -p --pretty"
6247

6248
set gitencoding {}
6249
catch {
6250
    set gitencoding [exec git config --get i18n.commitencoding]
6251 6252
}
if {$gitencoding == ""} {
6253 6254 6255 6256 6257
    set gitencoding "utf-8"
}
set tclencoding [tcl_encoding $gitencoding]
if {$tclencoding == {}} {
    puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
6258
}
6259

6260 6261
set mainfont {Helvetica 9}
set textfont {Courier 9}
6262
set uifont {Helvetica 9 bold}
6263
set findmergefiles 0
6264
set maxgraphpct 50
6265
set maxwidth 16
P
Paul Mackerras 已提交
6266
set revlistorder 0
6267
set fastdate 0
P
Paul Mackerras 已提交
6268 6269 6270
set uparrowlen 7
set downarrowlen 7
set mingaplen 30
P
Paul Mackerras 已提交
6271
set cmitmode "patch"
6272
set wrapcomment "none"
P
Paul Mackerras 已提交
6273
set showneartags 1
6274 6275

set colors {green red blue magenta darkgrey brown orange}
6276 6277 6278
set bgcolor white
set fgcolor black
set diffcolors {red "#00a000" blue}
6279 6280 6281

catch {source ~/.gitk}

6282
font create optionfont -family sans-serif -size -12
6283

6284 6285 6286 6287 6288 6289 6290 6291 6292
set revtreeargs {}
foreach arg $argv {
    switch -regexp -- $arg {
	"^$" { }
	"^-d" { set datemode 1 }
	default {
	    lappend revtreeargs $arg
	}
    }
6293
}
6294

P
Paul Mackerras 已提交
6295 6296 6297
# check that we can find a .git directory somewhere...
set gitdir [gitdir]
if {![file isdirectory $gitdir]} {
P
Paul Mackerras 已提交
6298
    show_error {} . "Cannot find the git directory \"$gitdir\"."
P
Paul Mackerras 已提交
6299 6300 6301
    exit 1
}

6302 6303 6304 6305 6306 6307 6308
set cmdline_files {}
set i [lsearch -exact $revtreeargs "--"]
if {$i >= 0} {
    set cmdline_files [lrange $revtreeargs [expr {$i + 1}] end]
    set revtreeargs [lrange $revtreeargs 0 [expr {$i - 1}]]
} elseif {$revtreeargs ne {}} {
    if {[catch {
6309
	set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs]
6310 6311 6312 6313 6314 6315 6316 6317
	set cmdline_files [split $f "\n"]
	set n [llength $cmdline_files]
	set revtreeargs [lrange $revtreeargs 0 end-$n]
    } err]} {
	# unfortunately we get both stdout and stderr in $err,
	# so look for "fatal:".
	set i [string first "fatal:" $err]
	if {$i > 0} {
J
Junio C Hamano 已提交
6318
	    set err [string range $err [expr {$i + 6}] end]
6319
	}
P
Paul Mackerras 已提交
6320
	show_error {} . "Bad arguments to gitk:\n$err"
6321 6322 6323 6324
	exit 1
    }
}

6325 6326
set history {}
set historyindex 0
6327 6328
set fh_serial 0
set nhl_names {}
6329
set highlight_paths {}
6330
set searchdirn -forwards
6331 6332
set boldrows {}
set boldnamerows {}
6333

P
Paul Mackerras 已提交
6334 6335
set optim_delay 16

P
Paul Mackerras 已提交
6336 6337
set nextviewnum 1
set curview 0
6338
set selectedview 0
6339
set selectedhlview None
P
Paul Mackerras 已提交
6340
set viewfiles(0) {}
6341
set viewperm(0) 0
6342
set viewargs(0) {}
P
Paul Mackerras 已提交
6343

6344
set cmdlineok 0
6345
set stopped 0
6346
set stuffsaved 0
6347
set patchnum 0
6348
setcoords
6349
makewindow
6350
wm title . "[file tail $argv0]: [file tail [pwd]]"
6351
readrefs
6352

6353
if {$cmdline_files ne {} || $revtreeargs ne {}} {
P
Paul Mackerras 已提交
6354 6355
    # create a view for the files/dirs specified on the command line
    set curview 1
6356
    set selectedview 1
P
Paul Mackerras 已提交
6357 6358 6359
    set nextviewnum 2
    set viewname(1) "Command line"
    set viewfiles(1) $cmdline_files
6360
    set viewargs(1) $revtreeargs
6361
    set viewperm(1) 0
6362
    addviewmenu 1
6363 6364
    .bar.view entryconf Edit* -state normal
    .bar.view entryconf Delete* -state normal
P
Paul Mackerras 已提交
6365
}
6366 6367 6368 6369 6370 6371 6372

if {[info exists permviews]} {
    foreach v $permviews {
	set n $nextviewnum
	incr nextviewnum
	set viewname($n) [lindex $v 0]
	set viewfiles($n) [lindex $v 1]
6373
	set viewargs($n) [lindex $v 2]
6374
	set viewperm($n) 1
6375
	addviewmenu $n
6376 6377
    }
}
6378
getcommits