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

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

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

19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34
proc parse_args {rargs} {
    global parsed_args

    if [catch {
	set parse_args [concat --default HEAD $rargs]
	set parsed_args [split [eval exec git-rev-parse $parse_args] "\n"]
    }] {
	# if git-rev-parse failed for some reason...
	if {$rargs == {}} {
	    set rargs HEAD
	}
	set parsed_args $rargs
    }
    return $parsed_args
}

35
proc getcommits {rargs} {
36
    global oldcommits commits commfd phase canv mainfont env
37
    global startmsecs nextupdate ncmupdate
P
Pavel Roskin 已提交
38
    global ctext maincursor textcursor leftover gitencoding
39

40
    # check that we can find a .git directory somewhere...
41
    set gitdir [gitdir]
42 43 44 45
    if {![file isdirectory $gitdir]} {
	error_popup "Cannot find the git directory \"$gitdir\"."
	exit 1
    }
46
    set oldcommits {}
47
    set commits {}
48
    set phase getcommits
49
    set startmsecs [clock clicks -milliseconds]
J
Jeff Hobbs 已提交
50
    set nextupdate [expr {$startmsecs + 100}]
51
    set ncmupdate 1
52
    set parsed_args [parse_args $rargs]
53
    if [catch {
54
	set commfd [open "|git-rev-list --header --topo-order --parents $parsed_args" r]
55
    } err] {
56
	puts stderr "Error executing git-rev-list: $err"
57 58
	exit 1
    }
P
Paul Mackerras 已提交
59
    set leftover {}
P
Pavel Roskin 已提交
60
    fconfigure $commfd -blocking 0 -translation lf -encoding $gitencoding
61
    fileevent $commfd readable [list getcommitlines $commfd]
62 63 64
    $canv delete all
    $canv create text 3 3 -anchor nw -text "Reading commits..." \
	-font $mainfont -tags textitems
65
    . config -cursor watch
66
    settextcursor watch
67 68
}

P
Paul Mackerras 已提交
69
proc getcommitlines {commfd}  {
70
    global oldcommits commits parents cdate children nchildren
P
Paul Mackerras 已提交
71
    global commitlisted phase nextupdate
P
Paul Mackerras 已提交
72
    global stopped redisplaying leftover
73
    global canv
74

P
Paul Mackerras 已提交
75 76
    set stuff [read $commfd]
    if {$stuff == {}} {
77
	if {![eof $commfd]} return
78
	# set it blocking so we wait for the process to terminate
79
	fconfigure $commfd -blocking 1
80
	if {![catch {close $commfd} err]} {
81
	    after idle finishcommits
82 83
	    return
	}
84
	if {[string range $err 0 4] == "usage"} {
85
	    set err \
J
Jeff Hobbs 已提交
86 87 88
		"Gitk: error reading commits: bad arguments to git-rev-list.\
		(Note: arguments to gitk are passed to git-rev-list\
		to allow selection of commits to be displayed.)"
89
	} else {
90
	    set err "Error reading commits: $err"
91
	}
92
	error_popup $err
93
	exit 1
94
    }
P
Paul Mackerras 已提交
95 96 97 98
    set start 0
    while 1 {
	set i [string first "\0" $stuff $start]
	if {$i < 0} {
99
	    append leftover [string range $stuff $start end]
P
Paul Mackerras 已提交
100
	    return
101
	}
P
Paul Mackerras 已提交
102 103 104
	set cmit [string range $stuff $start [expr {$i - 1}]]
	if {$start == 0} {
	    set cmit "$leftover$cmit"
105
	    set leftover {}
P
Paul Mackerras 已提交
106 107
	}
	set start [expr {$i + 1}]
108 109 110 111 112 113 114 115 116 117 118 119 120
	set j [string first "\n" $cmit]
	set ok 0
	if {$j >= 0} {
	    set ids [string range $cmit 0 [expr {$j - 1}]]
	    set ok 1
	    foreach id $ids {
		if {![regexp {^[0-9a-f]{40}$} $id]} {
		    set ok 0
		    break
		}
	    }
	}
	if {!$ok} {
121 122 123 124 125
	    set shortcmit $cmit
	    if {[string length $shortcmit] > 80} {
		set shortcmit "[string range $shortcmit 0 80]..."
	    }
	    error_popup "Can't parse git-rev-list output: {$shortcmit}"
P
Paul Mackerras 已提交
126 127
	    exit 1
	}
128 129 130
	set id [lindex $ids 0]
	set olds [lrange $ids 1 end]
	set cmit [string range $cmit [expr {$j + 1}] end]
131 132 133 134 135 136 137 138
	if {$phase == "updatecommits"} {
	    $canv delete all
	    set oldcommits $commits
	    set commits {}
	    unset children
	    unset nchildren
	    set phase getcommits
	}
P
Paul Mackerras 已提交
139 140
	lappend commits $id
	set commitlisted($id) 1
141
	parsecommit $id $cmit 1 [lrange $ids 1 end]
142
	drawcommit $id 1
143 144
	if {[clock clicks -milliseconds] >= $nextupdate} {
	    doupdate 1
P
Paul Mackerras 已提交
145 146 147 148 149 150 151
	}
	while {$redisplaying} {
	    set redisplaying 0
	    if {$stopped == 1} {
		set stopped 0
		set phase "getcommits"
		foreach id $commits {
152
		    drawcommit $id 1
P
Paul Mackerras 已提交
153
		    if {$stopped} break
154 155
		    if {[clock clicks -milliseconds] >= $nextupdate} {
			doupdate 1
P
Paul Mackerras 已提交
156
		    }
157 158 159 160 161 162
		}
	    }
	}
    }
}

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

166 167 168
    if {$reading} {
	fileevent $commfd readable {}
    }
169
    update
170 171 172 173 174 175 176 177 178 179 180
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
    if {$numcommits < 100} {
	set ncmupdate [expr {$numcommits + 1}]
    } elseif {$numcommits < 10000} {
	set ncmupdate [expr {$numcommits + 10}]
    } else {
	set ncmupdate [expr {$numcommits + 100}]
    }
    if {$reading} {
	fileevent $commfd readable [list getcommitlines $commfd]
    }
181 182 183
}

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

188 189
proc updatechildren {id olds} {
    global children nchildren parents nparents ncleft
190

191 192 193
    if {![info exists nchildren($id)]} {
	set children($id) {}
	set nchildren($id) 0
194
	set ncleft($id) 0
195
    }
196 197 198 199 200 201 202 203 204 205 206
    set parents($id) $olds
    set nparents($id) [llength $olds]
    foreach p $olds {
	if {![info exists nchildren($p)]} {
	    set children($p) [list $id]
	    set nchildren($p) 1
	    set ncleft($p) 1
	} elseif {[lsearch -exact $children($p) $id] < 0} {
	    lappend children($p) $id
	    incr nchildren($p)
	    incr ncleft($p)
P
Paul Mackerras 已提交
207 208
	}
    }
209 210 211 212 213 214 215 216 217 218 219 220 221
}

proc parsecommit {id contents listed olds} {
    global commitinfo cdate

    set inhdr 1
    set comment {}
    set headline {}
    set auname {}
    set audate {}
    set comname {}
    set comdate {}
    updatechildren $id $olds
P
Paul Mackerras 已提交
222 223 224 225 226 227 228 229 230 231 232 233 234 235 236
    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]
237 238
	}
    }
P
Paul Mackerras 已提交
239 240 241 242 243
    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]]
244 245
    } else {
	set headline $comment
P
Paul Mackerras 已提交
246 247 248 249 250 251 252 253
    }
    if {!$listed} {
	# git-rev-list indents the comment by 4 spaces;
	# if we got this via git-cat-file, add the indentation
	set newcomment {}
	foreach line [split $comment "\n"] {
	    append newcomment "    "
	    append newcomment $line
254
	    append newcomment "\n"
P
Paul Mackerras 已提交
255 256
	}
	set comment $newcomment
257 258
    }
    if {$comdate != {}} {
259
	set cdate($id) $comdate
260
    }
261 262
    set commitinfo($id) [list $headline $auname $audate \
			     $comname $comdate $comment]
263 264
}

265
proc readrefs {} {
266
    global tagids idtags headids idheads tagcontents
267
    global otherrefids idotherrefs
268

269 270 271
    foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
	catch {unset $v}
    }
272 273 274 275 276
    set refd [open [list | git-ls-remote [gitdir]] r]
    while {0 <= [set n [gets $refd line]]} {
	if {![regexp {^([0-9a-f]{40})	refs/([^^]*)$} $line \
	    match id path]} {
	    continue
P
Paul Mackerras 已提交
277
	}
278 279 280
	if {![regexp {^(tags|heads)/(.*)$} $path match type name]} {
	    set type others
	    set name $path
281
	}
282 283 284 285 286 287 288 289 290 291 292 293 294 295 296
	if {$type == "tags"} {
	    set tagids($name) $id
	    lappend idtags($id) $name
	    set obj {}
	    set type {}
	    set tag {}
	    catch {
		set commit [exec git-rev-parse "$id^0"]
		if {"$commit" != "$id"} {
		    set tagids($name) $commit
		    lappend idtags($commit) $name
		}
	    }		
	    catch {
	        set tagcontents($name) [exec git-cat-file tag "$id"]
297
	    }
298 299 300 301 302 303
	} elseif { $type == "heads" } {
	    set headids($name) $id
	    lappend idheads($id) $name
	} else {
	    set otherrefids($name) $id
	    lappend idotherrefs($id) $name
304 305
	}
    }
306
    close $refd
307 308
}

309 310 311 312 313 314 315 316 317 318 319 320
proc error_popup msg {
    set w .error
    toplevel $w
    wm transient $w .
    message $w.m -text $msg -justify center -aspect 400
    pack $w.m -side top -fill x -padx 20 -pady 20
    button $w.ok -text OK -command "destroy $w"
    pack $w.ok -side bottom -fill x
    bind $w <Visibility> "grab $w; focus $w"
    tkwait window $w
}

321
proc makewindow {rargs} {
322
    global canv canv2 canv3 linespc charspc ctext cflist textfont
323
    global findtype findtypemenu findloc findstring fstring geometry
324
    global entries sha1entry sha1string sha1but
325
    global maincursor textcursor curtextcursor
326
    global rowctxmenu mergemax
327 328 329 330

    menu .bar
    .bar add cascade -label "File" -menu .bar.file
    menu .bar.file
331
    .bar.file add command -label "Update" -command [list updatecommits $rargs]
332
    .bar.file add command -label "Reread references" -command rereadrefs
333
    .bar.file add command -label "Quit" -command doquit
334 335 336
    menu .bar.edit
    .bar add cascade -label "Edit" -menu .bar.edit
    .bar.edit add command -label "Preferences" -command doprefs
337 338 339 340 341
    menu .bar.help
    .bar add cascade -label "Help" -menu .bar.help
    .bar.help add command -label "About gitk" -command about
    . configure -menu .bar

342
    if {![info exists geometry(canv1)]} {
J
Jeff Hobbs 已提交
343 344 345 346
	set geometry(canv1) [expr {45 * $charspc}]
	set geometry(canv2) [expr {30 * $charspc}]
	set geometry(canv3) [expr {15 * $charspc}]
	set geometry(canvh) [expr {25 * $linespc + 4}]
347 348 349 350
	set geometry(ctextw) 80
	set geometry(ctexth) 30
	set geometry(cflistw) 30
    }
P
Paul Mackerras 已提交
351
    panedwindow .ctop -orient vertical
352 353
    if {[info exists geometry(width)]} {
	.ctop conf -width $geometry(width) -height $geometry(height)
354 355 356
	set texth [expr {$geometry(height) - $geometry(canvh) - 56}]
	set geometry(ctexth) [expr {($texth - 8) /
				    [font metrics $textfont -linespace]}]
357
    }
358 359 360 361 362 363 364 365 366 367
    frame .ctop.top
    frame .ctop.top.bar
    pack .ctop.top.bar -side bottom -fill x
    set cscroll .ctop.top.csb
    scrollbar $cscroll -command {allcanvs yview} -highlightthickness 0
    pack $cscroll -side right -fill y
    panedwindow .ctop.top.clist -orient horizontal -sashpad 0 -handlesize 4
    pack .ctop.top.clist -side top -fill both -expand 1
    .ctop add .ctop.top
    set canv .ctop.top.clist.canv
368
    canvas $canv -height $geometry(canvh) -width $geometry(canv1) \
369 370
	-bg white -bd 0 \
	-yscrollincr $linespc -yscrollcommand "$cscroll set"
371 372
    .ctop.top.clist add $canv
    set canv2 .ctop.top.clist.canv2
373
    canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \
374
	-bg white -bd 0 -yscrollincr $linespc
375 376
    .ctop.top.clist add $canv2
    set canv3 .ctop.top.clist.canv3
377
    canvas $canv3 -height $geometry(canvh) -width $geometry(canv3) \
378
	-bg white -bd 0 -yscrollincr $linespc
379
    .ctop.top.clist add $canv3
380
    bind .ctop.top.clist <Configure> {resizeclistpanes %W %w}
381 382

    set sha1entry .ctop.top.bar.sha1
383 384 385 386 387
    set entries $sha1entry
    set sha1but .ctop.top.bar.sha1label
    button $sha1but -text "SHA1 ID: " -state disabled -relief flat \
	-command gotocommit -width 8
    $sha1but conf -disabledforeground [$sha1but cget -foreground]
388
    pack .ctop.top.bar.sha1label -side left
389 390
    entry $sha1entry -width 40 -font $textfont -textvariable sha1string
    trace add variable sha1string write sha1change
391
    pack $sha1entry -side left -pady 2
392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415

    image create bitmap bm-left -data {
	#define left_width 16
	#define left_height 16
	static unsigned char left_bits[] = {
	0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
	0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00,
	0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01};
    }
    image create bitmap bm-right -data {
	#define right_width 16
	#define right_height 16
	static unsigned char right_bits[] = {
	0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c,
	0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c,
	0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01};
    }
    button .ctop.top.bar.leftbut -image bm-left -command goback \
	-state disabled -width 26
    pack .ctop.top.bar.leftbut -side left -fill y
    button .ctop.top.bar.rightbut -image bm-right -command goforw \
	-state disabled -width 26
    pack .ctop.top.bar.rightbut -side left -fill y

416 417 418
    button .ctop.top.bar.findbut -text "Find" -command dofind
    pack .ctop.top.bar.findbut -side left
    set findstring {}
419
    set fstring .ctop.top.bar.findstring
420
    lappend entries $fstring
421 422
    entry $fstring -width 30 -font $textfont -textvariable findstring
    pack $fstring -side left -expand 1 -fill x
423
    set findtype Exact
424 425
    set findtypemenu [tk_optionMenu .ctop.top.bar.findtype \
			  findtype Exact IgnCase Regexp]
426 427
    set findloc "All fields"
    tk_optionMenu .ctop.top.bar.findloc findloc "All fields" Headline \
428
	Comments Author Committer Files Pickaxe
429 430
    pack .ctop.top.bar.findloc -side right
    pack .ctop.top.bar.findtype -side right
431 432
    # for making sure type==Exact whenever loc==Pickaxe
    trace add variable findloc write findlocchange
433

434 435
    panedwindow .ctop.cdet -orient horizontal
    .ctop add .ctop.cdet
436 437
    frame .ctop.cdet.left
    set ctext .ctop.cdet.left.ctext
438 439
    text $ctext -bg white -state disabled -font $textfont \
	-width $geometry(ctextw) -height $geometry(ctexth) \
440
	-yscrollcommand ".ctop.cdet.left.sb set" -wrap none
441 442 443 444 445
    scrollbar .ctop.cdet.left.sb -command "$ctext yview"
    pack .ctop.cdet.left.sb -side right -fill y
    pack $ctext -side left -fill both -expand 1
    .ctop.cdet add .ctop.cdet.left

446
    $ctext tag conf filesep -font [concat $textfont bold] -back "#aaaaaa"
447 448 449 450 451 452 453 454 455 456 457 458 459
    $ctext tag conf hunksep -fore blue
    $ctext tag conf d0 -fore red
    $ctext tag conf d1 -fore "#00a000"
    $ctext tag conf m0 -fore red
    $ctext tag conf m1 -fore blue
    $ctext tag conf m2 -fore green
    $ctext tag conf m3 -fore purple
    $ctext tag conf m4 -fore brown
    $ctext tag conf mmax -fore darkgrey
    set mergemax 5
    $ctext tag conf mresult -font [concat $textfont bold]
    $ctext tag conf msep -font [concat $textfont bold]
    $ctext tag conf found -back yellow
460

461 462
    frame .ctop.cdet.right
    set cflist .ctop.cdet.right.cfiles
463
    listbox $cflist -bg white -selectmode extended -width $geometry(cflistw) \
464 465 466 467 468
	-yscrollcommand ".ctop.cdet.right.sb set"
    scrollbar .ctop.cdet.right.sb -command "$cflist yview"
    pack .ctop.cdet.right.sb -side right -fill y
    pack $cflist -side left -fill both -expand 1
    .ctop.cdet add .ctop.cdet.right
469
    bind .ctop.cdet <Configure> {resizecdetpanes %W %w}
470

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

473 474
    bindall <1> {selcanvline %W %x %y}
    #bindall <B1-Motion> {selcanvline %W %x %y}
475 476
    bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
    bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
477 478
    bindall <2> "allcanvs scan mark 0 %y"
    bindall <B2-Motion> "allcanvs scan dragto 0 %y"
479 480
    bind . <Key-Up> "selnextline -1"
    bind . <Key-Down> "selnextline 1"
R
Robert Suetterlin 已提交
481 482
    bind . <Key-Right> "goforw"
    bind . <Key-Left> "goback"
483 484 485 486 487
    bind . <Key-Prior> "allcanvs yview scroll -1 pages"
    bind . <Key-Next> "allcanvs yview scroll 1 pages"
    bindkey <Key-Delete> "$ctext yview scroll -1 pages"
    bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
    bindkey <Key-space> "$ctext yview scroll 1 pages"
488 489
    bindkey p "selnextline -1"
    bindkey n "selnextline 1"
R
Robert Suetterlin 已提交
490 491 492 493 494 495
    bindkey z "goback"
    bindkey x "goforw"
    bindkey i "selnextline -1"
    bindkey k "selnextline 1"
    bindkey j "goback"
    bindkey l "goforw"
496 497 498
    bindkey b "$ctext yview scroll -1 pages"
    bindkey d "$ctext yview scroll 18 units"
    bindkey u "$ctext yview scroll -18 units"
499 500
    bindkey / {findnext 1}
    bindkey <Key-Return> {findnext 0}
501
    bindkey ? findprev
502
    bindkey f nextfile
503
    bind . <Control-q> doquit
504
    bind . <Control-f> dofind
505
    bind . <Control-g> {findnext 0}
506
    bind . <Control-r> findprev
507 508 509 510
    bind . <Control-equal> {incrfont 1}
    bind . <Control-KP_Add> {incrfont 1}
    bind . <Control-minus> {incrfont -1}
    bind . <Control-KP_Subtract> {incrfont -1}
511
    bind $cflist <<ListboxSelect>> listboxsel
512
    bind . <Destroy> {savestuff %W}
513
    bind . <Button-1> "click %W"
514
    bind $fstring <Key-Return> dofind
515
    bind $sha1entry <Key-Return> gotocommit
516
    bind $sha1entry <<PasteSelection>> clearsha1
517 518 519

    set maincursor [. cget -cursor]
    set textcursor [$ctext cget -cursor]
520
    set curtextcursor $textcursor
521

522 523 524 525 526 527
    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}
528
    $rowctxmenu add command -label "Make patch" -command mkpatch
529
    $rowctxmenu add command -label "Create tag" -command mktag
530
    $rowctxmenu add command -label "Write commit to file" -command writecommit
531 532 533 534 535 536
}

# 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} {
537
    global entries
538 539 540 541 542
    bind . $ev $script
    set escript [bind Entry $ev]
    if {$escript == {}} {
	set escript [bind Entry <Key>]
    }
543 544 545
    foreach e $entries {
	bind $e $ev "$escript; break"
    }
546 547 548
}

# set the focus back to the toplevel for any click outside
549
# the entry widgets
550
proc click {w} {
551 552 553
    global entries
    foreach e $entries {
	if {$w == $e} return
554
    }
555
    focus .
556 557 558 559
}

proc savestuff {w} {
    global canv canv2 canv3 ctext cflist mainfont textfont
560
    global stuffsaved findmergefiles maxgraphpct
561
    global maxwidth
562

563
    if {$stuffsaved} return
564
    if {![winfo viewable .]} return
565 566
    catch {
	set f [open "~/.gitk-new" w]
567 568 569
	puts $f [list set mainfont $mainfont]
	puts $f [list set textfont $textfont]
	puts $f [list set findmergefiles $findmergefiles]
570
	puts $f [list set maxgraphpct $maxgraphpct]
571
	puts $f [list set maxwidth $maxwidth]
572 573
	puts $f "set geometry(width) [winfo width .ctop]"
	puts $f "set geometry(height) [winfo height .ctop]"
J
Jeff Hobbs 已提交
574 575 576 577
	puts $f "set geometry(canv1) [expr {[winfo width $canv]-2}]"
	puts $f "set geometry(canv2) [expr {[winfo width $canv2]-2}]"
	puts $f "set geometry(canv3) [expr {[winfo width $canv3]-2}]"
	puts $f "set geometry(canvh) [expr {[winfo height $canv]-2}]"
578 579 580 581 582 583 584 585 586 587
	set wid [expr {([winfo width $ctext] - 8) \
			   / [font measure $textfont "0"]}]
	puts $f "set geometry(ctextw) $wid"
	set wid [expr {([winfo width $cflist] - 11) \
			   / [font measure [$cflist cget -font] "0"]}]
	puts $f "set geometry(cflistw) $wid"
	close $f
	file rename -force "~/.gitk-new" "~/.gitk"
    }
    set stuffsaved 1
588 589
}

590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605
proc resizeclistpanes {win w} {
    global oldwidth
    if [info exists oldwidth($win)] {
	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 已提交
606
		set sash1 [expr {$sash0 + 20}]
607 608
	    }
	    if {$sash1 > $w - 10} {
J
Jeff Hobbs 已提交
609
		set sash1 [expr {$w - 10}]
610
		if {$sash0 > $sash1 - 20} {
J
Jeff Hobbs 已提交
611
		    set sash0 [expr {$sash1 - 20}]
612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633
		}
	    }
	}
	$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
    if [info exists oldwidth($win)] {
	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 已提交
634
		set sash0 [expr {$w - 15}]
635 636 637 638 639 640 641
	    }
	}
	$win sash place 0 $sash0 [lindex $s0 1]
    }
    set oldwidth($win) $w
}

642 643 644 645 646 647 648 649 650 651 652 653 654 655
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
}

656 657 658 659 660 661 662 663 664
proc about {} {
    set w .about
    if {[winfo exists $w]} {
	raise $w
	return
    }
    toplevel $w
    wm title $w "About gitk"
    message $w.m -text {
665
Gitk version 1.2
666 667 668

Copyright  2005 Paul Mackerras

669
Use and redistribute under the terms of the GNU General Public License} \
670 671 672 673 674 675
	    -justify center -aspect 400
    pack $w.m -side top -fill x -padx 20 -pady 20
    button $w.ok -text Close -command "destroy $w"
    pack $w.ok -side bottom
}

676
proc assigncolor {id} {
P
Paul Mackerras 已提交
677
    global colormap commcolors colors nextcolor
678
    global parents nparents children nchildren
679 680
    global cornercrossings crossings

681 682
    if [info exists colormap($id)] return
    set ncolors [llength $colors]
P
Paul Mackerras 已提交
683
    if {$nparents($id) <= 1 && $nchildren($id) == 1} {
684 685 686 687 688
	set child [lindex $children($id) 0]
	if {[info exists colormap($child)]
	    && $nparents($child) == 1} {
	    set colormap($id) $colormap($child)
	    return
689
	}
690 691
    }
    set badcolors {}
692 693 694 695 696 697
    if {[info exists cornercrossings($id)]} {
	foreach x $cornercrossings($id) {
	    if {[info exists colormap($x)]
		&& [lsearch -exact $badcolors $colormap($x)] < 0} {
		lappend badcolors $colormap($x)
	    }
698
	}
699 700 701 702 703 704 705 706 707 708 709
	if {[llength $badcolors] >= $ncolors} {
	    set badcolors {}
	}
    }
    set origbad $badcolors
    if {[llength $badcolors] < $ncolors - 1} {
	if {[info exists crossings($id)]} {
	    foreach x $crossings($id) {
		if {[info exists colormap($x)]
		    && [lsearch -exact $badcolors $colormap($x)] < 0} {
		    lappend badcolors $colormap($x)
710 711
		}
	    }
712 713 714
	    if {[llength $badcolors] >= $ncolors} {
		set badcolors $origbad
	    }
715
	}
716
	set origbad $badcolors
717
    }
718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735
    if {[llength $badcolors] < $ncolors - 1} {
	foreach child $children($id) {
	    if {[info exists colormap($child)]
		&& [lsearch -exact $badcolors $colormap($child)] < 0} {
		lappend badcolors $colormap($child)
	    }
	    if {[info exists parents($child)]} {
		foreach p $parents($child) {
		    if {[info exists colormap($p)]
			&& [lsearch -exact $badcolors $colormap($p)] < 0} {
			lappend badcolors $colormap($p)
		    }
		}
	    }
	}
	if {[llength $badcolors] >= $ncolors} {
	    set badcolors $origbad
	}
736 737 738 739 740
    }
    for {set i 0} {$i <= $ncolors} {incr i} {
	set c [lindex $colors $nextcolor]
	if {[incr nextcolor] >= $ncolors} {
	    set nextcolor 0
741
	}
742
	if {[lsearch -exact $badcolors $c]} break
743
    }
744
    set colormap($id) $c
745 746
}

747
proc initgraph {} {
748 749
    global canvy canvy0 lineno numcommits nextcolor linespc
    global mainline mainlinearrow sidelines
750
    global nchildren ncleft
751
    global displist nhyperspace
752

753
    allcanvs delete all
754 755 756 757
    set nextcolor 0
    set canvy $canvy0
    set lineno -1
    set numcommits 0
P
Paul Mackerras 已提交
758
    catch {unset mainline}
759
    catch {unset mainlinearrow}
P
Paul Mackerras 已提交
760
    catch {unset sidelines}
761
    foreach id [array names nchildren] {
762
	set ncleft($id) $nchildren($id)
763
    }
764 765
    set displist {}
    set nhyperspace 0
766 767
}

768 769 770 771 772 773
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"
774
    $canv bind $t <Button-1> "lineclick %x %y $id 1"
775 776
}

P
Paul Mackerras 已提交
777
proc drawlines {id xtra delold} {
778 779
    global mainline mainlinearrow sidelines lthickness colormap canv

P
Paul Mackerras 已提交
780 781 782
    if {$delold} {
	$canv delete lines.$id
    }
783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804
    if {[info exists mainline($id)]} {
	set t [$canv create line $mainline($id) \
		   -width [expr {($xtra + 1) * $lthickness}] \
		   -fill $colormap($id) -tags lines.$id \
		   -arrow $mainlinearrow($id)]
	$canv lower $t
	bindline $t $id
    }
    if {[info exists sidelines($id)]} {
	foreach ls $sidelines($id) {
	    set coords [lindex $ls 0]
	    set thick [lindex $ls 1]
	    set arrow [lindex $ls 2]
	    set t [$canv create line $coords -fill $colormap($id) \
		       -width [expr {($thick + $xtra) * $lthickness}] \
		       -arrow $arrow -tags lines.$id]
	    $canv lower $t
	    bindline $t $id
	}
    }
}

805
# level here is an index in displist
806
proc drawcommitline {level} {
807
    global parents children nparents displist
808
    global canv canv2 canv3 mainfont namefont canvy linespc
809
    global lineid linehtag linentag linedtag commitinfo
810
    global colormap numcommits currentparents dupparents
811
    global idtags idline idheads idotherrefs
812 813 814
    global lineno lthickness mainline mainlinearrow sidelines
    global commitlisted rowtextx idpos lastuse displist
    global oldnlines olddlevel olddisplist
815 816 817

    incr numcommits
    incr lineno
818 819
    set id [lindex $displist $level]
    set lastuse($id) $lineno
820 821 822 823 824 825 826
    set lineid($lineno) $id
    set idline($id) $lineno
    set ofill [expr {[info exists commitlisted($id)]? "blue": "white"}]
    if {![info exists commitinfo($id)]} {
	readcommit $id
	if {![info exists commitinfo($id)]} {
	    set commitinfo($id) {"No commit information available"}
827 828
	    set nparents($id) 0
	}
829
    }
P
Paul Mackerras 已提交
830
    assigncolor $id
831
    set currentparents {}
832
    set dupparents {}
833
    if {[info exists commitlisted($id)] && [info exists parents($id)]} {
834 835 836 837 838 839 840 841
	foreach p $parents($id) {
	    if {[lsearch -exact $currentparents $p] < 0} {
		lappend currentparents $p
	    } else {
		# remember that this parent was listed twice
		lappend dupparents $p
	    }
	}
842
    }
843
    set x [xcoord $level $level $lineno]
844
    set y1 $canvy
J
Jeff Hobbs 已提交
845
    set canvy [expr {$canvy + $linespc}]
846
    allcanvs conf -scrollregion \
J
Jeff Hobbs 已提交
847
	[list 0 0 0 [expr {$y1 + 0.5 * $linespc + 2}]]
P
Paul Mackerras 已提交
848 849
    if {[info exists mainline($id)]} {
	lappend mainline($id) $x $y1
850 851 852
	if {$mainlinearrow($id) ne "none"} {
	    set mainline($id) [trimdiagstart $mainline($id)]
	}
P
Paul Mackerras 已提交
853
    }
P
Paul Mackerras 已提交
854
    drawlines $id 0 0
855
    set orad [expr {$linespc / 3}]
J
Jeff Hobbs 已提交
856 857
    set t [$canv create oval [expr {$x - $orad}] [expr {$y1 - $orad}] \
	       [expr {$x + $orad - 1}] [expr {$y1 + $orad - 1}] \
858 859
	       -fill $ofill -outline black -width 1]
    $canv raise $t
860
    $canv bind $t <1> {selcanvline {} %x %y}
861
    set xt [xcoord [llength $displist] $level $lineno]
P
Paul Mackerras 已提交
862 863
    if {[llength $currentparents] > 2} {
	set xt [expr {$xt + ([llength $currentparents] - 2) * $linespc}]
864
    }
865
    set rowtextx($lineno) $xt
866
    set idpos($id) [list $x $xt $y1]
867 868
    if {[info exists idtags($id)] || [info exists idheads($id)]
	|| [info exists idotherrefs($id)]} {
869
	set xt [drawtags $id $x $xt $y1]
870 871 872 873
    }
    set headline [lindex $commitinfo($id) 0]
    set name [lindex $commitinfo($id) 1]
    set date [lindex $commitinfo($id) 2]
P
Paul Mackerras 已提交
874
    set date [formatdate $date]
875 876
    set linehtag($lineno) [$canv create text $xt $y1 -anchor w \
			       -text $headline -font $mainfont ]
877
    $canv bind $linehtag($lineno) <Button-3> "rowmenu %X %Y $id"
878 879 880 881
    set linentag($lineno) [$canv2 create text 3 $y1 -anchor w \
			       -text $name -font $namefont]
    set linedtag($lineno) [$canv3 create text 3 $y1 -anchor w \
			       -text $date -font $mainfont]
882 883 884 885

    set olddlevel $level
    set olddisplist $displist
    set oldnlines [llength $displist]
886 887
}

888
proc drawtags {id x xt y1} {
889
    global idtags idheads idotherrefs
890
    global linespc lthickness
891
    global canv mainfont idline rowtextx
892 893 894

    set marks {}
    set ntags 0
895
    set nheads 0
896 897 898 899 900 901
    if {[info exists idtags($id)]} {
	set marks $idtags($id)
	set ntags [llength $marks]
    }
    if {[info exists idheads($id)]} {
	set marks [concat $marks $idheads($id)]
902 903 904 905
	set nheads [llength $idheads($id)]
    }
    if {[info exists idotherrefs($id)]} {
	set marks [concat $marks $idotherrefs($id)]
906 907 908 909 910 911
    }
    if {$marks eq {}} {
	return $xt
    }

    set delta [expr {int(0.5 * ($linespc - $lthickness))}]
J
Jeff Hobbs 已提交
912 913
    set yt [expr {$y1 - 0.5 * $linespc}]
    set yb [expr {$yt + $linespc - 1}]
914 915 916 917 918 919 920 921 922 923 924 925
    set xvals {}
    set wvals {}
    foreach tag $marks {
	set wid [font measure $mainfont $tag]
	lappend xvals $xt
	lappend wvals $wid
	set xt [expr {$xt + $delta + $wid + $lthickness + $linespc}]
    }
    set t [$canv create line $x $y1 [lindex $xvals end] $y1 \
	       -width $lthickness -fill black -tags tag.$id]
    $canv lower $t
    foreach tag $marks x $xvals wid $wvals {
J
Jeff Hobbs 已提交
926 927
	set xl [expr {$x + $delta}]
	set xr [expr {$x + $delta + $wid + $lthickness}]
928 929
	if {[incr ntags -1] >= 0} {
	    # draw a tag
J
Jeff Hobbs 已提交
930 931
	    set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
		       $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
932 933 934
		       -width 1 -outline black -fill yellow -tags tag.$id]
	    $canv bind $t <1> [list showtag $tag 1]
	    set rowtextx($idline($id)) [expr {$xr + $linespc}]
935
	} else {
936 937 938 939 940 941
	    # draw a head or other ref
	    if {[incr nheads -1] >= 0} {
		set col green
	    } else {
		set col "#ddddff"
	    }
J
Jeff Hobbs 已提交
942
	    set xl [expr {$xl - $delta/2}]
943
	    $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
944
		-width 1 -outline black -fill $col -tags tag.$id
945
	}
946 947 948 949 950
	set t [$canv create text $xl $y1 -anchor w -text $tag \
		   -font $mainfont -tags tag.$id]
	if {$ntags >= 0} {
	    $canv bind $t <1> [list showtag $tag 1]
	}
951 952 953 954
    }
    return $xt
}

955
proc notecrossings {id lo hi corner} {
956
    global olddisplist crossings cornercrossings
957 958

    for {set i $lo} {[incr i] < $hi} {} {
959
	set p [lindex $olddisplist $i]
960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982
	if {$p == {}} continue
	if {$i == $corner} {
	    if {![info exists cornercrossings($id)]
		|| [lsearch -exact $cornercrossings($id) $p] < 0} {
		lappend cornercrossings($id) $p
	    }
	    if {![info exists cornercrossings($p)]
		|| [lsearch -exact $cornercrossings($p) $id] < 0} {
		lappend cornercrossings($p) $id
	    }
	} else {
	    if {![info exists crossings($id)]
		|| [lsearch -exact $crossings($id) $p] < 0} {
		lappend crossings($id) $p
	    }
	    if {![info exists crossings($p)]
		|| [lsearch -exact $crossings($p) $id] < 0} {
		lappend crossings($p) $id
	    }
	}
    }
}

983 984 985 986 987 988 989 990 991 992 993
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
}
994

995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023
# it seems Tk can't draw arrows on the end of diagonal line segments...
proc trimdiagend {line} {
    while {[llength $line] > 4} {
	set x1 [lindex $line end-3]
	set y1 [lindex $line end-2]
	set x2 [lindex $line end-1]
	set y2 [lindex $line end]
	if {($x1 == $x2) != ($y1 == $y2)} break
	set line [lreplace $line end-1 end]
    }
    return $line
}

proc trimdiagstart {line} {
    while {[llength $line] > 4} {
	set x1 [lindex $line 0]
	set y1 [lindex $line 1]
	set x2 [lindex $line 2]
	set y2 [lindex $line 3]
	if {($x1 == $x2) != ($y1 == $y2)} break
	set line [lreplace $line 0 1]
    }
    return $line
}

proc drawslants {id needonscreen nohs} {
    global canv mainline mainlinearrow sidelines
    global canvx0 canvy xspc1 xspc2 lthickness
    global currentparents dupparents
1024
    global lthickness linespc canvy colormap lineno geometry
1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082
    global maxgraphpct maxwidth
    global displist onscreen lastuse
    global parents commitlisted
    global oldnlines olddlevel olddisplist
    global nhyperspace numcommits nnewparents

    if {$lineno < 0} {
	lappend displist $id
	set onscreen($id) 1
	return 0
    }

    set y1 [expr {$canvy - $linespc}]
    set y2 $canvy

    # work out what we need to get back on screen
    set reins {}
    if {$onscreen($id) < 0} {
	# next to do isn't displayed, better get it on screen...
	lappend reins [list $id 0]
    }
    # make sure all the previous commits's parents are on the screen
    foreach p $currentparents {
	if {$onscreen($p) < 0} {
	    lappend reins [list $p 0]
	}
    }
    # bring back anything requested by caller
    if {$needonscreen ne {}} {
	lappend reins $needonscreen
    }

    # try the shortcut
    if {$currentparents == $id && $onscreen($id) == 0 && $reins eq {}} {
	set dlevel $olddlevel
	set x [xcoord $dlevel $dlevel $lineno]
	set mainline($id) [list $x $y1]
	set mainlinearrow($id) none
	set lastuse($id) $lineno
	set displist [lreplace $displist $dlevel $dlevel $id]
	set onscreen($id) 1
	set xspc1([expr {$lineno + 1}]) $xspc1($lineno)
	return $dlevel
    }

    # update displist
    set displist [lreplace $displist $olddlevel $olddlevel]
    set j $olddlevel
    foreach p $currentparents {
	set lastuse($p) $lineno
	if {$onscreen($p) == 0} {
	    set displist [linsert $displist $j $p]
	    set onscreen($p) 1
	    incr j
	}
    }
    if {$onscreen($id) == 0} {
	lappend displist $id
1083
	set onscreen($id) 1
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 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 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 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175
    }

    # remove the null entry if present
    set nullentry [lsearch -exact $displist {}]
    if {$nullentry >= 0} {
	set displist [lreplace $displist $nullentry $nullentry]
    }

    # bring back the ones we need now (if we did it earlier
    # it would change displist and invalidate olddlevel)
    foreach pi $reins {
	# test again in case of duplicates in reins
	set p [lindex $pi 0]
	if {$onscreen($p) < 0} {
	    set onscreen($p) 1
	    set lastuse($p) $lineno
	    set displist [linsert $displist [lindex $pi 1] $p]
	    incr nhyperspace -1
	}
    }

    set lastuse($id) $lineno

    # see if we need to make any lines jump off into hyperspace
    set displ [llength $displist]
    if {$displ > $maxwidth} {
	set ages {}
	foreach x $displist {
	    lappend ages [list $lastuse($x) $x]
	}
	set ages [lsort -integer -index 0 $ages]
	set k 0
	while {$displ > $maxwidth} {
	    set use [lindex $ages $k 0]
	    set victim [lindex $ages $k 1]
	    if {$use >= $lineno - 5} break
	    incr k
	    if {[lsearch -exact $nohs $victim] >= 0} continue
	    set i [lsearch -exact $displist $victim]
	    set displist [lreplace $displist $i $i]
	    set onscreen($victim) -1
	    incr nhyperspace
	    incr displ -1
	    if {$i < $nullentry} {
		incr nullentry -1
	    }
	    set x [lindex $mainline($victim) end-1]
	    lappend mainline($victim) $x $y1
	    set line [trimdiagend $mainline($victim)]
	    set arrow "last"
	    if {$mainlinearrow($victim) ne "none"} {
		set line [trimdiagstart $line]
		set arrow "both"
	    }
	    lappend sidelines($victim) [list $line 1 $arrow]
	    unset mainline($victim)
	}
    }

    set dlevel [lsearch -exact $displist $id]

    # If we are reducing, put in a null entry
    if {$displ < $oldnlines} {
	# does the next line look like a merge?
	# i.e. does it have > 1 new parent?
	if {$nnewparents($id) > 1} {
	    set i [expr {$dlevel + 1}]
	} elseif {$nnewparents([lindex $olddisplist $olddlevel]) == 0} {
	    set i $olddlevel
	    if {$nullentry >= 0 && $nullentry < $i} {
		incr i -1
	    }
	} elseif {$nullentry >= 0} {
	    set i $nullentry
	    while {$i < $displ
		   && [lindex $olddisplist $i] == [lindex $displist $i]} {
		incr i
	    }
	} else {
	    set i $olddlevel
	    if {$dlevel >= $i} {
		incr i
	    }
	}
	if {$i < $displ} {
	    set displist [linsert $displist $i {}]
	    incr displ
	    if {$dlevel >= $i} {
		incr dlevel
	    }
	}
    }
1176 1177 1178 1179

    # decide on the line spacing for the next line
    set lj [expr {$lineno + 1}]
    set maxw [expr {$maxgraphpct * $geometry(canv1) / 100}]
1180
    if {$displ <= 1 || $canvx0 + $displ * $xspc2 <= $maxw} {
1181 1182
	set xspc1($lj) $xspc2
    } else {
1183
	set xspc1($lj) [expr {($maxw - $canvx0 - $xspc2) / ($displ - 1)}]
1184 1185 1186 1187
	if {$xspc1($lj) < $lthickness} {
	    set xspc1($lj) $lthickness
	}
    }
1188 1189 1190 1191 1192 1193 1194 1195 1196

    foreach idi $reins {
	set id [lindex $idi 0]
	set j [lsearch -exact $displist $id]
	set xj [xcoord $j $dlevel $lj]
	set mainline($id) [list $xj $y2]
	set mainlinearrow($id) first
    }

1197
    set i -1
1198
    foreach id $olddisplist {
1199 1200
	incr i
	if {$id == {}} continue
1201 1202 1203
	if {$onscreen($id) <= 0} continue
	set xi [xcoord $i $olddlevel $lineno]
	if {$i == $olddlevel} {
1204
	    foreach p $currentparents {
1205
		set j [lsearch -exact $displist $p]
1206
		set coords [list $xi $y1]
1207
		set xj [xcoord $j $dlevel $lj]
1208 1209
		if {$xj < $xi - $linespc} {
		    lappend coords [expr {$xj + $linespc}] $y1
1210
		    notecrossings $p $j $i [expr {$j + 1}]
1211 1212
		} elseif {$xj > $xi + $linespc} {
		    lappend coords [expr {$xj - $linespc}] $y1
1213
		    notecrossings $p $i $j [expr {$j - 1}]
1214 1215 1216
		}
		if {[lsearch -exact $dupparents $p] >= 0} {
		    # draw a double-width line to indicate the doubled parent
1217
		    lappend coords $xj $y2
1218
		    lappend sidelines($p) [list $coords 2 none]
P
Paul Mackerras 已提交
1219 1220
		    if {![info exists mainline($p)]} {
			set mainline($p) [list $xj $y2]
1221
			set mainlinearrow($p) none
1222 1223 1224
		    }
		} else {
		    # normal case, no parent duplicated
1225 1226 1227 1228 1229
		    set yb $y2
		    set dx [expr {abs($xi - $xj)}]
		    if {0 && $dx < $linespc} {
			set yb [expr {$y1 + $dx}]
		    }
P
Paul Mackerras 已提交
1230
		    if {![info exists mainline($p)]} {
1231 1232
			if {$xi != $xj} {
			    lappend coords $xj $yb
1233
			}
P
Paul Mackerras 已提交
1234
			set mainline($p) $coords
1235
			set mainlinearrow($p) none
1236
		    } else {
1237 1238 1239 1240
			lappend coords $xj $yb
			if {$yb < $y2} {
			    lappend coords $xj $y2
			}
1241
			lappend sidelines($p) [list $coords 1 none]
1242
		    }
P
Paul Mackerras 已提交
1243
		}
1244
	    }
1245 1246
	} else {
	    set j $i
1247 1248
	    if {[lindex $displist $i] != $id} {
		set j [lsearch -exact $displist $id]
1249 1250
	    }
	    if {$j != $i || $xspc1($lineno) != $xspc1($lj)
1251 1252
		|| ($olddlevel < $i && $i < $dlevel)
		|| ($dlevel < $i && $i < $olddlevel)} {
1253
		set xj [xcoord $j $dlevel $lj]
1254
		lappend mainline($id) $xi $y1 $xj $y2
1255
	    }
1256
	}
1257
    }
1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 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
    return $dlevel
}

# search for x in a list of lists
proc llsearch {llist x} {
    set i 0
    foreach l $llist {
	if {$l == $x || [lsearch -exact $l $x] >= 0} {
	    return $i
	}
	incr i
    }
    return -1
}

proc drawmore {reading} {
    global displayorder numcommits ncmupdate nextupdate
    global stopped nhyperspace parents commitlisted
    global maxwidth onscreen displist currentparents olddlevel

    set n [llength $displayorder]
    while {$numcommits < $n} {
	set id [lindex $displayorder $numcommits]
	set ctxend [expr {$numcommits + 10}]
	if {!$reading && $ctxend > $n} {
	    set ctxend $n
	}
	set dlist {}
	if {$numcommits > 0} {
	    set dlist [lreplace $displist $olddlevel $olddlevel]
	    set i $olddlevel
	    foreach p $currentparents {
		if {$onscreen($p) == 0} {
		    set dlist [linsert $dlist $i $p]
		    incr i
		}
	    }
	}
	set nohs {}
	set reins {}
	set isfat [expr {[llength $dlist] > $maxwidth}]
	if {$nhyperspace > 0 || $isfat} {
	    if {$ctxend > $n} break
	    # work out what to bring back and
	    # what we want to don't want to send into hyperspace
	    set room 1
	    for {set k $numcommits} {$k < $ctxend} {incr k} {
		set x [lindex $displayorder $k]
		set i [llsearch $dlist $x]
		if {$i < 0} {
		    set i [llength $dlist]
		    lappend dlist $x
		}
		if {[lsearch -exact $nohs $x] < 0} {
		    lappend nohs $x
		}
		if {$reins eq {} && $onscreen($x) < 0 && $room} {
		    set reins [list $x $i]
		}
		set newp {}
		if {[info exists commitlisted($x)]} {
		    set right 0
		    foreach p $parents($x) {
			if {[llsearch $dlist $p] < 0} {
			    lappend newp $p
			    if {[lsearch -exact $nohs $p] < 0} {
				lappend nohs $p
			    }
			    if {$reins eq {} && $onscreen($p) < 0 && $room} {
				set reins [list $p [expr {$i + $right}]]
			    }
			}
			set right 1
		    }
		}
		set l [lindex $dlist $i]
		if {[llength $l] == 1} {
		    set l $newp
		} else {
		    set j [lsearch -exact $l $x]
		    set l [concat [lreplace $l $j $j] $newp]
		}
		set dlist [lreplace $dlist $i $i $l]
		if {$room && $isfat && [llength $newp] <= 1} {
		    set room 0
		}
	    }
	}

	set dlevel [drawslants $id $reins $nohs]
	drawcommitline $dlevel
	if {[clock clicks -milliseconds] >= $nextupdate
	    && $numcommits >= $ncmupdate} {
	    doupdate $reading
	    if {$stopped} break
	}
    }
}

# level here is an index in todo
proc updatetodo {level noshortcut} {
    global ncleft todo nnewparents
    global commitlisted parents onscreen

    set id [lindex $todo $level]
    set olds {}
    if {[info exists commitlisted($id)]} {
	foreach p $parents($id) {
	    if {[lsearch -exact $olds $p] < 0} {
		lappend olds $p
	    }
	}
    }
    if {!$noshortcut && [llength $olds] == 1} {
	set p [lindex $olds 0]
	if {$ncleft($p) == 1 && [lsearch -exact $todo $p] < 0} {
	    set ncleft($p) 0
	    set todo [lreplace $todo $level $level $p]
	    set onscreen($p) 0
	    set nnewparents($id) 1
	    return 0
	}
    }

    set todo [lreplace $todo $level $level]
    set i $level
    set n 0
    foreach p $olds {
	incr ncleft($p) -1
	set k [lsearch -exact $todo $p]
	if {$k < 0} {
	    set todo [linsert $todo $i $p]
	    set onscreen($p) 0
	    incr i
	    incr n
	}
    }
    set nnewparents($id) $n

    return 1
1398
}
1399

1400
proc decidenext {{noread 0}} {
1401
    global ncleft todo
1402
    global datemode cdate
1403
    global commitinfo
1404

1405 1406 1407 1408 1409 1410 1411 1412
    # choose which one to do next time around
    set todol [llength $todo]
    set level -1
    set latest {}
    for {set k $todol} {[incr k -1] >= 0} {} {
	set p [lindex $todo $k]
	if {$ncleft($p) == 0} {
	    if {$datemode} {
1413 1414 1415 1416 1417 1418
		if {![info exists commitinfo($p)]} {
		    if {$noread} {
			return {}
		    }
		    readcommit $p
		}
1419
		if {$latest == {} || $cdate($p) > $latest} {
1420
		    set level $k
1421
		    set latest $cdate($p)
1422
		}
1423 1424 1425
	    } else {
		set level $k
		break
1426 1427
	    }
	}
1428 1429 1430 1431 1432
    }
    if {$level < 0} {
	if {$todo != {}} {
	    puts "ERROR: none of the pending commits can be done yet:"
	    foreach p $todo {
P
Paul Mackerras 已提交
1433
		puts "  $p ($ncleft($p))"
1434 1435
	    }
	}
1436 1437
	return -1
    }
1438

1439 1440
    return $level
}
1441

1442
proc drawcommit {id reading} {
P
Paul Mackerras 已提交
1443
    global phase todo nchildren datemode nextupdate revlistorder
1444
    global numcommits ncmupdate displayorder todo onscreen
P
Paul Mackerras 已提交
1445
    global numcommits ncmupdate displayorder todo onscreen parents
1446 1447 1448

    if {$phase != "incrdraw"} {
	set phase incrdraw
1449 1450
	set displayorder {}
	set todo {}
1451
	initgraph
1452 1453 1454 1455 1456
    }
    if {$nchildren($id) == 0} {
	lappend todo $id
	set onscreen($id) 0
    }
P
Paul Mackerras 已提交
1457 1458 1459 1460 1461
    if {$revlistorder} {
	set level [lsearch -exact $todo $id]
	if {$level < 0} {
	    error_popup "oops, $id isn't in todo"
	    return
1462
	}
P
Paul Mackerras 已提交
1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479
	lappend displayorder $id
	updatetodo $level 0
    } else {
	set level [decidenext 1]
	if {$level == {} || $id != [lindex $todo $level]} {
	    return
	}
	while 1 {
	    lappend displayorder [lindex $todo $level]
	    if {[updatetodo $level $datemode]} {
		set level [decidenext 1]
		if {$level == {}} break
	    }
	    set id [lindex $todo $level]
	    if {![info exists commitlisted($id)]} {
		break
	    }
1480 1481
	}
    }
1482
    drawmore $reading
1483 1484 1485
}

proc finishcommits {} {
1486
    global phase oldcommits commits
1487
    global canv mainfont ctext maincursor textcursor
1488
    global parents
1489

1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500
    if {$phase == "incrdraw" || $phase == "removecommits"} {
	foreach id $oldcommits {
	    lappend commits $id
	    updatechildren $id $parents($id)
	    drawcommit $id 0
	}
	set oldcommits {}
	drawrest
    } elseif {$phase == "updatecommits"} {
	set phase {}
    } else {
1501 1502 1503 1504 1505
	$canv delete all
	$canv create text 3 3 -anchor nw -text "No commits selected" \
	    -font $mainfont -tags textitems
	set phase {}
    }
1506
    . config -cursor $maincursor
1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518
    settextcursor $textcursor
}

# 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
1519 1520 1521
}

proc drawgraph {} {
1522 1523
    global nextupdate startmsecs ncmupdate
    global displayorder onscreen
1524

1525
    if {$displayorder == {}} return
1526
    set startmsecs [clock clicks -milliseconds]
J
Jeff Hobbs 已提交
1527
    set nextupdate [expr {$startmsecs + 100}]
1528
    set ncmupdate 1
1529
    initgraph
1530 1531 1532 1533
    foreach id $displayorder {
	set onscreen($id) 0
    }
    drawmore 0
1534 1535
}

1536
proc drawrest {} {
1537
    global phase stopped redisplaying selectedline
1538
    global datemode todo displayorder
1539
    global numcommits ncmupdate
P
Paul Mackerras 已提交
1540 1541
    global nextupdate startmsecs revlistorder

1542 1543 1544 1545 1546 1547 1548 1549 1550
    set level [decidenext]
    if {$level >= 0} {
	set phase drawgraph
	while 1 {
	    lappend displayorder [lindex $todo $level]
	    set hard [updatetodo $level $datemode]
	    if {$hard} {
		set level [decidenext]
		if {$level < 0} break
1551
	    }
1552
	}
1553
    }
P
Paul Mackerras 已提交
1554
    drawmore 0
1555
    set phase {}
J
Jeff Hobbs 已提交
1556
    set drawmsecs [expr {[clock clicks -milliseconds] - $startmsecs}]
1557
    #puts "overall $drawmsecs ms for $numcommits commits"
1558 1559
    if {$redisplaying} {
	if {$stopped == 0 && [info exists selectedline]} {
1560
	    selectline $selectedline 0
1561 1562 1563 1564 1565 1566 1567 1568
	}
	if {$stopped == 1} {
	    set stopped 0
	    after idle drawgraph
	} else {
	    set redisplaying 0
	}
    }
1569 1570
}

1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583
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 已提交
1584 1585
	    lappend matches [list $j [expr {$j+$foundstrlen-1}]]
	    set i [expr {$j + $foundstrlen}]
1586 1587 1588 1589 1590
	}
    }
    return $matches
}

1591 1592 1593 1594
proc dofind {} {
    global findtype findloc findstring markedmatches commitinfo
    global numcommits lineid linehtag linentag linedtag
    global mainfont namefont canv canv2 canv3 selectedline
1595
    global matchinglines foundstring foundstrlen
1596 1597

    stopfindproc
1598
    unmarkmatches
1599
    focus .
1600
    set matchinglines {}
1601 1602 1603 1604
    if {$findloc == "Pickaxe"} {
	findpatches
	return
    }
1605
    if {$findtype == "IgnCase"} {
1606
	set foundstring [string tolower $findstring]
1607
    } else {
1608
	set foundstring $findstring
1609
    }
1610 1611
    set foundstrlen [string length $findstring]
    if {$foundstrlen == 0} return
1612 1613 1614 1615
    if {$findloc == "Files"} {
	findfiles
	return
    }
1616 1617 1618 1619 1620 1621
    if {![info exists selectedline]} {
	set oldsel -1
    } else {
	set oldsel $selectedline
    }
    set didsel 0
1622
    set fldtypes {Headline Author Date Committer CDate Comment}
1623 1624 1625 1626 1627 1628 1629 1630
    for {set l 0} {$l < $numcommits} {incr l} {
	set id $lineid($l)
	set info $commitinfo($id)
	set doesmatch 0
	foreach f $info ty $fldtypes {
	    if {$findloc != "All fields" && $findloc != $ty} {
		continue
	    }
1631
	    set matches [findmatches $f]
1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644
	    if {$matches == {}} continue
	    set doesmatch 1
	    if {$ty == "Headline"} {
		markmatches $canv $l $f $linehtag($l) $matches $mainfont
	    } elseif {$ty == "Author"} {
		markmatches $canv2 $l $f $linentag($l) $matches $namefont
	    } elseif {$ty == "Date"} {
		markmatches $canv3 $l $f $linedtag($l) $matches $mainfont
	    }
	}
	if {$doesmatch} {
	    lappend matchinglines $l
	    if {!$didsel && $l > $oldsel} {
1645
		findselectline $l
1646 1647 1648 1649 1650 1651 1652
		set didsel 1
	    }
	}
    }
    if {$matchinglines == {}} {
	bell
    } elseif {!$didsel} {
1653 1654 1655 1656 1657 1658
	findselectline [lindex $matchinglines 0]
    }
}

proc findselectline {l} {
    global findloc commentend ctext
1659
    selectline $l 1
1660 1661 1662 1663 1664 1665
    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 已提交
1666
	    set end [expr {[lindex $match 1] + 1}]
1667 1668
	    $ctext tag add found "1.0 + $start c" "1.0 + $end c"
	}
1669 1670 1671
    }
}

1672
proc findnext {restart} {
1673 1674
    global matchinglines selectedline
    if {![info exists matchinglines]} {
1675 1676 1677
	if {$restart} {
	    dofind
	}
1678 1679 1680 1681 1682
	return
    }
    if {![info exists selectedline]} return
    foreach l $matchinglines {
	if {$l > $selectedline} {
1683
	    findselectline $l
1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702
	    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 != {}} {
1703
	findselectline $prev
1704 1705 1706 1707 1708
    } else {
	bell
    }
}

1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737
proc findlocchange {name ix op} {
    global findloc findtype findtypemenu
    if {$findloc == "Pickaxe"} {
	set findtype Exact
	set state disabled
    } else {
	set state normal
    }
    $findtypemenu entryconf 1 -state $state
    $findtypemenu entryconf 2 -state $state
}

proc stopfindproc {{done 0}} {
    global findprocpid findprocfile findids
    global ctext findoldcursor phase maincursor textcursor
    global findinprogress

    catch {unset findids}
    if {[info exists findprocpid]} {
	if {!$done} {
	    catch {exec kill $findprocpid}
	}
	catch {close $findprocfile}
	unset findprocpid
    }
    if {[info exists findinprogress]} {
	unset findinprogress
	if {$phase != "incrdraw"} {
	    . config -cursor $maincursor
1738
	    settextcursor $textcursor
1739 1740 1741 1742 1743 1744 1745 1746
	}
    }
}

proc findpatches {} {
    global findstring selectedline numcommits
    global findprocpid findprocfile
    global finddidsel ctext lineid findinprogress
1747
    global findinsertpos
1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773

    if {$numcommits == 0} return

    # make a list of all the ids to search, starting at the one
    # after the selected line (if any)
    if {[info exists selectedline]} {
	set l $selectedline
    } else {
	set l -1
    }
    set inputids {}
    for {set i 0} {$i < $numcommits} {incr i} {
	if {[incr l] >= $numcommits} {
	    set l 0
	}
	append inputids $lineid($l) "\n"
    }

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

1774
    set findinsertpos end
1775 1776 1777 1778 1779 1780
    set findprocfile $f
    set findprocpid [pid $f]
    fconfigure $f -blocking 0
    fileevent $f readable readfindproc
    set finddidsel 0
    . config -cursor watch
1781
    settextcursor watch
1782 1783 1784 1785 1786
    set findinprogress 1
}

proc readfindproc {} {
    global findprocfile finddidsel
1787
    global idline matchinglines findinsertpos
1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808

    set n [gets $findprocfile line]
    if {$n < 0} {
	if {[eof $findprocfile]} {
	    stopfindproc 1
	    if {!$finddidsel} {
		bell
	    }
	}
	return
    }
    if {![regexp {^[0-9a-f]{40}} $line id]} {
	error_popup "Can't parse git-diff-tree output: $line"
	stopfindproc
	return
    }
    if {![info exists idline($id)]} {
	puts stderr "spurious id: $id"
	return
    }
    set l $idline($id)
1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826
    insertmatch $l $id
}

proc insertmatch {l id} {
    global matchinglines findinsertpos finddidsel

    if {$findinsertpos == "end"} {
	if {$matchinglines != {} && $l < [lindex $matchinglines 0]} {
	    set matchinglines [linsert $matchinglines 0 $l]
	    set findinsertpos 1
	} else {
	    lappend matchinglines $l
	}
    } else {
	set matchinglines [linsert $matchinglines $findinsertpos $l]
	incr findinsertpos
    }
    markheadline $l $id
1827 1828 1829 1830 1831 1832 1833
    if {!$finddidsel} {
	findselectline $l
	set finddidsel 1
    }
}

proc findfiles {} {
1834 1835 1836 1837 1838
    global selectedline numcommits lineid ctext
    global ffileline finddidsel parents nparents
    global findinprogress findstartline findinsertpos
    global treediffs fdiffids fdiffsneeded fdiffpos
    global findmergefiles
1839 1840 1841 1842 1843 1844 1845 1846 1847 1848

    if {$numcommits == 0} return

    if {[info exists selectedline]} {
	set l [expr {$selectedline + 1}]
    } else {
	set l 0
    }
    set ffileline $l
    set findstartline $l
1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882
    set diffsneeded {}
    set fdiffsneeded {}
    while 1 {
	set id $lineid($l)
	if {$findmergefiles || $nparents($id) == 1} {
	    foreach p $parents($id) {
		if {![info exists treediffs([list $id $p])]} {
		    append diffsneeded "$id $p\n"
		    lappend fdiffsneeded [list $id $p]
		}
	    }
	}
	if {[incr l] >= $numcommits} {
	    set l 0
	}
	if {$l == $findstartline} break
    }

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

    set finddidsel 0
    set findinsertpos end
1883 1884 1885
    set id $lineid($l)
    set p [lindex $parents($id) 0]
    . config -cursor watch
1886
    settextcursor watch
1887 1888
    set findinprogress 1
    findcont [list $id $p]
1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948
    update
}

proc readfilediffs {df} {
    global findids fdiffids fdiffs

    set n [gets $df line]
    if {$n < 0} {
	if {[eof $df]} {
	    donefilediff
	    if {[catch {close $df} err]} {
		stopfindproc
		bell
		error_popup "Error in git-diff-tree: $err"
	    } elseif {[info exists findids]} {
		set ids $findids
		stopfindproc
		bell
		error_popup "Couldn't find diffs for {$ids}"
	    }
	}
	return
    }
    if {[regexp {^([0-9a-f]{40}) \(from ([0-9a-f]{40})\)} $line match id p]} {
	# start of a new string of diffs
	donefilediff
	set fdiffids [list $id $p]
	set fdiffs {}
    } elseif {[string match ":*" $line]} {
	lappend fdiffs [lindex $line 5]
    }
}

proc donefilediff {} {
    global fdiffids fdiffs treediffs findids
    global fdiffsneeded fdiffpos

    if {[info exists fdiffids]} {
	while {[lindex $fdiffsneeded $fdiffpos] ne $fdiffids
	       && $fdiffpos < [llength $fdiffsneeded]} {
	    # git-diff-tree doesn't output anything for a commit
	    # which doesn't change anything
	    set nullids [lindex $fdiffsneeded $fdiffpos]
	    set treediffs($nullids) {}
	    if {[info exists findids] && $nullids eq $findids} {
		unset findids
		findcont $nullids
	    }
	    incr fdiffpos
	}
	incr fdiffpos

	if {![info exists treediffs($fdiffids)]} {
	    set treediffs($fdiffids) $fdiffs
	}
	if {[info exists findids] && $fdiffids eq $findids} {
	    unset findids
	    findcont $fdiffids
	}
    }
1949 1950 1951
}

proc findcont {ids} {
1952
    global findids treediffs parents nparents
1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976
    global ffileline findstartline finddidsel
    global lineid numcommits matchinglines findinprogress
    global findmergefiles

    set id [lindex $ids 0]
    set p [lindex $ids 1]
    set pi [lsearch -exact $parents($id) $p]
    set l $ffileline
    while 1 {
	if {$findmergefiles || $nparents($id) == 1} {
	    if {![info exists treediffs($ids)]} {
		set findids $ids
		set ffileline $l
		return
	    }
	    set doesmatch 0
	    foreach f $treediffs($ids) {
		set x [findmatches $f]
		if {$x != {}} {
		    set doesmatch 1
		    break
		}
	    }
	    if {$doesmatch} {
1977
		insertmatch $l $id
1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010
		set pi $nparents($id)
	    }
	} else {
	    set pi $nparents($id)
	}
	if {[incr pi] >= $nparents($id)} {
	    set pi 0
	    if {[incr l] >= $numcommits} {
		set l 0
	    }
	    if {$l == $findstartline} break
	    set id $lineid($l)
	}
	set p [lindex $parents($id) $pi]
	set ids [list $id $p]
    }
    stopfindproc
    if {!$finddidsel} {
	bell
    }
}

# mark a commit as matching by putting a yellow background
# behind the headline
proc markheadline {l id} {
    global canv mainfont linehtag commitinfo

    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
2011 2012 2013 2014 2015 2016 2017 2018 2019
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 已提交
2020 2021 2022 2023
	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 \
2024 2025 2026 2027 2028 2029
		   -outline {} -tags matches -fill yellow]
	$canv lower $t
    }
}

proc unmarkmatches {} {
2030
    global matchinglines findids
2031 2032
    allcanvs delete matches
    catch {unset matchinglines}
2033
    catch {unset findids}
2034 2035
}

2036
proc selcanvline {w x y} {
2037
    global canv canvy0 ctext linespc
2038
    global lineid linehtag linentag linedtag rowtextx
2039
    set ymax [lindex [$canv cget -scrollregion] 3]
2040
    if {$ymax == {}} return
2041 2042 2043 2044 2045 2046
    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
    }
2047 2048 2049
    if {$w eq $canv} {
	if {![info exists rowtextx($l)] || $x < $rowtextx($l)} return
    }
2050
    unmarkmatches
2051
    selectline $l 1
2052 2053
}

2054 2055 2056 2057 2058 2059 2060 2061 2062
proc commit_descriptor {p} {
    global commitinfo
    set l "..."
    if {[info exists commitinfo($p)]} {
	set l [lindex $commitinfo($p) 0]
    }
    return "$p ($l)"
}

2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087
# append some text to the ctext widget, and make any SHA1 ID
# that we know about be a clickable link.
proc appendwithlinks {text} {
    global ctext idline linknum

    set start [$ctext index "end - 1c"]
    $ctext insert end $text
    $ctext insert end "\n"
    set links [regexp -indices -all -inline {[0-9a-f]{40}} $text]
    foreach l $links {
	set s [lindex $l 0]
	set e [lindex $l 1]
	set linkid [string range $text $s $e]
	if {![info exists idline($linkid)]} continue
	incr e
	$ctext tag add link "$start + $s c" "$start + $e c"
	$ctext tag add link$linknum "$start + $s c" "$start + $e c"
	$ctext tag bind link$linknum <1> [list selectline $idline($linkid) 1]
	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 }
}

2088
proc selectline {l isnew} {
2089 2090
    global canv canv2 canv3 ctext commitinfo selectedline
    global lineid linehtag linentag linedtag
2091
    global canvy0 linespc parents nparents children
2092
    global cflist currentid sha1entry
2093
    global commentend idtags idline linknum
2094

2095
    $canv delete hover
2096
    normalline
2097
    if {![info exists lineid($l)] || ![info exists linehtag($l)]} return
2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109
    $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
2110
    set y [expr {$canvy0 + $l * $linespc}]
2111
    set ymax [lindex [$canv cget -scrollregion] 3]
2112 2113
    set ytop [expr {$y - $linespc - 1}]
    set ybot [expr {$y + $linespc + 1}]
2114
    set wnow [$canv yview]
J
Jeff Hobbs 已提交
2115 2116
    set wtop [expr {[lindex $wnow 0] * $ymax}]
    set wbot [expr {[lindex $wnow 1] * $ymax}]
2117 2118
    set wh [expr {$wbot - $wtop}]
    set newtop $wtop
2119
    if {$ytop < $wtop} {
2120 2121 2122 2123 2124 2125 2126
	if {$ybot < $wtop} {
	    set newtop [expr {$y - $wh / 2.0}]
	} else {
	    set newtop $ytop
	    if {$newtop > $wtop - $linespc} {
		set newtop [expr {$wtop - $linespc}]
	    }
2127
	}
2128 2129 2130 2131 2132 2133 2134 2135
    } 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}]
	    }
2136
	}
2137 2138 2139 2140 2141
    }
    if {$newtop != $wtop} {
	if {$newtop < 0} {
	    set newtop 0
	}
J
Jeff Hobbs 已提交
2142
	allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
2143
    }
2144

2145 2146
    if {$isnew} {
	addtohistory [list selectline $l 0]
2147 2148
    }

2149 2150
    set selectedline $l

2151
    set id $lineid($l)
2152
    set currentid $id
2153 2154 2155 2156 2157
    $sha1entry delete 0 end
    $sha1entry insert 0 $id
    $sha1entry selection from 0
    $sha1entry selection to end

2158
    $ctext conf -state normal
2159
    $ctext delete 0.0 end
2160
    set linknum 0
2161 2162
    $ctext mark set fmark.0 0.0
    $ctext mark gravity fmark.0 left
2163
    set info $commitinfo($id)
P
Paul Mackerras 已提交
2164 2165 2166 2167
    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"
2168 2169 2170 2171 2172 2173 2174
    if {[info exists idtags($id)]} {
	$ctext insert end "Tags:"
	foreach tag $idtags($id) {
	    $ctext insert end " $tag"
	}
	$ctext insert end "\n"
    }
2175 2176
 
    set comment {}
2177 2178 2179 2180 2181 2182 2183 2184
    if {[info exists parents($id)]} {
	foreach p $parents($id) {
	    append comment "Parent: [commit_descriptor $p]\n"
	}
    }
    if {[info exists children($id)]} {
	foreach c $children($id) {
	    append comment "Child:  [commit_descriptor $c]\n"
2185 2186 2187 2188
	}
    }
    append comment "\n"
    append comment [lindex $info 5]
2189 2190

    # make anything that looks like a SHA1 ID be a clickable link
2191
    appendwithlinks $comment
2192

2193
    $ctext tag delete Comments
2194
    $ctext tag remove found 1.0 end
2195
    $ctext conf -state disabled
2196
    set commentend [$ctext index "end - 1c"]
2197 2198

    $cflist delete 0 end
2199
    $cflist insert end "Comments"
2200
    if {$nparents($id) == 1} {
2201
	startdiff $id
2202 2203 2204 2205 2206 2207 2208 2209
    } elseif {$nparents($id) > 1} {
	mergediff $id
    }
}

proc selnextline {dir} {
    global selectedline
    if {![info exists selectedline]} return
J
Jeff Hobbs 已提交
2210
    set l [expr {$selectedline + $dir}]
2211
    unmarkmatches
2212 2213 2214
    selectline $l 1
}

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
proc unselectline {} {
    global selectedline

    catch {unset selectedline}
    allcanvs delete secsel
}

proc addtohistory {cmd} {
    global history historyindex

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

    if {$historyindex < [llength $history]} {
	set history [lreplace $history $historyindex end $cmd]
    } else {
	lappend history $cmd
    }
    incr historyindex
    if {$historyindex > 1} {
	.ctop.top.bar.leftbut conf -state normal
    } else {
	.ctop.top.bar.leftbut conf -state disabled
    }
    .ctop.top.bar.rightbut conf -state disabled
}

2244 2245 2246 2247 2248
proc goback {} {
    global history historyindex

    if {$historyindex > 1} {
	incr historyindex -1
2249 2250
	set cmd [lindex $history [expr {$historyindex - 1}]]
	eval $cmd
2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261
	.ctop.top.bar.rightbut conf -state normal
    }
    if {$historyindex <= 1} {
	.ctop.top.bar.leftbut conf -state disabled
    }
}

proc goforw {} {
    global history historyindex

    if {$historyindex < [llength $history]} {
2262
	set cmd [lindex $history $historyindex]
2263
	incr historyindex
2264
	eval $cmd
2265 2266 2267 2268 2269
	.ctop.top.bar.leftbut conf -state normal
    }
    if {$historyindex >= [llength $history]} {
	.ctop.top.bar.rightbut conf -state disabled
    }
2270 2271
}

2272 2273
proc mergediff {id} {
    global parents diffmergeid diffmergegca mergefilelist diffpindex
2274

2275 2276 2277 2278
    set diffmergeid $id
    set diffpindex -1
    set diffmergegca [findgca $parents($id)]
    if {[info exists mergefilelist($id)]} {
2279 2280 2281
	if {$mergefilelist($id) ne {}} {
	    showmergediff
	}
2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304
    } else {
	contmergediff {}
    }
}

proc findgca {ids} {
    set gca {}
    foreach id $ids {
	if {$gca eq {}} {
	    set gca $id
	} else {
	    if {[catch {
		set gca [exec git-merge-base $gca $id]
	    } err]} {
		return {}
	    }
	}
    }
    return $gca
}

proc contmergediff {ids} {
    global diffmergeid diffpindex parents nparents diffmergegca
2305
    global treediffs mergefilelist diffids treepending
2306 2307 2308 2309

    # diff the child against each of the parents, and diff
    # each of the parents against the GCA.
    while 1 {
2310 2311
	if {[lindex $ids 1] == $diffmergeid && $diffmergegca ne {}} {
	    set ids [list $diffmergegca [lindex $ids 0]]
2312 2313 2314
	} else {
	    if {[incr diffpindex] >= $nparents($diffmergeid)} break
	    set p [lindex $parents($diffmergeid) $diffpindex]
2315
	    set ids [list $p $diffmergeid]
2316 2317 2318
	}
	if {![info exists treediffs($ids)]} {
	    set diffids $ids
2319 2320 2321
	    if {![info exists treepending]} {
		gettreediffs $ids
	    }
2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332
	    return
	}
    }

    # If a file in some parent is different from the child and also
    # different from the GCA, then it's interesting.
    # If we don't have a GCA, then a file is interesting if it is
    # different from the child in all the parents.
    if {$diffmergegca ne {}} {
	set files {}
	foreach p $parents($diffmergeid) {
2333 2334
	    set gcadiffs $treediffs([list $diffmergegca $p])
	    foreach f $treediffs([list $p $diffmergeid]) {
2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346
		if {[lsearch -exact $files $f] < 0
		    && [lsearch -exact $gcadiffs $f] >= 0} {
		    lappend files $f
		}
	    }
	}
	set files [lsort $files]
    } else {
	set p [lindex $parents($diffmergeid) 0]
	set files $treediffs([list $diffmergeid $p])
	for {set i 1} {$i < $nparents($diffmergeid) && $files ne {}} {incr i} {
	    set p [lindex $parents($diffmergeid) $i]
2347
	    set df $treediffs([list $p $diffmergeid])
2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358
	    set nf {}
	    foreach f $files {
		if {[lsearch -exact $df $f] >= 0} {
		    lappend nf $f
		}
	    }
	    set files $nf
	}
    }

    set mergefilelist($diffmergeid) $files
2359 2360 2361
    if {$files ne {}} {
	showmergediff
    }
2362 2363 2364
}

proc showmergediff {} {
2365
    global cflist diffmergeid mergefilelist parents
2366 2367
    global diffopts diffinhunk currentfile currenthunk filelines
    global diffblocked groupfilelast mergefds groupfilenum grouphunks
2368 2369 2370 2371 2372

    set files $mergefilelist($diffmergeid)
    foreach f $files {
	$cflist insert end $f
    }
2373 2374 2375 2376 2377
    set env(GIT_DIFF_OPTS) $diffopts
    set flist {}
    catch {unset currentfile}
    catch {unset currenthunk}
    catch {unset filelines}
2378 2379
    catch {unset groupfilenum}
    catch {unset grouphunks}
2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 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 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651
    set groupfilelast -1
    foreach p $parents($diffmergeid) {
	set cmd [list | git-diff-tree -p $p $diffmergeid]
	set cmd [concat $cmd $mergefilelist($diffmergeid)]
	if {[catch {set f [open $cmd r]} err]} {
	    error_popup "Error getting diffs: $err"
	    foreach f $flist {
		catch {close $f}
	    }
	    return
	}
	lappend flist $f
	set ids [list $diffmergeid $p]
	set mergefds($ids) $f
	set diffinhunk($ids) 0
	set diffblocked($ids) 0
	fconfigure $f -blocking 0
	fileevent $f readable [list getmergediffline $f $ids $diffmergeid]
    }
}

proc getmergediffline {f ids id} {
    global diffmergeid diffinhunk diffoldlines diffnewlines
    global currentfile currenthunk
    global diffoldstart diffnewstart diffoldlno diffnewlno
    global diffblocked mergefilelist
    global noldlines nnewlines difflcounts filelines

    set n [gets $f line]
    if {$n < 0} {
	if {![eof $f]} return
    }

    if {!([info exists diffmergeid] && $diffmergeid == $id)} {
	if {$n < 0} {
	    close $f
	}
	return
    }

    if {$diffinhunk($ids) != 0} {
	set fi $currentfile($ids)
	if {$n > 0 && [regexp {^[-+ \\]} $line match]} {
	    # continuing an existing hunk
	    set line [string range $line 1 end]
	    set p [lindex $ids 1]
	    if {$match eq "-" || $match eq " "} {
		set filelines($p,$fi,$diffoldlno($ids)) $line
		incr diffoldlno($ids)
	    }
	    if {$match eq "+" || $match eq " "} {
		set filelines($id,$fi,$diffnewlno($ids)) $line
		incr diffnewlno($ids)
	    }
	    if {$match eq " "} {
		if {$diffinhunk($ids) == 2} {
		    lappend difflcounts($ids) \
			[list $noldlines($ids) $nnewlines($ids)]
		    set noldlines($ids) 0
		    set diffinhunk($ids) 1
		}
		incr noldlines($ids)
	    } elseif {$match eq "-" || $match eq "+"} {
		if {$diffinhunk($ids) == 1} {
		    lappend difflcounts($ids) [list $noldlines($ids)]
		    set noldlines($ids) 0
		    set nnewlines($ids) 0
		    set diffinhunk($ids) 2
		}
		if {$match eq "-"} {
		    incr noldlines($ids)
		} else {
		    incr nnewlines($ids)
		}
	    }
	    # and if it's \ No newline at end of line, then what?
	    return
	}
	# end of a hunk
	if {$diffinhunk($ids) == 1 && $noldlines($ids) != 0} {
	    lappend difflcounts($ids) [list $noldlines($ids)]
	} elseif {$diffinhunk($ids) == 2
		  && ($noldlines($ids) != 0 || $nnewlines($ids) != 0)} {
	    lappend difflcounts($ids) [list $noldlines($ids) $nnewlines($ids)]
	}
	set currenthunk($ids) [list $currentfile($ids) \
				   $diffoldstart($ids) $diffnewstart($ids) \
				   $diffoldlno($ids) $diffnewlno($ids) \
				   $difflcounts($ids)]
	set diffinhunk($ids) 0
	# -1 = need to block, 0 = unblocked, 1 = is blocked
	set diffblocked($ids) -1
	processhunks
	if {$diffblocked($ids) == -1} {
	    fileevent $f readable {}
	    set diffblocked($ids) 1
	}
    }

    if {$n < 0} {
	# eof
	if {!$diffblocked($ids)} {
	    close $f
	    set currentfile($ids) [llength $mergefilelist($diffmergeid)]
	    set currenthunk($ids) [list $currentfile($ids) 0 0 0 0 {}]
	    processhunks
	}
    } elseif {[regexp {^diff --git a/(.*) b/} $line match fname]} {
	# start of a new file
	set currentfile($ids) \
	    [lsearch -exact $mergefilelist($diffmergeid) $fname]
    } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
		   $line match f1l f1c f2l f2c rest]} {
	if {[info exists currentfile($ids)] && $currentfile($ids) >= 0} {
	    # start of a new hunk
	    if {$f1l == 0 && $f1c == 0} {
		set f1l 1
	    }
	    if {$f2l == 0 && $f2c == 0} {
		set f2l 1
	    }
	    set diffinhunk($ids) 1
	    set diffoldstart($ids) $f1l
	    set diffnewstart($ids) $f2l
	    set diffoldlno($ids) $f1l
	    set diffnewlno($ids) $f2l
	    set difflcounts($ids) {}
	    set noldlines($ids) 0
	    set nnewlines($ids) 0
	}
    }
}

proc processhunks {} {
    global diffmergeid parents nparents currenthunk
    global mergefilelist diffblocked mergefds
    global grouphunks grouplinestart grouplineend groupfilenum

    set nfiles [llength $mergefilelist($diffmergeid)]
    while 1 {
	set fi $nfiles
	set lno 0
	# look for the earliest hunk
	foreach p $parents($diffmergeid) {
	    set ids [list $diffmergeid $p]
	    if {![info exists currenthunk($ids)]} return
	    set i [lindex $currenthunk($ids) 0]
	    set l [lindex $currenthunk($ids) 2]
	    if {$i < $fi || ($i == $fi && $l < $lno)} {
		set fi $i
		set lno $l
		set pi $p
	    }
	}

	if {$fi < $nfiles} {
	    set ids [list $diffmergeid $pi]
	    set hunk $currenthunk($ids)
	    unset currenthunk($ids)
	    if {$diffblocked($ids) > 0} {
		fileevent $mergefds($ids) readable \
		    [list getmergediffline $mergefds($ids) $ids $diffmergeid]
	    }
	    set diffblocked($ids) 0

	    if {[info exists groupfilenum] && $groupfilenum == $fi
		&& $lno <= $grouplineend} {
		# add this hunk to the pending group
		lappend grouphunks($pi) $hunk
		set endln [lindex $hunk 4]
		if {$endln > $grouplineend} {
		    set grouplineend $endln
		}
		continue
	    }
	}

	# succeeding stuff doesn't belong in this group, so
	# process the group now
	if {[info exists groupfilenum]} {
	    processgroup
	    unset groupfilenum
	    unset grouphunks
	}

	if {$fi >= $nfiles} break

	# start a new group
	set groupfilenum $fi
	set grouphunks($pi) [list $hunk]
	set grouplinestart $lno
	set grouplineend [lindex $hunk 4]
    }
}

proc processgroup {} {
    global groupfilelast groupfilenum difffilestart
    global mergefilelist diffmergeid ctext filelines
    global parents diffmergeid diffoffset
    global grouphunks grouplinestart grouplineend nparents
    global mergemax

    $ctext conf -state normal
    set id $diffmergeid
    set f $groupfilenum
    if {$groupfilelast != $f} {
	$ctext insert end "\n"
	set here [$ctext index "end - 1c"]
	set difffilestart($f) $here
	set mark fmark.[expr {$f + 1}]
	$ctext mark set $mark $here
	$ctext mark gravity $mark left
	set header [lindex $mergefilelist($id) $f]
	set l [expr {(78 - [string length $header]) / 2}]
	set pad [string range "----------------------------------------" 1 $l]
	$ctext insert end "$pad $header $pad\n" filesep
	set groupfilelast $f
	foreach p $parents($id) {
	    set diffoffset($p) 0
	}
    }

    $ctext insert end "@@" msep
    set nlines [expr {$grouplineend - $grouplinestart}]
    set events {}
    set pnum 0
    foreach p $parents($id) {
	set startline [expr {$grouplinestart + $diffoffset($p)}]
	set ol $startline
	set nl $grouplinestart
	if {[info exists grouphunks($p)]} {
	    foreach h $grouphunks($p) {
		set l [lindex $h 2]
		if {$nl < $l} {
		    for {} {$nl < $l} {incr nl} {
			set filelines($p,$f,$ol) $filelines($id,$f,$nl)
			incr ol
		    }
		}
		foreach chunk [lindex $h 5] {
		    if {[llength $chunk] == 2} {
			set olc [lindex $chunk 0]
			set nlc [lindex $chunk 1]
			set nnl [expr {$nl + $nlc}]
			lappend events [list $nl $nnl $pnum $olc $nlc]
			incr ol $olc
			set nl $nnl
		    } else {
			incr ol [lindex $chunk 0]
			incr nl [lindex $chunk 0]
		    }
		}
	    }
	}
	if {$nl < $grouplineend} {
	    for {} {$nl < $grouplineend} {incr nl} {
		set filelines($p,$f,$ol) $filelines($id,$f,$nl)
		incr ol
	    }
	}
	set nlines [expr {$ol - $startline}]
	$ctext insert end " -$startline,$nlines" msep
	incr pnum
    }

    set nlines [expr {$grouplineend - $grouplinestart}]
    $ctext insert end " +$grouplinestart,$nlines @@\n" msep

    set events [lsort -integer -index 0 $events]
    set nevents [llength $events]
    set nmerge $nparents($diffmergeid)
    set l $grouplinestart
2652
    for {set i 0} {$i < $nevents} {set i $j} {
2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680
	set nl [lindex $events $i 0]
	while {$l < $nl} {
	    $ctext insert end " $filelines($id,$f,$l)\n"
	    incr l
	}
	set e [lindex $events $i]
	set enl [lindex $e 1]
	set j $i
	set active {}
	while 1 {
	    set pnum [lindex $e 2]
	    set olc [lindex $e 3]
	    set nlc [lindex $e 4]
	    if {![info exists delta($pnum)]} {
		set delta($pnum) [expr {$olc - $nlc}]
		lappend active $pnum
	    } else {
		incr delta($pnum) [expr {$olc - $nlc}]
	    }
	    if {[incr j] >= $nevents} break
	    set e [lindex $events $j]
	    if {[lindex $e 0] >= $enl} break
	    if {[lindex $e 1] > $enl} {
		set enl [lindex $e 1]
	    }
	}
	set nlc [expr {$enl - $l}]
	set ncol mresult
2681
	set bestpn -1
2682
	if {[llength $active] == $nmerge - 1} {
2683
	    # no diff for one of the parents, i.e. it's identical
2684 2685 2686 2687 2688 2689 2690 2691 2692 2693
	    for {set pnum 0} {$pnum < $nmerge} {incr pnum} {
		if {![info exists delta($pnum)]} {
		    if {$pnum < $mergemax} {
			lappend ncol m$pnum
		    } else {
			lappend ncol mmax
		    }
		    break
		}
	    }
2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707
	} elseif {[llength $active] == $nmerge} {
	    # all parents are different, see if one is very similar
	    set bestsim 30
	    for {set pnum 0} {$pnum < $nmerge} {incr pnum} {
		set sim [similarity $pnum $l $nlc $f \
			     [lrange $events $i [expr {$j-1}]]]
		if {$sim > $bestsim} {
		    set bestsim $sim
		    set bestpn $pnum
		}
	    }
	    if {$bestpn >= 0} {
		lappend ncol m$bestpn
	    }
2708 2709 2710 2711
	}
	set pnum -1
	foreach p $parents($id) {
	    incr pnum
2712
	    if {![info exists delta($pnum)] || $pnum == $bestpn} continue
2713 2714 2715 2716 2717 2718 2719 2720 2721
	    set olc [expr {$nlc + $delta($pnum)}]
	    set ol [expr {$l + $diffoffset($p)}]
	    incr diffoffset($p) $delta($pnum)
	    unset delta($pnum)
	    for {} {$olc > 0} {incr olc -1} {
		$ctext insert end "-$filelines($p,$f,$ol)\n" m$pnum
		incr ol
	    }
	}
2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748
	set endl [expr {$l + $nlc}]
	if {$bestpn >= 0} {
	    # show this pretty much as a normal diff
	    set p [lindex $parents($id) $bestpn]
	    set ol [expr {$l + $diffoffset($p)}]
	    incr diffoffset($p) $delta($bestpn)
	    unset delta($bestpn)
	    for {set k $i} {$k < $j} {incr k} {
		set e [lindex $events $k]
		if {[lindex $e 2] != $bestpn} continue
		set nl [lindex $e 0]
		set ol [expr {$ol + $nl - $l}]
		for {} {$l < $nl} {incr l} {
		    $ctext insert end "+$filelines($id,$f,$l)\n" $ncol
		}
		set c [lindex $e 3]
		for {} {$c > 0} {incr c -1} {
		    $ctext insert end "-$filelines($p,$f,$ol)\n" m$bestpn
		    incr ol
		}
		set nl [lindex $e 1]
		for {} {$l < $nl} {incr l} {
		    $ctext insert end "+$filelines($id,$f,$l)\n" mresult
		}
	    }
	}
	for {} {$l < $endl} {incr l} {
2749 2750 2751 2752 2753 2754 2755 2756
	    $ctext insert end "+$filelines($id,$f,$l)\n" $ncol
	}
    }
    while {$l < $grouplineend} {
	$ctext insert end " $filelines($id,$f,$l)\n"
	incr l
    }
    $ctext conf -state disabled
2757
}
2758

2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797
proc similarity {pnum l nlc f events} {
    global diffmergeid parents diffoffset filelines

    set id $diffmergeid
    set p [lindex $parents($id) $pnum]
    set ol [expr {$l + $diffoffset($p)}]
    set endl [expr {$l + $nlc}]
    set same 0
    set diff 0
    foreach e $events {
	if {[lindex $e 2] != $pnum} continue
	set nl [lindex $e 0]
	set ol [expr {$ol + $nl - $l}]
	for {} {$l < $nl} {incr l} {
	    incr same [string length $filelines($id,$f,$l)]
	    incr same
	}
	set oc [lindex $e 3]
	for {} {$oc > 0} {incr oc -1} {
	    incr diff [string length $filelines($p,$f,$ol)]
	    incr diff
	    incr ol
	}
	set nl [lindex $e 1]
	for {} {$l < $nl} {incr l} {
	    incr diff [string length $filelines($id,$f,$l)]
	    incr diff
	}
    }
    for {} {$l < $endl} {incr l} {
	incr same [string length $filelines($id,$f,$l)]
	incr same
    }
    if {$same == 0} {
	return 0
    }
    return [expr {200 * $same / (2 * $same + $diff)}]
}

2798 2799
proc startdiff {ids} {
    global treediffs diffids treepending diffmergeid
2800

2801
    set diffids $ids
2802
    catch {unset diffmergeid}
2803
    if {![info exists treediffs($ids)]} {
2804
	if {![info exists treepending]} {
2805
	    gettreediffs $ids
2806 2807
	}
    } else {
2808
	addtocflist $ids
2809 2810 2811 2812
    }
}

proc addtocflist {ids} {
2813
    global treediffs cflist
2814
    foreach f $treediffs($ids) {
2815 2816
	$cflist insert end $f
    }
2817
    getblobdiffs $ids
2818 2819
}

2820
proc gettreediffs {ids} {
2821
    global treediff parents treepending
2822
    set treepending $ids
2823
    set treediff {}
2824
    if [catch {set gdtf [open [concat | git-diff-tree --no-commit-id -r $ids] r]}] return
2825
    fconfigure $gdtf -blocking 0
2826
    fileevent $gdtf readable [list gettreediffline $gdtf $ids]
2827 2828
}

2829
proc gettreediffline {gdtf ids} {
2830 2831
    global treediff treediffs treepending diffids diffmergeid

2832 2833 2834 2835
    set n [gets $gdtf line]
    if {$n < 0} {
	if {![eof $gdtf]} return
	close $gdtf
2836
	set treediffs($ids) $treediff
2837
	unset treepending
2838 2839 2840 2841 2842
	if {$ids != $diffids} {
	    gettreediffs $diffids
	} else {
	    if {[info exists diffmergeid]} {
		contmergediff $ids
2843 2844 2845 2846
	    } else {
		addtocflist $ids
	    }
	}
2847 2848
	return
    }
2849
    set file [lindex $line 5]
2850
    lappend treediff $file
2851 2852
}

2853
proc getblobdiffs {ids} {
2854
    global diffopts blobdifffd diffids env curdifftag curtagstart
2855
    global difffilestart nextupdate diffinhdr treediffs
2856

2857
    set env(GIT_DIFF_OPTS) $diffopts
2858
    set cmd [concat | git-diff-tree --no-commit-id -r -p -C $ids]
2859
    if {[catch {set bdf [open $cmd r]} err]} {
2860 2861 2862
	puts "error getting diffs: $err"
	return
    }
2863
    set diffinhdr 0
2864
    fconfigure $bdf -blocking 0
2865
    set blobdifffd($ids) $bdf
2866 2867 2868 2869
    set curdifftag Comments
    set curtagstart 0.0
    catch {unset difffilestart}
    fileevent $bdf readable [list getblobdiffline $bdf $diffids]
2870
    set nextupdate [expr {[clock clicks -milliseconds] + 100}]
2871 2872
}

2873
proc getblobdiffline {bdf ids} {
2874
    global diffids blobdifffd ctext curdifftag curtagstart
2875 2876
    global diffnexthead diffnextnote difffilestart
    global nextupdate diffinhdr treediffs
2877

2878 2879 2880 2881
    set n [gets $bdf line]
    if {$n < 0} {
	if {[eof $bdf]} {
	    close $bdf
2882
	    if {$ids == $diffids && $bdf == $blobdifffd($ids)} {
2883 2884 2885 2886 2887
		$ctext tag add $curdifftag $curtagstart end
	    }
	}
	return
    }
2888
    if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
2889 2890 2891
	return
    }
    $ctext conf -state normal
2892
    if {[regexp {^diff --git a/(.*) b/(.*)} $line match fname newname]} {
2893 2894 2895 2896
	# start of a new file
	$ctext insert end "\n"
	$ctext tag add $curdifftag $curtagstart end
	set curtagstart [$ctext index "end - 1c"]
2897
	set header $newname
2898
	set here [$ctext index "end - 1c"]
2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914
	set i [lsearch -exact $treediffs($diffids) $fname]
	if {$i >= 0} {
	    set difffilestart($i) $here
	    incr i
	    $ctext mark set fmark.$i $here
	    $ctext mark gravity fmark.$i left
	}
	if {$newname != $fname} {
	    set i [lsearch -exact $treediffs($diffids) $newname]
	    if {$i >= 0} {
		set difffilestart($i) $here
		incr i
		$ctext mark set fmark.$i $here
		$ctext mark gravity fmark.$i left
	    }
	}
2915 2916
	set curdifftag "f:$fname"
	$ctext tag delete $curdifftag
2917
	set l [expr {(78 - [string length $header]) / 2}]
2918
	set pad [string range "----------------------------------------" 1 $l]
2919
	$ctext insert end "$pad $header $pad\n" filesep
2920 2921 2922
	set diffinhdr 1
    } elseif {[regexp {^(---|\+\+\+)} $line]} {
	set diffinhdr 0
2923 2924
    } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
		   $line match f1l f1c f2l f2c rest]} {
2925
	$ctext insert end "$line\n" hunksep
2926
	set diffinhdr 0
2927 2928 2929 2930 2931 2932 2933
    } 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"
2934
	} elseif {$diffinhdr || $x == "\\"} {
2935 2936
	    # e.g. "\ No newline at end of file"
	    $ctext insert end "$line\n" filesep
2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948
	} 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
2949 2950 2951 2952 2953 2954
    if {[clock clicks -milliseconds] >= $nextupdate} {
	incr nextupdate 100
	fileevent $bdf readable {}
	update
	fileevent $bdf readable "getblobdiffline $bdf {$ids}"
    }
2955 2956
}

2957 2958 2959 2960 2961
proc nextfile {} {
    global difffilestart ctext
    set here [$ctext index @0,0]
    for {set i 0} {[info exists difffilestart($i)]} {incr i} {
	if {[$ctext compare $difffilestart($i) > $here]} {
2962 2963 2964 2965
	    if {![info exists pos]
		|| [$ctext compare $difffilestart($i) < $pos]} {
		set pos $difffilestart($i)
	    }
2966 2967
	}
    }
2968 2969 2970
    if {[info exists pos]} {
	$ctext yview $pos
    }
2971 2972
}

2973
proc listboxsel {} {
2974
    global ctext cflist currentid
2975
    if {![info exists currentid]} return
2976 2977 2978 2979
    set sel [lsort [$cflist curselection]]
    if {$sel eq {}} return
    set first [lindex $sel 0]
    catch {$ctext yview fmark.$first}
2980 2981
}

2982 2983
proc setcoords {} {
    global linespc charspc canvx0 canvy0 mainfont
2984
    global xspc1 xspc2 lthickness
2985

2986 2987
    set linespc [font metrics $mainfont -linespace]
    set charspc [font measure $mainfont "m"]
J
Jeff Hobbs 已提交
2988 2989
    set canvy0 [expr {3 + 0.5 * $linespc}]
    set canvx0 [expr {3 + 0.5 * $linespc}]
2990
    set lthickness [expr {int($linespc / 9) + 1}]
2991 2992
    set xspc1(0) $linespc
    set xspc2 $linespc
2993
}
2994

2995
proc redisplay {} {
2996
    global stopped redisplaying phase
2997 2998 2999
    if {$stopped > 1} return
    if {$phase == "getcommits"} return
    set redisplaying 1
3000
    if {$phase == "drawgraph" || $phase == "incrdraw"} {
3001 3002 3003 3004 3005 3006 3007
	set stopped 1
    } else {
	drawgraph
    }
}

proc incrfont {inc} {
3008
    global mainfont namefont textfont ctext canv phase
3009
    global stopped entries
3010 3011 3012 3013 3014 3015 3016
    unmarkmatches
    set mainfont [lreplace $mainfont 1 1 [expr {[lindex $mainfont 1] + $inc}]]
    set namefont [lreplace $namefont 1 1 [expr {[lindex $namefont 1] + $inc}]]
    set textfont [lreplace $textfont 1 1 [expr {[lindex $textfont 1] + $inc}]]
    setcoords
    $ctext conf -font $textfont
    $ctext tag conf filesep -font [concat $textfont bold]
3017 3018 3019
    foreach e $entries {
	$e conf -font $mainfont
    }
3020 3021 3022 3023 3024
    if {$phase == "getcommits"} {
	$canv itemconf textitems -font $mainfont
    }
    redisplay
}
3025

3026 3027 3028 3029 3030 3031 3032
proc clearsha1 {} {
    global sha1entry sha1string
    if {[string length $sha1string] == 40} {
	$sha1entry delete 0 end
    }
}

3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050
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 {} {
    global sha1string currentid idline tagids
3051 3052
    global lineid numcommits

3053 3054 3055 3056 3057 3058
    if {$sha1string == {}
	|| ([info exists currentid] && $sha1string == $currentid)} return
    if {[info exists tagids($sha1string)]} {
	set id $tagids($sha1string)
    } else {
	set id [string tolower $sha1string]
3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073
	if {[regexp {^[0-9a-f]{4,39}$} $id]} {
	    set matches {}
	    for {set l 0} {$l < $numcommits} {incr l} {
		if {[string match $id* $lineid($l)]} {
		    lappend matches $lineid($l)
		}
	    }
	    if {$matches ne {}} {
		if {[llength $matches] > 1} {
		    error_popup "Short SHA1 id $id is ambiguous"
		    return
		}
		set id [lindex $matches 0]
	    }
	}
3074 3075
    }
    if {[info exists idline($id)]} {
3076
	selectline $idline($id) 1
3077 3078
	return
    }
3079
    if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
3080 3081 3082 3083 3084 3085 3086
	set type "SHA1 id"
    } else {
	set type "Tag"
    }
    error_popup "$type $sha1string is not known"
}

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 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145
proc lineenter {x y id} {
    global hoverx hovery hoverid hovertimer
    global commitinfo canv

    if {![info exists commitinfo($id)]} return
    set hoverx $x
    set hovery $y
    set hoverid $id
    if {[info exists hovertimer]} {
	after cancel $hovertimer
    }
    set hovertimer [after 500 linehover]
    $canv delete hover
}

proc linemotion {x y id} {
    global hoverx hovery hoverid hovertimer

    if {[info exists hoverid] && $id == $hoverid} {
	set hoverx $x
	set hovery $y
	if {[info exists hovertimer]} {
	    after cancel $hovertimer
	}
	set hovertimer [after 500 linehover]
    }
}

proc lineleave {id} {
    global hoverid hovertimer canv

    if {[info exists hoverid] && $id == $hoverid} {
	$canv delete hover
	if {[info exists hovertimer]} {
	    after cancel $hovertimer
	    unset hovertimer
	}
	unset hoverid
    }
}

proc linehover {} {
    global hoverx hovery hoverid hovertimer
    global canv linespc lthickness
    global commitinfo mainfont

    set text [lindex $commitinfo($hoverid) 0]
    set ymax [lindex [$canv cget -scrollregion] 3]
    if {$ymax == {}} return
    set yfrac [lindex [$canv yview] 0]
    set x [expr {$hoverx + 2 * $linespc}]
    set y [expr {$hovery + $yfrac * $ymax - $linespc / 2}]
    set x0 [expr {$x - 2 * $lthickness}]
    set y0 [expr {$y - 2 * $lthickness}]
    set x1 [expr {$x + [font measure $mainfont $text] + 2 * $lthickness}]
    set y1 [expr {$y + $linespc + 2 * $lthickness}]
    set t [$canv create rectangle $x0 $y0 $x1 $y1 \
	       -fill \#ffff80 -outline black -width 1 -tags hover]
    $canv raise $t
F
Frank Sorenson 已提交
3146
    set t [$canv create text $x $y -anchor nw -text $text -tags hover -font $mainfont]
3147 3148 3149
    $canv raise $t
}

3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180
proc clickisonarrow {id y} {
    global mainline mainlinearrow sidelines lthickness

    set thresh [expr {2 * $lthickness + 6}]
    if {[info exists mainline($id)]} {
	if {$mainlinearrow($id) ne "none"} {
	    if {abs([lindex $mainline($id) 1] - $y) < $thresh} {
		return "up"
	    }
	}
    }
    if {[info exists sidelines($id)]} {
	foreach ls $sidelines($id) {
	    set coords [lindex $ls 0]
	    set arrow [lindex $ls 2]
	    if {$arrow eq "first" || $arrow eq "both"} {
		if {abs([lindex $coords 1] - $y) < $thresh} {
		    return "up"
		}
	    }
	    if {$arrow eq "last" || $arrow eq "both"} {
		if {abs([lindex $coords end] - $y) < $thresh} {
		    return "down"
		}
	    }
	}
    }
    return {}
}

proc arrowjump {id dirn y} {
3181
    global mainline sidelines canv canv2 canv3
3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218

    set yt {}
    if {$dirn eq "down"} {
	if {[info exists mainline($id)]} {
	    set y1 [lindex $mainline($id) 1]
	    if {$y1 > $y} {
		set yt $y1
	    }
	}
	if {[info exists sidelines($id)]} {
	    foreach ls $sidelines($id) {
		set y1 [lindex $ls 0 1]
		if {$y1 > $y && ($yt eq {} || $y1 < $yt)} {
		    set yt $y1
		}
	    }
	}
    } else {
	if {[info exists sidelines($id)]} {
	    foreach ls $sidelines($id) {
		set y1 [lindex $ls 0 end]
		if {$y1 < $y && ($yt eq {} || $y1 > $yt)} {
		    set yt $y1
		}
	    }
	}
    }
    if {$yt eq {}} return
    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
    }
    $canv yview moveto $yfrac
3219 3220
    $canv2 yview moveto $yfrac
    $canv3 yview moveto $yfrac
3221 3222
}

3223
proc lineclick {x y id isnew} {
3224
    global ctext commitinfo children cflist canv thickerline
3225 3226

    unmarkmatches
3227
    unselectline
3228 3229 3230
    normalline
    $canv delete hover
    # draw this line thicker than normal
P
Paul Mackerras 已提交
3231
    drawlines $id 1 1
3232
    set thickerline $id
3233
    if {$isnew} {
3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246
	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]
3247
    }
3248 3249 3250
    # fill the details pane with info about this line
    $ctext conf -state normal
    $ctext delete 0.0 end
3251 3252 3253 3254 3255 3256
    $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]
3257
    set info $commitinfo($id)
3258
    $ctext insert end "\n\t[lindex $info 0]\n"
3259
    $ctext insert end "\tAuthor:\t[lindex $info 1]\n"
P
Paul Mackerras 已提交
3260 3261
    set date [formatdate [lindex $info 2]]
    $ctext insert end "\tDate:\t$date\n"
3262 3263
    if {[info exists children($id)]} {
	$ctext insert end "\nChildren:"
3264
	set i 0
3265
	foreach child $children($id) {
3266
	    incr i
3267
	    set info $commitinfo($child)
3268 3269 3270 3271 3272
	    $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 已提交
3273 3274
	    set date [formatdate [lindex $info 2]]
	    $ctext insert end "\n\tDate:\t$date\n"
3275 3276 3277 3278 3279 3280 3281
	}
    }
    $ctext conf -state disabled

    $cflist delete 0 end
}

3282 3283 3284
proc normalline {} {
    global thickerline
    if {[info exists thickerline]} {
P
Paul Mackerras 已提交
3285
	drawlines $thickerline 0 1
3286 3287 3288 3289
	unset thickerline
    }
}

3290 3291 3292
proc selbyid {id} {
    global idline
    if {[info exists idline($id)]} {
3293
	selectline $idline($id) 1
3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314
    }
}

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} {
    global rowctxmenu idline selectedline rowmenuid

    if {![info exists selectedline] || $idline($id) eq $selectedline} {
	set state disabled
    } else {
	set state normal
    }
    $rowctxmenu entryconfigure 0 -state $state
    $rowctxmenu entryconfigure 1 -state $state
3315
    $rowctxmenu entryconfigure 2 -state $state
3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330
    set rowmenuid $id
    tk_popup $rowctxmenu $x $y
}

proc diffvssel {dirn} {
    global rowmenuid selectedline lineid

    if {![info exists selectedline]} return
    if {$dirn} {
	set oldid $lineid($selectedline)
	set newid $rowmenuid
    } else {
	set oldid $rowmenuid
	set newid $lineid($selectedline)
    }
3331 3332 3333 3334 3335 3336 3337 3338
    addtohistory [list doseldiff $oldid $newid]
    doseldiff $oldid $newid
}

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

3339 3340 3341 3342 3343 3344
    $ctext conf -state normal
    $ctext delete 0.0 end
    $ctext mark set fmark.0 0.0
    $ctext mark gravity fmark.0 left
    $cflist delete 0 end
    $cflist insert end "Top"
3345 3346 3347 3348 3349 3350 3351
    $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     "
3352
    $ctext insert end [lindex $commitinfo($oldid) 0]
3353 3354 3355 3356
    $ctext insert end "\n\nTo   "
    $ctext tag bind link1 <1> [list selbyid $newid]
    $ctext insert end $newid [list link link1]
    $ctext insert end "\n     "
3357 3358 3359 3360 3361
    $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
3362
    startdiff [list $oldid $newid]
3363 3364
}

3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377
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"
3378
    grid $top.title - -pady 10
3379
    label $top.from -text "From:"
3380
    entry $top.fromsha1 -width 40 -relief flat
3381 3382 3383
    $top.fromsha1 insert 0 $oldid
    $top.fromsha1 conf -state readonly
    grid $top.from $top.fromsha1 -sticky w
3384
    entry $top.fromhead -width 60 -relief flat
3385 3386 3387 3388
    $top.fromhead insert 0 $oldhead
    $top.fromhead conf -state readonly
    grid x $top.fromhead -sticky w
    label $top.to -text "To:"
3389
    entry $top.tosha1 -width 40 -relief flat
3390 3391 3392
    $top.tosha1 insert 0 $newid
    $top.tosha1 conf -state readonly
    grid $top.to $top.tosha1 -sticky w
3393
    entry $top.tohead -width 60 -relief flat
3394 3395 3396 3397 3398 3399 3400 3401 3402
    $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
3403
    grid $top.flab $top.fname -sticky w
3404 3405 3406 3407 3408 3409 3410
    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
3411
    focus $top.fname
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
}

proc mkpatchrev {} {
    global patchtop

    set oldid [$patchtop.fromsha1 get]
    set oldhead [$patchtop.fromhead get]
    set newid [$patchtop.tosha1 get]
    set newhead [$patchtop.tohead get]
    foreach e [list fromsha1 fromhead tosha1 tohead] \
	    v [list $newid $newhead $oldid $oldhead] {
	$patchtop.$e conf -state normal
	$patchtop.$e delete 0 end
	$patchtop.$e insert 0 $v
	$patchtop.$e conf -state readonly
    }
}

proc mkpatchgo {} {
    global patchtop

    set oldid [$patchtop.fromsha1 get]
    set newid [$patchtop.tosha1 get]
    set fname [$patchtop.fname get]
    if {[catch {exec git-diff-tree -p $oldid $newid >$fname &} err]} {
	error_popup "Error creating patch: $err"
    }
    catch {destroy $patchtop}
    unset patchtop
}

proc mkpatchcan {} {
    global patchtop

    catch {destroy $patchtop}
    unset patchtop
}

3450 3451 3452 3453 3454 3455 3456 3457
proc mktag {} {
    global rowmenuid mktagtop commitinfo

    set top .maketag
    set mktagtop $top
    catch {destroy $top}
    toplevel $top
    label $top.title -text "Create tag"
3458
    grid $top.title - -pady 10
3459
    label $top.id -text "ID:"
3460
    entry $top.sha1 -width 40 -relief flat
3461 3462 3463
    $top.sha1 insert 0 $rowmenuid
    $top.sha1 conf -state readonly
    grid $top.id $top.sha1 -sticky w
3464
    entry $top.head -width 60 -relief flat
3465 3466 3467 3468
    $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:"
3469
    entry $top.tag -width 60
3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494
    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 {
3495
	set dir [gitdir]
3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506
	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
3507 3508 3509 3510 3511 3512 3513
    redrawtags $id
}

proc redrawtags {id} {
    global canv linehtag idline idpos selectedline

    if {![info exists idline($id)]} return
3514 3515 3516 3517
    $canv delete tag.$id
    set xt [eval drawtags $id $idpos($id)]
    $canv coords $linehtag($idline($id)) $xt [lindex $idpos($id) 2]
    if {[info exists selectedline] && $selectedline == $idline($id)} {
3518
	selectline $selectedline 0
3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533
    }
}

proc mktagcan {} {
    global mktagtop

    catch {destroy $mktagtop}
    unset mktagtop
}

proc mktaggo {} {
    domktag
    mktagcan
}

3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588
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
}

3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628
proc listrefs {id} {
    global idtags idheads idotherrefs

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

proc rereadrefs {} {
    global idtags idheads idotherrefs
    global tagids headids otherrefids

    set refids [concat [array names idtags] \
		    [array names idheads] [array names idotherrefs]]
    foreach id $refids {
	if {![info exists ref($id)]} {
	    set ref($id) [listrefs $id]
	}
    }
    readrefs
    set refids [lsort -unique [concat $refids [array names idtags] \
			[array names idheads] [array names idotherrefs]]]
    foreach id $refids {
	set v [listrefs $id]
	if {![info exists ref($id)] || $ref($id) != $v} {
	    redrawtags $id
	}
    }
}

3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702
proc updatecommits {rargs} {
    global commitlisted commfd phase
    global startmsecs nextupdate ncmupdate
    global idtags idheads idotherrefs
    global leftover
    global parsed_args
    global canv
    global oldcommits commits
    global parents nchildren children ncleft

    set old_args $parsed_args
    parse_args $rargs

    foreach id $old_args {
	if {![regexp {^[0-9a-f]{40}$} $id]} continue
	if {[info exists oldref($id)]} continue
	set oldref($id) $id
	lappend ignoreold "^$id"
    }
    foreach id $parsed_args {
	if {![regexp {^[0-9a-f]{40}$} $id]} continue
	if {[info exists ref($id)]} continue
	set ref($id) $id
	lappend ignorenew "^$id"
    }

    foreach a $old_args {
	if {![info exists ref($a)]} {
	    lappend ignorenew $a
	}
    }

    set phase updatecommits
    set removed_commits [split [eval exec git-rev-list $ignorenew] "\n" ]
    if {[llength $removed_commits] > 0} {
	$canv delete all
	set oldcommits {}
	foreach c $commits {
	    if {[lsearch $c $removed_commits] < 0} {
		lappend oldcommits $c
	    } else {
		unset commitlisted($c)
	    }
	}
	set commits {}
	unset children
	unset nchildren
	set phase removecommits
    }

    set args {}
    foreach a $parsed_args {
	if {![info exists oldref($a)]} {
	    lappend args $a
	}
    }

    readrefs
    if [catch {
	set commfd [open "|git-rev-list --header --topo-order --parents $ignoreold $args" r]
    } err] {
	puts stderr "Error executing git-rev-list: $err"
	exit 1
    }
    set startmsecs [clock clicks -milliseconds]
    set nextupdate [expr $startmsecs + 100]
    set ncmupdate 1
    set leftover {}
    fconfigure $commfd -blocking 0 -translation lf
    fileevent $commfd readable [list getcommitlines $commfd]
    . config -cursor watch
    settextcursor watch
}

3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721
proc showtag {tag isnew} {
    global ctext cflist tagcontents tagids linknum

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

3722 3723 3724 3725 3726
proc doquit {} {
    global stopped
    set stopped 100
    destroy .
}
3727

3728 3729 3730
proc doprefs {} {
    global maxwidth maxgraphpct diffopts findmergefiles
    global oldprefs prefstop
P
Paul Mackerras 已提交
3731

3732 3733 3734 3735 3736
    set top .gitkprefs
    set prefstop $top
    if {[winfo exists $top]} {
	raise $top
	return
3737
    }
3738 3739
    foreach v {maxwidth maxgraphpct diffopts findmergefiles} {
	set oldprefs($v) [set $v]
P
Paul Mackerras 已提交
3740
    }
3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797
    toplevel $top
    wm title $top "Gitk preferences"
    label $top.ldisp -text "Commit list display options"
    grid $top.ldisp - -sticky w -pady 10
    label $top.spacer -text " "
    label $top.maxwidthl -text "Maximum graph width (lines)" \
	-font optionfont
    spinbox $top.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
    grid $top.spacer $top.maxwidthl $top.maxwidth -sticky w
    label $top.maxpctl -text "Maximum graph width (% of pane)" \
	-font optionfont
    spinbox $top.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
    grid x $top.maxpctl $top.maxpct -sticky w
    checkbutton $top.findm -variable findmergefiles
    label $top.findml -text "Include merges for \"Find\" in \"Files\"" \
	-font optionfont
    grid $top.findm $top.findml - -sticky w
    label $top.ddisp -text "Diff display options"
    grid $top.ddisp - -sticky w -pady 10
    label $top.diffoptl -text "Options for diff program" \
	-font optionfont
    entry $top.diffopt -width 20 -textvariable diffopts
    grid x $top.diffoptl $top.diffopt -sticky w
    frame $top.buts
    button $top.buts.ok -text "OK" -command prefsok
    button $top.buts.can -text "Cancel" -command prefscan
    grid $top.buts.ok $top.buts.can
    grid columnconfigure $top.buts 0 -weight 1 -uniform a
    grid columnconfigure $top.buts 1 -weight 1 -uniform a
    grid $top.buts - - -pady 10 -sticky ew
}

proc prefscan {} {
    global maxwidth maxgraphpct diffopts findmergefiles
    global oldprefs prefstop

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

proc prefsok {} {
    global maxwidth maxgraphpct
    global oldprefs prefstop

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

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

3800 3801 3802
# defaults...
set datemode 0
set diffopts "-U 5 -p"
3803
set wrcomcmd "git-diff-tree --stdin -p --pretty"
3804 3805 3806 3807 3808 3809 3810 3811

set gitencoding ""
catch {
    set gitencoding [exec git-repo-config --get i18n.commitencoding]
}
if {$gitencoding == ""} {
	set gitencoding "utf-8"
}
3812

3813 3814
set mainfont {Helvetica 9}
set textfont {Courier 9}
3815
set findmergefiles 0
3816
set maxgraphpct 50
3817
set maxwidth 16
P
Paul Mackerras 已提交
3818
set revlistorder 0
3819
set fastdate 0
3820 3821 3822 3823 3824

set colors {green red blue magenta darkgrey brown orange}

catch {source ~/.gitk}

3825
set namefont $mainfont
3826 3827

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

3829 3830 3831 3832 3833
set revtreeargs {}
foreach arg $argv {
    switch -regexp -- $arg {
	"^$" { }
	"^-d" { set datemode 1 }
P
Paul Mackerras 已提交
3834
	"^-r" { set revlistorder 1 }
3835 3836 3837 3838
	default {
	    lappend revtreeargs $arg
	}
    }
3839
}
3840

3841 3842 3843
set history {}
set historyindex 0

3844 3845
set stopped 0
set redisplaying 0
3846
set stuffsaved 0
3847
set patchnum 0
3848
setcoords
3849
makewindow $revtreeargs
3850
readrefs
3851
getcommits $revtreeargs