2 # Tcl ignores the next line -*- tcl -*- \
5 # Copyright © 2005-2011 Paul Mackerras. All rights reserved.
6 # This program is free software; it may be used, copied, modified
7 # and distributed under the terms of the GNU General Public Licence,
8 # either version 2, or (at your option) any later version.
13 return [expr {[exec git rev-parse
--is-bare-repository] == "false" &&
14 [exec git rev-parse
--is-inside-git-dir] == "false"}]
17 # A simple scheduler for compute-intensive stuff.
18 # The aim is to make sure that event handlers for GUI actions can
19 # run at least every 50-100 ms. Unfortunately fileevent handlers are
20 # run before X event handlers, so reading from a fast source can
21 # make the GUI completely unresponsive.
23 global isonrunq runq currunq
26 if {[info exists isonrunq
($script)]} return
27 if {$runq eq
{} && ![info exists currunq
]} {
30 lappend runq
[list
{} $script]
31 set isonrunq
($script) 1
34 proc filerun
{fd
script} {
35 fileevent
$fd readable
[list filereadable
$fd $script]
38 proc filereadable
{fd
script} {
41 fileevent
$fd readable
{}
42 if {$runq eq
{} && ![info exists currunq
]} {
45 lappend runq
[list
$fd $script]
51 for {set i
0} {$i < [llength
$runq]} {} {
52 if {[lindex
$runq $i 0] eq
$fd} {
53 set runq
[lreplace
$runq $i $i]
61 global isonrunq runq currunq
63 set tstart
[clock clicks
-milliseconds]
65 while {[llength
$runq] > 0} {
66 set fd
[lindex
$runq 0 0]
67 set script [lindex
$runq 0 1]
68 set currunq
[lindex
$runq 0]
69 set runq
[lrange
$runq 1 end
]
70 set repeat
[eval $script]
72 set t1
[clock clicks
-milliseconds]
73 set t
[expr {$t1 - $t0}]
74 if {$repeat ne
{} && $repeat} {
75 if {$fd eq
{} ||
$repeat == 2} {
76 # script returns 1 if it wants to be readded
77 # file readers return 2 if they could do more straight away
78 lappend runq
[list
$fd $script]
80 fileevent
$fd readable
[list filereadable
$fd $script]
82 } elseif
{$fd eq
{}} {
83 unset isonrunq
($script)
86 if {$t1 - $tstart >= 80} break
93 proc reg_instance
{fd
} {
94 global commfd leftover loginstance
96 set i
[incr loginstance
]
102 proc unmerged_files
{files
} {
105 # find the list of unmerged files
109 set fd
[open
"| git ls-files -u" r
]
111 show_error
{} .
"[mc "Couldn
't get list of unmerged files:"] $err"
114 while {[gets $fd line] >= 0} {
115 set i [string first "\t" $line]
117 set fname [string range $line [expr {$i+1}] end]
118 if {[lsearch -exact $mlist $fname] >= 0} continue
120 if {$files eq {} || [path_filter $files $fname]} {
128 proc parseviewargs {n arglist} {
129 global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs env
130 global worddiff git_version
138 set origargs $arglist
142 foreach arg $arglist {
149 switch -glob -- $arg {
153 # remove from origargs in case we hit an unknown option
154 set origargs [lreplace $origargs $i $i]
158 "--no-renames" - "--full-index" - "--binary" - "--abbrev=*" -
159 "--find-copies-harder" - "-l*" - "--ext-diff" - "--no-ext-diff" -
160 "--src-prefix=*" - "--dst-prefix=*" - "--no-prefix" -
161 "-O*" - "--text" - "--full-diff" - "--ignore-space-at-eol" -
162 "--ignore-space-change" - "-U*" - "--unified=*" {
163 # These request or affect diff output, which we don't want.
164 # Some could be used to set our defaults for diff display.
165 lappend diffargs
$arg
167 "--raw" - "--patch-with-raw" - "--patch-with-stat" -
168 "--name-only" - "--name-status" - "--color" -
169 "--log-size" - "--pretty=*" - "--decorate" - "--abbrev-commit" -
170 "--cc" - "-z" - "--header" - "--parents" - "--boundary" -
171 "--no-color" - "-g" - "--walk-reflogs" - "--no-walk" -
172 "--timestamp" - "relative-date" - "--date=*" - "--stdin" -
173 "--objects" - "--objects-edge" - "--reverse" {
174 # These cause our parsing of git log's output to fail, or else
175 # they're options we want to set ourselves, so ignore them.
177 "--color-words*" - "--word-diff=color" {
178 # These trigger a word diff in the console interface,
179 # so help the user by enabling our own support
180 if {[package vcompare
$git_version "1.7.2"] >= 0} {
181 set worddiff
[mc
"Color words"]
185 if {[package vcompare
$git_version "1.7.2"] >= 0} {
186 set worddiff
[mc
"Markup words"]
189 "--stat=*" - "--numstat" - "--shortstat" - "--summary" -
190 "--check" - "--exit-code" - "--quiet" - "--topo-order" -
191 "--full-history" - "--dense" - "--sparse" -
192 "--follow" - "--left-right" - "--encoding=*" {
193 # These are harmless, and some are even useful
196 "--diff-filter=*" - "--no-merges" - "--unpacked" -
197 "--max-count=*" - "--skip=*" - "--since=*" - "--after=*" -
198 "--until=*" - "--before=*" - "--max-age=*" - "--min-age=*" -
199 "--author=*" - "--committer=*" - "--grep=*" - "-[iE]" -
200 "--remove-empty" - "--first-parent" - "--cherry-pick" -
201 "-S*" - "--pickaxe-all" - "--pickaxe-regex" -
202 "--simplify-by-decoration" {
203 # These mean that we get a subset of the commits
208 # This appears to be the only one that has a value as a
209 # separate word following it
219 # git rev-parse doesn't understand --merge
220 lappend revargs
--gitk-symmetric-diff-marker MERGE_HEAD...HEAD
222 "--no-replace-objects" {
223 set env
(GIT_NO_REPLACE_OBJECTS
) "1"
226 # Other flag arguments including -<n>
227 if {[string is digit
-strict [string range
$arg 1 end
]]} {
230 # a flag argument that we don't recognize;
231 # that means we can't optimize
237 # Non-flag arguments specify commits or ranges of commits
238 if {[string match
"*...*" $arg]} {
239 lappend revargs
--gitk-symmetric-diff-marker
245 set vdflags
($n) $diffargs
246 set vflags
($n) $glflags
247 set vrevs
($n) $revargs
248 set vfiltered
($n) $filtered
249 set vorigargs
($n) $origargs
253 proc parseviewrevs
{view revs
} {
254 global vposids vnegids
259 if {[catch
{set ids
[eval exec git rev-parse
$revs]} err
]} {
260 # we get stdout followed by stderr in $err
261 # for an unknown rev, git rev-parse echoes it and then errors out
262 set errlines
[split $err "\n"]
264 for {set l
0} {$l < [llength
$errlines]} {incr l
} {
265 set line
[lindex
$errlines $l]
266 if {!([string length
$line] == 40 && [string is xdigit
$line])} {
267 if {[string match
"fatal:*" $line]} {
268 if {[string match
"fatal: ambiguous argument*" $line]
270 if {[llength
$badrev] == 1} {
271 set err
"unknown revision $badrev"
273 set err
"unknown revisions: [join $badrev ", "]"
276 set err
[join [lrange
$errlines $l end
] "\n"]
283 error_popup
"[mc "Error parsing revisions
:"] $err"
290 foreach id
[split $ids "\n"] {
291 if {$id eq
"--gitk-symmetric-diff-marker"} {
293 } elseif
{[string match
"^*" $id]} {
300 lappend neg
[string range
$id 1 end
]
305 lset ret end
$id...
[lindex
$ret end
]
311 set vposids
($view) $pos
312 set vnegids
($view) $neg
316 # Start off a git log process and arrange to read its output
317 proc start_rev_list
{view
} {
318 global startmsecs commitidx viewcomplete curview
320 global viewargs viewargscmd viewfiles vfilelimit
321 global showlocalchanges
322 global viewactive viewinstances vmergeonly
323 global mainheadid viewmainheadid viewmainheadid_orig
324 global vcanopt vflags vrevs vorigargs
327 set startmsecs
[clock clicks
-milliseconds]
328 set commitidx
($view) 0
329 # these are set this way for the error exits
330 set viewcomplete
($view) 1
331 set viewactive
($view) 0
334 set args
$viewargs($view)
335 if {$viewargscmd($view) ne
{}} {
337 set str
[exec sh
-c $viewargscmd($view)]
339 error_popup
"[mc "Error executing
--argscmd command:"] $err"
342 set args
[concat
$args [split $str "\n"]]
344 set vcanopt
($view) [parseviewargs
$view $args]
346 set files
$viewfiles($view)
347 if {$vmergeonly($view)} {
348 set files
[unmerged_files
$files]
351 if {$nr_unmerged == 0} {
352 error_popup
[mc
"No files selected: --merge specified but\
353 no files are unmerged."]
355 error_popup
[mc
"No files selected: --merge specified but\
356 no unmerged files are within file limit."]
361 set vfilelimit
($view) $files
363 if {$vcanopt($view)} {
364 set revs
[parseviewrevs
$view $vrevs($view)]
368 set args
[concat
$vflags($view) $revs]
370 set args
$vorigargs($view)
374 set fd
[open
[concat | git log
--no-color -z --pretty=raw
$show_notes \
375 --parents --boundary $args "--" $files] r
]
377 error_popup
"[mc "Error executing git log
:"] $err"
380 set i
[reg_instance
$fd]
381 set viewinstances
($view) [list
$i]
382 set viewmainheadid
($view) $mainheadid
383 set viewmainheadid_orig
($view) $mainheadid
384 if {$files ne
{} && $mainheadid ne
{}} {
385 get_viewmainhead
$view
387 if {$showlocalchanges && $viewmainheadid($view) ne
{}} {
388 interestedin
$viewmainheadid($view) dodiffindex
390 fconfigure
$fd -blocking 0 -translation lf
-eofchar {}
391 if {$tclencoding != {}} {
392 fconfigure
$fd -encoding $tclencoding
394 filerun
$fd [list getcommitlines
$fd $i $view 0]
395 nowbusy
$view [mc
"Reading"]
396 set viewcomplete
($view) 0
397 set viewactive
($view) 1
401 proc stop_instance
{inst
} {
402 global commfd leftover
404 set fd
$commfd($inst)
408 if {$
::tcl_platform
(platform
) eq
{windows
}} {
417 unset leftover
($inst)
420 proc stop_backends
{} {
423 foreach inst
[array names commfd
] {
428 proc stop_rev_list
{view
} {
431 foreach inst
$viewinstances($view) {
434 set viewinstances
($view) {}
437 proc reset_pending_select
{selid
} {
438 global pending_select mainheadid selectheadid
441 set pending_select
$selid
442 } elseif
{$selectheadid ne
{}} {
443 set pending_select
$selectheadid
445 set pending_select
$mainheadid
449 proc getcommits
{selid
} {
450 global canv curview need_redisplay viewactive
453 if {[start_rev_list
$curview]} {
454 reset_pending_select
$selid
455 show_status
[mc
"Reading commits..."]
458 show_status
[mc
"No commits selected"]
462 proc updatecommits
{} {
463 global curview vcanopt vorigargs vfilelimit viewinstances
464 global viewactive viewcomplete tclencoding
465 global startmsecs showneartags showlocalchanges
466 global mainheadid viewmainheadid viewmainheadid_orig pending_select
468 global varcid vposids vnegids vflags vrevs
471 set hasworktree
[hasworktree
]
474 if {$mainheadid ne
$viewmainheadid_orig($view)} {
475 if {$showlocalchanges} {
478 set viewmainheadid
($view) $mainheadid
479 set viewmainheadid_orig
($view) $mainheadid
480 if {$vfilelimit($view) ne
{}} {
481 get_viewmainhead
$view
484 if {$showlocalchanges} {
487 if {$vcanopt($view)} {
488 set oldpos
$vposids($view)
489 set oldneg
$vnegids($view)
490 set revs
[parseviewrevs
$view $vrevs($view)]
494 # note: getting the delta when negative refs change is hard,
495 # and could require multiple git log invocations, so in that
496 # case we ask git log for all the commits (not just the delta)
497 if {$oldneg eq
$vnegids($view)} {
500 # take out positive refs that we asked for before or
501 # that we have already seen
503 if {[string length
$rev] == 40} {
504 if {[lsearch
-exact $oldpos $rev] < 0
505 && ![info exists varcid
($view,$rev)]} {
510 lappend
$newrevs $rev
513 if {$npos == 0} return
515 set vposids
($view) [lsort
-unique [concat
$oldpos $vposids($view)]]
517 set args
[concat
$vflags($view) $revs --not $oldpos]
519 set args
$vorigargs($view)
522 set fd
[open
[concat | git log
--no-color -z --pretty=raw
$show_notes \
523 --parents --boundary $args "--" $vfilelimit($view)] r
]
525 error_popup
"[mc "Error executing git log
:"] $err"
528 if {$viewactive($view) == 0} {
529 set startmsecs
[clock clicks
-milliseconds]
531 set i
[reg_instance
$fd]
532 lappend viewinstances
($view) $i
533 fconfigure
$fd -blocking 0 -translation lf
-eofchar {}
534 if {$tclencoding != {}} {
535 fconfigure
$fd -encoding $tclencoding
537 filerun
$fd [list getcommitlines
$fd $i $view 1]
538 incr viewactive
($view)
539 set viewcomplete
($view) 0
540 reset_pending_select
{}
541 nowbusy
$view [mc
"Reading"]
547 proc reloadcommits
{} {
548 global curview viewcomplete selectedline currentid thickerline
549 global showneartags treediffs commitinterest cached_commitrow
553 if {$selectedline ne
{}} {
557 if {!$viewcomplete($curview)} {
558 stop_rev_list
$curview
562 catch
{unset currentid
}
563 catch
{unset thickerline
}
564 catch
{unset treediffs
}
571 catch
{unset commitinterest
}
572 catch
{unset cached_commitrow
}
573 catch
{unset targetid
}
579 # This makes a string representation of a positive integer which
580 # sorts as a string in numerical order
583 return [format
"%x" $n]
584 } elseif
{$n < 256} {
585 return [format
"x%.2x" $n]
586 } elseif
{$n < 65536} {
587 return [format
"y%.4x" $n]
589 return [format
"z%.8x" $n]
592 # Procedures used in reordering commits from git log (without
593 # --topo-order) into the order for display.
595 proc varcinit
{view
} {
596 global varcstart vupptr vdownptr vleftptr vbackptr varctok varcrow
597 global vtokmod varcmod vrowmod varcix vlastins
599 set varcstart
($view) {{}}
600 set vupptr
($view) {0}
601 set vdownptr
($view) {0}
602 set vleftptr
($view) {0}
603 set vbackptr
($view) {0}
604 set varctok
($view) {{}}
605 set varcrow
($view) {{}}
606 set vtokmod
($view) {}
609 set varcix
($view) {{}}
610 set vlastins
($view) {0}
613 proc resetvarcs
{view
} {
614 global varcid varccommits parents children vseedcount ordertok
616 foreach vid
[array names varcid
$view,*] {
621 # some commits might have children but haven't been seen yet
622 foreach vid
[array names children
$view,*] {
625 foreach va
[array names varccommits
$view,*] {
626 unset varccommits
($va)
628 foreach vd
[array names vseedcount
$view,*] {
629 unset vseedcount
($vd)
631 catch
{unset ordertok
}
634 # returns a list of the commits with no children
636 global vdownptr vleftptr varcstart
639 set a
[lindex
$vdownptr($v) 0]
641 lappend ret
[lindex
$varcstart($v) $a]
642 set a
[lindex
$vleftptr($v) $a]
647 proc newvarc
{view id
} {
648 global varcid varctok parents children vdatemode
649 global vupptr vdownptr vleftptr vbackptr varcrow varcix varcstart
650 global commitdata commitinfo vseedcount varccommits vlastins
652 set a
[llength
$varctok($view)]
654 if {[llength
$children($vid)] == 0 ||
$vdatemode($view)} {
655 if {![info exists commitinfo
($id)]} {
656 parsecommit
$id $commitdata($id) 1
658 set cdate
[lindex
[lindex
$commitinfo($id) 4] 0]
659 if {![string is integer
-strict $cdate]} {
662 if {![info exists vseedcount
($view,$cdate)]} {
663 set vseedcount
($view,$cdate) -1
665 set c
[incr vseedcount
($view,$cdate)]
666 set cdate
[expr {$cdate ^
0xffffffff}]
667 set tok
"s[strrep $cdate][strrep $c]"
672 if {[llength
$children($vid)] > 0} {
673 set kid
[lindex
$children($vid) end
]
674 set k
$varcid($view,$kid)
675 if {[string compare
[lindex
$varctok($view) $k] $tok] > 0} {
678 set tok
[lindex
$varctok($view) $k]
682 set i
[lsearch
-exact $parents($view,$ki) $id]
683 set j
[expr {[llength
$parents($view,$ki)] - 1 - $i}]
684 append tok
[strrep
$j]
686 set c
[lindex
$vlastins($view) $ka]
687 if {$c == 0 ||
[string compare
$tok [lindex
$varctok($view) $c]] < 0} {
689 set b
[lindex
$vdownptr($view) $ka]
691 set b
[lindex
$vleftptr($view) $c]
693 while {$b != 0 && [string compare
$tok [lindex
$varctok($view) $b]] >= 0} {
695 set b
[lindex
$vleftptr($view) $c]
698 lset vdownptr
($view) $ka $a
699 lappend vbackptr
($view) 0
701 lset vleftptr
($view) $c $a
702 lappend vbackptr
($view) $c
704 lset vlastins
($view) $ka $a
705 lappend vupptr
($view) $ka
706 lappend vleftptr
($view) $b
708 lset vbackptr
($view) $b $a
710 lappend varctok
($view) $tok
711 lappend varcstart
($view) $id
712 lappend vdownptr
($view) 0
713 lappend varcrow
($view) {}
714 lappend varcix
($view) {}
715 set varccommits
($view,$a) {}
716 lappend vlastins
($view) 0
720 proc splitvarc
{p v
} {
721 global varcid varcstart varccommits varctok vtokmod
722 global vupptr vdownptr vleftptr vbackptr varcix varcrow vlastins
724 set oa
$varcid($v,$p)
725 set otok
[lindex
$varctok($v) $oa]
726 set ac
$varccommits($v,$oa)
727 set i
[lsearch
-exact $varccommits($v,$oa) $p]
729 set na
[llength
$varctok($v)]
730 # "%" sorts before "0"...
731 set tok
"$otok%[strrep $i]"
732 lappend varctok
($v) $tok
733 lappend varcrow
($v) {}
734 lappend varcix
($v) {}
735 set varccommits
($v,$oa) [lrange
$ac 0 [expr {$i - 1}]]
736 set varccommits
($v,$na) [lrange
$ac $i end
]
737 lappend varcstart
($v) $p
738 foreach id
$varccommits($v,$na) {
739 set varcid
($v,$id) $na
741 lappend vdownptr
($v) [lindex
$vdownptr($v) $oa]
742 lappend vlastins
($v) [lindex
$vlastins($v) $oa]
743 lset vdownptr
($v) $oa $na
744 lset vlastins
($v) $oa 0
745 lappend vupptr
($v) $oa
746 lappend vleftptr
($v) 0
747 lappend vbackptr
($v) 0
748 for {set b
[lindex
$vdownptr($v) $na]} {$b != 0} {set b
[lindex
$vleftptr($v) $b]} {
749 lset vupptr
($v) $b $na
751 if {[string compare
$otok $vtokmod($v)] <= 0} {
756 proc renumbervarc
{a v
} {
757 global parents children varctok varcstart varccommits
758 global vupptr vdownptr vleftptr vbackptr vlastins varcid vtokmod vdatemode
760 set t1
[clock clicks
-milliseconds]
766 if {[info exists isrelated
($a)]} {
768 set id
[lindex
$varccommits($v,$a) end
]
769 foreach p
$parents($v,$id) {
770 if {[info exists varcid
($v,$p)]} {
771 set isrelated
($varcid($v,$p)) 1
776 set b
[lindex
$vdownptr($v) $a]
779 set b
[lindex
$vleftptr($v) $a]
781 set a
[lindex
$vupptr($v) $a]
787 if {![info exists kidchanged
($a)]} continue
788 set id
[lindex
$varcstart($v) $a]
789 if {[llength
$children($v,$id)] > 1} {
790 set children
($v,$id) [lsort
-command [list vtokcmp
$v] \
793 set oldtok
[lindex
$varctok($v) $a]
794 if {!$vdatemode($v)} {
800 set kid
[last_real_child
$v,$id]
802 set k
$varcid($v,$kid)
803 if {[string compare
[lindex
$varctok($v) $k] $tok] > 0} {
806 set tok
[lindex
$varctok($v) $k]
810 set i
[lsearch
-exact $parents($v,$ki) $id]
811 set j
[expr {[llength
$parents($v,$ki)] - 1 - $i}]
812 append tok
[strrep
$j]
814 if {$tok eq
$oldtok} {
817 set id
[lindex
$varccommits($v,$a) end
]
818 foreach p
$parents($v,$id) {
819 if {[info exists varcid
($v,$p)]} {
820 set kidchanged
($varcid($v,$p)) 1
825 lset varctok
($v) $a $tok
826 set b
[lindex
$vupptr($v) $a]
828 if {[string compare
[lindex
$varctok($v) $ka] $vtokmod($v)] < 0} {
831 if {[string compare
[lindex
$varctok($v) $b] $vtokmod($v)] < 0} {
834 set c
[lindex
$vbackptr($v) $a]
835 set d
[lindex
$vleftptr($v) $a]
837 lset vdownptr
($v) $b $d
839 lset vleftptr
($v) $c $d
842 lset vbackptr
($v) $d $c
844 if {[lindex
$vlastins($v) $b] == $a} {
845 lset vlastins
($v) $b $c
847 lset vupptr
($v) $a $ka
848 set c
[lindex
$vlastins($v) $ka]
850 [string compare
$tok [lindex
$varctok($v) $c]] < 0} {
852 set b
[lindex
$vdownptr($v) $ka]
854 set b
[lindex
$vleftptr($v) $c]
857 [string compare
$tok [lindex
$varctok($v) $b]] >= 0} {
859 set b
[lindex
$vleftptr($v) $c]
862 lset vdownptr
($v) $ka $a
863 lset vbackptr
($v) $a 0
865 lset vleftptr
($v) $c $a
866 lset vbackptr
($v) $a $c
868 lset vleftptr
($v) $a $b
870 lset vbackptr
($v) $b $a
872 lset vlastins
($v) $ka $a
875 foreach id
[array names sortkids
] {
876 if {[llength
$children($v,$id)] > 1} {
877 set children
($v,$id) [lsort
-command [list vtokcmp
$v] \
881 set t2
[clock clicks
-milliseconds]
882 #puts "renumbervarc did [llength $todo] of $ntot arcs in [expr {$t2-$t1}]ms"
885 # Fix up the graph after we have found out that in view $v,
886 # $p (a commit that we have already seen) is actually the parent
887 # of the last commit in arc $a.
888 proc fix_reversal
{p a v
} {
889 global varcid varcstart varctok vupptr
891 set pa
$varcid($v,$p)
892 if {$p ne
[lindex
$varcstart($v) $pa]} {
894 set pa
$varcid($v,$p)
896 # seeds always need to be renumbered
897 if {[lindex
$vupptr($v) $pa] == 0 ||
898 [string compare
[lindex
$varctok($v) $a] \
899 [lindex
$varctok($v) $pa]] > 0} {
904 proc insertrow
{id p v
} {
905 global cmitlisted children parents varcid varctok vtokmod
906 global varccommits ordertok commitidx numcommits curview
907 global targetid targetrow
911 set cmitlisted
($vid) 1
912 set children
($vid) {}
913 set parents
($vid) [list
$p]
914 set a
[newvarc
$v $id]
916 if {[string compare
[lindex
$varctok($v) $a] $vtokmod($v)] < 0} {
919 lappend varccommits
($v,$a) $id
921 if {[llength
[lappend children
($vp) $id]] > 1} {
922 set children
($vp) [lsort
-command [list vtokcmp
$v] $children($vp)]
923 catch
{unset ordertok
}
925 fix_reversal
$p $a $v
927 if {$v == $curview} {
928 set numcommits
$commitidx($v)
930 if {[info exists targetid
]} {
931 if {![comes_before
$targetid $p]} {
938 proc insertfakerow
{id p
} {
939 global varcid varccommits parents children cmitlisted
940 global commitidx varctok vtokmod targetid targetrow curview numcommits
944 set i
[lsearch
-exact $varccommits($v,$a) $p]
946 puts
"oops: insertfakerow can't find [shortids $p] on arc $a"
949 set children
($v,$id) {}
950 set parents
($v,$id) [list
$p]
951 set varcid
($v,$id) $a
952 lappend children
($v,$p) $id
953 set cmitlisted
($v,$id) 1
954 set numcommits
[incr commitidx
($v)]
955 # note we deliberately don't update varcstart($v) even if $i == 0
956 set varccommits
($v,$a) [linsert
$varccommits($v,$a) $i $id]
958 if {[info exists targetid
]} {
959 if {![comes_before
$targetid $p]} {
967 proc removefakerow
{id
} {
968 global varcid varccommits parents children commitidx
969 global varctok vtokmod cmitlisted currentid selectedline
970 global targetid curview numcommits
973 if {[llength
$parents($v,$id)] != 1} {
974 puts
"oops: removefakerow [shortids $id] has [llength $parents($v,$id)] parents"
977 set p
[lindex
$parents($v,$id) 0]
978 set a
$varcid($v,$id)
979 set i
[lsearch
-exact $varccommits($v,$a) $id]
981 puts
"oops: removefakerow can't find [shortids $id] on arc $a"
985 set varccommits
($v,$a) [lreplace
$varccommits($v,$a) $i $i]
986 unset parents
($v,$id)
987 unset children
($v,$id)
988 unset cmitlisted
($v,$id)
989 set numcommits
[incr commitidx
($v) -1]
990 set j
[lsearch
-exact $children($v,$p) $id]
992 set children
($v,$p) [lreplace
$children($v,$p) $j $j]
995 if {[info exist currentid
] && $id eq
$currentid} {
999 if {[info exists targetid
] && $targetid eq
$id} {
1006 proc real_children
{vp
} {
1007 global children nullid nullid2
1010 foreach id
$children($vp) {
1011 if {$id ne
$nullid && $id ne
$nullid2} {
1018 proc first_real_child
{vp
} {
1019 global children nullid nullid2
1021 foreach id
$children($vp) {
1022 if {$id ne
$nullid && $id ne
$nullid2} {
1029 proc last_real_child
{vp
} {
1030 global children nullid nullid2
1032 set kids
$children($vp)
1033 for {set i
[llength
$kids]} {[incr i
-1] >= 0} {} {
1034 set id
[lindex
$kids $i]
1035 if {$id ne
$nullid && $id ne
$nullid2} {
1042 proc vtokcmp
{v a b
} {
1043 global varctok varcid
1045 return [string compare
[lindex
$varctok($v) $varcid($v,$a)] \
1046 [lindex
$varctok($v) $varcid($v,$b)]]
1049 # This assumes that if lim is not given, the caller has checked that
1050 # arc a's token is less than $vtokmod($v)
1051 proc modify_arc
{v a
{lim
{}}} {
1052 global varctok vtokmod varcmod varcrow vupptr curview vrowmod varccommits
1055 set c
[string compare
[lindex
$varctok($v) $a] $vtokmod($v)]
1058 set r
[lindex
$varcrow($v) $a]
1059 if {$r ne
{} && $vrowmod($v) <= $r + $lim} return
1062 set vtokmod
($v) [lindex
$varctok($v) $a]
1064 if {$v == $curview} {
1065 while {$a != 0 && [lindex
$varcrow($v) $a] eq
{}} {
1066 set a
[lindex
$vupptr($v) $a]
1072 set lim
[llength
$varccommits($v,$a)]
1074 set r
[expr {[lindex
$varcrow($v) $a] + $lim}]
1081 proc update_arcrows
{v
} {
1082 global vtokmod varcmod vrowmod varcrow commitidx currentid selectedline
1083 global varcid vrownum varcorder varcix varccommits
1084 global vupptr vdownptr vleftptr varctok
1085 global displayorder parentlist curview cached_commitrow
1087 if {$vrowmod($v) == $commitidx($v)} return
1088 if {$v == $curview} {
1089 if {[llength
$displayorder] > $vrowmod($v)} {
1090 set displayorder
[lrange
$displayorder 0 [expr {$vrowmod($v) - 1}]]
1091 set parentlist
[lrange
$parentlist 0 [expr {$vrowmod($v) - 1}]]
1093 catch
{unset cached_commitrow
}
1095 set narctot
[expr {[llength
$varctok($v)] - 1}]
1097 while {$a != 0 && [lindex
$varcix($v) $a] eq
{}} {
1098 # go up the tree until we find something that has a row number,
1099 # or we get to a seed
1100 set a
[lindex
$vupptr($v) $a]
1103 set a
[lindex
$vdownptr($v) 0]
1106 set varcorder
($v) [list
$a]
1107 lset varcix
($v) $a 0
1108 lset varcrow
($v) $a 0
1112 set arcn
[lindex
$varcix($v) $a]
1113 if {[llength
$vrownum($v)] > $arcn + 1} {
1114 set vrownum
($v) [lrange
$vrownum($v) 0 $arcn]
1115 set varcorder
($v) [lrange
$varcorder($v) 0 $arcn]
1117 set row
[lindex
$varcrow($v) $a]
1121 incr row
[llength
$varccommits($v,$a)]
1122 # go down if possible
1123 set b
[lindex
$vdownptr($v) $a]
1125 # if not, go left, or go up until we can go left
1127 set b
[lindex
$vleftptr($v) $a]
1129 set a
[lindex
$vupptr($v) $a]
1135 lappend vrownum
($v) $row
1136 lappend varcorder
($v) $a
1137 lset varcix
($v) $a $arcn
1138 lset varcrow
($v) $a $row
1140 set vtokmod
($v) [lindex
$varctok($v) $p]
1142 set vrowmod
($v) $row
1143 if {[info exists currentid
]} {
1144 set selectedline
[rowofcommit
$currentid]
1148 # Test whether view $v contains commit $id
1149 proc commitinview
{id v
} {
1152 return [info exists varcid
($v,$id)]
1155 # Return the row number for commit $id in the current view
1156 proc rowofcommit
{id
} {
1157 global varcid varccommits varcrow curview cached_commitrow
1158 global varctok vtokmod
1161 if {![info exists varcid
($v,$id)]} {
1162 puts
"oops rowofcommit no arc for [shortids $id]"
1165 set a
$varcid($v,$id)
1166 if {[string compare
[lindex
$varctok($v) $a] $vtokmod($v)] >= 0} {
1169 if {[info exists cached_commitrow
($id)]} {
1170 return $cached_commitrow($id)
1172 set i
[lsearch
-exact $varccommits($v,$a) $id]
1174 puts
"oops didn't find commit [shortids $id] in arc $a"
1177 incr i
[lindex
$varcrow($v) $a]
1178 set cached_commitrow
($id) $i
1182 # Returns 1 if a is on an earlier row than b, otherwise 0
1183 proc comes_before
{a b
} {
1184 global varcid varctok curview
1187 if {$a eq
$b ||
![info exists varcid
($v,$a)] || \
1188 ![info exists varcid
($v,$b)]} {
1191 if {$varcid($v,$a) != $varcid($v,$b)} {
1192 return [expr {[string compare
[lindex
$varctok($v) $varcid($v,$a)] \
1193 [lindex
$varctok($v) $varcid($v,$b)]] < 0}]
1195 return [expr {[rowofcommit
$a] < [rowofcommit
$b]}]
1198 proc bsearch
{l elt
} {
1199 if {[llength
$l] == 0 ||
$elt <= [lindex
$l 0]} {
1204 while {$hi - $lo > 1} {
1205 set mid
[expr {int
(($lo + $hi) / 2)}]
1206 set t
[lindex
$l $mid]
1209 } elseif
{$elt > $t} {
1218 # Make sure rows $start..$end-1 are valid in displayorder and parentlist
1219 proc make_disporder
{start end
} {
1220 global vrownum curview commitidx displayorder parentlist
1221 global varccommits varcorder parents vrowmod varcrow
1222 global d_valid_start d_valid_end
1224 if {$end > $vrowmod($curview)} {
1225 update_arcrows
$curview
1227 set ai
[bsearch
$vrownum($curview) $start]
1228 set start
[lindex
$vrownum($curview) $ai]
1229 set narc
[llength
$vrownum($curview)]
1230 for {set r
$start} {$ai < $narc && $r < $end} {incr ai
} {
1231 set a
[lindex
$varcorder($curview) $ai]
1232 set l
[llength
$displayorder]
1233 set al
[llength
$varccommits($curview,$a)]
1234 if {$l < $r + $al} {
1236 set pad
[ntimes
[expr {$r - $l}] {}]
1237 set displayorder
[concat
$displayorder $pad]
1238 set parentlist
[concat
$parentlist $pad]
1239 } elseif
{$l > $r} {
1240 set displayorder
[lrange
$displayorder 0 [expr {$r - 1}]]
1241 set parentlist
[lrange
$parentlist 0 [expr {$r - 1}]]
1243 foreach id
$varccommits($curview,$a) {
1244 lappend displayorder
$id
1245 lappend parentlist
$parents($curview,$id)
1247 } elseif
{[lindex
$displayorder [expr {$r + $al - 1}]] eq
{}} {
1249 foreach id
$varccommits($curview,$a) {
1250 lset displayorder
$i $id
1251 lset parentlist
$i $parents($curview,$id)
1259 proc commitonrow
{row
} {
1262 set id
[lindex
$displayorder $row]
1264 make_disporder
$row [expr {$row + 1}]
1265 set id
[lindex
$displayorder $row]
1270 proc closevarcs
{v
} {
1271 global varctok varccommits varcid parents children
1272 global cmitlisted commitidx vtokmod
1274 set missing_parents
0
1276 set narcs
[llength
$varctok($v)]
1277 for {set a
1} {$a < $narcs} {incr a
} {
1278 set id
[lindex
$varccommits($v,$a) end
]
1279 foreach p
$parents($v,$id) {
1280 if {[info exists varcid
($v,$p)]} continue
1281 # add p as a new commit
1282 incr missing_parents
1283 set cmitlisted
($v,$p) 0
1284 set parents
($v,$p) {}
1285 if {[llength
$children($v,$p)] == 1 &&
1286 [llength
$parents($v,$id)] == 1} {
1289 set b
[newvarc
$v $p]
1291 set varcid
($v,$p) $b
1292 if {[string compare
[lindex
$varctok($v) $b] $vtokmod($v)] < 0} {
1295 lappend varccommits
($v,$b) $p
1297 set scripts
[check_interest
$p $scripts]
1300 if {$missing_parents > 0} {
1301 foreach s
$scripts {
1307 # Use $rwid as a substitute for $id, i.e. reparent $id's children to $rwid
1308 # Assumes we already have an arc for $rwid.
1309 proc rewrite_commit
{v id rwid
} {
1310 global children parents varcid varctok vtokmod varccommits
1312 foreach ch
$children($v,$id) {
1313 # make $rwid be $ch's parent in place of $id
1314 set i
[lsearch
-exact $parents($v,$ch) $id]
1316 puts
"oops rewrite_commit didn't find $id in parent list for $ch"
1318 set parents
($v,$ch) [lreplace
$parents($v,$ch) $i $i $rwid]
1319 # add $ch to $rwid's children and sort the list if necessary
1320 if {[llength
[lappend children
($v,$rwid) $ch]] > 1} {
1321 set children
($v,$rwid) [lsort
-command [list vtokcmp
$v] \
1322 $children($v,$rwid)]
1324 # fix the graph after joining $id to $rwid
1325 set a
$varcid($v,$ch)
1326 fix_reversal
$rwid $a $v
1327 # parentlist is wrong for the last element of arc $a
1328 # even if displayorder is right, hence the 3rd arg here
1329 modify_arc
$v $a [expr {[llength
$varccommits($v,$a)] - 1}]
1333 # Mechanism for registering a command to be executed when we come
1334 # across a particular commit. To handle the case when only the
1335 # prefix of the commit is known, the commitinterest array is now
1336 # indexed by the first 4 characters of the ID. Each element is a
1337 # list of id, cmd pairs.
1338 proc interestedin
{id cmd
} {
1339 global commitinterest
1341 lappend commitinterest
([string range
$id 0 3]) $id $cmd
1344 proc check_interest
{id scripts
} {
1345 global commitinterest
1347 set prefix
[string range
$id 0 3]
1348 if {[info exists commitinterest
($prefix)]} {
1350 foreach
{i
script} $commitinterest($prefix) {
1351 if {[string match
"$i*" $id]} {
1352 lappend scripts
[string map
[list
"%I" $id "%P" $i] $script]
1354 lappend newlist
$i $script
1357 if {$newlist ne
{}} {
1358 set commitinterest
($prefix) $newlist
1360 unset commitinterest
($prefix)
1366 proc getcommitlines
{fd inst view updating
} {
1367 global cmitlisted leftover
1368 global commitidx commitdata vdatemode
1369 global parents children curview hlview
1370 global idpending ordertok
1371 global varccommits varcid varctok vtokmod vfilelimit
1373 set stuff
[read $fd 500000]
1374 # git log doesn't terminate the last commit with a null...
1375 if {$stuff == {} && $leftover($inst) ne
{} && [eof
$fd]} {
1382 global commfd viewcomplete viewactive viewname
1383 global viewinstances
1385 set i
[lsearch
-exact $viewinstances($view) $inst]
1387 set viewinstances
($view) [lreplace
$viewinstances($view) $i $i]
1389 # set it blocking so we wait for the process to terminate
1390 fconfigure
$fd -blocking 1
1391 if {[catch
{close
$fd} err
]} {
1393 if {$view != $curview} {
1394 set fv
" for the \"$viewname($view)\" view"
1396 if {[string range
$err 0 4] == "usage"} {
1397 set err
"Gitk: error reading commits$fv:\
1398 bad arguments to git log."
1399 if {$viewname($view) eq
"Command line"} {
1401 " (Note: arguments to gitk are passed to git log\
1402 to allow selection of commits to be displayed.)"
1405 set err
"Error reading commits$fv: $err"
1409 if {[incr viewactive
($view) -1] <= 0} {
1410 set viewcomplete
($view) 1
1411 # Check if we have seen any ids listed as parents that haven't
1412 # appeared in the list
1416 if {$view == $curview} {
1425 set i
[string first
"\0" $stuff $start]
1427 append leftover
($inst) [string range
$stuff $start end
]
1431 set cmit
$leftover($inst)
1432 append cmit
[string range
$stuff 0 [expr {$i - 1}]]
1433 set leftover
($inst) {}
1435 set cmit
[string range
$stuff $start [expr {$i - 1}]]
1437 set start
[expr {$i + 1}]
1438 set j
[string first
"\n" $cmit]
1441 if {$j >= 0 && [string match
"commit *" $cmit]} {
1442 set ids
[string range
$cmit 7 [expr {$j - 1}]]
1443 if {[string match
{[-^
<>]*} $ids]} {
1444 switch
-- [string index
$ids 0] {
1450 set ids
[string range
$ids 1 end
]
1454 if {[string length
$id] != 40} {
1462 if {[string length
$shortcmit] > 80} {
1463 set shortcmit
"[string range $shortcmit 0 80]..."
1465 error_popup
"[mc "Can
't parse git log output:"] {$shortcmit}"
1468 set id [lindex $ids 0]
1471 if {!$listed && $updating && ![info exists varcid($vid)] &&
1472 $vfilelimit($view) ne {}} {
1473 # git log doesn't rewrite parents
for unlisted commits
1474 # when doing path limiting, so work around that here
1475 # by working out the rewritten parent with git rev-list
1476 # and if we already know about it, using the rewritten
1477 # parent as a substitute parent for $id's children.
1479 set rwid
[exec git rev-list
--first-parent --max-count=1 \
1480 $id -- $vfilelimit($view)]
1482 if {$rwid ne
{} && [info exists varcid
($view,$rwid)]} {
1483 # use $rwid in place of $id
1484 rewrite_commit
$view $id $rwid
1491 if {[info exists varcid
($vid)]} {
1492 if {$cmitlisted($vid) ||
!$listed} continue
1496 set olds
[lrange
$ids 1 end
]
1500 set commitdata
($id) [string range
$cmit [expr {$j + 1}] end
]
1501 set cmitlisted
($vid) $listed
1502 set parents
($vid) $olds
1503 if {![info exists children
($vid)]} {
1504 set children
($vid) {}
1505 } elseif
{$a == 0 && [llength
$children($vid)] == 1} {
1506 set k
[lindex
$children($vid) 0]
1507 if {[llength
$parents($view,$k)] == 1 &&
1508 (!$vdatemode($view) ||
1509 $varcid($view,$k) == [llength
$varctok($view)] - 1)} {
1510 set a
$varcid($view,$k)
1515 set a
[newvarc
$view $id]
1517 if {[string compare
[lindex
$varctok($view) $a] $vtokmod($view)] < 0} {
1520 if {![info exists varcid
($vid)]} {
1522 lappend varccommits
($view,$a) $id
1523 incr commitidx
($view)
1528 if {$i == 0 ||
[lsearch
-exact $olds $p] >= $i} {
1530 if {[llength
[lappend children
($vp) $id]] > 1 &&
1531 [vtokcmp
$view [lindex
$children($vp) end-1
] $id] > 0} {
1532 set children
($vp) [lsort
-command [list vtokcmp
$view] \
1534 catch
{unset ordertok
}
1536 if {[info exists varcid
($view,$p)]} {
1537 fix_reversal
$p $a $view
1543 set scripts
[check_interest
$id $scripts]
1547 global numcommits hlview
1549 if {$view == $curview} {
1550 set numcommits
$commitidx($view)
1553 if {[info exists hlview
] && $view == $hlview} {
1554 # we never actually get here...
1557 foreach s
$scripts {
1564 proc chewcommits
{} {
1565 global curview hlview viewcomplete
1566 global pending_select
1569 if {$viewcomplete($curview)} {
1570 global commitidx varctok
1571 global numcommits startmsecs
1573 if {[info exists pending_select
]} {
1575 reset_pending_select
{}
1577 if {[commitinview
$pending_select $curview]} {
1578 selectline
[rowofcommit
$pending_select] 1
1580 set row
[first_real_row
]
1584 if {$commitidx($curview) > 0} {
1585 #set ms [expr {[clock clicks -milliseconds] - $startmsecs}]
1586 #puts "overall $ms ms for $numcommits commits"
1587 #puts "[llength $varctok($view)] arcs, $commitidx($view) commits"
1589 show_status
[mc
"No commits selected"]
1596 proc do_readcommit
{id
} {
1599 # Invoke git-log to handle automatic encoding conversion
1600 set fd
[open
[concat | git log
--no-color --pretty=raw
-1 $id] r
]
1601 # Read the results using i18n.logoutputencoding
1602 fconfigure
$fd -translation lf
-eofchar {}
1603 if {$tclencoding != {}} {
1604 fconfigure
$fd -encoding $tclencoding
1606 set contents
[read $fd]
1608 # Remove the heading line
1609 regsub
{^commit
[0-9a-f]+\n} $contents {} contents
1614 proc readcommit
{id
} {
1615 if {[catch
{set contents
[do_readcommit
$id]}]} return
1616 parsecommit
$id $contents 1
1619 proc parsecommit
{id contents listed
} {
1629 set hdrend
[string first
"\n\n" $contents]
1631 # should never happen...
1632 set hdrend
[string length
$contents]
1634 set header
[string range
$contents 0 [expr {$hdrend - 1}]]
1635 set comment
[string range
$contents [expr {$hdrend + 2}] end
]
1636 foreach line
[split $header "\n"] {
1637 set line
[split $line " "]
1638 set tag
[lindex
$line 0]
1639 if {$tag == "author"} {
1640 set audate
[lrange
$line end-1 end
]
1641 set auname
[join [lrange
$line 1 end-2
] " "]
1642 } elseif
{$tag == "committer"} {
1643 set comdate
[lrange
$line end-1 end
]
1644 set comname
[join [lrange
$line 1 end-2
] " "]
1648 # take the first non-blank line of the comment as the headline
1649 set headline
[string trimleft
$comment]
1650 set i
[string first
"\n" $headline]
1652 set headline
[string range
$headline 0 $i]
1654 set headline
[string trimright
$headline]
1655 set i
[string first
"\r" $headline]
1657 set headline
[string trimright
[string range
$headline 0 $i]]
1660 # git log indents the comment by 4 spaces;
1661 # if we got this via git cat-file, add the indentation
1663 foreach line
[split $comment "\n"] {
1664 append newcomment
" "
1665 append newcomment
$line
1666 append newcomment
"\n"
1668 set comment
$newcomment
1670 set hasnote
[string first
"\nNotes:\n" $contents]
1671 set commitinfo
($id) [list
$headline $auname $audate \
1672 $comname $comdate $comment $hasnote]
1675 proc getcommit
{id
} {
1676 global commitdata commitinfo
1678 if {[info exists commitdata
($id)]} {
1679 parsecommit
$id $commitdata($id) 1
1682 if {![info exists commitinfo
($id)]} {
1683 set commitinfo
($id) [list
[mc
"No commit information available"]]
1689 # Expand an abbreviated commit ID to a list of full 40-char IDs that match
1690 # and are present in the current view.
1691 # This is fairly slow...
1692 proc longid
{prefix
} {
1693 global varcid curview
1696 foreach match
[array names varcid
"$curview,$prefix*"] {
1697 lappend ids
[lindex
[split $match ","] 1]
1703 global tagids idtags headids idheads tagobjid
1704 global otherrefids idotherrefs mainhead mainheadid
1705 global selecthead selectheadid
1708 foreach v
{tagids idtags headids idheads otherrefids idotherrefs
} {
1711 set refd
[open
[list | git show-ref
-d] r
]
1712 while {[gets
$refd line
] >= 0} {
1713 if {[string index
$line 40] ne
" "} continue
1714 set id
[string range
$line 0 39]
1715 set ref
[string range
$line 41 end
]
1716 if {![string match
"refs/*" $ref]} continue
1717 set name
[string range
$ref 5 end
]
1718 if {[string match
"remotes/*" $name]} {
1719 if {![string match
"*/HEAD" $name] && !$hideremotes} {
1720 set headids
($name) $id
1721 lappend idheads
($id) $name
1723 } elseif
{[string match
"heads/*" $name]} {
1724 set name
[string range
$name 6 end
]
1725 set headids
($name) $id
1726 lappend idheads
($id) $name
1727 } elseif
{[string match
"tags/*" $name]} {
1728 # this lets refs/tags/foo^{} overwrite refs/tags/foo,
1729 # which is what we want since the former is the commit ID
1730 set name
[string range
$name 5 end
]
1731 if {[string match
"*^{}" $name]} {
1732 set name
[string range
$name 0 end-3
]
1734 set tagobjid
($name) $id
1736 set tagids
($name) $id
1737 lappend idtags
($id) $name
1739 set otherrefids
($name) $id
1740 lappend idotherrefs
($id) $name
1747 set mainheadid
[exec git rev-parse HEAD
]
1748 set thehead
[exec git symbolic-ref HEAD
]
1749 if {[string match
"refs/heads/*" $thehead]} {
1750 set mainhead
[string range
$thehead 11 end
]
1754 if {$selecthead ne
{}} {
1756 set selectheadid
[exec git rev-parse
--verify $selecthead]
1761 # skip over fake commits
1762 proc first_real_row
{} {
1763 global nullid nullid2 numcommits
1765 for {set row
0} {$row < $numcommits} {incr row
} {
1766 set id
[commitonrow
$row]
1767 if {$id ne
$nullid && $id ne
$nullid2} {
1774 # update things for a head moved to a child of its previous location
1775 proc movehead
{id name
} {
1776 global headids idheads
1778 removehead
$headids($name) $name
1779 set headids
($name) $id
1780 lappend idheads
($id) $name
1783 # update things when a head has been removed
1784 proc removehead
{id name
} {
1785 global headids idheads
1787 if {$idheads($id) eq
$name} {
1790 set i
[lsearch
-exact $idheads($id) $name]
1792 set idheads
($id) [lreplace
$idheads($id) $i $i]
1795 unset headids
($name)
1798 proc ttk_toplevel
{w args
} {
1800 eval [linsert
$args 0 ::toplevel
$w]
1802 place
[ttk
::frame
$w._toplevel_background
] -x 0 -y 0 -relwidth 1 -relheight 1
1807 proc make_transient
{window origin
} {
1810 # In MacOS Tk 8.4 transient appears to work by setting
1811 # overrideredirect, which is utterly useless, since the
1812 # windows get no border, and are not even kept above
1814 if {!$have_tk85 && [tk windowingsystem
] eq
{aqua
}} return
1816 wm transient
$window $origin
1818 # Windows fails to place transient windows normally, so
1819 # schedule a callback to center them on the parent.
1820 if {[tk windowingsystem
] eq
{win32
}} {
1821 after idle
[list tk
::PlaceWindow
$window widget
$origin]
1825 proc show_error
{w top msg
{mc mc
}} {
1827 if {![info exists NS
]} {set NS
""}
1828 if {[wm state
$top] eq
"withdrawn"} { wm deiconify
$top }
1829 message
$w.m
-text $msg -justify center
-aspect 400
1830 pack
$w.m
-side top
-fill x
-padx 20 -pady 20
1831 ${NS}::button
$w.ok
-default active
-text [$mc OK
] -command "destroy $top"
1832 pack
$w.ok
-side bottom
-fill x
1833 bind $top <Visibility
> "grab $top; focus $top"
1834 bind $top <Key-Return
> "destroy $top"
1835 bind $top <Key-space
> "destroy $top"
1836 bind $top <Key-Escape
> "destroy $top"
1840 proc error_popup
{msg
{owner .
}} {
1841 if {[tk windowingsystem
] eq
"win32"} {
1842 tk_messageBox
-icon error
-type ok
-title [wm title .
] \
1843 -parent $owner -message $msg
1847 make_transient
$w $owner
1848 show_error
$w $w $msg
1852 proc confirm_popup
{msg
{owner .
}} {
1853 global confirm_ok NS
1857 make_transient
$w $owner
1858 message
$w.m
-text $msg -justify center
-aspect 400
1859 pack
$w.m
-side top
-fill x
-padx 20 -pady 20
1860 ${NS}::button
$w.ok
-text [mc OK
] -command "set confirm_ok 1; destroy $w"
1861 pack
$w.ok
-side left
-fill x
1862 ${NS}::button
$w.cancel
-text [mc Cancel
] -command "destroy $w"
1863 pack
$w.cancel
-side right
-fill x
1864 bind $w <Visibility
> "grab $w; focus $w"
1865 bind $w <Key-Return
> "set confirm_ok 1; destroy $w"
1866 bind $w <Key-space
> "set confirm_ok 1; destroy $w"
1867 bind $w <Key-Escape
> "destroy $w"
1868 tk
::PlaceWindow
$w widget
$owner
1873 proc setoptions
{} {
1874 if {[tk windowingsystem
] ne
"win32"} {
1875 option add
*Panedwindow.showHandle
1 startupFile
1876 option add
*Panedwindow.sashRelief raised startupFile
1877 if {[tk windowingsystem
] ne
"aqua"} {
1878 option add
*Menu.font uifont startupFile
1881 option add
*Menu.TearOff
0 startupFile
1883 option add
*Button.font uifont startupFile
1884 option add
*Checkbutton.font uifont startupFile
1885 option add
*Radiobutton.font uifont startupFile
1886 option add
*Menubutton.font uifont startupFile
1887 option add
*Label.font uifont startupFile
1888 option add
*Message.font uifont startupFile
1889 option add
*Entry.font textfont startupFile
1890 option add
*Text.font textfont startupFile
1891 option add
*Labelframe.font uifont startupFile
1892 option add
*Spinbox.font textfont startupFile
1893 option add
*Listbox.font mainfont startupFile
1896 # Make a menu and submenus.
1897 # m is the window name for the menu, items is the list of menu items to add.
1898 # Each item is a list {mc label type description options...}
1899 # mc is ignored; it's so we can put mc there to alert xgettext
1900 # label is the string that appears in the menu
1901 # type is cascade, command or radiobutton (should add checkbutton)
1902 # description depends on type; it's the sublist for cascade, the
1903 # command to invoke for command, or {variable value} for radiobutton
1904 proc makemenu
{m items
} {
1906 if {[tk windowingsystem
] eq
{aqua
}} {
1912 set name
[mc
[lindex
$i 1]]
1913 set type [lindex
$i 2]
1914 set thing
[lindex
$i 3]
1915 set params
[list
$type]
1917 set u
[string first
"&" [string map
{&& x
} $name]]
1918 lappend params
-label [string map
{&& & & {}} $name]
1920 lappend params
-underline $u
1925 set submenu
[string tolower
[string map
{& ""} [lindex
$i 1]]]
1926 lappend params
-menu $m.
$submenu
1929 lappend params
-command $thing
1932 lappend params
-variable [lindex
$thing 0] \
1933 -value [lindex
$thing 1]
1936 set tail [lrange
$i 4 end
]
1937 regsub
-all {\yMeta1\y
} $tail $Meta1 tail
1938 eval $m add
$params $tail
1939 if {$type eq
"cascade"} {
1940 makemenu
$m.
$submenu $thing
1945 # translate string and remove ampersands
1947 return [string map
{&& & & {}} [mc
$str]]
1950 proc makedroplist
{w varname args
} {
1954 foreach label
$args {
1955 set cx
[string length
$label]
1956 if {$cx > $width} {set width
$cx}
1958 set gm
[ttk
::combobox
$w -width $width -state readonly\
1959 -textvariable $varname -values $args]
1961 set gm
[eval [linsert
$args 0 tk_optionMenu
$w $varname]]
1966 proc makewindow
{} {
1967 global canv canv2 canv3 linespc charspc ctext cflist cscroll
1969 global findtype findtypemenu findloc findstring fstring geometry
1970 global entries sha1entry sha1string sha1but
1971 global diffcontextstring diffcontext
1973 global maincursor textcursor curtextcursor
1974 global rowctxmenu fakerowmenu mergemax wrapcomment
1975 global highlight_files gdttype
1976 global searchstring sstring
1977 global bgcolor fgcolor bglist fglist diffcolors selectbgcolor
1978 global headctxmenu progresscanv progressitem progresscoords statusw
1979 global fprogitem fprogcoord lastprogupdate progupdatepending
1980 global rprogitem rprogcoord rownumsel numcommits
1981 global have_tk85 use_ttk NS
1985 # The "mc" arguments here are purely so that xgettext
1986 # sees the following string as needing to be translated
1989 {mc
"Update" command updatecommits
-accelerator F5
}
1990 {mc
"Reload" command reloadcommits
-accelerator Meta1-F5
}
1991 {mc
"Reread references" command rereadrefs
}
1992 {mc
"List references" command showrefs
-accelerator F2
}
1994 {mc
"Start git gui" command {exec git gui
&}}
1996 {mc
"Quit" command doquit
-accelerator Meta1-Q
}
2000 {mc
"Preferences" command doprefs
}
2004 {mc
"New view..." command {newview
0} -accelerator Shift-F4
}
2005 {mc
"Edit view..." command editview
-state disabled
-accelerator F4
}
2006 {mc
"Delete view" command delview
-state disabled
}
2008 {mc
"All files" radiobutton
{selectedview
0} -command {showview
0}}
2010 if {[tk windowingsystem
] ne
"aqua"} {
2013 {mc
"About gitk" command about
}
2014 {mc
"Key bindings" command keys
}
2016 set bar
[list
$file $edit $view $help]
2018 proc
::tk
::mac
::ShowPreferences
{} {doprefs
}
2019 proc
::tk
::mac
::Quit
{} {doquit
}
2020 lset
file end
[lreplace
[lindex
$file end
] end-1 end
]
2022 xx
"Apple" cascade
{
2023 {mc
"About gitk" command about
}
2028 {mc
"Key bindings" command keys
}
2030 set bar
[list
$apple $file $view $help]
2033 . configure
-menu .bar
2036 # cover the non-themed toplevel with a themed frame.
2037 place
[ttk
::frame ._main_background
] -x 0 -y 0 -relwidth 1 -relheight 1
2040 # the gui has upper and lower half, parts of a paned window.
2041 ${NS}::panedwindow .ctop
-orient vertical
2043 # possibly use assumed geometry
2044 if {![info exists geometry
(pwsash0
)]} {
2045 set geometry
(topheight
) [expr {15 * $linespc}]
2046 set geometry
(topwidth
) [expr {80 * $charspc}]
2047 set geometry
(botheight
) [expr {15 * $linespc}]
2048 set geometry
(botwidth
) [expr {50 * $charspc}]
2049 set geometry
(pwsash0
) [list
[expr {40 * $charspc}] 2]
2050 set geometry
(pwsash1
) [list
[expr {60 * $charspc}] 2]
2053 # the upper half will have a paned window, a scroll bar to the right, and some stuff below
2054 ${NS}::frame .tf
-height $geometry(topheight
) -width $geometry(topwidth
)
2055 ${NS}::frame .tf.histframe
2056 ${NS}::panedwindow .tf.histframe.pwclist
-orient horizontal
2058 .tf.histframe.pwclist configure
-sashpad 0 -handlesize 4
2061 # create three canvases
2062 set cscroll .tf.histframe.csb
2063 set canv .tf.histframe.pwclist.canv
2065 -selectbackground $selectbgcolor \
2066 -background $bgcolor -bd 0 \
2067 -yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
2068 .tf.histframe.pwclist add
$canv
2069 set canv2 .tf.histframe.pwclist.canv2
2071 -selectbackground $selectbgcolor \
2072 -background $bgcolor -bd 0 -yscrollincr $linespc
2073 .tf.histframe.pwclist add
$canv2
2074 set canv3 .tf.histframe.pwclist.canv3
2076 -selectbackground $selectbgcolor \
2077 -background $bgcolor -bd 0 -yscrollincr $linespc
2078 .tf.histframe.pwclist add
$canv3
2080 bind .tf.histframe.pwclist
<Map
> {
2082 .tf.histframe.pwclist sashpos
1 [lindex $
::geometry
(pwsash1
) 0]
2083 .tf.histframe.pwclist sashpos
0 [lindex $
::geometry
(pwsash0
) 0]
2086 eval .tf.histframe.pwclist sash place
0 $geometry(pwsash0
)
2087 eval .tf.histframe.pwclist sash place
1 $geometry(pwsash1
)
2090 # a scroll bar to rule them
2091 ${NS}::scrollbar
$cscroll -command {allcanvs yview
}
2092 if {!$use_ttk} {$cscroll configure
-highlightthickness 0}
2093 pack
$cscroll -side right
-fill y
2094 bind .tf.histframe.pwclist
<Configure
> {resizeclistpanes
%W
%w
}
2095 lappend bglist
$canv $canv2 $canv3
2096 pack .tf.histframe.pwclist
-fill both
-expand 1 -side left
2098 # we have two button bars at bottom of top frame. Bar 1
2099 ${NS}::frame .tf.bar
2100 ${NS}::frame .tf.lbar
-height 15
2102 set sha1entry .tf.bar.sha1
2103 set entries
$sha1entry
2104 set sha1but .tf.bar.sha1label
2105 button
$sha1but -text "[mc "SHA1 ID
:"] " -state disabled
-relief flat \
2106 -command gotocommit
-width 8
2107 $sha1but conf
-disabledforeground [$sha1but cget
-foreground]
2108 pack .tf.bar.sha1label
-side left
2109 ${NS}::entry
$sha1entry -width 40 -font textfont
-textvariable sha1string
2110 trace add variable sha1string
write sha1change
2111 pack
$sha1entry -side left
-pady 2
2113 image create bitmap bm-left
-data {
2114 #define left_width 16
2115 #define left_height 16
2116 static unsigned char left_bits
[] = {
2117 0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
2118 0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00,
2119 0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01};
2121 image create bitmap bm-right
-data {
2122 #define right_width 16
2123 #define right_height 16
2124 static unsigned char right_bits
[] = {
2125 0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c,
2126 0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c,
2127 0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01};
2129 ${NS}::button .tf.bar.leftbut
-image bm-left
-command goback \
2130 -state disabled
-width 26
2131 pack .tf.bar.leftbut
-side left
-fill y
2132 ${NS}::button .tf.bar.rightbut
-image bm-right
-command goforw \
2133 -state disabled
-width 26
2134 pack .tf.bar.rightbut
-side left
-fill y
2136 ${NS}::label .tf.bar.rowlabel
-text [mc
"Row"]
2138 ${NS}::label .tf.bar.rownum
-width 7 -textvariable rownumsel \
2139 -relief sunken
-anchor e
2140 ${NS}::label .tf.bar.rowlabel2
-text "/"
2141 ${NS}::label .tf.bar.numcommits
-width 7 -textvariable numcommits \
2142 -relief sunken
-anchor e
2143 pack .tf.bar.rowlabel .tf.bar.rownum .tf.bar.rowlabel2 .tf.bar.numcommits \
2146 foreach w
{rownum numcommits
} {.tf.bar.
$w configure
-font textfont
}
2149 trace add variable selectedline
write selectedline_change
2151 # Status label and progress bar
2152 set statusw .tf.bar.status
2153 ${NS}::label
$statusw -width 15 -relief sunken
2154 pack
$statusw -side left
-padx 5
2156 set progresscanv
[ttk
::progressbar .tf.bar.progress
]
2158 set h
[expr {[font metrics uifont
-linespace] + 2}]
2159 set progresscanv .tf.bar.progress
2160 canvas
$progresscanv -relief sunken
-height $h -borderwidth 2
2161 set progressitem
[$progresscanv create rect
-1 0 0 $h -fill green
]
2162 set fprogitem
[$progresscanv create rect
-1 0 0 $h -fill yellow
]
2163 set rprogitem
[$progresscanv create rect
-1 0 0 $h -fill red
]
2165 pack
$progresscanv -side right
-expand 1 -fill x
-padx {0 2}
2166 set progresscoords
{0 0}
2169 bind $progresscanv <Configure
> adjustprogress
2170 set lastprogupdate
[clock clicks
-milliseconds]
2171 set progupdatepending
0
2173 # build up the bottom bar of upper window
2174 ${NS}::label .tf.lbar.flabel
-text "[mc "Find
"] "
2175 ${NS}::button .tf.lbar.fnext
-text [mc
"next"] -command {dofind
1 1}
2176 ${NS}::button .tf.lbar.fprev
-text [mc
"prev"] -command {dofind
-1 1}
2177 ${NS}::label .tf.lbar.flab2
-text " [mc "commit
"] "
2178 pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \
2180 set gdttype
[mc
"containing:"]
2181 set gm
[makedroplist .tf.lbar.gdttype gdttype \
2182 [mc
"containing:"] \
2183 [mc
"touching paths:"] \
2184 [mc
"adding/removing string:"]]
2185 trace add variable gdttype
write gdttype_change
2186 pack .tf.lbar.gdttype
-side left
-fill y
2189 set fstring .tf.lbar.findstring
2190 lappend entries
$fstring
2191 ${NS}::entry
$fstring -width 30 -textvariable findstring
2192 trace add variable findstring
write find_change
2193 set findtype
[mc
"Exact"]
2194 set findtypemenu
[makedroplist .tf.lbar.findtype \
2195 findtype
[mc
"Exact"] [mc
"IgnCase"] [mc
"Regexp"]]
2196 trace add variable findtype
write findcom_change
2197 set findloc
[mc
"All fields"]
2198 makedroplist .tf.lbar.findloc findloc
[mc
"All fields"] [mc
"Headline"] \
2199 [mc
"Comments"] [mc
"Author"] [mc
"Committer"]
2200 trace add variable findloc
write find_change
2201 pack .tf.lbar.findloc
-side right
2202 pack .tf.lbar.findtype
-side right
2203 pack
$fstring -side left
-expand 1 -fill x
2205 # Finish putting the upper half of the viewer together
2206 pack .tf.lbar
-in .tf
-side bottom
-fill x
2207 pack .tf.bar
-in .tf
-side bottom
-fill x
2208 pack .tf.histframe
-fill both
-side top
-expand 1
2211 .ctop paneconfigure .tf
-height $geometry(topheight
)
2212 .ctop paneconfigure .tf
-width $geometry(topwidth
)
2215 # now build up the bottom
2216 ${NS}::panedwindow .pwbottom
-orient horizontal
2218 # lower left, a text box over search bar, scroll bar to the right
2219 # if we know window height, then that will set the lower text height, otherwise
2220 # we set lower text height which will drive window height
2221 if {[info exists geometry
(main
)]} {
2222 ${NS}::frame .bleft
-width $geometry(botwidth
)
2224 ${NS}::frame .bleft
-width $geometry(botwidth
) -height $geometry(botheight
)
2226 ${NS}::frame .bleft.top
2227 ${NS}::frame .bleft.mid
2228 ${NS}::frame .bleft.bottom
2230 ${NS}::button .bleft.top.search
-text [mc
"Search"] -command dosearch
2231 pack .bleft.top.search
-side left
-padx 5
2232 set sstring .bleft.top.sstring
2234 ${NS}::entry
$sstring -width 20 -textvariable searchstring
2235 lappend entries
$sstring
2236 trace add variable searchstring
write incrsearch
2237 pack
$sstring -side left
-expand 1 -fill x
2238 ${NS}::radiobutton .bleft.mid.
diff -text [mc
"Diff"] \
2239 -command changediffdisp
-variable diffelide
-value {0 0}
2240 ${NS}::radiobutton .bleft.mid.old
-text [mc
"Old version"] \
2241 -command changediffdisp
-variable diffelide
-value {0 1}
2242 ${NS}::radiobutton .bleft.mid.new
-text [mc
"New version"] \
2243 -command changediffdisp
-variable diffelide
-value {1 0}
2244 ${NS}::label .bleft.mid.labeldiffcontext
-text " [mc "Lines of context
"]: "
2245 pack .bleft.mid.
diff .bleft.mid.old .bleft.mid.new
-side left
2246 spinbox .bleft.mid.diffcontext
-width 5 \
2247 -from 0 -increment 1 -to 10000000 \
2248 -validate all
-validatecommand "diffcontextvalidate %P" \
2249 -textvariable diffcontextstring
2250 .bleft.mid.diffcontext
set $diffcontext
2251 trace add variable diffcontextstring
write diffcontextchange
2252 lappend entries .bleft.mid.diffcontext
2253 pack .bleft.mid.labeldiffcontext .bleft.mid.diffcontext
-side left
2254 ${NS}::checkbutton .bleft.mid.ignspace
-text [mc
"Ignore space change"] \
2255 -command changeignorespace
-variable ignorespace
2256 pack .bleft.mid.ignspace
-side left
-padx 5
2258 set worddiff
[mc
"Line diff"]
2259 if {[package vcompare
$git_version "1.7.2"] >= 0} {
2260 makedroplist .bleft.mid.worddiff worddiff
[mc
"Line diff"] \
2261 [mc
"Markup words"] [mc
"Color words"]
2262 trace add variable worddiff
write changeworddiff
2263 pack .bleft.mid.worddiff
-side left
-padx 5
2266 set ctext .bleft.bottom.ctext
2267 text
$ctext -background $bgcolor -foreground $fgcolor \
2268 -state disabled
-font textfont \
2269 -yscrollcommand scrolltext
-wrap none \
2270 -xscrollcommand ".bleft.bottom.sbhorizontal set"
2272 $ctext conf
-tabstyle wordprocessor
2274 ${NS}::scrollbar .bleft.bottom.sb
-command "$ctext yview"
2275 ${NS}::scrollbar .bleft.bottom.sbhorizontal
-command "$ctext xview" -orient h
2276 pack .bleft.top
-side top
-fill x
2277 pack .bleft.mid
-side top
-fill x
2278 grid
$ctext .bleft.bottom.sb
-sticky nsew
2279 grid .bleft.bottom.sbhorizontal
-sticky ew
2280 grid columnconfigure .bleft.bottom
0 -weight 1
2281 grid rowconfigure .bleft.bottom
0 -weight 1
2282 grid rowconfigure .bleft.bottom
1 -weight 0
2283 pack .bleft.bottom
-side top
-fill both
-expand 1
2284 lappend bglist
$ctext
2285 lappend fglist
$ctext
2287 $ctext tag conf comment
-wrap $wrapcomment
2288 $ctext tag conf filesep
-font textfontbold
-back "#aaaaaa"
2289 $ctext tag conf hunksep
-fore [lindex
$diffcolors 2]
2290 $ctext tag conf d0
-fore [lindex
$diffcolors 0]
2291 $ctext tag conf dresult
-fore [lindex
$diffcolors 1]
2292 $ctext tag conf m0
-fore red
2293 $ctext tag conf m1
-fore blue
2294 $ctext tag conf m2
-fore green
2295 $ctext tag conf m3
-fore purple
2296 $ctext tag conf
m4 -fore brown
2297 $ctext tag conf m5
-fore "#009090"
2298 $ctext tag conf m6
-fore magenta
2299 $ctext tag conf m7
-fore "#808000"
2300 $ctext tag conf m8
-fore "#009000"
2301 $ctext tag conf m9
-fore "#ff0080"
2302 $ctext tag conf m10
-fore cyan
2303 $ctext tag conf m11
-fore "#b07070"
2304 $ctext tag conf m12
-fore "#70b0f0"
2305 $ctext tag conf m13
-fore "#70f0b0"
2306 $ctext tag conf m14
-fore "#f0b070"
2307 $ctext tag conf m15
-fore "#ff70b0"
2308 $ctext tag conf mmax
-fore darkgrey
2310 $ctext tag conf mresult
-font textfontbold
2311 $ctext tag conf msep
-font textfontbold
2312 $ctext tag conf found
-back yellow
2314 .pwbottom add .bleft
2316 .pwbottom paneconfigure .bleft
-width $geometry(botwidth
)
2320 ${NS}::frame .bright
2321 ${NS}::frame .bright.mode
2322 ${NS}::radiobutton .bright.mode.
patch -text [mc
"Patch"] \
2323 -command reselectline
-variable cmitmode
-value "patch"
2324 ${NS}::radiobutton .bright.mode.tree
-text [mc
"Tree"] \
2325 -command reselectline
-variable cmitmode
-value "tree"
2326 grid .bright.mode.
patch .bright.mode.tree
-sticky ew
2327 pack .bright.mode
-side top
-fill x
2328 set cflist .bright.cfiles
2329 set indent
[font measure mainfont
"nn"]
2331 -selectbackground $selectbgcolor \
2332 -background $bgcolor -foreground $fgcolor \
2334 -tabs [list
$indent [expr {2 * $indent}]] \
2335 -yscrollcommand ".bright.sb set" \
2336 -cursor [. cget
-cursor] \
2337 -spacing1 1 -spacing3 1
2338 lappend bglist
$cflist
2339 lappend fglist
$cflist
2340 ${NS}::scrollbar .bright.sb
-command "$cflist yview"
2341 pack .bright.sb
-side right
-fill y
2342 pack
$cflist -side left
-fill both
-expand 1
2343 $cflist tag configure highlight \
2344 -background [$cflist cget
-selectbackground]
2345 $cflist tag configure bold
-font mainfontbold
2347 .pwbottom add .bright
2350 # restore window width & height if known
2351 if {[info exists geometry
(main
)]} {
2352 if {[scan
$geometry(main
) "%dx%d" w h
] >= 2} {
2353 if {$w > [winfo screenwidth .
]} {
2354 set w
[winfo screenwidth .
]
2356 if {$h > [winfo screenheight .
]} {
2357 set h
[winfo screenheight .
]
2359 wm geometry .
"${w}x$h"
2363 if {[info exists geometry
(state
)] && $geometry(state
) eq
"zoomed"} {
2364 wm state .
$geometry(state
)
2367 if {[tk windowingsystem
] eq
{aqua
}} {
2378 %W sashpos
0 $
::geometry
(topheight
)
2380 bind .pwbottom
<Map
> {
2382 %W sashpos
0 $
::geometry
(botwidth
)
2386 bind .pwbottom
<Configure
> {resizecdetpanes
%W
%w
}
2387 pack .ctop
-fill both
-expand 1
2388 bindall
<1> {selcanvline
%W
%x
%y
}
2389 #bindall <B1-Motion> {selcanvline %W %x %y}
2390 if {[tk windowingsystem
] == "win32"} {
2391 bind .
<MouseWheel
> { windows_mousewheel_redirector
%W
%X
%Y
%D
}
2392 bind $ctext <MouseWheel
> { windows_mousewheel_redirector
%W
%X
%Y
%D
; break }
2394 bindall
<ButtonRelease-4
> "allcanvs yview scroll -5 units"
2395 bindall
<ButtonRelease-5
> "allcanvs yview scroll 5 units"
2396 if {[tk windowingsystem
] eq
"aqua"} {
2397 bindall
<MouseWheel
> {
2398 set delta
[expr {- (%D
)}]
2399 allcanvs yview scroll
$delta units
2401 bindall
<Shift-MouseWheel
> {
2402 set delta
[expr {- (%D
)}]
2403 $canv xview scroll
$delta units
2407 bindall
<$
::BM
> "canvscan mark %W %x %y"
2408 bindall
<B$
::BM-Motion
> "canvscan dragto %W %x %y"
2409 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
2410 bind .
<$M1B-Key-w> doquit
2411 bindkey
<Home
> selfirstline
2412 bindkey
<End
> sellastline
2413 bind .
<Key-Up
> "selnextline -1"
2414 bind .
<Key-Down
> "selnextline 1"
2415 bind .
<Shift-Key-Up
> "dofind -1 0"
2416 bind .
<Shift-Key-Down
> "dofind 1 0"
2417 bindkey
<Key-Right
> "goforw"
2418 bindkey
<Key-Left
> "goback"
2419 bind .
<Key-Prior
> "selnextpage -1"
2420 bind .
<Key-Next
> "selnextpage 1"
2421 bind .
<$M1B-Home> "allcanvs yview moveto 0.0"
2422 bind .
<$M1B-End> "allcanvs yview moveto 1.0"
2423 bind .
<$M1B-Key-Up> "allcanvs yview scroll -1 units"
2424 bind .
<$M1B-Key-Down> "allcanvs yview scroll 1 units"
2425 bind .
<$M1B-Key-Prior> "allcanvs yview scroll -1 pages"
2426 bind .
<$M1B-Key-Next> "allcanvs yview scroll 1 pages"
2427 bindkey
<Key-Delete
> "$ctext yview scroll -1 pages"
2428 bindkey
<Key-BackSpace
> "$ctext yview scroll -1 pages"
2429 bindkey
<Key-space
> "$ctext yview scroll 1 pages"
2430 bindkey p
"selnextline -1"
2431 bindkey n
"selnextline 1"
2434 bindkey i
"selnextline -1"
2435 bindkey k
"selnextline 1"
2439 bindkey d
"$ctext yview scroll 18 units"
2440 bindkey u
"$ctext yview scroll -18 units"
2441 bindkey
/ {focus
$fstring}
2442 bindkey
<Key-KP_Divide
> {focus
$fstring}
2443 bindkey
<Key-Return
> {dofind
1 1}
2444 bindkey ?
{dofind
-1 1}
2446 bind .
<F5
> updatecommits
2447 bind .
<$M1B-F5> reloadcommits
2448 bind .
<F2
> showrefs
2449 bind .
<Shift-F4
> {newview
0}
2450 catch
{ bind .
<Shift-Key-XF86_Switch_VT_4
> {newview
0} }
2451 bind .
<F4
> edit_or_newview
2452 bind .
<$M1B-q> doquit
2453 bind .
<$M1B-f> {dofind
1 1}
2454 bind .
<$M1B-g> {dofind
1 0}
2455 bind .
<$M1B-r> dosearchback
2456 bind .
<$M1B-s> dosearch
2457 bind .
<$M1B-equal> {incrfont
1}
2458 bind .
<$M1B-plus> {incrfont
1}
2459 bind .
<$M1B-KP_Add> {incrfont
1}
2460 bind .
<$M1B-minus> {incrfont
-1}
2461 bind .
<$M1B-KP_Subtract> {incrfont
-1}
2462 wm protocol . WM_DELETE_WINDOW doquit
2463 bind .
<Destroy
> {stop_backends
}
2464 bind .
<Button-1
> "click %W"
2465 bind $fstring <Key-Return
> {dofind
1 1}
2466 bind $sha1entry <Key-Return
> {gotocommit
; break}
2467 bind $sha1entry <<PasteSelection>> clearsha1
2468 bind $cflist <1> {sel_flist %W %x %y; break}
2469 bind $cflist <B1-Motion> {sel_flist %W %x %y; break}
2470 bind $cflist <ButtonRelease-1> {treeclick %W %x %y}
2472 bind $cflist $ctxbut {pop_flist_menu %W %X %Y %x %y}
2473 bind $ctext $ctxbut {pop_diff_menu %W %X %Y %x %y}
2474 bind $ctext <Button-1> {focus %W}
2476 set maincursor [. cget -cursor]
2477 set textcursor [$ctext cget -cursor]
2478 set curtextcursor $textcursor
2480 set rowctxmenu .rowctxmenu
2481 makemenu $rowctxmenu {
2482 {mc "Diff this -> selected" command {diffvssel 0}}
2483 {mc "Diff selected -> this" command {diffvssel 1}}
2484 {mc "Make patch" command mkpatch}
2485 {mc "Create tag" command mktag}
2486 {mc "Write commit to file" command writecommit}
2487 {mc "Create new branch" command mkbranch}
2488 {mc "Cherry-pick this commit" command cherrypick}
2489 {mc "Reset HEAD branch to here" command resethead}
2490 {mc "Mark this commit" command markhere}
2491 {mc "Return to mark" command gotomark}
2492 {mc "Find descendant of this and mark" command find_common_desc}
2493 {mc "Compare with marked commit" command compare_commits}
2495 $rowctxmenu configure -tearoff 0
2497 set fakerowmenu .fakerowmenu
2498 makemenu $fakerowmenu {
2499 {mc "Diff this -> selected" command {diffvssel 0}}
2500 {mc "Diff selected -> this" command {diffvssel 1}}
2501 {mc "Make patch" command mkpatch}
2503 $fakerowmenu configure -tearoff 0
2505 set headctxmenu .headctxmenu
2506 makemenu $headctxmenu {
2507 {mc "Check out this branch" command cobranch}
2508 {mc "Remove this branch" command rmbranch}
2510 $headctxmenu configure -tearoff 0
2513 set flist_menu .flistctxmenu
2514 makemenu $flist_menu {
2515 {mc "Highlight this too" command {flist_hl 0}}
2516 {mc "Highlight this only" command {flist_hl 1}}
2517 {mc "External diff" command {external_diff}}
2518 {mc "Blame parent commit" command {external_blame 1}}
2520 $flist_menu configure -tearoff 0
2523 set diff_menu .diffctxmenu
2524 makemenu $diff_menu {
2525 {mc "Show origin of this line" command show_line_source}
2526 {mc "Run git gui blame on this line" command {external_blame_diff}}
2528 $diff_menu configure -tearoff 0
2531 # Windows sends all mouse wheel events to the current focused window, not
2532 # the one where the mouse hovers, so bind those events here and redirect
2533 # to the correct window
2534 proc windows_mousewheel_redirector {W X Y D} {
2535 global canv canv2 canv3
2536 set w [winfo containing -displayof $W $X $Y]
2538 set u [expr {$D < 0 ? 5 : -5}]
2539 if {$w == $canv || $w == $canv2 || $w == $canv3} {
2540 allcanvs yview scroll $u units
2543 $w yview scroll $u units
2549 # Update row number label when selectedline changes
2550 proc selectedline_change {n1 n2 op} {
2551 global selectedline rownumsel
2553 if {$selectedline eq {}} {
2556 set rownumsel [expr {$selectedline + 1}]
2560 # mouse-2 makes all windows scan vertically, but only the one
2561 # the cursor is in scans horizontally
2562 proc canvscan {op w x y} {
2563 global canv canv2 canv3
2564 foreach c [list $canv $canv2 $canv3] {
2573 proc scrollcanv {cscroll f0 f1} {
2574 $cscroll set $f0 $f1
2579 # when we make a key binding for the toplevel, make sure
2580 # it doesn't get triggered when that key is pressed in the
2581 # find string entry widget.
2582 proc bindkey {ev script} {
2585 set escript [bind Entry $ev]
2586 if {$escript == {}} {
2587 set escript [bind Entry <Key>]
2589 foreach e $entries {
2590 bind $e $ev "$escript; break"
2594 # set the focus back to the toplevel for any click outside
2597 global ctext entries
2598 foreach e [concat $entries $ctext] {
2599 if {$w == $e} return
2604 # Adjust the progress bar for a change in requested extent or canvas size
2605 proc adjustprogress {} {
2606 global progresscanv progressitem progresscoords
2607 global fprogitem fprogcoord lastprogupdate progupdatepending
2608 global rprogitem rprogcoord use_ttk
2611 $progresscanv configure -value [expr {int($fprogcoord * 100)}]
2615 set w [expr {[winfo width $progresscanv] - 4}]
2616 set x0 [expr {$w * [lindex $progresscoords 0]}]
2617 set x1 [expr {$w * [lindex $progresscoords 1]}]
2618 set h [winfo height $progresscanv]
2619 $progresscanv coords $progressitem $x0 0 $x1 $h
2620 $progresscanv coords $fprogitem 0 0 [expr {$w * $fprogcoord}] $h
2621 $progresscanv coords $rprogitem 0 0 [expr {$w * $rprogcoord}] $h
2622 set now [clock clicks -milliseconds]
2623 if {$now >= $lastprogupdate + 100} {
2624 set progupdatepending 0
2626 } elseif {!$progupdatepending} {
2627 set progupdatepending 1
2628 after [expr {$lastprogupdate + 100 - $now}] doprogupdate
2632 proc doprogupdate {} {
2633 global lastprogupdate progupdatepending
2635 if {$progupdatepending} {
2636 set progupdatepending 0
2637 set lastprogupdate [clock clicks -milliseconds]
2642 proc savestuff {w} {
2643 global canv canv2 canv3 mainfont textfont uifont tabstop
2644 global stuffsaved findmergefiles maxgraphpct
2645 global maxwidth showneartags showlocalchanges
2646 global viewname viewfiles viewargs viewargscmd viewperm nextviewnum
2647 global cmitmode wrapcomment datetimeformat limitdiffs
2648 global colors uicolor bgcolor fgcolor diffcolors diffcontext selectbgcolor
2649 global autoselect autosellen extdifftool perfile_attrs markbgcolor use_ttk
2650 global hideremotes want_ttk
2652 if {$stuffsaved} return
2653 if {![winfo viewable .]} return
2655 if {[file exists ~/.gitk-new]} {file delete -force ~/.gitk-new}
2656 set f [open "~/.gitk-new" w]
2657 if {$::tcl_platform(platform) eq {windows}} {
2658 file attributes "~/.gitk-new" -hidden true
2660 puts $f [list set mainfont $mainfont]
2661 puts $f [list set textfont $textfont]
2662 puts $f [list set uifont $uifont]
2663 puts $f [list set tabstop $tabstop]
2664 puts $f [list set findmergefiles $findmergefiles]
2665 puts $f [list set maxgraphpct $maxgraphpct]
2666 puts $f [list set maxwidth $maxwidth]
2667 puts $f [list set cmitmode $cmitmode]
2668 puts $f [list set wrapcomment $wrapcomment]
2669 puts $f [list set autoselect $autoselect]
2670 puts $f [list set autosellen $autosellen]
2671 puts $f [list set showneartags $showneartags]
2672 puts $f [list set hideremotes $hideremotes]
2673 puts $f [list set showlocalchanges $showlocalchanges]
2674 puts $f [list set datetimeformat $datetimeformat]
2675 puts $f [list set limitdiffs $limitdiffs]
2676 puts $f [list set uicolor $uicolor]
2677 puts $f [list set want_ttk $want_ttk]
2678 puts $f [list set bgcolor $bgcolor]
2679 puts $f [list set fgcolor $fgcolor]
2680 puts $f [list set colors $colors]
2681 puts $f [list set diffcolors $diffcolors]
2682 puts $f [list set markbgcolor $markbgcolor]
2683 puts $f [list set diffcontext $diffcontext]
2684 puts $f [list set selectbgcolor $selectbgcolor]
2685 puts $f [list set extdifftool $extdifftool]
2686 puts $f [list set perfile_attrs $perfile_attrs]
2688 puts $f "set geometry(main) [wm geometry .]"
2689 puts $f "set geometry(state) [wm state .]"
2690 puts $f "set geometry(topwidth) [winfo width .tf]"
2691 puts $f "set geometry(topheight) [winfo height .tf]"
2693 puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sashpos 0] 1\""
2694 puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sashpos 1] 1\""
2696 puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\""
2697 puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\""
2699 puts $f "set geometry(botwidth) [winfo width .bleft]"
2700 puts $f "set geometry(botheight) [winfo height .bleft]"
2702 puts -nonewline $f "set permviews {"
2703 for {set v 0} {$v < $nextviewnum} {incr v} {
2704 if {$viewperm($v)} {
2705 puts $f "{[list $viewname($v) $viewfiles($v) $viewargs($v) $viewargscmd($v)]}"
2710 file rename -force "~/.gitk-new" "~/.gitk"
2715 proc resizeclistpanes {win w} {
2716 global oldwidth use_ttk
2717 if {[info exists oldwidth($win)]} {
2719 set s0 [$win sashpos 0]
2720 set s1 [$win sashpos 1]
2722 set s0 [$win sash coord 0]
2723 set s1 [$win sash coord 1]
2726 set sash0 [expr {int($w/2 - 2)}]
2727 set sash1 [expr {int($w*5/6 - 2)}]
2729 set factor [expr {1.0 * $w / $oldwidth($win)}]
2730 set sash0 [expr {int($factor * [lindex $s0 0])}]
2731 set sash1 [expr {int($factor * [lindex $s1 0])}]
2735 if {$sash1 < $sash0 + 20} {
2736 set sash1 [expr {$sash0 + 20}]
2738 if {$sash1 > $w - 10} {
2739 set sash1 [expr {$w - 10}]
2740 if {$sash0 > $sash1 - 20} {
2741 set sash0 [expr {$sash1 - 20}]
2746 $win sashpos 0 $sash0
2747 $win sashpos 1 $sash1
2749 $win sash place 0 $sash0 [lindex $s0 1]
2750 $win sash place 1 $sash1 [lindex $s1 1]
2753 set oldwidth($win) $w
2756 proc resizecdetpanes {win w} {
2757 global oldwidth use_ttk
2758 if {[info exists oldwidth($win)]} {
2760 set s0 [$win sashpos 0]
2762 set s0 [$win sash coord 0]
2765 set sash0 [expr {int($w*3/4 - 2)}]
2767 set factor [expr {1.0 * $w / $oldwidth($win)}]
2768 set sash0 [expr {int($factor * [lindex $s0 0])}]
2772 if {$sash0 > $w - 15} {
2773 set sash0 [expr {$w - 15}]
2777 $win sashpos 0 $sash0
2779 $win sash place 0 $sash0 [lindex $s0 1]
2782 set oldwidth($win) $w
2785 proc allcanvs args {
2786 global canv canv2 canv3
2792 proc bindall {event action} {
2793 global canv canv2 canv3
2794 bind $canv $event $action
2795 bind $canv2 $event $action
2796 bind $canv3 $event $action
2802 if {[winfo exists $w]} {
2807 wm title $w [mc "About gitk"]
2809 message $w.m -text [mc "
2810 Gitk - a commit viewer for git
2812 Copyright \u00a9 2005-2011 Paul Mackerras
2814 Use and redistribute under the terms of the GNU General Public License"] \
2815 -justify center -aspect 400 -border 2 -bg white -relief groove
2816 pack $w.m -side top -fill x -padx 2 -pady 2
2817 ${NS}::button $w.ok -text [mc "Close"] -command "destroy $w" -default active
2818 pack $w.ok -side bottom
2819 bind $w <Visibility> "focus $w.ok"
2820 bind $w <Key-Escape> "destroy $w"
2821 bind $w <Key-Return> "destroy $w"
2822 tk::PlaceWindow $w widget .
2828 if {[winfo exists $w]} {
2832 if {[tk windowingsystem] eq {aqua}} {
2838 wm title $w [mc "Gitk key bindings"]
2840 message $w.m -text "
2841 [mc "Gitk key bindings:"]
2843 [mc "<%s-Q> Quit" $M1T]
2844 [mc "<%s-W> Close window" $M1T]
2845 [mc "<Home> Move to first commit"]
2846 [mc "<End> Move to last commit"]
2847 [mc "<Up>, p, i Move up one commit"]
2848 [mc "<Down>, n, k Move down one commit"]
2849 [mc "<Left>, z, j Go back in history list"]
2850 [mc "<Right>, x, l Go forward in history list"]
2851 [mc "<PageUp> Move up one page in commit list"]
2852 [mc "<PageDown> Move down one page in commit list"]
2853 [mc "<%s-Home> Scroll to top of commit list" $M1T]
2854 [mc "<%s-End> Scroll to bottom of commit list" $M1T]
2855 [mc "<%s-Up> Scroll commit list up one line" $M1T]
2856 [mc "<%s-Down> Scroll commit list down one line" $M1T]
2857 [mc "<%s-PageUp> Scroll commit list up one page" $M1T]
2858 [mc "<%s-PageDown> Scroll commit list down one page" $M1T]
2859 [mc "<Shift-Up> Find backwards (upwards, later commits)"]
2860 [mc "<Shift-Down> Find forwards (downwards, earlier commits)"]
2861 [mc "<Delete>, b Scroll diff view up one page"]
2862 [mc "<Backspace> Scroll diff view up one page"]
2863 [mc "<Space> Scroll diff view down one page"]
2864 [mc "u Scroll diff view up 18 lines"]
2865 [mc "d Scroll diff view down 18 lines"]
2866 [mc "<%s-F> Find" $M1T]
2867 [mc "<%s-G> Move to next find hit" $M1T]
2868 [mc "<Return> Move to next find hit"]
2869 [mc "/ Focus the search box"]
2870 [mc "? Move to previous find hit"]
2871 [mc "f Scroll diff view to next file"]
2872 [mc "<%s-S> Search for next hit in diff view" $M1T]
2873 [mc "<%s-R> Search for previous hit in diff view" $M1T]
2874 [mc "<%s-KP+> Increase font size" $M1T]
2875 [mc "<%s-plus> Increase font size" $M1T]
2876 [mc "<%s-KP-> Decrease font size" $M1T]
2877 [mc "<%s-minus> Decrease font size" $M1T]
2880 -justify left -bg white -border 2 -relief groove
2881 pack $w.m -side top -fill both -padx 2 -pady 2
2882 ${NS}::button $w.ok -text [mc "Close"] -command "destroy $w" -default active
2883 bind $w <Key-Escape> [list destroy $w]
2884 pack $w.ok -side bottom
2885 bind $w <Visibility> "focus $w.ok"
2886 bind $w <Key-Escape> "destroy $w"
2887 bind $w <Key-Return> "destroy $w"
2890 # Procedures for manipulating the file list window at the
2891 # bottom right of the overall window.
2893 proc treeview {w l openlevs} {
2894 global treecontents treediropen treeheight treeparent treeindex
2904 set treecontents() {}
2905 $w conf -state normal
2907 while {[string range $f 0 $prefixend] ne $prefix} {
2908 if {$lev <= $openlevs} {
2909 $w mark set e:$treeindex($prefix) "end -1c"
2910 $w mark gravity e:$treeindex($prefix) left
2912 set treeheight($prefix) $ht
2913 incr ht [lindex $htstack end]
2914 set htstack [lreplace $htstack end end]
2915 set prefixend [lindex $prefendstack end]
2916 set prefendstack [lreplace $prefendstack end end]
2917 set prefix [string range $prefix 0 $prefixend]
2920 set tail [string range $f [expr {$prefixend+1}] end]
2921 while {[set slash [string first "/" $tail]] >= 0} {
2924 lappend prefendstack $prefixend
2925 incr prefixend [expr {$slash + 1}]
2926 set d [string range $tail 0 $slash]
2927 lappend treecontents($prefix) $d
2928 set oldprefix $prefix
2930 set treecontents($prefix) {}
2931 set treeindex($prefix) [incr ix]
2932 set treeparent($prefix) $oldprefix
2933 set tail [string range $tail [expr {$slash+1}] end]
2934 if {$lev <= $openlevs} {
2936 set treediropen($prefix) [expr {$lev < $openlevs}]
2937 set bm [expr {$lev == $openlevs? "tri-rt": "tri-dn"}]
2938 $w mark set d:$ix "end -1c"
2939 $w mark gravity d:$ix left
2941 for {set i 0} {$i < $lev} {incr i} {append str "\t"}
2943 $w image create end -align center -image $bm -padx 1 \
2945 $w insert end $d [highlight_tag $prefix]
2946 $w mark set s:$ix "end -1c"
2947 $w mark gravity s:$ix left
2952 if {$lev <= $openlevs} {
2955 for {set i 0} {$i < $lev} {incr i} {append str "\t"}
2957 $w insert end $tail [highlight_tag $f]
2959 lappend treecontents($prefix) $tail
2962 while {$htstack ne {}} {
2963 set treeheight($prefix) $ht
2964 incr ht [lindex $htstack end]
2965 set htstack [lreplace $htstack end end]
2966 set prefixend [lindex $prefendstack end]
2967 set prefendstack [lreplace $prefendstack end end]
2968 set prefix [string range $prefix 0 $prefixend]
2970 $w conf -state disabled
2973 proc linetoelt {l} {
2974 global treeheight treecontents
2979 foreach e $treecontents($prefix) {
2984 if {[string index $e end] eq "/"} {
2985 set n $treeheight($prefix$e)
2997 proc highlight_tree {y prefix} {
2998 global treeheight treecontents cflist
3000 foreach e $treecontents($prefix) {
3002 if {[highlight_tag $path] ne {}} {
3003 $cflist tag add bold $y.0 "$y.0 lineend"
3006 if {[string index $e end] eq "/" && $treeheight($path) > 1} {
3007 set y [highlight_tree $y $path]
3013 proc treeclosedir {w dir} {
3014 global treediropen treeheight treeparent treeindex
3016 set ix $treeindex($dir)
3017 $w conf -state normal
3018 $w delete s:$ix e:$ix
3019 set treediropen($dir) 0
3020 $w image configure a:$ix -image tri-rt
3021 $w conf -state disabled
3022 set n [expr {1 - $treeheight($dir)}]
3023 while {$dir ne {}} {
3024 incr treeheight($dir) $n
3025 set dir $treeparent($dir)
3029 proc treeopendir {w dir} {
3030 global treediropen treeheight treeparent treecontents treeindex
3032 set ix $treeindex($dir)
3033 $w conf -state normal
3034 $w image configure a:$ix -image tri-dn
3035 $w mark set e:$ix s:$ix
3036 $w mark gravity e:$ix right
3039 set n [llength $treecontents($dir)]
3040 for {set x $dir} {$x ne {}} {set x $treeparent($x)} {
3043 incr treeheight($x) $n
3045 foreach e $treecontents($dir) {
3047 if {[string index $e end] eq "/"} {
3048 set iy $treeindex($de)
3049 $w mark set d:$iy e:$ix
3050 $w mark gravity d:$iy left
3051 $w insert e:$ix $str
3052 set treediropen($de) 0
3053 $w image create e:$ix -align center -image tri-rt -padx 1 \
3055 $w insert e:$ix $e [highlight_tag $de]
3056 $w mark set s:$iy e:$ix
3057 $w mark gravity s:$iy left
3058 set treeheight($de) 1
3060 $w insert e:$ix $str
3061 $w insert e:$ix $e [highlight_tag $de]
3064 $w mark gravity e:$ix right
3065 $w conf -state disabled
3066 set treediropen($dir) 1
3067 set top [lindex [split [$w index @0,0] .] 0]
3068 set ht [$w cget -height]
3069 set l [lindex [split [$w index s:$ix] .] 0]
3072 } elseif {$l + $n + 1 > $top + $ht} {
3073 set top [expr {$l + $n + 2 - $ht}]
3081 proc treeclick {w x y} {
3082 global treediropen cmitmode ctext cflist cflist_top
3084 if {$cmitmode ne "tree"} return
3085 if {![info exists cflist_top]} return
3086 set l [lindex [split [$w index "@$x,$y"] "."] 0]
3087 $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
3088 $cflist tag add highlight $l.0 "$l.0 lineend"
3094 set e [linetoelt $l]
3095 if {[string index $e end] ne "/"} {
3097 } elseif {$treediropen($e)} {
3104 proc setfilelist {id} {
3105 global treefilelist cflist jump_to_here
3107 treeview $cflist $treefilelist($id) 0
3108 if {$jump_to_here ne {}} {
3109 set f [lindex $jump_to_here 0]
3110 if {[lsearch -exact $treefilelist($id) $f] >= 0} {
3116 image create bitmap tri-rt -background black -foreground blue -data {
3117 #define tri-rt_width 13
3118 #define tri-rt_height 13
3119 static unsigned char tri-rt_bits[] = {
3120 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x00, 0x70, 0x00, 0xf0, 0x00,
3121 0xf0, 0x01, 0xf0, 0x00, 0x70, 0x00, 0x30, 0x00, 0x10, 0x00, 0x00, 0x00,
3124 #define tri-rt-mask_width 13
3125 #define tri-rt-mask_height 13
3126 static unsigned char tri-rt-mask_bits[] = {
3127 0x08, 0x00, 0x18, 0x00, 0x38, 0x00, 0x78, 0x00, 0xf8, 0x00, 0xf8, 0x01,
3128 0xf8, 0x03, 0xf8, 0x01, 0xf8, 0x00, 0x78, 0x00, 0x38, 0x00, 0x18, 0x00,
3131 image create bitmap tri-dn -background black -foreground blue -data {
3132 #define tri-dn_width 13
3133 #define tri-dn_height 13
3134 static unsigned char tri-dn_bits[] = {
3135 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x07, 0xf8, 0x03,
3136 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
3139 #define tri-dn-mask_width 13
3140 #define tri-dn-mask_height 13
3141 static unsigned char tri-dn-mask_bits[] = {
3142 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0xfe, 0x0f, 0xfc, 0x07,
3143 0xf8, 0x03, 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
3147 image create bitmap reficon-T -background black -foreground yellow -data {
3148 #define tagicon_width 13
3149 #define tagicon_height 9
3150 static unsigned char tagicon_bits[] = {
3151 0x00, 0x00, 0x00, 0x00, 0xf0, 0x07, 0xf8, 0x07,
3152 0xfc, 0x07, 0xf8, 0x07, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00};
3154 #define tagicon-mask_width 13
3155 #define tagicon-mask_height 9
3156 static unsigned char tagicon-mask_bits[] = {
3157 0x00, 0x00, 0xf0, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
3158 0xfe, 0x0f, 0xfc, 0x0f, 0xf8, 0x0f, 0xf0, 0x0f, 0x00, 0x00};
3161 #define headicon_width 13
3162 #define headicon_height 9
3163 static unsigned char headicon_bits[] = {
3164 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xf8, 0x07,
3165 0xf8, 0x07, 0xf8, 0x07, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00};
3168 #define headicon-mask_width 13
3169 #define headicon-mask_height 9
3170 static unsigned char headicon-mask_bits[] = {
3171 0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
3172 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00};
3174 image create bitmap reficon-H -background black -foreground green \
3175 -data $rectdata -maskdata $rectmask
3176 image create bitmap reficon-o -background black -foreground "#ddddff" \
3177 -data $rectdata -maskdata $rectmask
3179 proc init_flist {first} {
3180 global cflist cflist_top difffilestart
3182 $cflist conf -state normal
3183 $cflist delete 0.0 end
3185 $cflist insert end $first
3187 $cflist tag add highlight 1.0 "1.0 lineend"
3189 catch {unset cflist_top}
3191 $cflist conf -state disabled
3192 set difffilestart {}
3195 proc highlight_tag {f} {
3196 global highlight_paths
3198 foreach p $highlight_paths {
3199 if {[string match $p $f]} {
3206 proc highlight_filelist {} {
3207 global cmitmode cflist
3209 $cflist conf -state normal
3210 if {$cmitmode ne "tree"} {
3211 set end [lindex [split [$cflist index end] .] 0]
3212 for {set l 2} {$l < $end} {incr l} {
3213 set line [$cflist get $l.0 "$l.0 lineend"]
3214 if {[highlight_tag $line] ne {}} {
3215 $cflist tag add bold $l.0 "$l.0 lineend"
3221 $cflist conf -state disabled
3224 proc unhighlight_filelist {} {
3227 $cflist conf -state normal
3228 $cflist tag remove bold 1.0 end
3229 $cflist conf -state disabled
3232 proc add_flist {fl} {
3235 $cflist conf -state normal
3237 $cflist insert end "\n"
3238 $cflist insert end $f [highlight_tag $f]
3240 $cflist conf -state disabled
3243 proc sel_flist {w x y} {
3244 global ctext difffilestart cflist cflist_top cmitmode
3246 if {$cmitmode eq "tree"} return
3247 if {![info exists cflist_top]} return
3248 set l [lindex [split [$w index "@$x,$y"] "."] 0]
3249 $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
3250 $cflist tag add highlight $l.0 "$l.0 lineend"
3255 catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
3259 proc pop_flist_menu {w X Y x y} {
3260 global ctext cflist cmitmode flist_menu flist_menu_file
3261 global treediffs diffids
3264 set l [lindex [split [$w index "@$x,$y"] "."] 0]
3266 if {$cmitmode eq "tree"} {
3267 set e [linetoelt $l]
3268 if {[string index $e end] eq "/"} return
3270 set e [lindex $treediffs($diffids) [expr {$l-2}]]
3272 set flist_menu_file $e
3273 set xdiffstate "normal"
3274 if {$cmitmode eq "tree"} {
3275 set xdiffstate "disabled"
3277 # Disable "External diff" item in tree mode
3278 $flist_menu entryconf 2 -state $xdiffstate
3279 tk_popup $flist_menu $X $Y
3282 proc find_ctext_fileinfo {line} {
3283 global ctext_file_names ctext_file_lines
3285 set ok [bsearch $ctext_file_lines $line]
3286 set tline [lindex $ctext_file_lines $ok]
3288 if {$ok >= [llength $ctext_file_lines] || $line < $tline} {
3291 return [list [lindex $ctext_file_names $ok] $tline]
3295 proc pop_diff_menu {w X Y x y} {
3296 global ctext diff_menu flist_menu_file
3297 global diff_menu_txtpos diff_menu_line
3298 global diff_menu_filebase
3300 set diff_menu_txtpos [split [$w index "@$x,$y"] "."]
3301 set diff_menu_line [lindex $diff_menu_txtpos 0]
3302 # don't pop up the menu on hunk-separator or file-separator lines
3303 if {[lsearch -glob [$ctext tag names $diff_menu_line.0] "*sep"] >= 0} {
3307 set f [find_ctext_fileinfo $diff_menu_line]
3308 if {$f eq {}} return
3309 set flist_menu_file [lindex $f 0]
3310 set diff_menu_filebase [lindex $f 1]
3311 tk_popup $diff_menu $X $Y
3314 proc flist_hl {only} {
3315 global flist_menu_file findstring gdttype
3317 set x [shellquote $flist_menu_file]
3318 if {$only || $findstring eq {} || $gdttype ne [mc "touching paths:"]} {
3321 append findstring " " $x
3323 set gdttype [mc "touching paths:"]
3326 proc gitknewtmpdir {} {
3327 global diffnum gitktmpdir gitdir
3329 if {![info exists gitktmpdir]} {
3330 set gitktmpdir [file join $gitdir [format ".gitk-tmp.%s" [pid]]]
3331 if {[catch {file mkdir $gitktmpdir} err]} {
3332 error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err"
3339 set diffdir [file join $gitktmpdir $diffnum]
3340 if {[catch {file mkdir $diffdir} err]} {
3341 error_popup "[mc "Error creating temporary directory %s:" $diffdir] $err"
3347 proc save_file_from_commit {filename output what} {
3350 if {[catch {exec git show $filename -- > $output} err]} {
3351 if {[string match "fatal: bad revision *" $err]} {
3354 error_popup "[mc "Error getting \"%s\" from %s:" $filename $what] $err"
3360 proc external_diff_get_one_file {diffid filename diffdir} {
3361 global nullid nullid2 nullfile
3364 if {$diffid == $nullid} {
3365 set difffile [file join $worktree $filename]
3366 if {[file exists $difffile]} {
3371 if {$diffid == $nullid2} {
3372 set difffile [file join $diffdir "\[index\] [file tail $filename]"]
3373 return [save_file_from_commit :$filename $difffile index]
3375 set difffile [file join $diffdir "\[$diffid\] [file tail $filename]"]
3376 return [save_file_from_commit $diffid:$filename $difffile \
3380 proc external_diff {} {
3381 global nullid nullid2
3382 global flist_menu_file
3386 if {[llength $diffids] == 1} {
3387 # no reference commit given
3388 set diffidto [lindex $diffids 0]
3389 if {$diffidto eq $nullid} {
3390 # diffing working copy with index
3391 set diffidfrom $nullid2
3392 } elseif {$diffidto eq $nullid2} {
3393 # diffing index with HEAD
3394 set diffidfrom "HEAD"
3396 # use first parent commit
3397 global parentlist selectedline
3398 set diffidfrom [lindex $parentlist $selectedline 0]
3401 set diffidfrom [lindex $diffids 0]
3402 set diffidto [lindex $diffids 1]
3405 # make sure that several diffs wont collide
3406 set diffdir [gitknewtmpdir]
3407 if {$diffdir eq {}} return
3409 # gather files to diff
3410 set difffromfile [external_diff_get_one_file $diffidfrom $flist_menu_file $diffdir]
3411 set difftofile [external_diff_get_one_file $diffidto $flist_menu_file $diffdir]
3413 if {$difffromfile ne {} && $difftofile ne {}} {
3414 set cmd [list [shellsplit $extdifftool] $difffromfile $difftofile]
3415 if {[catch {set fl [open |$cmd r]} err]} {
3416 file delete -force $diffdir
3417 error_popup "$extdifftool: [mc "command failed:"] $err"
3419 fconfigure $fl -blocking 0
3420 filerun $fl [list delete_at_eof $fl $diffdir]
3425 proc find_hunk_blamespec {base line} {
3428 # Find and parse the hunk header
3429 set s_lix [$ctext search -backwards -regexp ^@@ "$line.0 lineend" $base.0]
3430 if {$s_lix eq {}} return
3432 set s_line [$ctext get $s_lix "$s_lix + 1 lines"]
3433 if {![regexp {^@@@*(( -\d+(,\d+)?)+) \+(\d+)(,\d+)? @@} $s_line \
3434 s_line old_specs osz osz1 new_line nsz]} {
3438 # base lines for the parents
3439 set base_lines [list $new_line]
3440 foreach old_spec [lrange [split $old_specs " "] 1 end] {
3441 if {![regexp -- {-(\d+)(,\d+)?} $old_spec \
3442 old_spec old_line osz]} {
3445 lappend base_lines $old_line
3448 # Now scan the lines to determine offset within the hunk
3449 set max_parent [expr {[llength $base_lines]-2}]
3451 set s_lno [lindex [split $s_lix "."] 0]
3453 # Determine if the line is removed
3454 set chunk [$ctext get $line.0 "$line.1 + $max_parent chars"]
3455 if {[string match {[-+ ]*} $chunk]} {
3456 set removed_idx [string first "-" $chunk]
3457 # Choose a parent index
3458 if {$removed_idx >= 0} {
3459 set parent $removed_idx
3461 set unchanged_idx [string first " " $chunk]
3462 if {$unchanged_idx >= 0} {
3463 set parent $unchanged_idx
3465 # blame the current commit
3469 # then count other lines that belong to it
3470 for {set i $line} {[incr i -1] > $s_lno} {} {
3471 set chunk [$ctext get $i.0 "$i.1 + $max_parent chars"]
3472 # Determine if the line is removed
3473 set removed_idx [string first "-" $chunk]
3475 set code [string index $chunk $parent]
3476 if {$code eq "-" || ($removed_idx < 0 && $code ne "+")} {
3480 if {$removed_idx < 0} {
3490 incr dline [lindex $base_lines $parent]
3491 return [list $parent $dline]
3494 proc external_blame_diff {} {
3495 global currentid cmitmode
3496 global diff_menu_txtpos diff_menu_line
3497 global diff_menu_filebase flist_menu_file
3499 if {$cmitmode eq "tree"} {
3501 set line [expr {$diff_menu_line - $diff_menu_filebase}]
3503 set hinfo [find_hunk_blamespec $diff_menu_filebase $diff_menu_line]
3505 set parent_idx [lindex $hinfo 0]
3506 set line [lindex $hinfo 1]
3513 external_blame $parent_idx $line
3516 # Find the SHA1 ID of the blob for file $fname in the index
3518 proc index_sha1 {fname} {
3519 set f [open [list | git ls-files -s $fname] r]
3520 while {[gets $f line] >= 0} {
3521 set info [lindex [split $line "\t"] 0]
3522 set stage [lindex $info 2]
3523 if {$stage eq "0" || $stage eq "2"} {
3525 return [lindex $info 1]
3532 # Turn an absolute path into one relative to the current directory
3533 proc make_relative {f} {
3534 if {[file pathtype $f] eq "relative"} {
3537 set elts [file split $f]
3538 set here [file split [pwd]]
3543 if {$ei < $hi || $ei >= [llength $elts] || [lindex $elts $ei] ne $d} {
3550 set elts [concat $res [lrange $elts $ei end]]
3551 return [eval file join $elts]
3554 proc external_blame {parent_idx {line {}}} {
3555 global flist_menu_file cdup
3556 global nullid nullid2
3557 global parentlist selectedline currentid
3559 if {$parent_idx > 0} {
3560 set base_commit [lindex $parentlist $selectedline [expr {$parent_idx-1}]]
3562 set base_commit $currentid
3565 if {$base_commit eq {} || $base_commit eq $nullid || $base_commit eq $nullid2} {
3566 error_popup [mc "No such commit"]
3570 set cmdline [list git gui blame]
3571 if {$line ne {} && $line > 1} {
3572 lappend cmdline "--line=$line"
3574 set f [file join $cdup $flist_menu_file]
3575 # Unfortunately it seems git gui blame doesn't like
3576 # being given an absolute path...
3577 set f [make_relative $f]
3578 lappend cmdline $base_commit $f
3579 if {[catch {eval exec $cmdline &} err]} {
3580 error_popup "[mc "git gui blame: command failed:"] $err"
3584 proc show_line_source {} {
3585 global cmitmode currentid parents curview blamestuff blameinst
3586 global diff_menu_line diff_menu_filebase flist_menu_file
3587 global nullid nullid2 gitdir cdup
3590 if {$cmitmode eq "tree"} {
3592 set line [expr {$diff_menu_line - $diff_menu_filebase}]
3594 set h [find_hunk_blamespec $diff_menu_filebase $diff_menu_line]
3595 if {$h eq {}} return
3596 set pi [lindex $h 0]
3598 mark_ctext_line $diff_menu_line
3602 if {$currentid eq $nullid} {
3604 # must be a merge in progress...
3606 # get the last line from .git/MERGE_HEAD
3607 set f [open [file join $gitdir MERGE_HEAD] r]
3608 set id [lindex [split [read $f] "\n"] end-1]
3611 error_popup [mc "Couldn't read merge head: %s" $err]
3614 } elseif {$parents($curview,$currentid) eq $nullid2} {
3615 # need to do the blame from the index
3617 set from_index [index_sha1 $flist_menu_file]
3619 error_popup [mc "Error reading index: %s" $err]
3623 set id $parents($curview,$currentid)
3626 set id [lindex $parents($curview,$currentid) $pi]
3628 set line [lindex $h 1]
3631 if {$from_index ne {}} {
3632 lappend blameargs | git cat-file blob $from_index
3634 lappend blameargs | git blame -p -L$line,+1
3635 if {$from_index ne {}} {
3636 lappend blameargs --contents -
3638 lappend blameargs $id
3640 lappend blameargs -- [file join $cdup $flist_menu_file]
3642 set f [open $blameargs r]
3644 error_popup [mc "Couldn't start git blame: %s" $err]
3647 nowbusy blaming [mc "Searching"]
3648 fconfigure $f -blocking 0
3649 set i [reg_instance $f]
3650 set blamestuff($i) {}
3652 filerun $f [list read_line_source $f $i]
3655 proc stopblaming {} {
3658 if {[info exists blameinst]} {
3659 stop_instance $blameinst
3665 proc read_line_source {fd inst} {
3666 global blamestuff curview commfd blameinst nullid nullid2
3668 while {[gets $fd line] >= 0} {
3669 lappend blamestuff($inst) $line
3677 fconfigure $fd -blocking 1
3678 if {[catch {close $fd} err]} {
3679 error_popup [mc "Error running git blame: %s" $err]
3684 set line [split [lindex $blamestuff($inst) 0] " "]
3685 set id [lindex $line 0]
3686 set lnum [lindex $line 1]
3687 if {[string length $id] == 40 && [string is xdigit $id] &&
3688 [string is digit -strict $lnum]} {
3689 # look for "filename" line
3690 foreach l $blamestuff($inst) {
3691 if {[string match "filename *" $l]} {
3692 set fname [string range $l 9 end]
3698 # all looks good, select it
3699 if {$id eq $nullid} {
3700 # blame uses all-zeroes to mean not committed,
3701 # which would mean a change in the index
3704 if {[commitinview $id $curview]} {
3705 selectline [rowofcommit $id] 1 [list $fname $lnum]
3707 error_popup [mc "That line comes from commit %s, \
3708 which is not in this view" [shortids $id]]
3711 puts "oops couldn't parse git blame output"
3716 # delete $dir when we see eof on $f (presumably because the child has exited)
3717 proc delete_at_eof {f dir} {
3718 while {[gets $f line] >= 0} {}
3720 if {[catch {close $f} err]} {
3721 error_popup "[mc "External diff viewer failed:"] $err"
3723 file delete -force $dir
3729 # Functions for adding and removing shell-type quoting
3731 proc shellquote {str} {
3732 if {![string match "*\['\"\\ \t]*" $str]} {
3735 if {![string match "*\['\"\\]*" $str]} {
3738 if {![string match "*'*" $str]} {
3741 return "\"[string map {\" \\\" \\ \\\\} $str]\""
3744 proc shellarglist {l} {
3750 append str [shellquote $a]
3755 proc shelldequote {str} {
3760 if {![regexp -start $used -indices "\['\"\\\\ \t]" $str first]} {
3761 append ret [string range $str $used end]
3762 set used [string length $str]
3765 set first [lindex $first 0]
3766 set ch [string index $str $first]
3767 if {$first > $used} {
3768 append ret [string range $str $used [expr {$first - 1}]]
3771 if {$ch eq " " || $ch eq "\t"} break
3774 set first [string first "'" $str $used]
3776 error "unmatched single-quote"
3778 append ret [string range $str $used [expr {$first - 1}]]
3783 if {$used >= [string length $str]} {
3784 error "trailing backslash"
3786 append ret [string index $str $used]
3791 if {![regexp -start $used -indices "\[\"\\\\]" $str first]} {
3792 error "unmatched double-quote"
3794 set first [lindex $first 0]
3795 set ch [string index $str $first]
3796 if {$first > $used} {
3797 append ret [string range $str $used [expr {$first - 1}]]
3800 if {$ch eq "\""} break
3802 append ret [string index $str $used]
3806 return [list $used $ret]
3809 proc shellsplit {str} {
3812 set str [string trimleft $str]
3813 if {$str eq {}} break
3814 set dq [shelldequote $str]
3815 set n [lindex $dq 0]
3816 set word [lindex $dq 1]
3817 set str [string range $str $n end]
3823 # Code to implement multiple views
3825 proc newview {ishighlight} {
3826 global nextviewnum newviewname newishighlight
3827 global revtreeargs viewargscmd newviewopts curview
3829 set newishighlight $ishighlight
3831 if {[winfo exists $top]} {
3835 decode_view_opts $nextviewnum $revtreeargs
3836 set newviewname($nextviewnum) "[mc "View"] $nextviewnum"
3837 set newviewopts($nextviewnum,perm) 0
3838 set newviewopts($nextviewnum,cmd) $viewargscmd($curview)
3839 vieweditor $top $nextviewnum [mc "Gitk view definition"]
3842 set known_view_options {
3843 {perm b . {} {mc "Remember this view"}}
3844 {reflabel l + {} {mc "References (space separated list):"}}
3845 {refs t15 .. {} {mc "Branches & tags:"}}
3846 {allrefs b *. "--all" {mc "All refs"}}
3847 {branches b . "--branches" {mc "All (local) branches"}}
3848 {tags b . "--tags" {mc "All tags"}}
3849 {remotes b . "--remotes" {mc "All remote-tracking branches"}}
3850 {commitlbl l + {} {mc "Commit Info (regular expressions):"}}
3851 {author t15 .. "--author=*" {mc "Author:"}}
3852 {committer t15 . "--committer=*" {mc "Committer:"}}
3853 {loginfo t15 .. "--grep=*" {mc "Commit Message:"}}
3854 {allmatch b .. "--all-match" {mc "Matches all Commit Info criteria"}}
3855 {changes_l l + {} {mc "Changes to Files:"}}
3856 {pickaxe_s r0 . {} {mc "Fixed String"}}
3857 {pickaxe_t r1 . "--pickaxe-regex" {mc "Regular Expression"}}
3858 {pickaxe t15 .. "-S*" {mc "Search string:"}}
3859 {datelabel l + {} {mc "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 15:27:38\"):"}}
3860 {since t15 .. {"--since=*" "--after=*"} {mc "Since:"}}
3861 {until t15 . {"--until=*" "--before=*"} {mc "Until:"}}
3862 {limit_lbl l + {} {mc "Limit and/or skip a number of revisions (positive integer):"}}
3863 {limit t10 *. "--max-count=*" {mc "Number to show:"}}
3864 {skip t10 . "--skip=*" {mc "Number to skip:"}}
3865 {misc_lbl l + {} {mc "Miscellaneous options:"}}
3866 {dorder b *. {"--date-order" "-d"} {mc "Strictly sort by date"}}
3867 {lright b . "--left-right" {mc "Mark branch sides"}}
3868 {first b . "--first-parent" {mc "Limit to first parent"}}
3869 {smplhst b . "--simplify-by-decoration" {mc "Simple history"}}
3870 {args t50 *. {} {mc "Additional arguments to git log:"}}
3871 {allpaths path + {} {mc "Enter files and directories to include, one per line:"}}
3872 {cmd t50= + {} {mc "Command to generate more commits to include:"}}
3875 # Convert $newviewopts($n, ...) into args for git log.
3876 proc encode_view_opts {n} {
3877 global known_view_options newviewopts
3880 foreach opt $known_view_options {
3881 set patterns [lindex $opt 3]
3882 if {$patterns eq {}} continue
3883 set pattern [lindex $patterns 0]
3885 if {[lindex $opt 1] eq "b"} {
3886 set val $newviewopts($n,[lindex $opt 0])
3888 lappend rargs $pattern
3890 } elseif {[regexp {^r(\d+)$} [lindex $opt 1] type value]} {
3891 regexp {^(.*_)} [lindex $opt 0] uselessvar button_id
3892 set val $newviewopts($n,$button_id)
3893 if {$val eq $value} {
3894 lappend rargs $pattern
3897 set val $newviewopts($n,[lindex $opt 0])
3898 set val [string trim $val]
3900 set pfix [string range $pattern 0 end-1]
3901 lappend rargs $pfix$val
3905 set rargs [concat $rargs [shellsplit $newviewopts($n,refs)]]
3906 return [concat $rargs [shellsplit $newviewopts($n,args)]]
3909 # Fill $newviewopts($n, ...) based on args for git log.
3910 proc decode_view_opts {n view_args} {
3911 global known_view_options newviewopts
3913 foreach opt $known_view_options {
3914 set id [lindex $opt 0]
3915 if {[lindex $opt 1] eq "b"} {
3918 } elseif {[regexp {^r(\d+)$} [lindex $opt 1]]} {
3920 regexp {^(.*_)} $id uselessvar id
3926 set newviewopts($n,$id) $val
3930 foreach arg $view_args {
3931 if {[regexp -- {^-([0-9]+)$} $arg arg cnt]
3932 && ![info exists found(limit)]} {
3933 set newviewopts($n,limit) $cnt
3938 foreach opt $known_view_options {
3939 set id [lindex $opt 0]
3940 if {[info exists found($id)]} continue
3941 foreach pattern [lindex $opt 3] {
3942 if {![string match $pattern $arg]} continue
3943 if {[lindex $opt 1] eq "b"} {
3946 } elseif {[regexp {^r(\d+)$} [lindex $opt 1] match num]} {
3948 regexp {^(.*_)} $id uselessvar id
3952 set size [string length $pattern]
3953 set val [string range $arg [expr {$size-1}] end]
3955 set newviewopts($n,$id) $val
3959 if {[info exists val]} break
3961 if {[info exists val]} continue
3962 if {[regexp {^-} $arg]} {
3965 lappend refargs $arg
3968 set newviewopts($n,refs) [shellarglist $refargs]
3969 set newviewopts($n,args) [shellarglist $oargs]
3972 proc edit_or_newview {} {
3984 global viewname viewperm newviewname newviewopts
3985 global viewargs viewargscmd
3987 set top .gitkvedit-$curview
3988 if {[winfo exists $top]} {
3992 decode_view_opts $curview $viewargs($curview)
3993 set newviewname($curview) $viewname($curview)
3994 set newviewopts($curview,perm) $viewperm($curview)
3995 set newviewopts($curview,cmd) $viewargscmd($curview)
3996 vieweditor $top $curview "[mc "Gitk: edit view"] $viewname($curview)"
3999 proc vieweditor {top n title} {
4000 global newviewname newviewopts viewfiles bgcolor
4001 global known_view_options NS
4004 wm title $top [concat $title [mc "-- criteria for selecting revisions"]]
4005 make_transient $top .
4008 ${NS}::frame $top.nfr
4009 ${NS}::label $top.nl -text [mc "View Name"]
4010 ${NS}::entry $top.name -width 20 -textvariable newviewname($n)
4011 pack $top.nfr -in $top -fill x -pady 5 -padx 3
4012 pack $top.nl -in $top.nfr -side left -padx {0 5}
4013 pack $top.name -in $top.nfr -side left -padx {0 25}
4019 foreach opt $known_view_options {
4020 set id [lindex $opt 0]
4021 set type [lindex $opt 1]
4022 set flags [lindex $opt 2]
4023 set title [eval [lindex $opt 4]]
4026 if {$flags eq "+" || $flags eq "*"} {
4027 set cframe $top.fr$cnt
4029 ${NS}::frame $cframe
4030 pack $cframe -in $top -fill x -pady 3 -padx 3
4031 set cexpand [expr {$flags eq "*"}]
4032 } elseif {$flags eq ".." || $flags eq "*."} {
4033 set cframe $top.fr$cnt
4035 ${NS}::frame $cframe
4036 pack $cframe -in $top -fill x -pady 3 -padx [list 15 3]
4037 set cexpand [expr {$flags eq "*."}]
4043 ${NS}::label $cframe.l_$id -text $title
4044 pack $cframe.l_$id -in $cframe -side left -pady [list 3 0] -anchor w
4045 } elseif {$type eq "b"} {
4046 ${NS}::checkbutton $cframe.c_$id -text $title -variable newviewopts($n,$id)
4047 pack $cframe.c_$id -in $cframe -side left \
4048 -padx [list $lxpad 0] -expand $cexpand -anchor w
4049 } elseif {[regexp {^r(\d+)$} $type type sz]} {
4050 regexp {^(.*_)} $id uselessvar button_id
4051 ${NS}::radiobutton $cframe.c_$id -text $title -variable newviewopts($n,$button_id) -value $sz
4052 pack $cframe.c_$id -in $cframe -side left \
4053 -padx [list $lxpad 0] -expand $cexpand -anchor w
4054 } elseif {[regexp {^t(\d+)$} $type type sz]} {
4055 ${NS}::label $cframe.l_$id -text $title
4056 ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \
4057 -textvariable newviewopts($n,$id)
4058 pack $cframe.l_$id -in $cframe -side left -padx [list $lxpad 0]
4059 pack $cframe.e_$id -in $cframe -side left -expand 1 -fill x
4060 } elseif {[regexp {^t(\d+)=$} $type type sz]} {
4061 ${NS}::label $cframe.l_$id -text $title
4062 ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \
4063 -textvariable newviewopts($n,$id)
4064 pack $cframe.l_$id -in $cframe -side top -pady [list 3 0] -anchor w
4065 pack $cframe.e_$id -in $cframe -side top -fill x
4066 } elseif {$type eq "path"} {
4067 ${NS}::label $top.l -text $title
4068 pack $top.l -in $top -side top -pady [list 3 0] -anchor w -padx 3
4069 text $top.t -width 40 -height 5 -background $bgcolor
4070 if {[info exists viewfiles($n)]} {
4071 foreach f $viewfiles($n) {
4072 $top.t insert end $f
4073 $top.t insert end "\n"
4075 $top.t delete {end - 1c} end
4076 $top.t mark set insert 0.0
4078 pack $top.t -in $top -side top -pady [list 0 5] -fill both -expand 1 -padx 3
4082 ${NS}::frame $top.buts
4083 ${NS}::button $top.buts.ok -text [mc "OK"] -command [list newviewok $top $n]
4084 ${NS}::button $top.buts.apply -text [mc "Apply (F5)"] -command [list newviewok $top $n 1]
4085 ${NS}::button $top.buts.can -text [mc "Cancel"] -command [list destroy $top]
4086 bind $top <Control-Return> [list newviewok $top $n]
4087 bind $top <F5> [list newviewok $top $n 1]
4088 bind $top <Escape> [list destroy $top]
4089 grid $top.buts.ok $top.buts.apply $top.buts.can
4090 grid columnconfigure $top.buts 0 -weight 1 -uniform a
4091 grid columnconfigure $top.buts 1 -weight 1 -uniform a
4092 grid columnconfigure $top.buts 2 -weight 1 -uniform a
4093 pack $top.buts -in $top -side top -fill x
4097 proc doviewmenu {m first cmd op argv} {
4098 set nmenu [$m index end]
4099 for {set i $first} {$i <= $nmenu} {incr i} {
4100 if {[$m entrycget $i -command] eq $cmd} {
4101 eval $m $op $i $argv
4107 proc allviewmenus {n op args} {
4110 doviewmenu .bar.view 5 [list showview $n] $op $args
4111 # doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
4114 proc newviewok {top n {apply 0}} {
4115 global nextviewnum newviewperm newviewname newishighlight
4116 global viewname viewfiles viewperm selectedview curview
4117 global viewargs viewargscmd newviewopts viewhlmenu
4120 set newargs [encode_view_opts $n]
4122 error_popup "[mc "Error in commit selection arguments:"] $err" $top
4126 foreach f [split [$top.t get 0.0 end] "\n"] {
4127 set ft [string trim $f]
4132 if {![info exists viewfiles($n)]} {
4133 # creating a new view
4135 set viewname($n) $newviewname($n)
4136 set viewperm($n) $newviewopts($n,perm)
4137 set viewfiles($n) $files
4138 set viewargs($n) $newargs
4139 set viewargscmd($n) $newviewopts($n,cmd)
4141 if {!$newishighlight} {
4144 run addvhighlight $n
4147 # editing an existing view
4148 set viewperm($n) $newviewopts($n,perm)
4149 if {$newviewname($n) ne $viewname($n)} {
4150 set viewname($n) $newviewname($n)
4151 doviewmenu .bar.view 5 [list showview $n] \
4152 entryconf [list -label $viewname($n)]
4153 # doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
4154 # entryconf [list -label $viewname($n) -value $viewname($n)]
4156 if {$files ne $viewfiles($n) || $newargs ne $viewargs($n) || \
4157 $newviewopts($n,cmd) ne $viewargscmd($n)} {
4158 set viewfiles($n) $files
4159 set viewargs($n) $newargs
4160 set viewargscmd($n) $newviewopts($n,cmd)
4161 if {$curview == $n} {
4167 catch {destroy $top}
4171 global curview viewperm hlview selectedhlview
4173 if {$curview == 0} return
4174 if {[info exists hlview] && $hlview == $curview} {
4175 set selectedhlview [mc "None"]
4178 allviewmenus $curview delete
4179 set viewperm($curview) 0
4183 proc addviewmenu {n} {
4184 global viewname viewhlmenu
4186 .bar.view add radiobutton -label $viewname($n) \
4187 -command [list showview $n] -variable selectedview -value $n
4188 #$viewhlmenu add radiobutton -label $viewname($n) \
4189 # -command [list addvhighlight $n] -variable selectedhlview
4193 global curview cached_commitrow ordertok
4194 global displayorder parentlist rowidlist rowisopt rowfinal
4195 global colormap rowtextx nextcolor canvxmax
4196 global numcommits viewcomplete
4197 global selectedline currentid canv canvy0
4199 global pending_select mainheadid
4202 global hlview selectedhlview commitinterest
4204 if {$n == $curview} return
4206 set ymax [lindex [$canv cget -scrollregion] 3]
4207 set span [$canv yview]
4208 set ytop [expr {[lindex $span 0] * $ymax}]
4209 set ybot [expr {[lindex $span 1] * $ymax}]
4210 set yscreen [expr {($ybot - $ytop) / 2}]
4211 if {$selectedline ne {}} {
4212 set selid $currentid
4213 set y [yc $selectedline]
4214 if {$ytop < $y && $y < $ybot} {
4215 set yscreen [expr {$y - $ytop}]
4217 } elseif {[info exists pending_select]} {
4218 set selid $pending_select
4219 unset pending_select
4223 catch {unset treediffs}
4225 if {[info exists hlview] && $hlview == $n} {
4227 set selectedhlview [mc "None"]
4229 catch {unset commitinterest}
4230 catch {unset cached_commitrow}
4231 catch {unset ordertok}
4235 .bar.view entryconf [mca "Edit view..."] -state [expr {$n == 0? "disabled": "normal"}]
4236 .bar.view entryconf [mca "Delete view"] -state [expr {$n == 0? "disabled": "normal"}]
4239 if {![info exists viewcomplete($n)]} {
4249 set numcommits $commitidx($n)
4251 catch {unset colormap}
4252 catch {unset rowtextx}
4254 set canvxmax [$canv cget -width]
4260 if {$selid ne {} && [commitinview $selid $n]} {
4261 set row [rowofcommit $selid]
4262 # try to get the selected row in the same position on the screen
4263 set ymax [lindex [$canv cget -scrollregion] 3]
4264 set ytop [expr {[yc $row] - $yscreen}]
4268 set yf [expr {$ytop * 1.0 / $ymax}]
4270 allcanvs yview moveto $yf
4274 } elseif {!$viewcomplete($n)} {
4275 reset_pending_select $selid
4277 reset_pending_select {}
4279 if {[commitinview $pending_select $curview]} {
4280 selectline [rowofcommit $pending_select] 1
4282 set row [first_real_row]
4283 if {$row < $numcommits} {
4288 if {!$viewcomplete($n)} {
4289 if {$numcommits == 0} {
4290 show_status [mc "Reading commits..."]
4292 } elseif {$numcommits == 0} {
4293 show_status [mc "No commits selected"]
4297 # Stuff relating to the highlighting facility
4299 proc ishighlighted {id} {
4300 global vhighlights fhighlights nhighlights rhighlights
4302 if {[info exists nhighlights($id)] && $nhighlights($id) > 0} {
4303 return $nhighlights($id)
4305 if {[info exists vhighlights($id)] && $vhighlights($id) > 0} {
4306 return $vhighlights($id)
4308 if {[info exists fhighlights($id)] && $fhighlights($id) > 0} {
4309 return $fhighlights($id)
4311 if {[info exists rhighlights($id)] && $rhighlights($id) > 0} {
4312 return $rhighlights($id)
4317 proc bolden {id font} {
4318 global canv linehtag currentid boldids need_redisplay markedid
4320 # need_redisplay = 1 means the display is stale and about to be redrawn
4321 if {$need_redisplay} return
4323 $canv itemconf $linehtag($id) -font $font
4324 if {[info exists currentid] && $id eq $currentid} {
4326 set t [eval $canv create rect [$canv bbox $linehtag($id)] \
4327 -outline {{}} -tags secsel \
4328 -fill [$canv cget -selectbackground]]
4331 if {[info exists markedid] && $id eq $markedid} {
4336 proc bolden_name {id font} {
4337 global canv2 linentag currentid boldnameids need_redisplay
4339 if {$need_redisplay} return
4340 lappend boldnameids $id
4341 $canv2 itemconf $linentag($id) -font $font
4342 if {[info exists currentid] && $id eq $currentid} {
4343 $canv2 delete secsel
4344 set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] \
4345 -outline {{}} -tags secsel \
4346 -fill [$canv2 cget -selectbackground]]
4355 foreach id $boldids {
4356 if {![ishighlighted $id]} {
4359 lappend stillbold $id
4362 set boldids $stillbold
4365 proc addvhighlight {n} {
4366 global hlview viewcomplete curview vhl_done commitidx
4368 if {[info exists hlview]} {
4372 if {$n != $curview && ![info exists viewcomplete($n)]} {
4375 set vhl_done $commitidx($hlview)
4376 if {$vhl_done > 0} {
4381 proc delvhighlight {} {
4382 global hlview vhighlights
4384 if {![info exists hlview]} return
4386 catch {unset vhighlights}
4390 proc vhighlightmore {} {
4391 global hlview vhl_done commitidx vhighlights curview
4393 set max $commitidx($hlview)
4394 set vr [visiblerows]
4395 set r0 [lindex $vr 0]
4396 set r1 [lindex $vr 1]
4397 for {set i $vhl_done} {$i < $max} {incr i} {
4398 set id [commitonrow $i $hlview]
4399 if {[commitinview $id $curview]} {
4400 set row [rowofcommit $id]
4401 if {$r0 <= $row && $row <= $r1} {
4402 if {![highlighted $row]} {
4403 bolden $id mainfontbold
4405 set vhighlights($id) 1
4413 proc askvhighlight {row id} {
4414 global hlview vhighlights iddrawn
4416 if {[commitinview $id $hlview]} {
4417 if {[info exists iddrawn($id)] && ![ishighlighted $id]} {
4418 bolden $id mainfontbold
4420 set vhighlights($id) 1
4422 set vhighlights($id) 0
4426 proc hfiles_change {} {
4427 global highlight_files filehighlight fhighlights fh_serial
4428 global highlight_paths
4430 if {[info exists filehighlight]} {
4431 # delete previous highlights
4432 catch {close $filehighlight}
4434 catch {unset fhighlights}
4436 unhighlight_filelist
4438 set highlight_paths {}
4439 after cancel do_file_hl $fh_serial
4441 if {$highlight_files ne {}} {
4442 after 300 do_file_hl $fh_serial
4446 proc gdttype_change {name ix op} {
4447 global gdttype highlight_files findstring findpattern
4450 if {$findstring ne {}} {
4451 if {$gdttype eq [mc "containing:"]} {
4452 if {$highlight_files ne {}} {
4453 set highlight_files {}
4458 if {$findpattern ne {}} {
4462 set highlight_files $findstring
4467 # enable/disable findtype/findloc menus too
4470 proc find_change {name ix op} {
4471 global gdttype findstring highlight_files
4474 if {$gdttype eq [mc "containing:"]} {
4477 if {$highlight_files ne $findstring} {
4478 set highlight_files $findstring
4485 proc findcom_change args {
4486 global nhighlights boldnameids
4487 global findpattern findtype findstring gdttype
4490 # delete previous highlights, if any
4491 foreach id $boldnameids {
4492 bolden_name $id mainfont
4495 catch {unset nhighlights}
4498 if {$gdttype ne [mc "containing:"] || $findstring eq {}} {
4500 } elseif {$findtype eq [mc "Regexp"]} {
4501 set findpattern $findstring
4503 set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
4505 set findpattern "*$e*"
4509 proc makepatterns {l} {
4512 set ee [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} $e]
4513 if {[string index $ee end] eq "/"} {
4523 proc do_file_hl {serial} {
4524 global highlight_files filehighlight highlight_paths gdttype fhl_list
4527 if {$gdttype eq [mc "touching paths:"]} {
4528 if {[catch {set paths [shellsplit $highlight_files]}]} return
4529 set highlight_paths [makepatterns $paths]
4531 set relative_paths {}
4532 foreach path $paths {
4533 lappend relative_paths [file join $cdup $path]
4535 set gdtargs [concat -- $relative_paths]
4536 } elseif {$gdttype eq [mc "adding/removing string:"]} {
4537 set gdtargs [list "-S$highlight_files"]
4539 # must be "containing:", i.e. we're searching commit info
4542 set cmd [concat | git diff-tree -r -s --stdin $gdtargs]
4543 set filehighlight [open $cmd r+]
4544 fconfigure $filehighlight -blocking 0
4545 filerun $filehighlight readfhighlight
4551 proc flushhighlights {} {
4552 global filehighlight fhl_list
4554 if {[info exists filehighlight]} {
4556 puts $filehighlight ""
4557 flush $filehighlight
4561 proc askfilehighlight {row id} {
4562 global filehighlight fhighlights fhl_list
4564 lappend fhl_list $id
4565 set fhighlights($id) -1
4566 puts $filehighlight $id
4569 proc readfhighlight {} {
4570 global filehighlight fhighlights curview iddrawn
4571 global fhl_list find_dirn
4573 if {![info exists filehighlight]} {
4577 while {[incr nr] <= 100 && [gets $filehighlight line] >= 0} {
4578 set line [string trim $line]
4579 set i [lsearch -exact $fhl_list $line]
4580 if {$i < 0} continue
4581 for {set j 0} {$j < $i} {incr j} {
4582 set id [lindex $fhl_list $j]
4583 set fhighlights($id) 0
4585 set fhl_list [lrange $fhl_list [expr {$i+1}] end]
4586 if {$line eq {}} continue
4587 if {![commitinview $line $curview]} continue
4588 if {[info exists iddrawn($line)] && ![ishighlighted $line]} {
4589 bolden $line mainfontbold
4591 set fhighlights($line) 1
4593 if {[eof $filehighlight]} {
4595 puts "oops, git diff-tree died"
4596 catch {close $filehighlight}
4600 if {[info exists find_dirn]} {
4606 proc doesmatch {f} {
4607 global findtype findpattern
4609 if {$findtype eq [mc "Regexp"]} {
4610 return [regexp $findpattern $f]
4611 } elseif {$findtype eq [mc "IgnCase"]} {
4612 return [string match -nocase $findpattern $f]
4614 return [string match $findpattern $f]
4618 proc askfindhighlight {row id} {
4619 global nhighlights commitinfo iddrawn
4621 global markingmatches
4623 if {![info exists commitinfo($id)]} {
4626 set info $commitinfo($id)
4628 set fldtypes [list [mc Headline] [mc Author] [mc Date] [mc Committer] [mc CDate] [mc Comments]]
4629 foreach f $info ty $fldtypes {
4630 if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
4632 if {$ty eq [mc "Author"]} {
4639 if {$isbold && [info exists iddrawn($id)]} {
4640 if {![ishighlighted $id]} {
4641 bolden $id mainfontbold
4643 bolden_name $id mainfontbold
4646 if {$markingmatches} {
4647 markrowmatches $row $id
4650 set nhighlights($id) $isbold
4653 proc markrowmatches {row id} {
4654 global canv canv2 linehtag linentag commitinfo findloc
4656 set headline [lindex $commitinfo($id) 0]
4657 set author [lindex $commitinfo($id) 1]
4658 $canv delete match$row
4659 $canv2 delete match$row
4660 if {$findloc eq [mc "All fields"] || $findloc eq [mc "Headline"]} {
4661 set m [findmatches $headline]
4663 markmatches $canv $row $headline $linehtag($id) $m \
4664 [$canv itemcget $linehtag($id) -font] $row
4667 if {$findloc eq [mc "All fields"] || $findloc eq [mc "Author"]} {
4668 set m [findmatches $author]
4670 markmatches $canv2 $row $author $linentag($id) $m \
4671 [$canv2 itemcget $linentag($id) -font] $row
4676 proc vrel_change {name ix op} {
4677 global highlight_related
4680 if {$highlight_related ne [mc "None"]} {
4685 # prepare for testing whether commits are descendents or ancestors of a
4686 proc rhighlight_sel {a} {
4687 global descendent desc_todo ancestor anc_todo
4688 global highlight_related
4690 catch {unset descendent}
4691 set desc_todo [list $a]
4692 catch {unset ancestor}
4693 set anc_todo [list $a]
4694 if {$highlight_related ne [mc "None"]} {
4700 proc rhighlight_none {} {
4703 catch {unset rhighlights}
4707 proc is_descendent {a} {
4708 global curview children descendent desc_todo
4711 set la [rowofcommit $a]
4715 for {set i 0} {$i < [llength $todo]} {incr i} {
4716 set do [lindex $todo $i]
4717 if {[rowofcommit $do] < $la} {
4718 lappend leftover $do
4721 foreach nk $children($v,$do) {
4722 if {![info exists descendent($nk)]} {
4723 set descendent($nk) 1
4731 set desc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
4735 set descendent($a) 0
4736 set desc_todo $leftover
4739 proc is_ancestor {a} {
4740 global curview parents ancestor anc_todo
4743 set la [rowofcommit $a]
4747 for {set i 0} {$i < [llength $todo]} {incr i} {
4748 set do [lindex $todo $i]
4749 if {![commitinview $do $v] || [rowofcommit $do] > $la} {
4750 lappend leftover $do
4753 foreach np $parents($v,$do) {
4754 if {![info exists ancestor($np)]} {
4763 set anc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
4768 set anc_todo $leftover
4771 proc askrelhighlight {row id} {
4772 global descendent highlight_related iddrawn rhighlights
4773 global selectedline ancestor
4775 if {$selectedline eq {}} return
4777 if {$highlight_related eq [mc "Descendant"] ||
4778 $highlight_related eq [mc "Not descendant"]} {
4779 if {![info exists descendent($id)]} {
4782 if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} {
4785 } elseif {$highlight_related eq [mc "Ancestor"] ||
4786 $highlight_related eq [mc "Not ancestor"]} {
4787 if {![info exists ancestor($id)]} {
4790 if {$ancestor($id) == ($highlight_related eq [mc "Ancestor"])} {
4794 if {[info exists iddrawn($id)]} {
4795 if {$isbold && ![ishighlighted $id]} {
4796 bolden $id mainfontbold
4799 set rhighlights($id) $isbold
4802 # Graph layout functions
4804 proc shortids {ids} {
4807 if {[llength $id] > 1} {
4808 lappend res [shortids $id]
4809 } elseif {[regexp {^[0-9a-f]{40}$} $id]} {
4810 lappend res [string range $id 0 7]
4821 for {set mask 1} {$mask <= $n} {incr mask $mask} {
4822 if {($n & $mask) != 0} {
4823 set ret [concat $ret $o]
4825 set o [concat $o $o]
4830 proc ordertoken {id} {
4831 global ordertok curview varcid varcstart varctok curview parents children
4832 global nullid nullid2
4834 if {[info exists ordertok($id)]} {
4835 return $ordertok($id)
4840 if {[info exists varcid($curview,$id)]} {
4841 set a $varcid($curview,$id)
4842 set p [lindex $varcstart($curview) $a]
4844 set p [lindex $children($curview,$id) 0]
4846 if {[info exists ordertok($p)]} {
4847 set tok $ordertok($p)
4850 set id [first_real_child $curview,$p]
4853 set tok [lindex $varctok($curview) $varcid($curview,$p)]
4856 if {[llength $parents($curview,$id)] == 1} {
4857 lappend todo [list $p {}]
4859 set j [lsearch -exact $parents($curview,$id) $p]
4861 puts "oops didn't find [shortids $p] in parents of [shortids $id]"
4863 lappend todo [list $p [strrep $j]]
4866 for {set i [llength $todo]} {[incr i -1] >= 0} {} {
4867 set p [lindex $todo $i 0]
4868 append tok [lindex $todo $i 1]
4869 set ordertok($p) $tok
4871 set ordertok($origid) $tok
4875 # Work out where id should go in idlist so that order-token
4876 # values increase from left to right
4877 proc idcol {idlist id {i 0}} {
4878 set t [ordertoken $id]
4882 if {$i >= [llength $idlist] || $t < [ordertoken [lindex $idlist $i]]} {
4883 if {$i > [llength $idlist]} {
4884 set i [llength $idlist]
4886 while {[incr i -1] >= 0 && $t < [ordertoken [lindex $idlist $i]]} {}
4889 if {$t > [ordertoken [lindex $idlist $i]]} {
4890 while {[incr i] < [llength $idlist] &&
4891 $t >= [ordertoken [lindex $idlist $i]]} {}
4897 proc initlayout {} {
4898 global rowidlist rowisopt rowfinal displayorder parentlist
4899 global numcommits canvxmax canv
4901 global colormap rowtextx
4910 set canvxmax [$canv cget -width]
4911 catch {unset colormap}
4912 catch {unset rowtextx}
4916 proc setcanvscroll {} {
4917 global canv canv2 canv3 numcommits linespc canvxmax canvy0
4918 global lastscrollset lastscrollrows
4920 set ymax [expr {$canvy0 + ($numcommits - 0.5) * $linespc + 2}]
4921 $canv conf -scrollregion [list 0 0 $canvxmax $ymax]
4922 $canv2 conf -scrollregion [list 0 0 0 $ymax]
4923 $canv3 conf -scrollregion [list 0 0 0 $ymax]
4924 set lastscrollset [clock clicks -milliseconds]
4925 set lastscrollrows $numcommits
4928 proc visiblerows {} {
4929 global canv numcommits linespc
4931 set ymax [lindex [$canv cget -scrollregion] 3]
4932 if {$ymax eq {} || $ymax == 0} return
4934 set y0 [expr {int([lindex $f 0] * $ymax)}]
4935 set r0 [expr {int(($y0 - 3) / $linespc) - 1}]
4939 set y1 [expr {int([lindex $f 1] * $ymax)}]
4940 set r1 [expr {int(($y1 - 3) / $linespc) + 1}]
4941 if {$r1 >= $numcommits} {
4942 set r1 [expr {$numcommits - 1}]
4944 return [list $r0 $r1]
4947 proc layoutmore {} {
4948 global commitidx viewcomplete curview
4949 global numcommits pending_select curview
4950 global lastscrollset lastscrollrows
4952 if {$lastscrollrows < 100 || $viewcomplete($curview) ||
4953 [clock clicks -milliseconds] - $lastscrollset > 500} {
4956 if {[info exists pending_select] &&
4957 [commitinview $pending_select $curview]} {
4959 selectline [rowofcommit $pending_select] 1
4964 # With path limiting, we mightn't get the actual HEAD commit,
4965 # so ask git rev-list what is the first ancestor of HEAD that
4966 # touches a file in the path limit.
4967 proc get_viewmainhead {view} {
4968 global viewmainheadid vfilelimit viewinstances mainheadid
4971 set rfd [open [concat | git rev-list -1 $mainheadid \
4972 -- $vfilelimit($view)] r]
4973 set j [reg_instance $rfd]
4974 lappend viewinstances($view) $j
4975 fconfigure $rfd -blocking 0
4976 filerun $rfd [list getviewhead $rfd $j $view]
4977 set viewmainheadid($curview) {}
4981 # git rev-list should give us just 1 line to use as viewmainheadid($view)
4982 proc getviewhead {fd inst view} {
4983 global viewmainheadid commfd curview viewinstances showlocalchanges
4986 if {[gets $fd line] < 0} {
4990 } elseif {[string length $line] == 40 && [string is xdigit $line]} {
4993 set viewmainheadid($view) $id
4996 set i [lsearch -exact $viewinstances($view) $inst]
4998 set viewinstances($view) [lreplace $viewinstances($view) $i $i]
5000 if {$showlocalchanges && $id ne {} && $view == $curview} {
5006 proc doshowlocalchanges {} {
5007 global curview viewmainheadid
5009 if {$viewmainheadid($curview) eq {}} return
5010 if {[commitinview $viewmainheadid($curview) $curview]} {
5013 interestedin $viewmainheadid($curview) dodiffindex
5017 proc dohidelocalchanges {} {
5018 global nullid nullid2 lserial curview
5020 if {[commitinview $nullid $curview]} {
5021 removefakerow $nullid
5023 if {[commitinview $nullid2 $curview]} {
5024 removefakerow $nullid2
5029 # spawn off a process to do git diff-index --cached HEAD
5030 proc dodiffindex {} {
5031 global lserial showlocalchanges vfilelimit curview
5034 if {!$showlocalchanges || !$hasworktree} return
5036 set cmd "|git diff-index --cached HEAD"
5037 if {$vfilelimit($curview) ne {}} {
5038 set cmd [concat $cmd -- $vfilelimit($curview)]
5040 set fd [open $cmd r]
5041 fconfigure $fd -blocking 0
5042 set i [reg_instance $fd]
5043 filerun $fd [list readdiffindex $fd $lserial $i]
5046 proc readdiffindex {fd serial inst} {
5047 global viewmainheadid nullid nullid2 curview commitinfo commitdata lserial
5051 if {[gets $fd line] < 0} {
5057 # we only need to see one line and we don't really care what it says...
5060 if {$serial != $lserial} {
5064 # now see if there are any local changes not checked in to the index
5065 set cmd "|git diff-files"
5066 if {$vfilelimit($curview) ne {}} {
5067 set cmd [concat $cmd -- $vfilelimit($curview)]
5069 set fd [open $cmd r]
5070 fconfigure $fd -blocking 0
5071 set i [reg_instance $fd]
5072 filerun $fd [list readdifffiles $fd $serial $i]
5074 if {$isdiff && ![commitinview $nullid2 $curview]} {
5075 # add the line for the changes in the index to the graph
5076 set hl [mc "Local changes checked in to index but not committed"]
5077 set commitinfo($nullid2) [list $hl {} {} {} {} " $hl\n"]
5078 set commitdata($nullid2) "\n $hl\n"
5079 if {[commitinview $nullid $curview]} {
5080 removefakerow $nullid
5082 insertfakerow $nullid2 $viewmainheadid($curview)
5083 } elseif {!$isdiff && [commitinview $nullid2 $curview]} {
5084 if {[commitinview $nullid $curview]} {
5085 removefakerow $nullid
5087 removefakerow $nullid2
5092 proc readdifffiles {fd serial inst} {
5093 global viewmainheadid nullid nullid2 curview
5094 global commitinfo commitdata lserial
5097 if {[gets $fd line] < 0} {
5103 # we only need to see one line and we don't really care what it says...
5106 if {$serial != $lserial} {
5110 if {$isdiff && ![commitinview $nullid $curview]} {
5111 # add the line for the local diff to the graph
5112 set hl [mc "Local uncommitted changes, not checked in to index"]
5113 set commitinfo($nullid) [list $hl {} {} {} {} " $hl\n"]
5114 set commitdata($nullid) "\n $hl\n"
5115 if {[commitinview $nullid2 $curview]} {
5118 set p $viewmainheadid($curview)
5120 insertfakerow $nullid $p
5121 } elseif {!$isdiff && [commitinview $nullid $curview]} {
5122 removefakerow $nullid
5127 proc nextuse {id row} {
5128 global curview children
5130 if {[info exists children($curview,$id)]} {
5131 foreach kid $children($curview,$id) {
5132 if {![commitinview $kid $curview]} {
5135 if {[rowofcommit $kid] > $row} {
5136 return [rowofcommit $kid]
5140 if {[commitinview $id $curview]} {
5141 return [rowofcommit $id]
5146 proc prevuse {id row} {
5147 global curview children
5150 if {[info exists children($curview,$id)]} {
5151 foreach kid $children($curview,$id) {
5152 if {![commitinview $kid $curview]} break
5153 if {[rowofcommit $kid] < $row} {
5154 set ret [rowofcommit $kid]
5161 proc make_idlist {row} {
5162 global displayorder parentlist uparrowlen downarrowlen mingaplen
5163 global commitidx curview children
5165 set r [expr {$row - $mingaplen - $downarrowlen - 1}]
5169 set ra [expr {$row - $downarrowlen}]
5173 set rb [expr {$row + $uparrowlen}]
5174 if {$rb > $commitidx($curview)} {
5175 set rb $commitidx($curview)
5177 make_disporder $r [expr {$rb + 1}]
5179 for {} {$r < $ra} {incr r} {
5180 set nextid [lindex $displayorder [expr {$r + 1}]]
5181 foreach p [lindex $parentlist $r] {
5182 if {$p eq $nextid} continue
5183 set rn [nextuse $p $r]
5185 $rn <= $r + $downarrowlen + $mingaplen + $uparrowlen} {
5186 lappend ids [list [ordertoken $p] $p]
5190 for {} {$r < $row} {incr r} {
5191 set nextid [lindex $displayorder [expr {$r + 1}]]
5192 foreach p [lindex $parentlist $r] {
5193 if {$p eq $nextid} continue
5194 set rn [nextuse $p $r]
5195 if {$rn < 0 || $rn >= $row} {
5196 lappend ids [list [ordertoken $p] $p]
5200 set id [lindex $displayorder $row]
5201 lappend ids [list [ordertoken $id] $id]
5203 foreach p [lindex $parentlist $r] {
5204 set firstkid [lindex $children($curview,$p) 0]
5205 if {[rowofcommit $firstkid] < $row} {
5206 lappend ids [list [ordertoken $p] $p]
5210 set id [lindex $displayorder $r]
5212 set firstkid [lindex $children($curview,$id) 0]
5213 if {$firstkid ne {} && [rowofcommit $firstkid] < $row} {
5214 lappend ids [list [ordertoken $id] $id]
5219 foreach idx [lsort -unique $ids] {
5220 lappend idlist [lindex $idx 1]
5225 proc rowsequal {a b} {
5226 while {[set i [lsearch -exact $a {}]] >= 0} {
5227 set a [lreplace $a $i $i]
5229 while {[set i [lsearch -exact $b {}]] >= 0} {
5230 set b [lreplace $b $i $i]
5232 return [expr {$a eq $b}]
5235 proc makeupline {id row rend col} {
5236 global rowidlist uparrowlen downarrowlen mingaplen
5238 for {set r $rend} {1} {set r $rstart} {
5239 set rstart [prevuse $id $r]
5240 if {$rstart < 0} return
5241 if {$rstart < $row} break
5243 if {$rstart + $uparrowlen + $mingaplen + $downarrowlen < $rend} {
5244 set rstart [expr {$rend - $uparrowlen - 1}]
5246 for {set r $rstart} {[incr r] <= $row} {} {
5247 set idlist [lindex $rowidlist $r]
5248 if {$idlist ne {} && [lsearch -exact $idlist $id] < 0} {
5249 set col [idcol $idlist $id $col]
5250 lset rowidlist $r [linsert $idlist $col $id]
5256 proc layoutrows {row endrow} {
5257 global rowidlist rowisopt rowfinal displayorder
5258 global uparrowlen downarrowlen maxwidth mingaplen
5259 global children parentlist
5260 global commitidx viewcomplete curview
5262 make_disporder [expr {$row - 1}] [expr {$endrow + $uparrowlen}]
5265 set rm1 [expr {$row - 1}]
5266 foreach id [lindex $rowidlist $rm1] {
5271 set final [lindex $rowfinal $rm1]
5273 for {} {$row < $endrow} {incr row} {
5274 set rm1 [expr {$row - 1}]
5275 if {$rm1 < 0 || $idlist eq {}} {
5276 set idlist [make_idlist $row]
5279 set id [lindex $displayorder $rm1]
5280 set col [lsearch -exact $idlist $id]
5281 set idlist [lreplace $idlist $col $col]
5282 foreach p [lindex $parentlist $rm1] {
5283 if {[lsearch -exact $idlist $p] < 0} {
5284 set col [idcol $idlist $p $col]
5285 set idlist [linsert $idlist $col $p]
5286 # if not the first child, we have to insert a line going up
5287 if {$id ne [lindex $children($curview,$p) 0]} {
5288 makeupline $p $rm1 $row $col
5292 set id [lindex $displayorder $row]
5293 if {$row > $downarrowlen} {
5294 set termrow [expr {$row - $downarrowlen - 1}]
5295 foreach p [lindex $parentlist $termrow] {
5296 set i [lsearch -exact $idlist $p]
5297 if {$i < 0} continue
5298 set nr [nextuse $p $termrow]
5299 if {$nr < 0 || $nr >= $row + $mingaplen + $uparrowlen} {
5300 set idlist [lreplace $idlist $i $i]
5304 set col [lsearch -exact $idlist $id]
5306 set col [idcol $idlist $id]
5307 set idlist [linsert $idlist $col $id]
5308 if {$children($curview,$id) ne {}} {
5309 makeupline $id $rm1 $row $col
5312 set r [expr {$row + $uparrowlen - 1}]
5313 if {$r < $commitidx($curview)} {
5315 foreach p [lindex $parentlist $r] {
5316 if {[lsearch -exact $idlist $p] >= 0} continue
5317 set fk [lindex $children($curview,$p) 0]
5318 if {[rowofcommit $fk] < $row} {
5319 set x [idcol $idlist $p $x]
5320 set idlist [linsert $idlist $x $p]
5323 if {[incr r] < $commitidx($curview)} {
5324 set p [lindex $displayorder $r]
5325 if {[lsearch -exact $idlist $p] < 0} {
5326 set fk [lindex $children($curview,$p) 0]
5327 if {$fk ne {} && [rowofcommit $fk] < $row} {
5328 set x [idcol $idlist $p $x]
5329 set idlist [linsert $idlist $x $p]
5335 if {$final && !$viewcomplete($curview) &&
5336 $row + $uparrowlen + $mingaplen + $downarrowlen
5337 >= $commitidx($curview)} {
5340 set l [llength $rowidlist]
5342 lappend rowidlist $idlist
5344 lappend rowfinal $final
5345 } elseif {$row < $l} {
5346 if {![rowsequal $idlist [lindex $rowidlist $row]]} {
5347 lset rowidlist $row $idlist
5350 lset rowfinal $row $final
5352 set pad [ntimes [expr {$row - $l}] {}]
5353 set rowidlist [concat $rowidlist $pad]
5354 lappend rowidlist $idlist
5355 set rowfinal [concat $rowfinal $pad]
5356 lappend rowfinal $final
5357 set rowisopt [concat $rowisopt [ntimes [expr {$row - $l + 1}] 0]]
5363 proc changedrow {row} {
5364 global displayorder iddrawn rowisopt need_redisplay
5366 set l [llength $rowisopt]
5368 lset rowisopt $row 0
5369 if {$row + 1 < $l} {
5370 lset rowisopt [expr {$row + 1}] 0
5371 if {$row + 2 < $l} {
5372 lset rowisopt [expr {$row + 2}] 0
5376 set id [lindex $displayorder $row]
5377 if {[info exists iddrawn($id)]} {
5378 set need_redisplay 1
5382 proc insert_pad {row col npad} {
5385 set pad [ntimes $npad {}]
5386 set idlist [lindex $rowidlist $row]
5387 set bef [lrange $idlist 0 [expr {$col - 1}]]
5388 set aft [lrange $idlist $col end]
5389 set i [lsearch -exact $aft {}]
5391 set aft [lreplace $aft $i $i]
5393 lset rowidlist $row [concat $bef $pad $aft]
5397 proc optimize_rows {row col endrow} {
5398 global rowidlist rowisopt displayorder curview children
5403 for {} {$row < $endrow} {incr row; set col 0} {
5404 if {[lindex $rowisopt $row]} continue
5406 set y0 [expr {$row - 1}]
5407 set ym [expr {$row - 2}]
5408 set idlist [lindex $rowidlist $row]
5409 set previdlist [lindex $rowidlist $y0]
5410 if {$idlist eq {} || $previdlist eq {}} continue
5412 set pprevidlist [lindex $rowidlist $ym]
5413 if {$pprevidlist eq {}} continue
5419 for {} {$col < [llength $idlist]} {incr col} {
5420 set id [lindex $idlist $col]
5421 if {[lindex $previdlist $col] eq $id} continue
5426 set x0 [lsearch -exact $previdlist $id]
5427 if {$x0 < 0} continue
5428 set z [expr {$x0 - $col}]
5432 set xm [lsearch -exact $pprevidlist $id]
5434 set z0 [expr {$xm - $x0}]
5438 # if row y0 is the first child of $id then it's not an arrow
5439 if {[lindex $children($curview,$id) 0] ne
5440 [lindex $displayorder $y0]} {
5444 if {!$isarrow && $id ne [lindex $displayorder $row] &&
5445 [lsearch -exact [lindex $rowidlist [expr {$row+1}]] $id] < 0} {
5448 # Looking at lines from this row to the previous row,
5449 # make them go straight up if they end in an arrow on
5450 # the previous row; otherwise make them go straight up
5452 if {$z < -1 || ($z < 0 && $isarrow)} {
5453 # Line currently goes left too much;
5454 # insert pads in the previous row, then optimize it
5455 set npad [expr {-1 - $z + $isarrow}]
5456 insert_pad $y0 $x0 $npad
5458 optimize_rows $y0 $x0 $row
5460 set previdlist [lindex $rowidlist $y0]
5461 set x0 [lsearch -exact $previdlist $id]
5462 set z [expr {$x0 - $col}]
5464 set pprevidlist [lindex $rowidlist $ym]
5465 set xm [lsearch -exact $pprevidlist $id]
5466 set z0 [expr {$xm - $x0}]
5468 } elseif {$z > 1 || ($z > 0 && $isarrow)} {
5469 # Line currently goes right too much;
5470 # insert pads in this line
5471 set npad [expr {$z - 1 + $isarrow}]
5472 insert_pad $row $col $npad
5473 set idlist [lindex $rowidlist $row]
5475 set z [expr {$x0 - $col}]
5478 if {$z0 eq {} && !$isarrow && $ym >= 0} {
5479 # this line links to its first child on row $row-2
5480 set id [lindex $displayorder $ym]
5481 set xc [lsearch -exact $pprevidlist $id]
5483 set z0 [expr {$xc - $x0}]
5486 # avoid lines jigging left then immediately right
5487 if {$z0 ne {} && $z < 0 && $z0 > 0} {
5488 insert_pad $y0 $x0 1
5490 optimize_rows $y0 $x0 $row
5491 set previdlist [lindex $rowidlist $y0]
5495 # Find the first column that doesn't have a line going right
5496 for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
5497 set id [lindex $idlist $col]
5498 if {$id eq {}} break
5499 set x0 [lsearch -exact $previdlist $id]
5501 # check if this is the link to the first child
5502 set kid [lindex $displayorder $y0]
5503 if {[lindex $children($curview,$id) 0] eq $kid} {
5504 # it is, work out offset to child
5505 set x0 [lsearch -exact $previdlist $kid]
5508 if {$x0 <= $col} break
5510 # Insert a pad at that column as long as it has a line and
5511 # isn't the last column
5512 if {$x0 >= 0 && [incr col] < [llength $idlist]} {
5513 set idlist [linsert $idlist $col {}]
5514 lset rowidlist $row $idlist
5522 global canvx0 linespc
5523 return [expr {$canvx0 + $col * $linespc}]
5527 global canvy0 linespc
5528 return [expr {$canvy0 + $row * $linespc}]
5531 proc linewidth {id} {
5532 global thickerline lthickness
5535 if {[info exists thickerline] && $id eq $thickerline} {
5536 set wid [expr {2 * $lthickness}]
5541 proc rowranges {id} {
5542 global curview children uparrowlen downarrowlen
5545 set kids $children($curview,$id)
5551 foreach child $kids {
5552 if {![commitinview $child $curview]} break
5553 set row [rowofcommit $child]
5554 if {![info exists prev]} {
5555 lappend ret [expr {$row + 1}]
5557 if {$row <= $prevrow} {
5558 puts "oops children of [shortids $id] out of order [shortids $child] $row <= [shortids $prev] $prevrow"
5560 # see if the line extends the whole way from prevrow to row
5561 if {$row > $prevrow + $uparrowlen + $downarrowlen &&
5562 [lsearch -exact [lindex $rowidlist \
5563 [expr {int(($row + $prevrow) / 2)}]] $id] < 0} {
5564 # it doesn't, see where it ends
5565 set r [expr {$prevrow + $downarrowlen}]
5566 if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {
5567 while {[incr r -1] > $prevrow &&
5568 [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}
5570 while {[incr r] <= $row &&
5571 [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}
5575 # see where it starts up again
5576 set r [expr {$row - $uparrowlen}]
5577 if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {
5578 while {[incr r] < $row &&
5579 [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}
5581 while {[incr r -1] >= $prevrow &&
5582 [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}
5588 if {$child eq $id} {
5597 proc drawlineseg {id row endrow arrowlow} {
5598 global rowidlist displayorder iddrawn linesegs
5599 global canv colormap linespc curview maxlinelen parentlist
5601 set cols [list [lsearch -exact [lindex $rowidlist $row] $id]]
5602 set le [expr {$row + 1}]
5605 set c [lsearch -exact [lindex $rowidlist $le] $id]
5611 set x [lindex $displayorder $le]
5616 if {[info exists iddrawn($x)] || $le == $endrow} {
5617 set c [lsearch -exact [lindex $rowidlist [expr {$le+1}]] $id]
5633 if {[info exists linesegs($id)]} {
5634 set lines $linesegs($id)
5636 set r0 [lindex $li 0]
5638 if {$r0 == $le && [lindex $li 1] - $row <= $maxlinelen} {
5648 set li [lindex $lines [expr {$i-1}]]
5649 set r1 [lindex $li 1]
5650 if {$r1 == $row && $le - [lindex $li 0] <= $maxlinelen} {
5655 set x [lindex $cols [expr {$le - $row}]]
5656 set xp [lindex $cols [expr {$le - 1 - $row}]]
5657 set dir [expr {$xp - $x}]
5659 set ith [lindex $lines $i 2]
5660 set coords [$canv coords $ith]
5661 set ah [$canv itemcget $ith -arrow]
5662 set arrowhigh [expr {$ah eq "first" || $ah eq "both"}]
5663 set x2 [lindex $cols [expr {$le + 1 - $row}]]
5664 if {$x2 ne {} && $x - $x2 == $dir} {
5665 set coords [lrange $coords 0 end-2]
5668 set coords [list [xc $le $x] [yc $le]]
5671 set itl [lindex $lines [expr {$i-1}] 2]
5672 set al [$canv itemcget $itl -arrow]
5673 set arrowlow [expr {$al eq "last" || $al eq "both"}]
5674 } elseif {$arrowlow} {
5675 if {[lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0 ||
5676 [lsearch -exact [lindex $parentlist [expr {$row-1}]] $id] >= 0} {
5680 set arrow [lindex {none first last both} [expr {$arrowhigh + 2*$arrowlow}]]
5681 for {set y $le} {[incr y -1] > $row} {} {
5683 set xp [lindex $cols [expr {$y - 1 - $row}]]
5684 set ndir [expr {$xp - $x}]
5685 if {$dir != $ndir || $xp < 0} {
5686 lappend coords [xc $y $x] [yc $y]
5692 # join parent line to first child
5693 set ch [lindex $displayorder $row]
5694 set xc [lsearch -exact [lindex $rowidlist $row] $ch]
5696 puts "oops: drawlineseg: child $ch not on row $row"
5697 } elseif {$xc != $x} {
5698 if {($arrowhigh && $le == $row + 1) || $dir == 0} {
5699 set d [expr {int(0.5 * $linespc)}]
5702 set x2 [expr {$x1 - $d}]
5704 set x2 [expr {$x1 + $d}]
5707 set y1 [expr {$y2 + $d}]
5708 lappend coords $x1 $y1 $x2 $y2
5709 } elseif {$xc < $x - 1} {
5710 lappend coords [xc $row [expr {$x-1}]] [yc $row]
5711 } elseif {$xc > $x + 1} {
5712 lappend coords [xc $row [expr {$x+1}]] [yc $row]
5716 lappend coords [xc $row $x] [yc $row]
5718 set xn [xc $row $xp]
5720 lappend coords $xn $yn
5724 set t [$canv create line $coords -width [linewidth $id] \
5725 -fill $colormap($id) -tags lines.$id -arrow $arrow]
5728 set lines [linsert $lines $i [list $row $le $t]]
5730 $canv coords $ith $coords
5731 if {$arrow ne $ah} {
5732 $canv itemconf $ith -arrow $arrow
5734 lset lines $i 0 $row
5737 set xo [lsearch -exact [lindex $rowidlist [expr {$row - 1}]] $id]
5738 set ndir [expr {$xo - $xp}]
5739 set clow [$canv coords $itl]
5740 if {$dir == $ndir} {
5741 set clow [lrange $clow 2 end]
5743 set coords [concat $coords $clow]
5745 lset lines [expr {$i-1}] 1 $le
5747 # coalesce two pieces
5749 set b [lindex $lines [expr {$i-1}] 0]
5750 set e [lindex $lines $i 1]
5751 set lines [lreplace $lines [expr {$i-1}] $i [list $b $e $itl]]
5753 $canv coords $itl $coords
5754 if {$arrow ne $al} {
5755 $canv itemconf $itl -arrow $arrow
5759 set linesegs($id) $lines
5763 proc drawparentlinks {id row} {
5764 global rowidlist canv colormap curview parentlist
5765 global idpos linespc
5767 set rowids [lindex $rowidlist $row]
5768 set col [lsearch -exact $rowids $id]
5769 if {$col < 0} return
5770 set olds [lindex $parentlist $row]
5771 set row2 [expr {$row + 1}]
5772 set x [xc $row $col]
5775 set d [expr {int(0.5 * $linespc)}]
5776 set ymid [expr {$y + $d}]
5777 set ids [lindex $rowidlist $row2]
5778 # rmx = right-most X coord used
5781 set i [lsearch -exact $ids $p]
5783 puts "oops, parent $p of $id not in list"
5786 set x2 [xc $row2 $i]
5790 set j [lsearch -exact $rowids $p]
5792 # drawlineseg will do this one for us
5796 # should handle duplicated parents here...
5797 set coords [list $x $y]
5799 # if attaching to a vertical segment, draw a smaller
5800 # slant for visual distinctness
5803 lappend coords [expr {$x2 + $d}] $y $x2 $ymid
5805 lappend coords [expr {$x2 - $d}] $y $x2 $ymid
5807 } elseif {$i < $col && $i < $j} {
5808 # segment slants towards us already
5809 lappend coords [xc $row $j] $y
5811 if {$i < $col - 1} {
5812 lappend coords [expr {$x2 + $linespc}] $y
5813 } elseif {$i > $col + 1} {
5814 lappend coords [expr {$x2 - $linespc}] $y
5816 lappend coords $x2 $y2
5819 lappend coords $x2 $y2
5821 set t [$canv create line $coords -width [linewidth $p] \
5822 -fill $colormap($p) -tags lines.$p]
5826 if {$rmx > [lindex $idpos($id) 1]} {
5827 lset idpos($id) 1 $rmx
5832 proc drawlines {id} {
5835 $canv itemconf lines.$id -width [linewidth $id]
5838 proc drawcmittext {id row col} {
5839 global linespc canv canv2 canv3 fgcolor curview
5840 global cmitlisted commitinfo rowidlist parentlist
5841 global rowtextx idpos idtags idheads idotherrefs
5842 global linehtag linentag linedtag selectedline
5843 global canvxmax boldids boldnameids fgcolor markedid
5844 global mainheadid nullid nullid2 circleitem circlecolors ctxbut
5846 # listed is 0 for boundary, 1 for normal, 2 for negative, 3 for left, 4 for right
5847 set listed $cmitlisted($curview,$id)
5848 if {$id eq $nullid} {
5850 } elseif {$id eq $nullid2} {
5852 } elseif {$id eq $mainheadid} {
5855 set ofill [lindex $circlecolors $listed]
5857 set x [xc $row $col]
5859 set orad [expr {$linespc / 3}]
5861 set t [$canv create oval [expr {$x - $orad}] [expr {$y - $orad}] \
5862 [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
5863 -fill $ofill -outline $fgcolor -width 1 -tags circle]
5864 } elseif {$listed == 3} {
5865 # triangle pointing left for left-side commits
5866 set t [$canv create polygon \
5867 [expr {$x - $orad}] $y \
5868 [expr {$x + $orad - 1}] [expr {$y - $orad}] \
5869 [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
5870 -fill $ofill -outline $fgcolor -width 1 -tags circle]
5872 # triangle pointing right for right-side commits
5873 set t [$canv create polygon \
5874 [expr {$x + $orad - 1}] $y \
5875 [expr {$x - $orad}] [expr {$y - $orad}] \
5876 [expr {$x - $orad}] [expr {$y + $orad - 1}] \
5877 -fill $ofill -outline $fgcolor -width 1 -tags circle]
5879 set circleitem($row) $t
5881 $canv bind $t <1> {selcanvline {} %x %y}
5882 set rmx [llength [lindex $rowidlist $row]]
5883 set olds [lindex $parentlist $row]
5885 set nextids [lindex $rowidlist [expr {$row + 1}]]
5887 set i [lsearch -exact $nextids $p]
5893 set xt [xc $row $rmx]
5894 set rowtextx($row) $xt
5895 set idpos($id) [list $x $xt $y]
5896 if {[info exists idtags($id)] || [info exists idheads($id)]
5897 || [info exists idotherrefs($id)]} {
5898 set xt [drawtags $id $x $xt $y]
5900 if {[lindex $commitinfo($id) 6] > 0} {
5901 set xt [drawnotesign $xt $y]
5903 set headline [lindex $commitinfo($id) 0]
5904 set name [lindex $commitinfo($id) 1]
5905 set date [lindex $commitinfo($id) 2]
5906 set date [formatdate $date]
5909 set isbold [ishighlighted $id]
5912 set font mainfontbold
5914 lappend boldnameids $id
5915 set nfont mainfontbold
5918 set linehtag($id) [$canv create text $xt $y -anchor w -fill $fgcolor \
5919 -text $headline -font $font -tags text]
5920 $canv bind $linehtag($id) $ctxbut "rowmenu %X %Y $id"
5921 set linentag($id) [$canv2 create text 3 $y -anchor w -fill $fgcolor \
5922 -text $name -font $nfont -tags text]
5923 set linedtag($id) [$canv3 create text 3 $y -anchor w -fill $fgcolor \
5924 -text $date -font mainfont -tags text]
5925 if {$selectedline == $row} {
5928 if {[info exists markedid] && $markedid eq $id} {
5931 set xr [expr {$xt + [font measure $font $headline]}]
5932 if {$xr > $canvxmax} {
5938 proc drawcmitrow {row} {
5939 global displayorder rowidlist nrows_drawn
5940 global iddrawn markingmatches
5941 global commitinfo numcommits
5942 global filehighlight fhighlights findpattern nhighlights
5943 global hlview vhighlights
5944 global highlight_related rhighlights
5946 if {$row >= $numcommits} return
5948 set id [lindex $displayorder $row]
5949 if {[info exists hlview] && ![info exists vhighlights($id)]} {
5950 askvhighlight $row $id
5952 if {[info exists filehighlight] && ![info exists fhighlights($id)]} {
5953 askfilehighlight $row $id
5955 if {$findpattern ne {} && ![info exists nhighlights($id)]} {
5956 askfindhighlight $row $id
5958 if {$highlight_related ne [mc "None"] && ![info exists rhighlights($id)]} {
5959 askrelhighlight $row $id
5961 if {![info exists iddrawn($id)]} {
5962 set col [lsearch -exact [lindex $rowidlist $row] $id]
5964 puts "oops, row $row id $id not in list"
5967 if {![info exists commitinfo($id)]} {
5971 drawcmittext $id $row $col
5975 if {$markingmatches} {
5976 markrowmatches $row $id
5980 proc drawcommits {row {endrow {}}} {
5981 global numcommits iddrawn displayorder curview need_redisplay
5982 global parentlist rowidlist rowfinal uparrowlen downarrowlen nrows_drawn
5987 if {$endrow eq {}} {
5990 if {$endrow >= $numcommits} {
5991 set endrow [expr {$numcommits - 1}]
5994 set rl1 [expr {$row - $downarrowlen - 3}]
5998 set ro1 [expr {$row - 3}]
6002 set r2 [expr {$endrow + $uparrowlen + 3}]
6003 if {$r2 > $numcommits} {
6006 for {set r $rl1} {$r < $r2} {incr r} {
6007 if {[lindex $rowidlist $r] ne {} && [lindex $rowfinal $r]} {
6011 set rl1 [expr {$r + 1}]
6017 optimize_rows $ro1 0 $r2
6018 if {$need_redisplay || $nrows_drawn > 2000} {
6022 # make the lines join to already-drawn rows either side
6023 set r [expr {$row - 1}]
6024 if {$r < 0 || ![info exists iddrawn([lindex $displayorder $r])]} {
6027 set er [expr {$endrow + 1}]
6028 if {$er >= $numcommits ||
6029 ![info exists iddrawn([lindex $displayorder $er])]} {
6032 for {} {$r <= $er} {incr r} {
6033 set id [lindex $displayorder $r]
6034 set wasdrawn [info exists iddrawn($id)]
6036 if {$r == $er} break
6037 set nextid [lindex $displayorder [expr {$r + 1}]]
6038 if {$wasdrawn && [info exists iddrawn($nextid)]} continue
6039 drawparentlinks $id $r
6041 set rowids [lindex $rowidlist $r]
6042 foreach lid $rowids {
6043 if {$lid eq {}} continue
6044 if {[info exists lineend($lid)] && $lineend($lid) > $r} continue
6046 # see if this is the first child of any of its parents
6047 foreach p [lindex $parentlist $r] {
6048 if {[lsearch -exact $rowids $p] < 0} {
6049 # make this line extend up to the child
6050 set lineend($p) [drawlineseg $p $r $er 0]
6054 set lineend($lid) [drawlineseg $lid $r $er 1]
6060 proc undolayout {row} {
6061 global uparrowlen mingaplen downarrowlen
6062 global rowidlist rowisopt rowfinal need_redisplay
6064 set r [expr {$row - ($uparrowlen + $mingaplen + $downarrowlen)}]
6068 if {[llength $rowidlist] > $r} {
6070 set rowidlist [lrange $rowidlist 0 $r]
6071 set rowfinal [lrange $rowfinal 0 $r]
6072 set rowisopt [lrange $rowisopt 0 $r]
6073 set need_redisplay 1
6078 proc drawvisible {} {
6079 global canv linespc curview vrowmod selectedline targetrow targetid
6080 global need_redisplay cscroll numcommits
6082 set fs [$canv yview]
6083 set ymax [lindex [$canv cget -scrollregion] 3]
6084 if {$ymax eq {} || $ymax == 0 || $numcommits == 0} return
6085 set f0 [lindex $fs 0]
6086 set f1 [lindex $fs 1]
6087 set y0 [expr {int($f0 * $ymax)}]
6088 set y1 [expr {int($f1 * $ymax)}]
6090 if {[info exists targetid]} {
6091 if {[commitinview $targetid $curview]} {
6092 set r [rowofcommit $targetid]
6093 if {$r != $targetrow} {
6094 # Fix up the scrollregion and change the scrolling position
6095 # now that our target row has moved.
6096 set diff [expr {($r - $targetrow) * $linespc}]
6099 set ymax [lindex [$canv cget -scrollregion] 3]
6102 set f0 [expr {$y0 / $ymax}]
6103 set f1 [expr {$y1 / $ymax}]
6104 allcanvs yview moveto $f0
6105 $cscroll set $f0 $f1
6106 set need_redisplay 1
6113 set row [expr {int(($y0 - 3) / $linespc) - 1}]
6114 set endrow [expr {int(($y1 - 3) / $linespc) + 1}]
6115 if {$endrow >= $vrowmod($curview)} {
6116 update_arcrows $curview
6118 if {$selectedline ne {} &&
6119 $row <= $selectedline && $selectedline <= $endrow} {
6120 set targetrow $selectedline
6121 } elseif {[info exists targetid]} {
6122 set targetrow [expr {int(($row + $endrow) / 2)}]
6124 if {[info exists targetrow]} {
6125 if {$targetrow >= $numcommits} {
6126 set targetrow [expr {$numcommits - 1}]
6128 set targetid [commitonrow $targetrow]
6130 drawcommits $row $endrow
6133 proc clear_display {} {
6134 global iddrawn linesegs need_redisplay nrows_drawn
6135 global vhighlights fhighlights nhighlights rhighlights
6136 global linehtag linentag linedtag boldids boldnameids
6139 catch {unset iddrawn}
6140 catch {unset linesegs}
6141 catch {unset linehtag}
6142 catch {unset linentag}
6143 catch {unset linedtag}
6146 catch {unset vhighlights}
6147 catch {unset fhighlights}
6148 catch {unset nhighlights}
6149 catch {unset rhighlights}
6150 set need_redisplay 0
6154 proc findcrossings {id} {
6155 global rowidlist parentlist numcommits displayorder
6159 foreach {s e} [rowranges $id] {
6160 if {$e >= $numcommits} {
6161 set e [expr {$numcommits - 1}]
6163 if {$e <= $s} continue
6164 for {set row $e} {[incr row -1] >= $s} {} {
6165 set x [lsearch -exact [lindex $rowidlist $row] $id]
6167 set olds [lindex $parentlist $row]
6168 set kid [lindex $displayorder $row]
6169 set kidx [lsearch -exact [lindex $rowidlist $row] $kid]
6170 if {$kidx < 0} continue
6171 set nextrow [lindex $rowidlist [expr {$row + 1}]]
6173 set px [lsearch -exact $nextrow $p]
6174 if {$px < 0} continue
6175 if {($kidx < $x && $x < $px) || ($px < $x && $x < $kidx)} {
6176 if {[lsearch -exact $ccross $p] >= 0} continue
6177 if {$x == $px + ($kidx < $px? -1: 1)} {
6179 } elseif {[lsearch -exact $cross $p] < 0} {
6186 return [concat $ccross {{}} $cross]
6189 proc assigncolor {id} {
6190 global colormap colors nextcolor
6191 global parents children children curview
6193 if {[info exists colormap($id)]} return
6194 set ncolors [llength $colors]
6195 if {[info exists children($curview,$id)]} {
6196 set kids $children($curview,$id)
6200 if {[llength $kids] == 1} {
6201 set child [lindex $kids 0]
6202 if {[info exists colormap($child)]
6203 && [llength $parents($curview,$child)] == 1} {
6204 set colormap($id) $colormap($child)
6210 foreach x [findcrossings $id] {
6212 # delimiter between corner crossings and other crossings
6213 if {[llength $badcolors] >= $ncolors - 1} break
6214 set origbad $badcolors
6216 if {[info exists colormap($x)]
6217 && [lsearch -exact $badcolors $colormap($x)] < 0} {
6218 lappend badcolors $colormap($x)
6221 if {[llength $badcolors] >= $ncolors} {
6222 set badcolors $origbad
6224 set origbad $badcolors
6225 if {[llength $badcolors] < $ncolors - 1} {
6226 foreach child $kids {
6227 if {[info exists colormap($child)]
6228 && [lsearch -exact $badcolors $colormap($child)] < 0} {
6229 lappend badcolors $colormap($child)
6231 foreach p $parents($curview,$child) {
6232 if {[info exists colormap($p)]
6233 && [lsearch -exact $badcolors $colormap($p)] < 0} {
6234 lappend badcolors $colormap($p)
6238 if {[llength $badcolors] >= $ncolors} {
6239 set badcolors $origbad
6242 for {set i 0} {$i <= $ncolors} {incr i} {
6243 set c [lindex $colors $nextcolor]
6244 if {[incr nextcolor] >= $ncolors} {
6247 if {[lsearch -exact $badcolors $c]} break
6249 set colormap($id) $c
6252 proc bindline {t id} {
6255 $canv bind $t <Enter> "lineenter %x %y $id"
6256 $canv bind $t <Motion> "linemotion %x %y $id"
6257 $canv bind $t <Leave> "lineleave $id"
6258 $canv bind $t <Button-1> "lineclick %x %y $id 1"
6261 proc drawtags {id x xt y1} {
6262 global idtags idheads idotherrefs mainhead
6263 global linespc lthickness
6264 global canv rowtextx curview fgcolor bgcolor ctxbut
6269 if {[info exists idtags($id)]} {
6270 set marks $idtags($id)
6271 set ntags [llength $marks]
6273 if {[info exists idheads($id)]} {
6274 set marks [concat $marks $idheads($id)]
6275 set nheads [llength $idheads($id)]
6277 if {[info exists idotherrefs($id)]} {
6278 set marks [concat $marks $idotherrefs($id)]
6284 set delta [expr {int(0.5 * ($linespc - $lthickness))}]
6285 set yt [expr {$y1 - 0.5 * $linespc}]
6286 set yb [expr {$yt + $linespc - 1}]
6290 foreach tag $marks {
6292 if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} {
6293 set wid [font measure mainfontbold $tag]
6295 set wid [font measure mainfont $tag]
6299 set xt [expr {$xt + $delta + $wid + $lthickness + $linespc}]
6301 set t [$canv create line $x $y1 [lindex $xvals end] $y1 \
6302 -width $lthickness -fill black -tags tag.$id]
6304 foreach tag $marks x $xvals wid $wvals {
6305 set tag_quoted [string map {% %%} $tag]
6306 set xl [expr {$x + $delta}]
6307 set xr [expr {$x + $delta + $wid + $lthickness}]
6309 if {[incr ntags -1] >= 0} {
6311 set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
6312 $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
6313 -width 1 -outline black -fill yellow -tags tag.$id]
6314 $canv bind $t <1> [list showtag $tag_quoted 1]
6315 set rowtextx([rowofcommit $id]) [expr {$xr + $linespc}]
6317 # draw a head or other ref
6318 if {[incr nheads -1] >= 0} {
6320 if {$tag eq $mainhead} {
6321 set font mainfontbold
6326 set xl [expr {$xl - $delta/2}]
6327 $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
6328 -width 1 -outline black -fill $col -tags tag.$id
6329 if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
6330 set rwid [font measure mainfont $remoteprefix]
6331 set xi [expr {$x + 1}]
6332 set yti [expr {$yt + 1}]
6333 set xri [expr {$x + $rwid}]
6334 $canv create polygon $xi $yti $xri $yti $xri $yb $xi $yb \
6335 -width 0 -fill "#ffddaa" -tags tag.$id
6338 set t [$canv create text $xl $y1 -anchor w -text $tag -fill $fgcolor \
6339 -font $font -tags [list tag.$id text]]
6341 $canv bind $t <1> [list showtag $tag_quoted 1]
6342 } elseif {$nheads >= 0} {
6343 $canv bind $t $ctxbut [list headmenu %X %Y $id $tag_quoted]
6349 proc drawnotesign {xt y} {
6350 global linespc canv fgcolor
6352 set orad [expr {$linespc / 3}]
6353 set t [$canv create rectangle [expr {$xt - $orad}] [expr {$y - $orad}] \
6354 [expr {$xt + $orad - 1}] [expr {$y + $orad - 1}] \
6355 -fill yellow -outline $fgcolor -width 1 -tags circle]
6356 set xt [expr {$xt + $orad * 3}]
6360 proc xcoord {i level ln} {
6361 global canvx0 xspc1 xspc2
6363 set x [expr {$canvx0 + $i * $xspc1($ln)}]
6364 if {$i > 0 && $i == $level} {
6365 set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}]
6366 } elseif {$i > $level} {
6367 set x [expr {$x + $xspc2 - $xspc1($ln)}]
6372 proc show_status {msg} {
6376 $canv create text 3 3 -anchor nw -text $msg -font mainfont \
6377 -tags text -fill $fgcolor
6380 # Don't change the text pane cursor if it is currently the hand cursor,
6381 # showing that we are over a sha1 ID link.
6382 proc settextcursor {c} {
6383 global ctext curtextcursor
6385 if {[$ctext cget -cursor] == $curtextcursor} {
6386 $ctext config -cursor $c
6388 set curtextcursor $c
6391 proc nowbusy {what {name {}}} {
6392 global isbusy busyname statusw
6394 if {[array names isbusy] eq {}} {
6395 . config -cursor watch
6399 set busyname($what) $name
6401 $statusw conf -text $name
6405 proc notbusy {what} {
6406 global isbusy maincursor textcursor busyname statusw
6410 if {$busyname($what) ne {} &&
6411 [$statusw cget -text] eq $busyname($what)} {
6412 $statusw conf -text {}
6415 if {[array names isbusy] eq {}} {
6416 . config -cursor $maincursor
6417 settextcursor $textcursor
6421 proc findmatches {f} {
6422 global findtype findstring
6423 if {$findtype == [mc "Regexp"]} {
6424 set matches [regexp -indices -all -inline $findstring $f]
6427 if {$findtype == [mc "IgnCase"]} {
6428 set f [string tolower $f]
6429 set fs [string tolower $fs]
6433 set l [string length $fs]
6434 while {[set j [string first $fs $f $i]] >= 0} {
6435 lappend matches [list $j [expr {$j+$l-1}]]
6436 set i [expr {$j + $l}]
6442 proc dofind {{dirn 1} {wrap 1}} {
6443 global findstring findstartline findcurline selectedline numcommits
6444 global gdttype filehighlight fh_serial find_dirn findallowwrap
6446 if {[info exists find_dirn]} {
6447 if {$find_dirn == $dirn} return
6451 if {$findstring eq {} || $numcommits == 0} return
6452 if {$selectedline eq {}} {
6453 set findstartline [lindex [visiblerows] [expr {$dirn < 0}]]
6455 set findstartline $selectedline
6457 set findcurline $findstartline
6458 nowbusy finding [mc "Searching"]
6459 if {$gdttype ne [mc "containing:"] && ![info exists filehighlight]} {
6460 after cancel do_file_hl $fh_serial
6461 do_file_hl $fh_serial
6464 set findallowwrap $wrap
6468 proc stopfinding {} {
6469 global find_dirn findcurline fprogcoord
6471 if {[info exists find_dirn]} {
6482 global commitdata commitinfo numcommits findpattern findloc
6483 global findstartline findcurline findallowwrap
6484 global find_dirn gdttype fhighlights fprogcoord
6485 global curview varcorder vrownum varccommits vrowmod
6487 if {![info exists find_dirn]} {
6490 set fldtypes [list [mc "Headline"] [mc "Author"] [mc "Date"] [mc "Committer"] [mc "CDate"] [mc "Comments"]]
6493 if {$find_dirn > 0} {
6495 if {$l >= $numcommits} {
6498 if {$l <= $findstartline} {
6499 set lim [expr {$findstartline + 1}]
6502 set moretodo $findallowwrap
6509 if {$l >= $findstartline} {
6510 set lim [expr {$findstartline - 1}]
6513 set moretodo $findallowwrap
6516 set n [expr {($lim - $l) * $find_dirn}]
6521 if {$l + ($find_dirn > 0? $n: 1) > $vrowmod($curview)} {
6522 update_arcrows $curview
6526 set ai [bsearch $vrownum($curview) $l]
6527 set a [lindex $varcorder($curview) $ai]
6528 set arow [lindex $vrownum($curview) $ai]
6529 set ids [lindex $varccommits($curview,$a)]
6530 set arowend [expr {$arow + [llength $ids]}]
6531 if {$gdttype eq [mc "containing:"]} {
6532 for {} {$n > 0} {incr n -1; incr l $find_dirn} {
6533 if {$l < $arow || $l >= $arowend} {
6535 set a [lindex $varcorder($curview) $ai]
6536 set arow [lindex $vrownum($curview) $ai]
6537 set ids [lindex $varccommits($curview,$a)]
6538 set arowend [expr {$arow + [llength $ids]}]
6540 set id [lindex $ids [expr {$l - $arow}]]
6541 # shouldn't happen unless git log doesn't give all the commits...
6542 if {![info exists commitdata($id)] ||
6543 ![doesmatch $commitdata($id)]} {
6546 if {![info exists commitinfo($id)]} {
6549 set info $commitinfo($id)
6550 foreach f $info ty $fldtypes {
6551 if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
6560 for {} {$n > 0} {incr n -1; incr l $find_dirn} {
6561 if {$l < $arow || $l >= $arowend} {
6563 set a [lindex $varcorder($curview) $ai]
6564 set arow [lindex $vrownum($curview) $ai]
6565 set ids [lindex $varccommits($curview,$a)]
6566 set arowend [expr {$arow + [llength $ids]}]
6568 set id [lindex $ids [expr {$l - $arow}]]
6569 if {![info exists fhighlights($id)]} {
6570 # this sets fhighlights($id) to -1
6571 askfilehighlight $l $id
6573 if {$fhighlights($id) > 0} {
6577 if {$fhighlights($id) < 0} {
6580 set findcurline [expr {$l - $find_dirn}]
6585 if {$found || ($domore && !$moretodo)} {
6601 set findcurline [expr {$l - $find_dirn}]
6603 set n [expr {($findcurline - $findstartline) * $find_dirn - 1}]
6607 set fprogcoord [expr {$n * 1.0 / $numcommits}]
6612 proc findselectline {l} {
6613 global findloc commentend ctext findcurline markingmatches gdttype
6615 set markingmatches [expr {$gdttype eq [mc "containing:"]}]
6618 if {$markingmatches &&
6619 ($findloc eq [mc "All fields"] || $findloc eq [mc "Comments"])} {
6620 # highlight the matches in the comments
6621 set f [$ctext get 1.0 $commentend]
6622 set matches [findmatches $f]
6623 foreach match $matches {
6624 set start [lindex $match 0]
6625 set end [expr {[lindex $match 1] + 1}]
6626 $ctext tag add found "1.0 + $start c" "1.0 + $end c"
6632 # mark the bits of a headline or author that match a find string
6633 proc markmatches {canv l str tag matches font row} {
6636 set bbox [$canv bbox $tag]
6637 set x0 [lindex $bbox 0]
6638 set y0 [lindex $bbox 1]
6639 set y1 [lindex $bbox 3]
6640 foreach match $matches {
6641 set start [lindex $match 0]
6642 set end [lindex $match 1]
6643 if {$start > $end} continue
6644 set xoff [font measure $font [string range $str 0 [expr {$start-1}]]]
6645 set xlen [font measure $font [string range $str 0 [expr {$end}]]]
6646 set t [$canv create rect [expr {$x0+$xoff}] $y0 \
6647 [expr {$x0+$xlen+2}] $y1 \
6648 -outline {} -tags [list match$l matches] -fill yellow]
6650 if {$row == $selectedline} {
6651 $canv raise $t secsel
6656 proc unmarkmatches {} {
6657 global markingmatches
6659 allcanvs delete matches
6660 set markingmatches 0
6664 proc selcanvline {w x y} {
6665 global canv canvy0 ctext linespc
6667 set ymax [lindex [$canv cget -scrollregion] 3]
6668 if {$ymax == {}} return
6669 set yfrac [lindex [$canv yview] 0]
6670 set y [expr {$y + $yfrac * $ymax}]
6671 set l [expr {int(($y - $canvy0) / $linespc + 0.5)}]
6676 set xmax [lindex [$canv cget -scrollregion] 2]
6677 set xleft [expr {[lindex [$canv xview] 0] * $xmax}]
6678 if {![info exists rowtextx($l)] || $xleft + $x < $rowtextx($l)} return
6684 proc commit_descriptor {p} {
6686 if {![info exists commitinfo($p)]} {
6690 if {[llength $commitinfo($p)] > 1} {
6691 set l [lindex $commitinfo($p) 0]
6696 # append some text to the ctext widget, and make any SHA1 ID
6697 # that we know about be a clickable link.
6698 proc appendwithlinks {text tags} {
6699 global ctext linknum curview
6701 set start [$ctext index "end - 1c"]
6702 $ctext insert end $text $tags
6703 set links [regexp -indices -all -inline {\m[0-9a-f]{6,40}\M} $text]
6707 set linkid [string range $text $s $e]
6709 $ctext tag delete link$linknum
6710 $ctext tag add link$linknum "$start + $s c" "$start + $e c"
6711 setlink $linkid link$linknum
6716 proc setlink {id lk} {
6717 global curview ctext pendinglinks
6720 if {[string length $id] < 40} {
6721 set matches [longid $id]
6722 if {[llength $matches] > 0} {
6723 if {[llength $matches] > 1} return
6725 set id [lindex $matches 0]
6728 set known [commitinview $id $curview]
6731 $ctext tag conf $lk -foreground blue -underline 1
6732 $ctext tag bind $lk <1> [list selbyid $id]
6733 $ctext tag bind $lk <Enter> {linkcursor %W 1}
6734 $ctext tag bind $lk <Leave> {linkcursor %W -1}
6736 lappend pendinglinks($id) $lk
6737 interestedin $id {makelink %P}
6741 proc appendshortlink {id {pre {}} {post {}}} {
6742 global ctext linknum
6744 $ctext insert end $pre
6745 $ctext tag delete link$linknum
6746 $ctext insert end [string range $id 0 7] link$linknum
6747 $ctext insert end $post
6748 setlink $id link$linknum
6752 proc makelink {id} {
6755 if {![info exists pendinglinks($id)]} return
6756 foreach lk $pendinglinks($id) {
6759 unset pendinglinks($id)
6762 proc linkcursor {w inc} {
6763 global linkentercount curtextcursor
6765 if {[incr linkentercount $inc] > 0} {
6766 $w configure -cursor hand2
6768 $w configure -cursor $curtextcursor
6769 if {$linkentercount < 0} {
6770 set linkentercount 0
6775 proc viewnextline {dir} {
6779 set ymax [lindex [$canv cget -scrollregion] 3]
6780 set wnow [$canv yview]
6781 set wtop [expr {[lindex $wnow 0] * $ymax}]
6782 set newtop [expr {$wtop + $dir * $linespc}]
6785 } elseif {$newtop > $ymax} {
6788 allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
6791 # add a list of tag or branch names at position pos
6792 # returns the number of names inserted
6793 proc appendrefs {pos ids var} {
6794 global ctext linknum curview $var maxrefs
6796 if {[catch {$ctext index $pos}]} {
6799 $ctext conf -state normal
6800 $ctext delete $pos "$pos lineend"
6803 foreach tag [set $var\($id\)] {
6804 lappend tags [list $tag $id]
6807 if {[llength $tags] > $maxrefs} {
6808 $ctext insert $pos "[mc "many"] ([llength $tags])"
6810 set tags [lsort -index 0 -decreasing $tags]
6813 set id [lindex $ti 1]
6816 $ctext tag delete $lk
6817 $ctext insert $pos $sep
6818 $ctext insert $pos [lindex $ti 0] $lk
6823 $ctext conf -state disabled
6824 return [llength $tags]
6827 # called when we have finished computing the nearby tags
6828 proc dispneartags {delay} {
6829 global selectedline currentid showneartags tagphase
6831 if {$selectedline eq {} || !$showneartags} return
6832 after cancel dispnexttag
6834 after 200 dispnexttag
6837 after idle dispnexttag
6842 proc dispnexttag {} {
6843 global selectedline currentid showneartags tagphase ctext
6845 if {$selectedline eq {} || !$showneartags} return
6846 switch -- $tagphase {
6848 set dtags [desctags $currentid]
6850 appendrefs precedes $dtags idtags
6854 set atags [anctags $currentid]
6856 appendrefs follows $atags idtags
6860 set dheads [descheads $currentid]
6861 if {$dheads ne {}} {
6862 if {[appendrefs branch $dheads idheads] > 1
6863 && [$ctext get "branch -3c"] eq "h"} {
6864 # turn "Branch" into "Branches"
6865 $ctext conf -state normal
6866 $ctext insert "branch -2c" "es"
6867 $ctext conf -state disabled
6872 if {[incr tagphase] <= 2} {
6873 after idle dispnexttag
6877 proc make_secsel {id} {
6878 global linehtag linentag linedtag canv canv2 canv3
6880 if {![info exists linehtag($id)]} return
6882 set t [eval $canv create rect [$canv bbox $linehtag($id)] -outline {{}} \
6883 -tags secsel -fill [$canv cget -selectbackground]]
6885 $canv2 delete secsel
6886 set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] -outline {{}} \
6887 -tags secsel -fill [$canv2 cget -selectbackground]]
6889 $canv3 delete secsel
6890 set t [eval $canv3 create rect [$canv3 bbox $linedtag($id)] -outline {{}} \
6891 -tags secsel -fill [$canv3 cget -selectbackground]]
6895 proc make_idmark {id} {
6896 global linehtag canv fgcolor
6898 if {![info exists linehtag($id)]} return
6900 set t [eval $canv create rect [$canv bbox $linehtag($id)] \
6901 -tags markid -outline $fgcolor]
6905 proc selectline {l isnew {desired_loc {}}} {
6906 global canv ctext commitinfo selectedline
6907 global canvy0 linespc parents children curview
6908 global currentid sha1entry
6909 global commentend idtags linknum
6910 global mergemax numcommits pending_select
6911 global cmitmode showneartags allcommits
6912 global targetrow targetid lastscrollrows
6913 global autoselect autosellen jump_to_here
6915 catch {unset pending_select}
6920 if {$l < 0 || $l >= $numcommits} return
6921 set id [commitonrow $l]
6926 if {$lastscrollrows < $numcommits} {
6930 set y [expr {$canvy0 + $l * $linespc}]
6931 set ymax [lindex [$canv cget -scrollregion] 3]
6932 set ytop [expr {$y - $linespc - 1}]
6933 set ybot [expr {$y + $linespc + 1}]
6934 set wnow [$canv yview]
6935 set wtop [expr {[lindex $wnow 0] * $ymax}]
6936 set wbot [expr {[lindex $wnow 1] * $ymax}]
6937 set wh [expr {$wbot - $wtop}]
6939 if {$ytop < $wtop} {
6940 if {$ybot < $wtop} {
6941 set newtop [expr {$y - $wh / 2.0}]
6944 if {$newtop > $wtop - $linespc} {
6945 set newtop [expr {$wtop - $linespc}]
6948 } elseif {$ybot > $wbot} {
6949 if {$ytop > $wbot} {
6950 set newtop [expr {$y - $wh / 2.0}]
6952 set newtop [expr {$ybot - $wh}]
6953 if {$newtop < $wtop + $linespc} {
6954 set newtop [expr {$wtop + $linespc}]
6958 if {$newtop != $wtop} {
6962 allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
6969 addtohistory [list selbyid $id 0] savecmitpos
6972 $sha1entry delete 0 end
6973 $sha1entry insert 0 $id
6975 $sha1entry selection range 0 $autosellen
6979 $ctext conf -state normal
6982 if {![info exists commitinfo($id)]} {
6985 set info $commitinfo($id)
6986 set date [formatdate [lindex $info 2]]
6987 $ctext insert end "[mc "Author"]: [lindex $info 1] $date\n"
6988 set date [formatdate [lindex $info 4]]
6989 $ctext insert end "[mc "Committer"]: [lindex $info 3] $date\n"
6990 if {[info exists idtags($id)]} {
6991 $ctext insert end [mc "Tags:"]
6992 foreach tag $idtags($id) {
6993 $ctext insert end " $tag"
6995 $ctext insert end "\n"
6999 set olds $parents($curview,$id)
7000 if {[llength $olds] > 1} {
7003 if {$np >= $mergemax} {
7008 $ctext insert end "[mc "Parent"]: " $tag
7009 appendwithlinks [commit_descriptor $p] {}
7014 append headers "[mc "Parent"]: [commit_descriptor $p]"
7018 foreach c $children($curview,$id) {
7019 append headers "[mc "Child"]: [commit_descriptor $c]"
7022 # make anything that looks like a SHA1 ID be a clickable link
7023 appendwithlinks $headers {}
7024 if {$showneartags} {
7025 if {![info exists allcommits]} {
7028 $ctext insert end "[mc "Branch"]: "
7029 $ctext mark set branch "end -1c"
7030 $ctext mark gravity branch left
7031 $ctext insert end "\n[mc "Follows"]: "
7032 $ctext mark set follows "end -1c"
7033 $ctext mark gravity follows left
7034 $ctext insert end "\n[mc "Precedes"]: "
7035 $ctext mark set precedes "end -1c"
7036 $ctext mark gravity precedes left
7037 $ctext insert end "\n"
7040 $ctext insert end "\n"
7041 set comment [lindex $info 5]
7042 if {[string first "\r" $comment] >= 0} {
7043 set comment [string map {"\r" "\n "} $comment]
7045 appendwithlinks $comment {comment}
7047 $ctext tag remove found 1.0 end
7048 $ctext conf -state disabled
7049 set commentend [$ctext index "end - 1c"]
7051 set jump_to_here $desired_loc
7052 init_flist [mc "Comments"]
7053 if {$cmitmode eq "tree"} {
7055 } elseif {[llength $olds] <= 1} {
7062 proc selfirstline {} {
7067 proc sellastline {} {
7070 set l [expr {$numcommits - 1}]
7074 proc selnextline {dir} {
7077 if {$selectedline eq {}} return
7078 set l [expr {$selectedline + $dir}]
7083 proc selnextpage {dir} {
7084 global canv linespc selectedline numcommits
7086 set lpp [expr {([winfo height $canv] - 2) / $linespc}]
7090 allcanvs yview scroll [expr {$dir * $lpp}] units
7092 if {$selectedline eq {}} return
7093 set l [expr {$selectedline + $dir * $lpp}]
7096 } elseif {$l >= $numcommits} {
7097 set l [expr $numcommits - 1]
7103 proc unselectline {} {
7104 global selectedline currentid
7107 catch {unset currentid}
7108 allcanvs delete secsel
7112 proc reselectline {} {
7115 if {$selectedline ne {}} {
7116 selectline $selectedline 0
7120 proc addtohistory {cmd {saveproc {}}} {
7121 global history historyindex curview
7125 set elt [list $curview $cmd $saveproc {}]
7126 if {$historyindex > 0
7127 && [lindex $history [expr {$historyindex - 1}]] == $elt} {
7131 if {$historyindex < [llength $history]} {
7132 set history [lreplace $history $historyindex end $elt]
7134 lappend history $elt
7137 if {$historyindex > 1} {
7138 .tf.bar.leftbut conf -state normal
7140 .tf.bar.leftbut conf -state disabled
7142 .tf.bar.rightbut conf -state disabled
7145 # save the scrolling position of the diff display pane
7146 proc save_position {} {
7147 global historyindex history
7149 if {$historyindex < 1} return
7150 set hi [expr {$historyindex - 1}]
7151 set fn [lindex $history $hi 2]
7153 lset history $hi 3 [eval $fn]
7157 proc unset_posvars {} {
7160 if {[info exists last_posvars]} {
7161 foreach {var val} $last_posvars {
7170 global curview last_posvars
7172 set view [lindex $elt 0]
7173 set cmd [lindex $elt 1]
7174 set pv [lindex $elt 3]
7175 if {$curview != $view} {
7179 foreach {var val} $pv {
7183 set last_posvars $pv
7188 global history historyindex
7191 if {$historyindex > 1} {
7193 incr historyindex -1
7194 godo [lindex $history [expr {$historyindex - 1}]]
7195 .tf.bar.rightbut conf -state normal
7197 if {$historyindex <= 1} {
7198 .tf.bar.leftbut conf -state disabled
7203 global history historyindex
7206 if {$historyindex < [llength $history]} {
7208 set cmd [lindex $history $historyindex]
7211 .tf.bar.leftbut conf -state normal
7213 if {$historyindex >= [llength $history]} {
7214 .tf.bar.rightbut conf -state disabled
7219 global treefilelist treeidlist diffids diffmergeid treepending
7220 global nullid nullid2
7223 catch {unset diffmergeid}
7224 if {![info exists treefilelist($id)]} {
7225 if {![info exists treepending]} {
7226 if {$id eq $nullid} {
7227 set cmd [list | git ls-files]
7228 } elseif {$id eq $nullid2} {
7229 set cmd [list | git ls-files --stage -t]
7231 set cmd [list | git ls-tree -r $id]
7233 if {[catch {set gtf [open $cmd r]}]} {
7237 set treefilelist($id) {}
7238 set treeidlist($id) {}
7239 fconfigure $gtf -blocking 0 -encoding binary
7240 filerun $gtf [list gettreeline $gtf $id]
7247 proc gettreeline {gtf id} {
7248 global treefilelist treeidlist treepending cmitmode diffids nullid nullid2
7251 while {[incr nl] <= 1000 && [gets $gtf line] >= 0} {
7252 if {$diffids eq $nullid} {
7255 set i [string first "\t" $line]
7256 if {$i < 0} continue
7257 set fname [string range $line [expr {$i+1}] end]
7258 set line [string range $line 0 [expr {$i-1}]]
7259 if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue
7260 set sha1 [lindex $line 2]
7261 lappend treeidlist($id) $sha1
7263 if {[string index $fname 0] eq "\""} {
7264 set fname [lindex $fname 0]
7266 set fname [encoding convertfrom $fname]
7267 lappend treefilelist($id) $fname
7270 return [expr {$nl >= 1000? 2: 1}]
7274 if {$cmitmode ne "tree"} {
7275 if {![info exists diffmergeid]} {
7276 gettreediffs $diffids
7278 } elseif {$id ne $diffids} {
7287 global treefilelist treeidlist diffids nullid nullid2
7288 global ctext_file_names ctext_file_lines
7289 global ctext commentend
7291 set i [lsearch -exact $treefilelist($diffids) $f]
7293 puts "oops, $f not in list for id $diffids"
7296 if {$diffids eq $nullid} {
7297 if {[catch {set bf [open $f r]} err]} {
7298 puts "oops, can't read $f: $err"
7302 set blob [lindex $treeidlist($diffids) $i]
7303 if {[catch {set bf [open [concat | git cat-file blob $blob] r]} err]} {
7304 puts "oops, error reading blob $blob: $err"
7308 fconfigure $bf -blocking 0 -encoding [get_path_encoding $f]
7309 filerun $bf [list getblobline $bf $diffids]
7310 $ctext config -state normal
7311 clear_ctext $commentend
7312 lappend ctext_file_names $f
7313 lappend ctext_file_lines [lindex [split $commentend "."] 0]
7314 $ctext insert end "\n"
7315 $ctext insert end "$f\n" filesep
7316 $ctext config -state disabled
7317 $ctext yview $commentend
7321 proc getblobline {bf id} {
7322 global diffids cmitmode ctext
7324 if {$id ne $diffids || $cmitmode ne "tree"} {
7328 $ctext config -state normal
7330 while {[incr nl] <= 1000 && [gets $bf line] >= 0} {
7331 $ctext insert end "$line\n"
7334 global jump_to_here ctext_file_names commentend
7336 # delete last newline
7337 $ctext delete "end - 2c" "end - 1c"
7339 if {$jump_to_here ne {} &&
7340 [lindex $jump_to_here 0] eq [lindex $ctext_file_names 0]} {
7341 set lnum [expr {[lindex $jump_to_here 1] +
7342 [lindex [split $commentend .] 0]}]
7343 mark_ctext_line $lnum
7345 $ctext config -state disabled
7348 $ctext config -state disabled
7349 return [expr {$nl >= 1000? 2: 1}]
7352 proc mark_ctext_line {lnum} {
7353 global ctext markbgcolor
7355 $ctext tag delete omark
7356 $ctext tag add omark $lnum.0 "$lnum.0 + 1 line"
7357 $ctext tag conf omark -background $markbgcolor
7361 proc mergediff {id} {
7363 global diffids treediffs
7364 global parents curview
7368 set treediffs($id) {}
7369 set np [llength $parents($curview,$id)]
7374 proc startdiff {ids} {
7375 global treediffs diffids treepending diffmergeid nullid nullid2
7379 catch {unset diffmergeid}
7380 if {![info exists treediffs($ids)] ||
7381 [lsearch -exact $ids $nullid] >= 0 ||
7382 [lsearch -exact $ids $nullid2] >= 0} {
7383 if {![info exists treepending]} {
7391 proc path_filter {filter name} {
7393 set l [string length $p]
7394 if {[string index $p end] eq "/"} {
7395 if {[string compare -length $l $p $name] == 0} {
7399 if {[string compare -length $l $p $name] == 0 &&
7400 ([string length $name] == $l ||
7401 [string index $name $l] eq "/")} {
7409 proc addtocflist {ids} {
7412 add_flist $treediffs($ids)
7416 proc diffcmd {ids flags} {
7417 global nullid nullid2
7419 set i [lsearch -exact $ids $nullid]
7420 set j [lsearch -exact $ids $nullid2]
7422 if {[llength $ids] > 1 && $j < 0} {
7423 # comparing working directory with some specific revision
7424 set cmd [concat | git diff-index $flags]
7426 lappend cmd -R [lindex $ids 1]
7428 lappend cmd [lindex $ids 0]
7431 # comparing working directory with index
7432 set cmd [concat | git diff-files $flags]
7437 } elseif {$j >= 0} {
7438 set cmd [concat | git diff-index --cached $flags]
7439 if {[llength $ids] > 1} {
7440 # comparing index with specific revision
7442 lappend cmd -R [lindex $ids 1]
7444 lappend cmd [lindex $ids 0]
7447 # comparing index with HEAD
7451 set cmd [concat | git diff-tree -r $flags $ids]
7456 proc gettreediffs {ids} {
7457 global treediff treepending
7459 if {[catch {set gdtf [open [diffcmd $ids {--no-commit-id}] r]}]} return
7461 set treepending $ids
7463 fconfigure $gdtf -blocking 0 -encoding binary
7464 filerun $gdtf [list gettreediffline $gdtf $ids]
7467 proc gettreediffline {gdtf ids} {
7468 global treediff treediffs treepending diffids diffmergeid
7469 global cmitmode vfilelimit curview limitdiffs perfile_attrs
7474 if {$perfile_attrs} {
7475 # cache_gitattr is slow, and even slower on win32 where we
7476 # have to invoke it for only about 30 paths at a time
7478 if {[tk windowingsystem] == "win32"} {
7482 while {[incr nr] <= $max && [gets $gdtf line] >= 0} {
7483 set i [string first "\t" $line]
7485 set file [string range $line [expr {$i+1}] end]
7486 if {[string index $file 0] eq "\""} {
7487 set file [lindex $file 0]
7489 set file [encoding convertfrom $file]
7490 if {$file ne [lindex $treediff end]} {
7491 lappend treediff $file
7492 lappend sublist $file
7496 if {$perfile_attrs} {
7497 cache_gitattr encoding $sublist
7500 return [expr {$nr >= $max? 2: 1}]
7503 if {$limitdiffs && $vfilelimit($curview) ne {}} {
7505 foreach f $treediff {
7506 if {[path_filter $vfilelimit($curview) $f]} {
7510 set treediffs($ids) $flist
7512 set treediffs($ids) $treediff
7515 if {$cmitmode eq "tree" && [llength $diffids] == 1} {
7517 } elseif {$ids != $diffids} {
7518 if {![info exists diffmergeid]} {
7519 gettreediffs $diffids
7527 # empty string or positive integer
7528 proc diffcontextvalidate {v} {
7529 return [regexp {^(|[1-9][0-9]*)$} $v]
7532 proc diffcontextchange {n1 n2 op} {
7533 global diffcontextstring diffcontext
7535 if {[string is integer -strict $diffcontextstring]} {
7536 if {$diffcontextstring >= 0} {
7537 set diffcontext $diffcontextstring
7543 proc changeignorespace {} {
7547 proc changeworddiff {name ix op} {
7551 proc getblobdiffs {ids} {
7552 global blobdifffd diffids env
7553 global diffinhdr treediffs
7557 global limitdiffs vfilelimit curview
7558 global diffencoding targetline diffnparents
7559 global git_version currdiffsubmod
7562 if {[package vcompare $git_version "1.6.1"] >= 0} {
7563 set textconv "--textconv"
7566 if {[package vcompare $git_version "1.6.6"] >= 0} {
7567 set submodule "--submodule"
7569 set cmd [diffcmd $ids "-p $textconv $submodule -C --cc --no-commit-id -U$diffcontext"]
7573 if {$worddiff ne [mc "Line diff"]} {
7574 append cmd " --word-diff=porcelain"
7576 if {$limitdiffs && $vfilelimit($curview) ne {}} {
7577 set cmd [concat $cmd -- $vfilelimit($curview)]
7579 if {[catch {set bdf [open $cmd r]} err]} {
7580 error_popup [mc "Error getting diffs: %s" $err]
7586 set diffencoding [get_path_encoding {}]
7587 fconfigure $bdf -blocking 0 -encoding binary -eofchar {}
7588 set blobdifffd($ids) $bdf
7589 set currdiffsubmod ""
7590 filerun $bdf [list getblobdiffline $bdf $diffids]
7593 proc savecmitpos {} {
7594 global ctext cmitmode
7596 if {$cmitmode eq "tree"} {
7599 return [list target_scrollpos [$ctext index @0,0]]
7602 proc savectextpos {} {
7605 return [list target_scrollpos [$ctext index @0,0]]
7608 proc maybe_scroll_ctext {ateof} {
7609 global ctext target_scrollpos
7611 if {![info exists target_scrollpos]} return
7613 set nlines [expr {[winfo height $ctext]
7614 / [font metrics textfont -linespace]}]
7615 if {[$ctext compare "$target_scrollpos + $nlines lines" <= end]} return
7617 $ctext yview $target_scrollpos
7618 unset target_scrollpos
7621 proc setinlist {var i val} {
7624 while {[llength [set $var]] < $i} {
7627 if {[llength [set $var]] == $i} {
7634 proc makediffhdr {fname ids} {
7635 global ctext curdiffstart treediffs diffencoding
7636 global ctext_file_names jump_to_here targetline diffline
7638 set fname [encoding convertfrom $fname]
7639 set diffencoding [get_path_encoding $fname]
7640 set i [lsearch -exact $treediffs($ids) $fname]
7642 setinlist difffilestart $i $curdiffstart
7644 lset ctext_file_names end $fname
7645 set l [expr {(78 - [string length $fname]) / 2}]
7646 set pad [string range "----------------------------------------" 1 $l]
7647 $ctext insert $curdiffstart "$pad $fname $pad" filesep
7649 if {$jump_to_here ne {} && [lindex $jump_to_here 0] eq $fname} {
7650 set targetline [lindex $jump_to_here 1]
7655 proc getblobdiffline {bdf ids} {
7656 global diffids blobdifffd ctext curdiffstart
7657 global diffnexthead diffnextnote difffilestart
7658 global ctext_file_names ctext_file_lines
7659 global diffinhdr treediffs mergemax diffnparents
7660 global diffencoding jump_to_here targetline diffline currdiffsubmod
7664 $ctext conf -state normal
7665 while {[incr nr] <= 1000 && [gets $bdf line] >= 0} {
7666 if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
7670 if {![string compare -length 5 "diff " $line]} {
7671 if {![regexp {^diff (--cc|--git) } $line m type]} {
7672 set line [encoding convertfrom $line]
7673 $ctext insert end "$line\n" hunksep
7676 # start of a new file
7678 $ctext insert end "\n"
7679 set curdiffstart [$ctext index "end - 1c"]
7680 lappend ctext_file_names ""
7681 lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
7682 $ctext insert end "\n" filesep
7684 if {$type eq "--cc"} {
7685 # start of a new file in a merge diff
7686 set fname [string range $line 10 end]
7687 if {[lsearch -exact $treediffs($ids) $fname] < 0} {
7688 lappend treediffs($ids) $fname
7689 add_flist [list $fname]
7693 set line [string range $line 11 end]
7694 # If the name hasn't changed the length will be odd,
7695 # the middle char will be a space, and the two bits either
7696 # side will be a/name and b/name, or "a/name" and "b/name".
7697 # If the name has changed we'll get "rename from" and
7698 # "rename to" or "copy from" and "copy to" lines following
7699 # this, and we'll use them to get the filenames.
7700 # This complexity is necessary because spaces in the
7701 # filename(s) don't get escaped.
7702 set l [string length $line]
7703 set i [expr {$l / 2}]
7704 if {!(($l & 1) && [string index $line $i] eq " " &&
7705 [string range $line 2 [expr {$i - 1}]] eq \
7706 [string range $line [expr {$i + 3}] end])} {
7709 # unescape if quoted and chop off the a/ from the front
7710 if {[string index $line 0] eq "\""} {
7711 set fname [string range [lindex $line 0] 2 end]
7713 set fname [string range $line 2 [expr {$i - 1}]]
7716 makediffhdr $fname $ids
7718 } elseif {![string compare -length 16 "* Unmerged path " $line]} {
7719 set fname [encoding convertfrom [string range $line 16 end]]
7720 $ctext insert end "\n"
7721 set curdiffstart [$ctext index "end - 1c"]
7722 lappend ctext_file_names $fname
7723 lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
7724 $ctext insert end "$line\n" filesep
7725 set i [lsearch -exact $treediffs($ids) $fname]
7727 setinlist difffilestart $i $curdiffstart
7730 } elseif {![string compare -length 2 "@@" $line]} {
7731 regexp {^@@+} $line ats
7732 set line [encoding convertfrom $diffencoding $line]
7733 $ctext insert end "$line\n" hunksep
7734 if {[regexp { \+(\d+),\d+ @@} $line m nl]} {
7737 set diffnparents [expr {[string length $ats] - 1}]
7740 } elseif {![string compare -length 10 "Submodule " $line]} {
7741 # start of a new submodule
7742 if {[regexp -indices "\[0-9a-f\]+\\.\\." $line nameend]} {
7743 set fname [string range $line 10 [expr [lindex $nameend 0] - 2]]
7745 set fname [string range $line 10 [expr [string first "contains " $line] - 2]]
7747 if {$currdiffsubmod != $fname} {
7748 $ctext insert end "\n"; # Add newline after commit message
7750 set curdiffstart [$ctext index "end - 1c"]
7751 lappend ctext_file_names ""
7752 if {$currdiffsubmod != $fname} {
7753 lappend ctext_file_lines $fname
7754 makediffhdr $fname $ids
7755 set currdiffsubmod $fname
7756 $ctext insert end "\n$line\n" filesep
7758 $ctext insert end "$line\n" filesep
7760 } elseif {![string compare -length 3 " >" $line]} {
7761 set $currdiffsubmod ""
7762 set line [encoding convertfrom $diffencoding $line]
7763 $ctext insert end "$line\n" dresult
7764 } elseif {![string compare -length 3 " <" $line]} {
7765 set $currdiffsubmod ""
7766 set line [encoding convertfrom $diffencoding $line]
7767 $ctext insert end "$line\n" d0
7768 } elseif {$diffinhdr} {
7769 if {![string compare -length 12 "rename from " $line]} {
7770 set fname [string range $line [expr 6 + [string first " from " $line] ] end]
7771 if {[string index $fname 0] eq "\""} {
7772 set fname [lindex $fname 0]
7774 set fname [encoding convertfrom $fname]
7775 set i [lsearch -exact $treediffs($ids) $fname]
7777 setinlist difffilestart $i $curdiffstart
7779 } elseif {![string compare -length 10 $line "rename to "] ||
7780 ![string compare -length 8 $line "copy to "]} {
7781 set fname [string range $line [expr 4 + [string first " to " $line] ] end]
7782 if {[string index $fname 0] eq "\""} {
7783 set fname [lindex $fname 0]
7785 makediffhdr $fname $ids
7786 } elseif {[string compare -length 3 $line "---"] == 0} {
7789 } elseif {[string compare -length 3 $line "+++"] == 0} {
7793 $ctext insert end "$line\n" filesep
7796 set line [string map {\x1A ^Z} \
7797 [encoding convertfrom $diffencoding $line]]
7798 # parse the prefix - one ' ', '-' or '+' for each parent
7799 set prefix [string range $line 0 [expr {$diffnparents - 1}]]
7800 set tag [expr {$diffnparents > 1? "m": "d"}]
7801 set dowords [expr {$worddiff ne [mc "Line diff"] && $diffnparents == 1}]
7802 set words_pre_markup ""
7803 set words_post_markup ""
7804 if {[string trim $prefix " -+"] eq {}} {
7805 # prefix only has " ", "-" and "+" in it: normal diff line
7806 set num [string first "-" $prefix]
7808 set line [string range $line 1 end]
7811 # removed line, first parent with line is $num
7812 if {$num >= $mergemax} {
7815 if {$dowords && $worddiff eq [mc "Markup words"]} {
7816 $ctext insert end "\[-$line-\]" $tag$num
7818 $ctext insert end "$line" $tag$num
7821 $ctext insert end "\n" $tag$num
7825 if {[string first "+" $prefix] >= 0} {
7827 lappend tags ${tag}result
7828 if {$diffnparents > 1} {
7829 set num [string first " " $prefix]
7831 if {$num >= $mergemax} {
7837 set words_pre_markup "{+"
7838 set words_post_markup "+}"
7840 if {$targetline ne {}} {
7841 if {$diffline == $targetline} {
7842 set seehere [$ctext index "end - 1 chars"]
7848 if {$dowords && $worddiff eq [mc "Markup words"]} {
7849 $ctext insert end "$words_pre_markup$line$words_post_markup" $tags
7851 $ctext insert end "$line" $tags
7854 $ctext insert end "\n" $tags
7857 } elseif {$dowords && $prefix eq "~"} {
7858 $ctext insert end "\n" {}
7860 # "\ No newline at end of file",
7861 # or something else we don't recognize
7862 $ctext insert end "$line\n" hunksep
7866 if {[info exists seehere]} {
7867 mark_ctext_line [lindex [split $seehere .] 0]
7869 maybe_scroll_ctext [eof $bdf]
7870 $ctext conf -state disabled
7875 return [expr {$nr >= 1000? 2: 1}]
7878 proc changediffdisp {} {
7879 global ctext diffelide
7881 $ctext tag conf d0 -elide [lindex $diffelide 0]
7882 $ctext tag conf dresult -elide [lindex $diffelide 1]
7885 proc highlightfile {loc cline} {
7886 global ctext cflist cflist_top
7889 $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
7890 $cflist tag add highlight $cline.0 "$cline.0 lineend"
7891 $cflist see $cline.0
7892 set cflist_top $cline
7896 global difffilestart ctext cmitmode
7898 if {$cmitmode eq "tree"} return
7901 set here [$ctext index @0,0]
7902 foreach loc $difffilestart {
7903 if {[$ctext compare $loc >= $here]} {
7904 highlightfile $prev $prevline
7910 highlightfile $prev $prevline
7914 global difffilestart ctext cmitmode
7916 if {$cmitmode eq "tree"} return
7917 set here [$ctext index @0,0]
7919 foreach loc $difffilestart {
7921 if {[$ctext compare $loc > $here]} {
7922 highlightfile $loc $line
7928 proc clear_ctext {{first 1.0}} {
7929 global ctext smarktop smarkbot
7930 global ctext_file_names ctext_file_lines
7933 set l [lindex [split $first .] 0]
7934 if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} {
7937 if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} {
7940 $ctext delete $first end
7941 if {$first eq "1.0"} {
7942 catch {unset pendinglinks}
7944 set ctext_file_names {}
7945 set ctext_file_lines {}
7948 proc settabs {{firstab {}}} {
7949 global firsttabstop tabstop ctext have_tk85
7951 if {$firstab ne {} && $have_tk85} {
7952 set firsttabstop $firstab
7954 set w [font measure textfont "0"]
7955 if {$firsttabstop != 0} {
7956 $ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \
7957 [expr {($firsttabstop + 2 * $tabstop) * $w}]]
7958 } elseif {$have_tk85 || $tabstop != 8} {
7959 $ctext conf -tabs [expr {$tabstop * $w}]
7961 $ctext conf -tabs {}
7965 proc incrsearch {name ix op} {
7966 global ctext searchstring searchdirn
7968 $ctext tag remove found 1.0 end
7969 if {[catch {$ctext index anchor}]} {
7970 # no anchor set, use start of selection, or of visible area
7971 set sel [$ctext tag ranges sel]
7973 $ctext mark set anchor [lindex $sel 0]
7974 } elseif {$searchdirn eq "-forwards"} {
7975 $ctext mark set anchor @0,0
7977 $ctext mark set anchor @0,[winfo height $ctext]
7980 if {$searchstring ne {}} {
7981 set here [$ctext search $searchdirn -- $searchstring anchor]
7990 global sstring ctext searchstring searchdirn
7993 $sstring icursor end
7994 set searchdirn -forwards
7995 if {$searchstring ne {}} {
7996 set sel [$ctext tag ranges sel]
7998 set start "[lindex $sel 0] + 1c"
7999 } elseif {[catch {set start [$ctext index anchor]}]} {
8002 set match [$ctext search -count mlen -- $searchstring $start]
8003 $ctext tag remove sel 1.0 end
8009 set mend "$match + $mlen c"
8010 $ctext tag add sel $match $mend
8011 $ctext mark unset anchor
8015 proc dosearchback {} {
8016 global sstring ctext searchstring searchdirn
8019 $sstring icursor end
8020 set searchdirn -backwards
8021 if {$searchstring ne {}} {
8022 set sel [$ctext tag ranges sel]
8024 set start [lindex $sel 0]
8025 } elseif {[catch {set start [$ctext index anchor]}]} {
8026 set start @0,[winfo height $ctext]
8028 set match [$ctext search -backwards -count ml -- $searchstring $start]
8029 $ctext tag remove sel 1.0 end
8035 set mend "$match + $ml c"
8036 $ctext tag add sel $match $mend
8037 $ctext mark unset anchor
8041 proc searchmark {first last} {
8042 global ctext searchstring
8046 set match [$ctext search -count mlen -- $searchstring $mend $last.end]
8047 if {$match eq {}} break
8048 set mend "$match + $mlen c"
8049 $ctext tag add found $match $mend
8053 proc searchmarkvisible {doall} {
8054 global ctext smarktop smarkbot
8056 set topline [lindex [split [$ctext index @0,0] .] 0]
8057 set botline [lindex [split [$ctext index @0,[winfo height $ctext]] .] 0]
8058 if {$doall || $botline < $smarktop || $topline > $smarkbot} {
8059 # no overlap with previous
8060 searchmark $topline $botline
8061 set smarktop $topline
8062 set smarkbot $botline
8064 if {$topline < $smarktop} {
8065 searchmark $topline [expr {$smarktop-1}]
8066 set smarktop $topline
8068 if {$botline > $smarkbot} {
8069 searchmark [expr {$smarkbot+1}] $botline
8070 set smarkbot $botline
8075 proc scrolltext {f0 f1} {
8078 .bleft.bottom.sb set $f0 $f1
8079 if {$searchstring ne {}} {
8085 global linespc charspc canvx0 canvy0
8086 global xspc1 xspc2 lthickness
8088 set linespc [font metrics mainfont -linespace]
8089 set charspc [font measure mainfont "m"]
8090 set canvy0 [expr {int(3 + 0.5 * $linespc)}]
8091 set canvx0 [expr {int(3 + 0.5 * $linespc)}]
8092 set lthickness [expr {int($linespc / 9) + 1}]
8093 set xspc1(0) $linespc
8101 set ymax [lindex [$canv cget -scrollregion] 3]
8102 if {$ymax eq {} || $ymax == 0} return
8103 set span [$canv yview]
8106 allcanvs yview moveto [lindex $span 0]
8108 if {$selectedline ne {}} {
8109 selectline $selectedline 0
8110 allcanvs yview moveto [lindex $span 0]
8114 proc parsefont {f n} {
8117 set fontattr($f,family) [lindex $n 0]
8119 if {$s eq {} || $s == 0} {
8122 set s [expr {int(-$s / [winfo fpixels . 1p] + 0.5)}]
8124 set fontattr($f,size) $s
8125 set fontattr($f,weight) normal
8126 set fontattr($f,slant) roman
8127 foreach style [lrange $n 2 end] {
8130 "bold" {set fontattr($f,weight) $style}
8132 "italic" {set fontattr($f,slant) $style}
8137 proc fontflags {f {isbold 0}} {
8140 return [list -family $fontattr($f,family) -size $fontattr($f,size) \
8141 -weight [expr {$isbold? "bold": $fontattr($f,weight)}] \
8142 -slant $fontattr($f,slant)]
8148 set n [list $fontattr($f,family) $fontattr($f,size)]
8149 if {$fontattr($f,weight) eq "bold"} {
8152 if {$fontattr($f,slant) eq "italic"} {
8158 proc incrfont {inc} {
8159 global mainfont textfont ctext canv cflist showrefstop
8160 global stopped entries fontattr
8163 set s $fontattr(mainfont,size)
8168 set fontattr(mainfont,size) $s
8169 font config mainfont -size $s
8170 font config mainfontbold -size $s
8171 set mainfont [fontname mainfont]
8172 set s $fontattr(textfont,size)
8177 set fontattr(textfont,size) $s
8178 font config textfont -size $s
8179 font config textfontbold -size $s
8180 set textfont [fontname textfont]
8187 global sha1entry sha1string
8188 if {[string length $sha1string] == 40} {
8189 $sha1entry delete 0 end
8193 proc sha1change {n1 n2 op} {
8194 global sha1string currentid sha1but
8195 if {$sha1string == {}
8196 || ([info exists currentid] && $sha1string == $currentid)} {
8201 if {[$sha1but cget -state] == $state} return
8202 if {$state == "normal"} {
8203 $sha1but conf -state normal -relief raised -text "[mc "Goto:"] "
8205 $sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] "
8209 proc gotocommit {} {
8210 global sha1string tagids headids curview varcid
8212 if {$sha1string == {}
8213 || ([info exists currentid] && $sha1string == $currentid)} return
8214 if {[info exists tagids($sha1string)]} {
8215 set id $tagids($sha1string)
8216 } elseif {[info exists headids($sha1string)]} {
8217 set id $headids($sha1string)
8219 set id [string tolower $sha1string]
8220 if {[regexp {^[0-9a-f]{4,39}$} $id]} {
8221 set matches [longid $id]
8222 if {$matches ne {}} {
8223 if {[llength $matches] > 1} {
8224 error_popup [mc "Short SHA1 id %s is ambiguous" $id]
8227 set id [lindex $matches 0]
8230 if {[catch {set id [exec git rev-parse --verify $sha1string]}]} {
8231 error_popup [mc "Revision %s is not known" $sha1string]
8236 if {[commitinview $id $curview]} {
8237 selectline [rowofcommit $id] 1
8240 if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
8241 set msg [mc "SHA1 id %s is not known" $sha1string]
8243 set msg [mc "Revision %s is not in the current view" $sha1string]
8248 proc lineenter {x y id} {
8249 global hoverx hovery hoverid hovertimer
8250 global commitinfo canv
8252 if {![info exists commitinfo($id)] && ![getcommit $id]} return
8256 if {[info exists hovertimer]} {
8257 after cancel $hovertimer
8259 set hovertimer [after 500 linehover]
8263 proc linemotion {x y id} {
8264 global hoverx hovery hoverid hovertimer
8266 if {[info exists hoverid] && $id == $hoverid} {
8269 if {[info exists hovertimer]} {
8270 after cancel $hovertimer
8272 set hovertimer [after 500 linehover]
8276 proc lineleave {id} {
8277 global hoverid hovertimer canv
8279 if {[info exists hoverid] && $id == $hoverid} {
8281 if {[info exists hovertimer]} {
8282 after cancel $hovertimer
8290 global hoverx hovery hoverid hovertimer
8291 global canv linespc lthickness
8294 set text [lindex $commitinfo($hoverid) 0]
8295 set ymax [lindex [$canv cget -scrollregion] 3]
8296 if {$ymax == {}} return
8297 set yfrac [lindex [$canv yview] 0]
8298 set x [expr {$hoverx + 2 * $linespc}]
8299 set y [expr {$hovery + $yfrac * $ymax - $linespc / 2}]
8300 set x0 [expr {$x - 2 * $lthickness}]
8301 set y0 [expr {$y - 2 * $lthickness}]
8302 set x1 [expr {$x + [font measure mainfont $text] + 2 * $lthickness}]
8303 set y1 [expr {$y + $linespc + 2 * $lthickness}]
8304 set t [$canv create rectangle $x0 $y0 $x1 $y1 \
8305 -fill \#ffff80 -outline black -width 1 -tags hover]
8307 set t [$canv create text $x $y -anchor nw -text $text -tags hover \
8312 proc clickisonarrow {id y} {
8315 set ranges [rowranges $id]
8316 set thresh [expr {2 * $lthickness + 6}]
8317 set n [expr {[llength $ranges] - 1}]
8318 for {set i 1} {$i < $n} {incr i} {
8319 set row [lindex $ranges $i]
8320 if {abs([yc $row] - $y) < $thresh} {
8327 proc arrowjump {id n y} {
8330 # 1 <-> 2, 3 <-> 4, etc...
8331 set n [expr {(($n - 1) ^ 1) + 1}]
8332 set row [lindex [rowranges $id] $n]
8334 set ymax [lindex [$canv cget -scrollregion] 3]
8335 if {$ymax eq {} || $ymax <= 0} return
8336 set view [$canv yview]
8337 set yspan [expr {[lindex $view 1] - [lindex $view 0]}]
8338 set yfrac [expr {$yt / $ymax - $yspan / 2}]
8342 allcanvs yview moveto $yfrac
8345 proc lineclick {x y id isnew} {
8346 global ctext commitinfo children canv thickerline curview
8348 if {![info exists commitinfo($id)] && ![getcommit $id]} return
8353 # draw this line thicker than normal
8357 set ymax [lindex [$canv cget -scrollregion] 3]
8358 if {$ymax eq {}} return
8359 set yfrac [lindex [$canv yview] 0]
8360 set y [expr {$y + $yfrac * $ymax}]
8362 set dirn [clickisonarrow $id $y]
8364 arrowjump $id $dirn $y
8369 addtohistory [list lineclick $x $y $id 0] savectextpos
8371 # fill the details pane with info about this line
8372 $ctext conf -state normal
8375 $ctext insert end "[mc "Parent"]:\t"
8376 $ctext insert end $id link0
8378 set info $commitinfo($id)
8379 $ctext insert end "\n\t[lindex $info 0]\n"
8380 $ctext insert end "\t[mc "Author"]:\t[lindex $info 1]\n"
8381 set date [formatdate [lindex $info 2]]
8382 $ctext insert end "\t[mc "Date"]:\t$date\n"
8383 set kids $children($curview,$id)
8385 $ctext insert end "\n[mc "Children"]:"
8387 foreach child $kids {
8389 if {![info exists commitinfo($child)] && ![getcommit $child]} continue
8390 set info $commitinfo($child)
8391 $ctext insert end "\n\t"
8392 $ctext insert end $child link$i
8393 setlink $child link$i
8394 $ctext insert end "\n\t[lindex $info 0]"
8395 $ctext insert end "\n\t[mc "Author"]:\t[lindex $info 1]"
8396 set date [formatdate [lindex $info 2]]
8397 $ctext insert end "\n\t[mc "Date"]:\t$date\n"
8400 maybe_scroll_ctext 1
8401 $ctext conf -state disabled
8405 proc normalline {} {
8407 if {[info exists thickerline]} {
8414 proc selbyid {id {isnew 1}} {
8416 if {[commitinview $id $curview]} {
8417 selectline [rowofcommit $id] $isnew
8423 if {![info exists startmstime]} {
8424 set startmstime [clock clicks -milliseconds]
8426 return [format "%.3f" [expr {([clock click -milliseconds] - $startmstime) / 1000.0}]]
8429 proc rowmenu {x y id} {
8430 global rowctxmenu selectedline rowmenuid curview
8431 global nullid nullid2 fakerowmenu mainhead markedid
8435 if {$selectedline eq {} || [rowofcommit $id] eq $selectedline} {
8440 if {$id ne $nullid && $id ne $nullid2} {
8441 set menu $rowctxmenu
8442 if {$mainhead ne {}} {
8443 $menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead] -state normal
8445 $menu entryconfigure 7 -label [mc "Detached head: can't reset" $mainhead] -state disabled
8447 if {[info exists markedid] && $markedid ne $id} {
8448 $menu entryconfigure 9 -state normal
8449 $menu entryconfigure 10 -state normal
8450 $menu entryconfigure 11 -state normal
8452 $menu entryconfigure 9 -state disabled
8453 $menu entryconfigure 10 -state disabled
8454 $menu entryconfigure 11 -state disabled
8457 set menu $fakerowmenu
8459 $menu entryconfigure [mca "Diff this -> selected"] -state $state
8460 $menu entryconfigure [mca "Diff selected -> this"] -state $state
8461 $menu entryconfigure [mca "Make patch"] -state $state
8462 tk_popup $menu $x $y
8466 global rowmenuid markedid canv
8468 set markedid $rowmenuid
8469 make_idmark $markedid
8475 if {[info exists markedid]} {
8480 proc replace_by_kids {l r} {
8481 global curview children
8483 set id [commitonrow $r]
8484 set l [lreplace $l 0 0]
8485 foreach kid $children($curview,$id) {
8486 lappend l [rowofcommit $kid]
8488 return [lsort -integer -decreasing -unique $l]
8491 proc find_common_desc {} {
8492 global markedid rowmenuid curview children
8494 if {![info exists markedid]} return
8495 if {![commitinview $markedid $curview] ||
8496 ![commitinview $rowmenuid $curview]} return
8497 #set t1 [clock clicks -milliseconds]
8498 set l1 [list [rowofcommit $markedid]]
8499 set l2 [list [rowofcommit $rowmenuid]]
8501 set r1 [lindex $l1 0]
8502 set r2 [lindex $l2 0]
8503 if {$r1 eq {} || $r2 eq {}} break
8509 set l1 [replace_by_kids $l1 $r1]
8511 set l2 [replace_by_kids $l2 $r2]
8514 #set t2 [clock clicks -milliseconds]
8515 #puts "took [expr {$t2-$t1}]ms"
8518 proc compare_commits {} {
8519 global markedid rowmenuid curview children
8521 if {![info exists markedid]} return
8522 if {![commitinview $markedid $curview]} return
8523 addtohistory [list do_cmp_commits $markedid $rowmenuid]
8524 do_cmp_commits $markedid $rowmenuid
8527 proc getpatchid {id} {
8530 if {![info exists patchids($id)]} {
8531 set cmd [diffcmd [list $id] {-p --root}]
8532 # trim off the initial "|"
8533 set cmd [lrange $cmd 1 end]
8535 set x [eval exec $cmd | git patch-id]
8536 set patchids($id) [lindex $x 0]
8538 set patchids($id) "error"
8541 return $patchids($id)
8544 proc do_cmp_commits {a b} {
8545 global ctext curview parents children patchids commitinfo
8547 $ctext conf -state normal
8550 for {set i 0} {$i < 100} {incr i} {
8553 if {[llength $parents($curview,$a)] > 1} {
8554 appendshortlink $a [mc "Skipping merge commit "] "\n"
8557 set patcha [getpatchid $a]
8559 if {[llength $parents($curview,$b)] > 1} {
8560 appendshortlink $b [mc "Skipping merge commit "] "\n"
8563 set patchb [getpatchid $b]
8565 if {!$skipa && !$skipb} {
8566 set heada [lindex $commitinfo($a) 0]
8567 set headb [lindex $commitinfo($b) 0]
8568 if {$patcha eq "error"} {
8569 appendshortlink $a [mc "Error getting patch ID for "] \
8570 [mc " - stopping\n"]
8573 if {$patchb eq "error"} {
8574 appendshortlink $b [mc "Error getting patch ID for "] \
8575 [mc " - stopping\n"]
8578 if {$patcha eq $patchb} {
8579 if {$heada eq $headb} {
8580 appendshortlink $a [mc "Commit "]
8581 appendshortlink $b " == " " $heada\n"
8583 appendshortlink $a [mc "Commit "] " $heada\n"
8584 appendshortlink $b [mc " is the same patch as\n "] \
8590 $ctext insert end "\n"
8591 appendshortlink $a [mc "Commit "] " $heada\n"
8592 appendshortlink $b [mc " differs from\n "] \
8594 $ctext insert end [mc "Diff of commits:\n\n"]
8595 $ctext conf -state disabled
8602 set kids [real_children $curview,$a]
8603 if {[llength $kids] != 1} {
8604 $ctext insert end "\n"
8605 appendshortlink $a [mc "Commit "] \
8606 [mc " has %s children - stopping\n" [llength $kids]]
8609 set a [lindex $kids 0]
8612 set kids [real_children $curview,$b]
8613 if {[llength $kids] != 1} {
8614 appendshortlink $b [mc "Commit "] \
8615 [mc " has %s children - stopping\n" [llength $kids]]
8618 set b [lindex $kids 0]
8621 $ctext conf -state disabled
8624 proc diffcommits {a b} {
8625 global diffcontext diffids blobdifffd diffinhdr currdiffsubmod
8627 set tmpdir [gitknewtmpdir]
8628 set fna [file join $tmpdir "commit-[string range $a 0 7]"]
8629 set fnb [file join $tmpdir "commit-[string range $b 0 7]"]
8631 exec git diff-tree -p --pretty $a >$fna
8632 exec git diff-tree -p --pretty $b >$fnb
8634 error_popup [mc "Error writing commit to file: %s" $err]
8638 set fd [open "| diff -U$diffcontext $fna $fnb" r]
8640 error_popup [mc "Error diffing commits: %s" $err]
8643 set diffids [list commits $a $b]
8644 set blobdifffd($diffids) $fd
8646 set currdiffsubmod ""
8647 filerun $fd [list getblobdiffline $fd $diffids]
8650 proc diffvssel {dirn} {
8651 global rowmenuid selectedline
8653 if {$selectedline eq {}} return
8655 set oldid [commitonrow $selectedline]
8656 set newid $rowmenuid
8658 set oldid $rowmenuid
8659 set newid [commitonrow $selectedline]
8661 addtohistory [list doseldiff $oldid $newid] savectextpos
8662 doseldiff $oldid $newid
8665 proc doseldiff {oldid newid} {
8669 $ctext conf -state normal
8671 init_flist [mc "Top"]
8672 $ctext insert end "[mc "From"] "
8673 $ctext insert end $oldid link0
8674 setlink $oldid link0
8675 $ctext insert end "\n "
8676 $ctext insert end [lindex $commitinfo($oldid) 0]
8677 $ctext insert end "\n\n[mc "To"] "
8678 $ctext insert end $newid link1
8679 setlink $newid link1
8680 $ctext insert end "\n "
8681 $ctext insert end [lindex $commitinfo($newid) 0]
8682 $ctext insert end "\n"
8683 $ctext conf -state disabled
8684 $ctext tag remove found 1.0 end
8685 startdiff [list $oldid $newid]
8689 global rowmenuid currentid commitinfo patchtop patchnum NS
8691 if {![info exists currentid]} return
8692 set oldid $currentid
8693 set oldhead [lindex $commitinfo($oldid) 0]
8694 set newid $rowmenuid
8695 set newhead [lindex $commitinfo($newid) 0]
8698 catch {destroy $top}
8700 make_transient $top .
8701 ${NS}::label $top.title -text [mc "Generate patch"]
8702 grid $top.title - -pady 10
8703 ${NS}::label $top.from -text [mc "From:"]
8704 ${NS}::entry $top.fromsha1 -width 40
8705 $top.fromsha1 insert 0 $oldid
8706 $top.fromsha1 conf -state readonly
8707 grid $top.from $top.fromsha1 -sticky w
8708 ${NS}::entry $top.fromhead -width 60
8709 $top.fromhead insert 0 $oldhead
8710 $top.fromhead conf -state readonly
8711 grid x $top.fromhead -sticky w
8712 ${NS}::label $top.to -text [mc "To:"]
8713 ${NS}::entry $top.tosha1 -width 40
8714 $top.tosha1 insert 0 $newid
8715 $top.tosha1 conf -state readonly
8716 grid $top.to $top.tosha1 -sticky w
8717 ${NS}::entry $top.tohead -width 60
8718 $top.tohead insert 0 $newhead
8719 $top.tohead conf -state readonly
8720 grid x $top.tohead -sticky w
8721 ${NS}::button $top.rev -text [mc "Reverse"] -command mkpatchrev
8722 grid $top.rev x -pady 10 -padx 5
8723 ${NS}::label $top.flab -text [mc "Output file:"]
8724 ${NS}::entry $top.fname -width 60
8725 $top.fname insert 0 [file normalize "patch$patchnum.patch"]
8727 grid $top.flab $top.fname -sticky w
8728 ${NS}::frame $top.buts
8729 ${NS}::button $top.buts.gen -text [mc "Generate"] -command mkpatchgo
8730 ${NS}::button $top.buts.can -text [mc "Cancel"] -command mkpatchcan
8731 bind $top <Key-Return> mkpatchgo
8732 bind $top <Key-Escape> mkpatchcan
8733 grid $top.buts.gen $top.buts.can
8734 grid columnconfigure $top.buts 0 -weight 1 -uniform a
8735 grid columnconfigure $top.buts 1 -weight 1 -uniform a
8736 grid $top.buts - -pady 10 -sticky ew
8740 proc mkpatchrev {} {
8743 set oldid [$patchtop.fromsha1 get]
8744 set oldhead [$patchtop.fromhead get]
8745 set newid [$patchtop.tosha1 get]
8746 set newhead [$patchtop.tohead get]
8747 foreach e [list fromsha1 fromhead tosha1 tohead] \
8748 v [list $newid $newhead $oldid $oldhead] {
8749 $patchtop.$e conf -state normal
8750 $patchtop.$e delete 0 end
8751 $patchtop.$e insert 0 $v
8752 $patchtop.$e conf -state readonly
8757 global patchtop nullid nullid2
8759 set oldid [$patchtop.fromsha1 get]
8760 set newid [$patchtop.tosha1 get]
8761 set fname [$patchtop.fname get]
8762 set cmd [diffcmd [list $oldid $newid] -p]
8763 # trim off the initial "|"
8764 set cmd [lrange $cmd 1 end]
8765 lappend cmd >$fname &
8766 if {[catch {eval exec $cmd} err]} {
8767 error_popup "[mc "Error creating patch:"] $err" $patchtop
8769 catch {destroy $patchtop}
8773 proc mkpatchcan {} {
8776 catch {destroy $patchtop}
8781 global rowmenuid mktagtop commitinfo NS
8785 catch {destroy $top}
8787 make_transient $top .
8788 ${NS}::label $top.title -text [mc "Create tag"]
8789 grid $top.title - -pady 10
8790 ${NS}::label $top.id -text [mc "ID:"]
8791 ${NS}::entry $top.sha1 -width 40
8792 $top.sha1 insert 0 $rowmenuid
8793 $top.sha1 conf -state readonly
8794 grid $top.id $top.sha1 -sticky w
8795 ${NS}::entry $top.head -width 60
8796 $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
8797 $top.head conf -state readonly
8798 grid x $top.head -sticky w
8799 ${NS}::label $top.tlab -text [mc "Tag name:"]
8800 ${NS}::entry $top.tag -width 60
8801 grid $top.tlab $top.tag -sticky w
8802 ${NS}::label $top.op -text [mc "Tag message is optional"]
8803 grid $top.op -columnspan 2 -sticky we
8804 ${NS}::label $top.mlab -text [mc "Tag message:"]
8805 ${NS}::entry $top.msg -width 60
8806 grid $top.mlab $top.msg -sticky w
8807 ${NS}::frame $top.buts
8808 ${NS}::button $top.buts.gen -text [mc "Create"] -command mktaggo
8809 ${NS}::button $top.buts.can -text [mc "Cancel"] -command mktagcan
8810 bind $top <Key-Return> mktaggo
8811 bind $top <Key-Escape> mktagcan
8812 grid $top.buts.gen $top.buts.can
8813 grid columnconfigure $top.buts 0 -weight 1 -uniform a
8814 grid columnconfigure $top.buts 1 -weight 1 -uniform a
8815 grid $top.buts - -pady 10 -sticky ew
8820 global mktagtop env tagids idtags
8822 set id [$mktagtop.sha1 get]
8823 set tag [$mktagtop.tag get]
8824 set msg [$mktagtop.msg get]
8826 error_popup [mc "No tag name specified"] $mktagtop
8829 if {[info exists tagids($tag)]} {
8830 error_popup [mc "Tag \"%s\" already exists" $tag] $mktagtop
8835 exec git tag -a -m $msg $tag $id
8837 exec git tag $tag $id
8840 error_popup "[mc "Error creating tag:"] $err" $mktagtop
8844 set tagids($tag) $id
8845 lappend idtags($id) $tag
8853 proc redrawtags {id} {
8854 global canv linehtag idpos currentid curview cmitlisted markedid
8855 global canvxmax iddrawn circleitem mainheadid circlecolors
8857 if {![commitinview $id $curview]} return
8858 if {![info exists iddrawn($id)]} return
8859 set row [rowofcommit $id]
8860 if {$id eq $mainheadid} {
8863 set ofill [lindex $circlecolors $cmitlisted($curview,$id)]
8865 $canv itemconf $circleitem($row) -fill $ofill
8866 $canv delete tag.$id
8867 set xt [eval drawtags $id $idpos($id)]
8868 $canv coords $linehtag($id) $xt [lindex $idpos($id) 2]
8869 set text [$canv itemcget $linehtag($id) -text]
8870 set font [$canv itemcget $linehtag($id) -font]
8871 set xr [expr {$xt + [font measure $font $text]}]
8872 if {$xr > $canvxmax} {
8876 if {[info exists currentid] && $currentid == $id} {
8879 if {[info exists markedid] && $markedid eq $id} {
8887 catch {destroy $mktagtop}
8892 if {![domktag]} return
8896 proc writecommit {} {
8897 global rowmenuid wrcomtop commitinfo wrcomcmd NS
8899 set top .writecommit
8901 catch {destroy $top}
8903 make_transient $top .
8904 ${NS}::label $top.title -text [mc "Write commit to file"]
8905 grid $top.title - -pady 10
8906 ${NS}::label $top.id -text [mc "ID:"]
8907 ${NS}::entry $top.sha1 -width 40
8908 $top.sha1 insert 0 $rowmenuid
8909 $top.sha1 conf -state readonly
8910 grid $top.id $top.sha1 -sticky w
8911 ${NS}::entry $top.head -width 60
8912 $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
8913 $top.head conf -state readonly
8914 grid x $top.head -sticky w
8915 ${NS}::label $top.clab -text [mc "Command:"]
8916 ${NS}::entry $top.cmd -width 60 -textvariable wrcomcmd
8917 grid $top.clab $top.cmd -sticky w -pady 10
8918 ${NS}::label $top.flab -text [mc "Output file:"]
8919 ${NS}::entry $top.fname -width 60
8920 $top.fname insert 0 [file normalize "commit-[string range $rowmenuid 0 6]"]
8921 grid $top.flab $top.fname -sticky w
8922 ${NS}::frame $top.buts
8923 ${NS}::button $top.buts.gen -text [mc "Write"] -command wrcomgo
8924 ${NS}::button $top.buts.can -text [mc "Cancel"] -command wrcomcan
8925 bind $top <Key-Return> wrcomgo
8926 bind $top <Key-Escape> wrcomcan
8927 grid $top.buts.gen $top.buts.can
8928 grid columnconfigure $top.buts 0 -weight 1 -uniform a
8929 grid columnconfigure $top.buts 1 -weight 1 -uniform a
8930 grid $top.buts - -pady 10 -sticky ew
8937 set id [$wrcomtop.sha1 get]
8938 set cmd "echo $id | [$wrcomtop.cmd get]"
8939 set fname [$wrcomtop.fname get]
8940 if {[catch {exec sh -c $cmd >$fname &} err]} {
8941 error_popup "[mc "Error writing commit:"] $err" $wrcomtop
8943 catch {destroy $wrcomtop}
8950 catch {destroy $wrcomtop}
8955 global rowmenuid mkbrtop NS
8958 catch {destroy $top}
8960 make_transient $top .
8961 ${NS}::label $top.title -text [mc "Create new branch"]
8962 grid $top.title - -pady 10
8963 ${NS}::label $top.id -text [mc "ID:"]
8964 ${NS}::entry $top.sha1 -width 40
8965 $top.sha1 insert 0 $rowmenuid
8966 $top.sha1 conf -state readonly
8967 grid $top.id $top.sha1 -sticky w
8968 ${NS}::label $top.nlab -text [mc "Name:"]
8969 ${NS}::entry $top.name -width 40
8970 grid $top.nlab $top.name -sticky w
8971 ${NS}::frame $top.buts
8972 ${NS}::button $top.buts.go -text [mc "Create"] -command [list mkbrgo $top]
8973 ${NS}::button $top.buts.can -text [mc "Cancel"] -command "catch {destroy $top}"
8974 bind $top <Key-Return> [list mkbrgo $top]
8975 bind $top <Key-Escape> "catch {destroy $top}"
8976 grid $top.buts.go $top.buts.can
8977 grid columnconfigure $top.buts 0 -weight 1 -uniform a
8978 grid columnconfigure $top.buts 1 -weight 1 -uniform a
8979 grid $top.buts - -pady 10 -sticky ew
8984 global headids idheads
8986 set name [$top.name get]
8987 set id [$top.sha1 get]
8991 error_popup [mc "Please specify a name for the new branch"] $top
8994 if {[info exists headids($name)]} {
8995 if {![confirm_popup [mc \
8996 "Branch '%s' already exists. Overwrite?" $name] $top]} {
8999 set old_id $headids($name)
9002 catch {destroy $top}
9003 lappend cmdargs $name $id
9007 eval exec git branch $cmdargs
9013 if {$old_id ne {}} {
9019 set headids($name) $id
9020 lappend idheads($id) $name
9029 proc exec_citool {tool_args {baseid {}}} {
9030 global commitinfo env
9032 set save_env [array get env GIT_AUTHOR_*]
9034 if {$baseid ne {}} {
9035 if {![info exists commitinfo($baseid)]} {
9038 set author [lindex $commitinfo($baseid) 1]
9039 set date [lindex $commitinfo($baseid) 2]
9040 if {[regexp {^\s*(\S.*\S|\S)\s*<(.*)>\s*$} \
9041 $author author name email]
9043 set env(GIT_AUTHOR_NAME) $name
9044 set env(GIT_AUTHOR_EMAIL) $email
9045 set env(GIT_AUTHOR_DATE) $date
9049 eval exec git citool $tool_args &
9051 array unset env GIT_AUTHOR_*
9052 array set env $save_env
9055 proc cherrypick {} {
9056 global rowmenuid curview
9057 global mainhead mainheadid
9060 set oldhead [exec git rev-parse HEAD]
9061 set dheads [descheads $rowmenuid]
9062 if {$dheads ne {} && [lsearch -exact $dheads $oldhead] >= 0} {
9063 set ok [confirm_popup [mc "Commit %s is already\
9064 included in branch %s -- really re-apply it?" \
9065 [string range $rowmenuid 0 7] $mainhead]]
9068 nowbusy cherrypick [mc "Cherry-picking"]
9070 # Unfortunately git-cherry-pick writes stuff to stderr even when
9071 # no error occurs, and exec takes that as an indication of error...
9072 if {[catch {exec sh -c "git cherry-pick -r $rowmenuid 2>&1"} err]} {
9075 {Entry '(.*)' (would be overwritten by merge|not uptodate)} \
9077 error_popup [mc "Cherry-pick failed because of local changes\
9078 to file '%s'.\nPlease commit, reset or stash\
9079 your changes and try again." $fname]
9080 } elseif {[regexp -line \
9081 {^(CONFLICT \(.*\):|Automatic cherry-pick failed|error: could not apply)} \
9083 if {[confirm_popup [mc "Cherry-pick failed because of merge\
9084 conflict.\nDo you wish to run git citool to\
9086 # Force citool to read MERGE_MSG
9087 file delete [file join $gitdir "GITGUI_MSG"]
9088 exec_citool {} $rowmenuid
9096 set newhead [exec git rev-parse HEAD]
9097 if {$newhead eq $oldhead} {
9099 error_popup [mc "No changes committed"]
9102 addnewchild $newhead $oldhead
9103 if {[commitinview $oldhead $curview]} {
9104 # XXX this isn't right if we have a path limit...
9105 insertrow $newhead $oldhead $curview
9106 if {$mainhead ne {}} {
9107 movehead $newhead $mainhead
9108 movedhead $newhead $mainhead
9110 set mainheadid $newhead
9119 global mainhead rowmenuid confirm_ok resettype NS
9122 set w ".confirmreset"
9125 wm title $w [mc "Confirm reset"]
9126 ${NS}::label $w.m -text \
9127 [mc "Reset branch %s to %s?" $mainhead [string range $rowmenuid 0 7]]
9128 pack $w.m -side top -fill x -padx 20 -pady 20
9129 ${NS}::labelframe $w.f -text [mc "Reset type:"]
9131 ${NS}::radiobutton $w.f.soft -value soft -variable resettype \
9132 -text [mc "Soft: Leave working tree and index untouched"]
9133 grid $w.f.soft -sticky w
9134 ${NS}::radiobutton $w.f.mixed -value mixed -variable resettype \
9135 -text [mc "Mixed: Leave working tree untouched, reset index"]
9136 grid $w.f.mixed -sticky w
9137 ${NS}::radiobutton $w.f.hard -value hard -variable resettype \
9138 -text [mc "Hard: Reset working tree and index\n(discard ALL local changes)"]
9139 grid $w.f.hard -sticky w
9140 pack $w.f -side top -fill x -padx 4
9141 ${NS}::button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w"
9142 pack $w.ok -side left -fill x -padx 20 -pady 20
9143 ${NS}::button $w.cancel -text [mc Cancel] -command "destroy $w"
9144 bind $w <Key-Escape> [list destroy $w]
9145 pack $w.cancel -side right -fill x -padx 20 -pady 20
9146 bind $w <Visibility> "grab $w; focus $w"
9148 if {!$confirm_ok} return
9149 if {[catch {set fd [open \
9150 [list | git reset --$resettype $rowmenuid 2>@1] r]} err]} {
9154 filerun $fd [list readresetstat $fd]
9155 nowbusy reset [mc "Resetting"]
9160 proc readresetstat {fd} {
9161 global mainhead mainheadid showlocalchanges rprogcoord
9163 if {[gets $fd line] >= 0} {
9164 if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
9165 set rprogcoord [expr {1.0 * $m / $n}]
9173 if {[catch {close $fd} err]} {
9176 set oldhead $mainheadid
9177 set newhead [exec git rev-parse HEAD]
9178 if {$newhead ne $oldhead} {
9179 movehead $newhead $mainhead
9180 movedhead $newhead $mainhead
9181 set mainheadid $newhead
9185 if {$showlocalchanges} {
9191 # context menu for a head
9192 proc headmenu {x y id head} {
9193 global headmenuid headmenuhead headctxmenu mainhead
9197 set headmenuhead $head
9199 if {[string match "remotes/*" $head]} {
9202 if {$head eq $mainhead} {
9205 $headctxmenu entryconfigure 0 -state $state
9206 $headctxmenu entryconfigure 1 -state $state
9207 tk_popup $headctxmenu $x $y
9211 global headmenuid headmenuhead headids
9212 global showlocalchanges
9214 # check the tree is clean first??
9215 nowbusy checkout [mc "Checking out"]
9219 set fd [open [list | git checkout $headmenuhead 2>@1] r]
9223 if {$showlocalchanges} {
9227 filerun $fd [list readcheckoutstat $fd $headmenuhead $headmenuid]
9231 proc readcheckoutstat {fd newhead newheadid} {
9232 global mainhead mainheadid headids showlocalchanges progresscoords
9233 global viewmainheadid curview
9235 if {[gets $fd line] >= 0} {
9236 if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
9237 set progresscoords [list 0 [expr {1.0 * $m / $n}]]
9242 set progresscoords {0 0}
9245 if {[catch {close $fd} err]} {
9248 set oldmainid $mainheadid
9249 set mainhead $newhead
9250 set mainheadid $newheadid
9251 set viewmainheadid($curview) $newheadid
9252 redrawtags $oldmainid
9253 redrawtags $newheadid
9255 if {$showlocalchanges} {
9261 global headmenuid headmenuhead mainhead
9264 set head $headmenuhead
9266 # this check shouldn't be needed any more...
9267 if {$head eq $mainhead} {
9268 error_popup [mc "Cannot delete the currently checked-out branch"]
9271 set dheads [descheads $id]
9272 if {[llength $dheads] == 1 && $idheads($dheads) eq $head} {
9273 # the stuff on this branch isn't on any other branch
9274 if {![confirm_popup [mc "The commits on branch %s aren't on any other\
9275 branch.\nReally delete branch %s?" $head $head]]} return
9279 if {[catch {exec git branch -D $head} err]} {
9284 removehead $id $head
9285 removedhead $id $head
9292 # Display a list of tags and heads
9294 global showrefstop bgcolor fgcolor selectbgcolor NS
9295 global bglist fglist reflistfilter reflist maincursor
9298 set showrefstop $top
9299 if {[winfo exists $top]} {
9305 wm title $top [mc "Tags and heads: %s" [file tail [pwd]]]
9306 make_transient $top .
9307 text $top.list -background $bgcolor -foreground $fgcolor \
9308 -selectbackground $selectbgcolor -font mainfont \
9309 -xscrollcommand "$top.xsb set" -yscrollcommand "$top.ysb set" \
9310 -width 30 -height 20 -cursor $maincursor \
9311 -spacing1 1 -spacing3 1 -state disabled
9312 $top.list tag configure highlight -background $selectbgcolor
9313 lappend bglist $top.list
9314 lappend fglist $top.list
9315 ${NS}::scrollbar $top.ysb -command "$top.list yview" -orient vertical
9316 ${NS}::scrollbar $top.xsb -command "$top.list xview" -orient horizontal
9317 grid $top.list $top.ysb -sticky nsew
9318 grid $top.xsb x -sticky ew
9320 ${NS}::label $top.f.l -text "[mc "Filter"]: "
9321 ${NS}::entry $top.f.e -width 20 -textvariable reflistfilter
9322 set reflistfilter "*"
9323 trace add variable reflistfilter write reflistfilter_change
9324 pack $top.f.e -side right -fill x -expand 1
9325 pack $top.f.l -side left
9326 grid $top.f - -sticky ew -pady 2
9327 ${NS}::button $top.close -command [list destroy $top] -text [mc "Close"]
9328 bind $top <Key-Escape> [list destroy $top]
9330 grid columnconfigure $top 0 -weight 1
9331 grid rowconfigure $top 0 -weight 1
9332 bind $top.list <1> {break}
9333 bind $top.list <B1-Motion> {break}
9334 bind $top.list <ButtonRelease-1> {sel_reflist %W %x %y; break}
9339 proc sel_reflist {w x y} {
9340 global showrefstop reflist headids tagids otherrefids
9342 if {![winfo exists $showrefstop]} return
9343 set l [lindex [split [$w index "@$x,$y"] "."] 0]
9344 set ref [lindex $reflist [expr {$l-1}]]
9345 set n [lindex $ref 0]
9346 switch -- [lindex $ref 1] {
9347 "H" {selbyid $headids($n)}
9348 "T" {selbyid $tagids($n)}
9349 "o" {selbyid $otherrefids($n)}
9351 $showrefstop.list tag add highlight $l.0 "$l.0 lineend"
9354 proc unsel_reflist {} {
9357 if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
9358 $showrefstop.list tag remove highlight 0.0 end
9361 proc reflistfilter_change {n1 n2 op} {
9362 global reflistfilter
9364 after cancel refill_reflist
9365 after 200 refill_reflist
9368 proc refill_reflist {} {
9369 global reflist reflistfilter showrefstop headids tagids otherrefids
9372 if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
9374 foreach n [array names headids] {
9375 if {[string match $reflistfilter $n]} {
9376 if {[commitinview $headids($n) $curview]} {
9377 lappend refs [list $n H]
9379 interestedin $headids($n) {run refill_reflist}
9383 foreach n [array names tagids] {
9384 if {[string match $reflistfilter $n]} {
9385 if {[commitinview $tagids($n) $curview]} {
9386 lappend refs [list $n T]
9388 interestedin $tagids($n) {run refill_reflist}
9392 foreach n [array names otherrefids] {
9393 if {[string match $reflistfilter $n]} {
9394 if {[commitinview $otherrefids($n) $curview]} {
9395 lappend refs [list $n o]
9397 interestedin $otherrefids($n) {run refill_reflist}
9401 set refs [lsort -index 0 $refs]
9402 if {$refs eq $reflist} return
9404 # Update the contents of $showrefstop.list according to the
9405 # differences between $reflist (old) and $refs (new)
9406 $showrefstop.list conf -state normal
9407 $showrefstop.list insert end "\n"
9410 while {$i < [llength $reflist] || $j < [llength $refs]} {
9411 if {$i < [llength $reflist]} {
9412 if {$j < [llength $refs]} {
9413 set cmp [string compare [lindex $reflist $i 0] \
9414 [lindex $refs $j 0]]
9416 set cmp [string compare [lindex $reflist $i 1] \
9417 [lindex $refs $j 1]]
9427 $showrefstop.list delete "[expr {$j+1}].0" "[expr {$j+2}].0"
9435 set l [expr {$j + 1}]
9436 $showrefstop.list image create $l.0 -align baseline \
9437 -image reficon-[lindex $refs $j 1] -padx 2
9438 $showrefstop.list insert $l.1 "[lindex $refs $j 0]\n"
9444 # delete last newline
9445 $showrefstop.list delete end-2c end-1c
9446 $showrefstop.list conf -state disabled
9449 # Stuff for finding nearby tags
9450 proc getallcommits {} {
9451 global allcommits nextarc seeds allccache allcwait cachedarcs allcupdate
9452 global idheads idtags idotherrefs allparents tagobjid
9455 if {![info exists allcommits]} {
9461 set allccache [file join $gitdir "gitk.cache"]
9463 set f [open $allccache r]
9472 set cmd [list | git rev-list --parents]
9473 set allcupdate [expr {$seeds ne {}}]
9477 set refs [concat [array names idheads] [array names idtags] \
9478 [array names idotherrefs]]
9481 foreach name [array names tagobjid] {
9482 lappend tagobjs $tagobjid($name)
9484 foreach id [lsort -unique $refs] {
9485 if {![info exists allparents($id)] &&
9486 [lsearch -exact $tagobjs $id] < 0} {
9497 set fd [open [concat $cmd $ids] r]
9498 fconfigure $fd -blocking 0
9501 filerun $fd [list getallclines $fd]
9507 # Since most commits have 1 parent and 1 child, we group strings of
9508 # such commits into "arcs" joining branch/merge points (BMPs), which
9509 # are commits that either don't have 1 parent or don't have 1 child.
9511 # arcnos(id) - incoming arcs for BMP, arc we're on for other nodes
9512 # arcout(id) - outgoing arcs for BMP
9513 # arcids(a) - list of IDs on arc including end but not start
9514 # arcstart(a) - BMP ID at start of arc
9515 # arcend(a) - BMP ID at end of arc
9516 # growing(a) - arc a is still growing
9517 # arctags(a) - IDs out of arcids (excluding end) that have tags
9518 # archeads(a) - IDs out of arcids (excluding end) that have heads
9519 # The start of an arc is at the descendent end, so "incoming" means
9520 # coming from descendents, and "outgoing" means going towards ancestors.
9522 proc getallclines {fd} {
9523 global allparents allchildren idtags idheads nextarc
9524 global arcnos arcids arctags arcout arcend arcstart archeads growing
9525 global seeds allcommits cachedarcs allcupdate
9528 while {[incr nid] <= 1000 && [gets $fd line] >= 0} {
9529 set id [lindex $line 0]
9530 if {[info exists allparents($id)]} {
9535 set olds [lrange $line 1 end]
9536 set allparents($id) $olds
9537 if {![info exists allchildren($id)]} {
9538 set allchildren($id) {}
9543 if {[llength $olds] == 1 && [llength $a] == 1} {
9544 lappend arcids($a) $id
9545 if {[info exists idtags($id)]} {
9546 lappend arctags($a) $id
9548 if {[info exists idheads($id)]} {
9549 lappend archeads($a) $id
9551 if {[info exists allparents($olds)]} {
9552 # seen parent already
9553 if {![info exists arcout($olds)]} {
9556 lappend arcids($a) $olds
9557 set arcend($a) $olds
9560 lappend allchildren($olds) $id
9561 lappend arcnos($olds) $a
9565 foreach a $arcnos($id) {
9566 lappend arcids($a) $id
9573 lappend allchildren($p) $id
9574 set a [incr nextarc]
9575 set arcstart($a) $id
9582 if {[info exists allparents($p)]} {
9583 # seen it already, may need to make a new branch
9584 if {![info exists arcout($p)]} {
9587 lappend arcids($a) $p
9591 lappend arcnos($p) $a
9596 global cached_dheads cached_dtags cached_atags
9597 catch {unset cached_dheads}
9598 catch {unset cached_dtags}
9599 catch {unset cached_atags}
9602 return [expr {$nid >= 1000? 2: 1}]
9606 fconfigure $fd -blocking 1
9609 # got an error reading the list of commits
9610 # if we were updating, try rereading the whole thing again
9616 error_popup "[mc "Error reading commit topology information;\
9617 branch and preceding/following tag information\
9618 will be incomplete."]\n($err)"
9621 if {[incr allcommits -1] == 0} {
9631 proc recalcarc {a} {
9632 global arctags archeads arcids idtags idheads
9636 foreach id [lrange $arcids($a) 0 end-1] {
9637 if {[info exists idtags($id)]} {
9640 if {[info exists idheads($id)]} {
9645 set archeads($a) $ah
9649 global arcnos arcids nextarc arctags archeads idtags idheads
9650 global arcstart arcend arcout allparents growing
9653 if {[llength $a] != 1} {
9654 puts "oops splitarc called but [llength $a] arcs already"
9658 set i [lsearch -exact $arcids($a) $p]
9660 puts "oops splitarc $p not in arc $a"
9663 set na [incr nextarc]
9664 if {[info exists arcend($a)]} {
9665 set arcend($na) $arcend($a)
9667 set l [lindex $allparents([lindex $arcids($a) end]) 0]
9668 set j [lsearch -exact $arcnos($l) $a]
9669 set arcnos($l) [lreplace $arcnos($l) $j $j $na]
9671 set tail [lrange $arcids($a) [expr {$i+1}] end]
9672 set arcids($a) [lrange $arcids($a) 0 $i]
9674 set arcstart($na) $p
9676 set arcids($na) $tail
9677 if {[info exists growing($a)]} {
9683 if {[llength $arcnos($id)] == 1} {
9686 set j [lsearch -exact $arcnos($id) $a]
9687 set arcnos($id) [lreplace $arcnos($id) $j $j $na]
9691 # reconstruct tags and heads lists
9692 if {$arctags($a) ne {} || $archeads($a) ne {}} {
9697 set archeads($na) {}
9701 # Update things for a new commit added that is a child of one
9702 # existing commit. Used when cherry-picking.
9703 proc addnewchild {id p} {
9704 global allparents allchildren idtags nextarc
9705 global arcnos arcids arctags arcout arcend arcstart archeads growing
9706 global seeds allcommits
9708 if {![info exists allcommits] || ![info exists arcnos($p)]} return
9709 set allparents($id) [list $p]
9710 set allchildren($id) {}
9713 lappend allchildren($p) $id
9714 set a [incr nextarc]
9715 set arcstart($a) $id
9718 set arcids($a) [list $p]
9720 if {![info exists arcout($p)]} {
9723 lappend arcnos($p) $a
9724 set arcout($id) [list $a]
9727 # This implements a cache for the topology information.
9728 # The cache saves, for each arc, the start and end of the arc,
9729 # the ids on the arc, and the outgoing arcs from the end.
9730 proc readcache {f} {
9731 global arcnos arcids arcout arcstart arcend arctags archeads nextarc
9732 global idtags idheads allparents cachedarcs possible_seeds seeds growing
9737 if {$lim - $a > 500} {
9738 set lim [expr {$a + 500}]
9742 # finish reading the cache and setting up arctags, etc.
9744 if {$line ne "1"} {error "bad final version"}
9746 foreach id [array names idtags] {
9747 if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 &&
9748 [llength $allparents($id)] == 1} {
9749 set a [lindex $arcnos($id) 0]
9750 if {$arctags($a) eq {}} {
9755 foreach id [array names idheads] {
9756 if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 &&
9757 [llength $allparents($id)] == 1} {
9758 set a [lindex $arcnos($id) 0]
9759 if {$archeads($a) eq {}} {
9764 foreach id [lsort -unique $possible_seeds] {
9765 if {$arcnos($id) eq {}} {
9771 while {[incr a] <= $lim} {
9773 if {[llength $line] != 3} {error "bad line"}
9774 set s [lindex $line 0]
9776 lappend arcout($s) $a
9777 if {![info exists arcnos($s)]} {
9778 lappend possible_seeds $s
9781 set e [lindex $line 1]
9786 if {![info exists arcout($e)]} {
9790 set arcids($a) [lindex $line 2]
9791 foreach id $arcids($a) {
9792 lappend allparents($s) $id
9794 lappend arcnos($id) $a
9796 if {![info exists allparents($s)]} {
9797 set allparents($s) {}
9802 set nextarc [expr {$a - 1}]
9815 global nextarc cachedarcs possible_seeds
9819 if {[llength $line] != 2 || [lindex $line 0] ne "1"} {error "bad version"}
9820 # make sure it's an integer
9821 set cachedarcs [expr {int([lindex $line 1])}]
9822 if {$cachedarcs < 0} {error "bad number of arcs"}
9824 set possible_seeds {}
9832 proc dropcache {err} {
9833 global allcwait nextarc cachedarcs seeds
9835 #puts "dropping cache ($err)"
9836 foreach v {arcnos arcout arcids arcstart arcend growing \
9837 arctags archeads allparents allchildren} {
9848 proc writecache {f} {
9849 global cachearc cachedarcs allccache
9850 global arcstart arcend arcnos arcids arcout
9854 if {$lim - $a > 1000} {
9855 set lim [expr {$a + 1000}]
9858 while {[incr a] <= $lim} {
9859 if {[info exists arcend($a)]} {
9860 puts $f [list $arcstart($a) $arcend($a) $arcids($a)]
9862 puts $f [list $arcstart($a) {} $arcids($a)]
9867 catch {file delete $allccache}
9868 #puts "writing cache failed ($err)"
9871 set cachearc [expr {$a - 1}]
9872 if {$a > $cachedarcs} {
9881 global nextarc cachedarcs cachearc allccache
9883 if {$nextarc == $cachedarcs} return
9885 set cachedarcs $nextarc
9887 set f [open $allccache w]
9888 puts $f [list 1 $cachedarcs]
9893 # Returns 1 if a is an ancestor of b, -1 if b is an ancestor of a,
9894 # or 0 if neither is true.
9895 proc anc_or_desc {a b} {
9896 global arcout arcstart arcend arcnos cached_isanc
9898 if {$arcnos($a) eq $arcnos($b)} {
9899 # Both are on the same arc(s); either both are the same BMP,
9900 # or if one is not a BMP, the other is also not a BMP or is
9901 # the BMP at end of the arc (and it only has 1 incoming arc).
9902 # Or both can be BMPs with no incoming arcs.
9903 if {$a eq $b || $arcnos($a) eq {}} {
9906 # assert {[llength $arcnos($a)] == 1}
9907 set arc [lindex $arcnos($a) 0]
9908 set i [lsearch -exact $arcids($arc) $a]
9909 set j [lsearch -exact $arcids($arc) $b]
9910 if {$i < 0 || $i > $j} {
9917 if {![info exists arcout($a)]} {
9918 set arc [lindex $arcnos($a) 0]
9919 if {[info exists arcend($arc)]} {
9920 set aend $arcend($arc)
9924 set a $arcstart($arc)
9928 if {![info exists arcout($b)]} {
9929 set arc [lindex $arcnos($b) 0]
9930 if {[info exists arcend($arc)]} {
9931 set bend $arcend($arc)
9935 set b $arcstart($arc)
9945 if {[info exists cached_isanc($a,$bend)]} {
9946 if {$cached_isanc($a,$bend)} {
9950 if {[info exists cached_isanc($b,$aend)]} {
9951 if {$cached_isanc($b,$aend)} {
9954 if {[info exists cached_isanc($a,$bend)]} {
9959 set todo [list $a $b]
9962 for {set i 0} {$i < [llength $todo]} {incr i} {
9963 set x [lindex $todo $i]
9964 if {$anc($x) eq {}} {
9967 foreach arc $arcnos($x) {
9968 set xd $arcstart($arc)
9970 set cached_isanc($a,$bend) 1
9971 set cached_isanc($b,$aend) 0
9973 } elseif {$xd eq $aend} {
9974 set cached_isanc($b,$aend) 1
9975 set cached_isanc($a,$bend) 0
9978 if {![info exists anc($xd)]} {
9979 set anc($xd) $anc($x)
9981 } elseif {$anc($xd) ne $anc($x)} {
9986 set cached_isanc($a,$bend) 0
9987 set cached_isanc($b,$aend) 0
9991 # This identifies whether $desc has an ancestor that is
9992 # a growing tip of the graph and which is not an ancestor of $anc
9993 # and returns 0 if so and 1 if not.
9994 # If we subsequently discover a tag on such a growing tip, and that
9995 # turns out to be a descendent of $anc (which it could, since we
9996 # don't necessarily see children before parents), then $desc
9997 # isn't a good choice to display as a descendent tag of
9998 # $anc (since it is the descendent of another tag which is
9999 # a descendent of $anc). Similarly, $anc isn't a good choice to
10000 # display as a ancestor tag of $desc.
10002 proc is_certain {desc anc} {
10003 global arcnos arcout arcstart arcend growing problems
10006 if {[llength $arcnos($anc)] == 1} {
10007 # tags on the same arc are certain
10008 if {$arcnos($desc) eq $arcnos($anc)} {
10011 if {![info exists arcout($anc)]} {
10012 # if $anc is partway along an arc, use the start of the arc instead
10013 set a [lindex $arcnos($anc) 0]
10014 set anc $arcstart($a)
10017 if {[llength $arcnos($desc)] > 1 || [info exists arcout($desc)]} {
10020 set a [lindex $arcnos($desc) 0]
10026 set anclist [list $x]
10030 for {set i 0} {$i < [llength $anclist] && ($nnh > 0 || $ngrowanc > 0)} {incr i} {
10031 set x [lindex $anclist $i]
10036 foreach a $arcout($x) {
10037 if {[info exists growing($a)]} {
10038 if {![info exists growanc($x)] && $dl($x)} {
10044 if {[info exists dl($y)]} {
10048 if {![info exists done($y)]} {
10051 if {[info exists growanc($x)]} {
10055 for {set k 0} {$k < [llength $xl]} {incr k} {
10056 set z [lindex $xl $k]
10057 foreach c $arcout($z) {
10058 if {[info exists arcend($c)]} {
10060 if {[info exists dl($v)] && $dl($v)} {
10062 if {![info exists done($v)]} {
10065 if {[info exists growanc($v)]} {
10075 } elseif {$y eq $anc || !$dl($x)} {
10086 foreach x [array names growanc] {
10095 proc validate_arctags {a} {
10096 global arctags idtags
10099 set na $arctags($a)
10100 foreach id $arctags($a) {
10102 if {![info exists idtags($id)]} {
10103 set na [lreplace $na $i $i]
10107 set arctags($a) $na
10110 proc validate_archeads {a} {
10111 global archeads idheads
10114 set na $archeads($a)
10115 foreach id $archeads($a) {
10117 if {![info exists idheads($id)]} {
10118 set na [lreplace $na $i $i]
10122 set archeads($a) $na
10125 # Return the list of IDs that have tags that are descendents of id,
10126 # ignoring IDs that are descendents of IDs already reported.
10127 proc desctags {id} {
10128 global arcnos arcstart arcids arctags idtags allparents
10129 global growing cached_dtags
10131 if {![info exists allparents($id)]} {
10134 set t1 [clock clicks -milliseconds]
10136 if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
10137 # part-way along an arc; check that arc first
10138 set a [lindex $arcnos($id) 0]
10139 if {$arctags($a) ne {}} {
10140 validate_arctags $a
10141 set i [lsearch -exact $arcids($a) $id]
10143 foreach t $arctags($a) {
10144 set j [lsearch -exact $arcids($a) $t]
10145 if {$j >= $i} break
10152 set id $arcstart($a)
10153 if {[info exists idtags($id)]} {
10157 if {[info exists cached_dtags($id)]} {
10158 return $cached_dtags($id)
10162 set todo [list $id]
10165 for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} {
10166 set id [lindex $todo $i]
10168 set ta [info exists hastaggedancestor($id)]
10172 # ignore tags on starting node
10173 if {!$ta && $i > 0} {
10174 if {[info exists idtags($id)]} {
10175 set tagloc($id) $id
10177 } elseif {[info exists cached_dtags($id)]} {
10178 set tagloc($id) $cached_dtags($id)
10182 foreach a $arcnos($id) {
10183 set d $arcstart($a)
10184 if {!$ta && $arctags($a) ne {}} {
10185 validate_arctags $a
10186 if {$arctags($a) ne {}} {
10187 lappend tagloc($id) [lindex $arctags($a) end]
10190 if {$ta || $arctags($a) ne {}} {
10191 set tomark [list $d]
10192 for {set j 0} {$j < [llength $tomark]} {incr j} {
10193 set dd [lindex $tomark $j]
10194 if {![info exists hastaggedancestor($dd)]} {
10195 if {[info exists done($dd)]} {
10196 foreach b $arcnos($dd) {
10197 lappend tomark $arcstart($b)
10199 if {[info exists tagloc($dd)]} {
10202 } elseif {[info exists queued($dd)]} {
10205 set hastaggedancestor($dd) 1
10209 if {![info exists queued($d)]} {
10212 if {![info exists hastaggedancestor($d)]} {
10219 foreach id [array names tagloc] {
10220 if {![info exists hastaggedancestor($id)]} {
10221 foreach t $tagloc($id) {
10222 if {[lsearch -exact $tags $t] < 0} {
10228 set t2 [clock clicks -milliseconds]
10231 # remove tags that are descendents of other tags
10232 for {set i 0} {$i < [llength $tags]} {incr i} {
10233 set a [lindex $tags $i]
10234 for {set j 0} {$j < $i} {incr j} {
10235 set b [lindex $tags $j]
10236 set r [anc_or_desc $a $b]
10238 set tags [lreplace $tags $j $j]
10241 } elseif {$r == -1} {
10242 set tags [lreplace $tags $i $i]
10249 if {[array names growing] ne {}} {
10250 # graph isn't finished, need to check if any tag could get
10251 # eclipsed by another tag coming later. Simply ignore any
10252 # tags that could later get eclipsed.
10255 if {[is_certain $t $origid]} {
10259 if {$tags eq $ctags} {
10260 set cached_dtags($origid) $tags
10265 set cached_dtags($origid) $tags
10267 set t3 [clock clicks -milliseconds]
10268 if {0 && $t3 - $t1 >= 100} {
10269 puts "iterating descendents ($loopix/[llength $todo] nodes) took\
10270 [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left"
10275 proc anctags {id} {
10276 global arcnos arcids arcout arcend arctags idtags allparents
10277 global growing cached_atags
10279 if {![info exists allparents($id)]} {
10282 set t1 [clock clicks -milliseconds]
10284 if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
10285 # part-way along an arc; check that arc first
10286 set a [lindex $arcnos($id) 0]
10287 if {$arctags($a) ne {}} {
10288 validate_arctags $a
10289 set i [lsearch -exact $arcids($a) $id]
10290 foreach t $arctags($a) {
10291 set j [lsearch -exact $arcids($a) $t]
10297 if {![info exists arcend($a)]} {
10301 if {[info exists idtags($id)]} {
10305 if {[info exists cached_atags($id)]} {
10306 return $cached_atags($id)
10310 set todo [list $id]
10314 for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} {
10315 set id [lindex $todo $i]
10317 set td [info exists hastaggeddescendent($id)]
10321 # ignore tags on starting node
10322 if {!$td && $i > 0} {
10323 if {[info exists idtags($id)]} {
10324 set tagloc($id) $id
10326 } elseif {[info exists cached_atags($id)]} {
10327 set tagloc($id) $cached_atags($id)
10331 foreach a $arcout($id) {
10332 if {!$td && $arctags($a) ne {}} {
10333 validate_arctags $a
10334 if {$arctags($a) ne {}} {
10335 lappend tagloc($id) [lindex $arctags($a) 0]
10338 if {![info exists arcend($a)]} continue
10340 if {$td || $arctags($a) ne {}} {
10341 set tomark [list $d]
10342 for {set j 0} {$j < [llength $tomark]} {incr j} {
10343 set dd [lindex $tomark $j]
10344 if {![info exists hastaggeddescendent($dd)]} {
10345 if {[info exists done($dd)]} {
10346 foreach b $arcout($dd) {
10347 if {[info exists arcend($b)]} {
10348 lappend tomark $arcend($b)
10351 if {[info exists tagloc($dd)]} {
10354 } elseif {[info exists queued($dd)]} {
10357 set hastaggeddescendent($dd) 1
10361 if {![info exists queued($d)]} {
10364 if {![info exists hastaggeddescendent($d)]} {
10370 set t2 [clock clicks -milliseconds]
10373 foreach id [array names tagloc] {
10374 if {![info exists hastaggeddescendent($id)]} {
10375 foreach t $tagloc($id) {
10376 if {[lsearch -exact $tags $t] < 0} {
10383 # remove tags that are ancestors of other tags
10384 for {set i 0} {$i < [llength $tags]} {incr i} {
10385 set a [lindex $tags $i]
10386 for {set j 0} {$j < $i} {incr j} {
10387 set b [lindex $tags $j]
10388 set r [anc_or_desc $a $b]
10390 set tags [lreplace $tags $j $j]
10393 } elseif {$r == 1} {
10394 set tags [lreplace $tags $i $i]
10401 if {[array names growing] ne {}} {
10402 # graph isn't finished, need to check if any tag could get
10403 # eclipsed by another tag coming later. Simply ignore any
10404 # tags that could later get eclipsed.
10407 if {[is_certain $origid $t]} {
10411 if {$tags eq $ctags} {
10412 set cached_atags($origid) $tags
10417 set cached_atags($origid) $tags
10419 set t3 [clock clicks -milliseconds]
10420 if {0 && $t3 - $t1 >= 100} {
10421 puts "iterating ancestors ($loopix/[llength $todo] nodes) took\
10422 [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left"
10427 # Return the list of IDs that have heads that are descendents of id,
10428 # including id itself if it has a head.
10429 proc descheads {id} {
10430 global arcnos arcstart arcids archeads idheads cached_dheads
10433 if {![info exists allparents($id)]} {
10437 if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
10438 # part-way along an arc; check it first
10439 set a [lindex $arcnos($id) 0]
10440 if {$archeads($a) ne {}} {
10441 validate_archeads $a
10442 set i [lsearch -exact $arcids($a) $id]
10443 foreach t $archeads($a) {
10444 set j [lsearch -exact $arcids($a) $t]
10449 set id $arcstart($a)
10452 set todo [list $id]
10455 for {set i 0} {$i < [llength $todo]} {incr i} {
10456 set id [lindex $todo $i]
10457 if {[info exists cached_dheads($id)]} {
10458 set ret [concat $ret $cached_dheads($id)]
10460 if {[info exists idheads($id)]} {
10463 foreach a $arcnos($id) {
10464 if {$archeads($a) ne {}} {
10465 validate_archeads $a
10466 if {$archeads($a) ne {}} {
10467 set ret [concat $ret $archeads($a)]
10470 set d $arcstart($a)
10471 if {![info exists seen($d)]} {
10478 set ret [lsort -unique $ret]
10479 set cached_dheads($origid) $ret
10480 return [concat $ret $aret]
10483 proc addedtag {id} {
10484 global arcnos arcout cached_dtags cached_atags
10486 if {![info exists arcnos($id)]} return
10487 if {![info exists arcout($id)]} {
10488 recalcarc [lindex $arcnos($id) 0]
10490 catch {unset cached_dtags}
10491 catch {unset cached_atags}
10494 proc addedhead {hid head} {
10495 global arcnos arcout cached_dheads
10497 if {![info exists arcnos($hid)]} return
10498 if {![info exists arcout($hid)]} {
10499 recalcarc [lindex $arcnos($hid) 0]
10501 catch {unset cached_dheads}
10504 proc removedhead {hid head} {
10505 global cached_dheads
10507 catch {unset cached_dheads}
10510 proc movedhead {hid head} {
10511 global arcnos arcout cached_dheads
10513 if {![info exists arcnos($hid)]} return
10514 if {![info exists arcout($hid)]} {
10515 recalcarc [lindex $arcnos($hid) 0]
10517 catch {unset cached_dheads}
10520 proc changedrefs {} {
10521 global cached_dheads cached_dtags cached_atags
10522 global arctags archeads arcnos arcout idheads idtags
10524 foreach id [concat [array names idheads] [array names idtags]] {
10525 if {[info exists arcnos($id)] && ![info exists arcout($id)]} {
10526 set a [lindex $arcnos($id) 0]
10527 if {![info exists donearc($a)]} {
10533 catch {unset cached_dtags}
10534 catch {unset cached_atags}
10535 catch {unset cached_dheads}
10538 proc rereadrefs {} {
10539 global idtags idheads idotherrefs mainheadid
10541 set refids [concat [array names idtags] \
10542 [array names idheads] [array names idotherrefs]]
10543 foreach id $refids {
10544 if {![info exists ref($id)]} {
10545 set ref($id) [listrefs $id]
10548 set oldmainhead $mainheadid
10551 set refids [lsort -unique [concat $refids [array names idtags] \
10552 [array names idheads] [array names idotherrefs]]]
10553 foreach id $refids {
10554 set v [listrefs $id]
10555 if {![info exists ref($id)] || $ref($id) != $v} {
10559 if {$oldmainhead ne $mainheadid} {
10560 redrawtags $oldmainhead
10561 redrawtags $mainheadid
10566 proc listrefs {id} {
10567 global idtags idheads idotherrefs
10570 if {[info exists idtags($id)]} {
10574 if {[info exists idheads($id)]} {
10575 set y $idheads($id)
10578 if {[info exists idotherrefs($id)]} {
10579 set z $idotherrefs($id)
10581 return [list $x $y $z]
10584 proc showtag {tag isnew} {
10585 global ctext tagcontents tagids linknum tagobjid
10588 addtohistory [list showtag $tag 0] savectextpos
10590 $ctext conf -state normal
10594 if {![info exists tagcontents($tag)]} {
10596 set tagcontents($tag) [exec git cat-file tag $tag]
10599 if {[info exists tagcontents($tag)]} {
10600 set text $tagcontents($tag)
10602 set text "[mc "Tag"]: $tag\n[mc "Id"]: $tagids($tag)"
10604 appendwithlinks $text {}
10605 maybe_scroll_ctext 1
10606 $ctext conf -state disabled
10618 if {[info exists gitktmpdir]} {
10619 catch {file delete -force $gitktmpdir}
10623 proc mkfontdisp {font top which} {
10624 global fontattr fontpref $font NS use_ttk
10626 set fontpref($font) [set $font]
10627 ${NS}::button $top.${font}but -text $which \
10628 -command [list choosefont $font $which]
10629 ${NS}::label $top.$font -relief flat -font $font \
10630 -text $fontattr($font,family) -justify left
10631 grid x $top.${font}but $top.$font -sticky w
10634 proc choosefont {font which} {
10635 global fontparam fontlist fonttop fontattr
10638 set fontparam(which) $which
10639 set fontparam(font) $font
10640 set fontparam(family) [font actual $font -family]
10641 set fontparam(size) $fontattr($font,size)
10642 set fontparam(weight) $fontattr($font,weight)
10643 set fontparam(slant) $fontattr($font,slant)
10646 if {![winfo exists $top]} {
10648 eval font config sample [font actual $font]
10650 make_transient $top $prefstop
10651 wm title $top [mc "Gitk font chooser"]
10652 ${NS}::label $top.l -textvariable fontparam(which)
10653 pack $top.l -side top
10654 set fontlist [lsort [font families]]
10655 ${NS}::frame $top.f
10656 listbox $top.f.fam -listvariable fontlist \
10657 -yscrollcommand [list $top.f.sb set]
10658 bind $top.f.fam <<ListboxSelect>> selfontfam
10659 ${NS}::scrollbar $top.f.sb -command [list $top.f.fam yview]
10660 pack $top.f.sb -side right -fill y
10661 pack $top.f.fam -side left -fill both -expand 1
10662 pack $top.f -side top -fill both -expand 1
10663 ${NS}::frame $top.g
10664 spinbox $top.g.size -from 4 -to 40 -width 4 \
10665 -textvariable fontparam(size) \
10666 -validatecommand {string is integer -strict %s}
10667 checkbutton $top.g.bold -padx 5 \
10668 -font {{Times New Roman} 12 bold} -text [mc "B"] -indicatoron 0 \
10669 -variable fontparam(weight) -onvalue bold -offvalue normal
10670 checkbutton $top.g.ital -padx 5 \
10671 -font {{Times New Roman} 12 italic} -text [mc "I"] -indicatoron 0 \
10672 -variable fontparam(slant) -onvalue italic -offvalue roman
10673 pack $top.g.size $top.g.bold $top.g.ital -side left
10674 pack $top.g -side top
10675 canvas $top.c -width 150 -height 50 -border 2 -relief sunk \
10677 $top.c create text 100 25 -anchor center -text $which -font sample \
10678 -fill black -tags text
10679 bind $top.c <Configure> [list centertext $top.c]
10680 pack $top.c -side top -fill x
10681 ${NS}::frame $top.buts
10682 ${NS}::button $top.buts.ok -text [mc "OK"] -command fontok -default active
10683 ${NS}::button $top.buts.can -text [mc "Cancel"] -command fontcan -default normal
10684 bind $top <Key-Return> fontok
10685 bind $top <Key-Escape> fontcan
10686 grid $top.buts.ok $top.buts.can
10687 grid columnconfigure $top.buts 0 -weight 1 -uniform a
10688 grid columnconfigure $top.buts 1 -weight 1 -uniform a
10689 pack $top.buts -side bottom -fill x
10690 trace add variable fontparam write chg_fontparam
10693 $top.c itemconf text -text $which
10695 set i [lsearch -exact $fontlist $fontparam(family)]
10697 $top.f.fam selection set $i
10702 proc centertext {w} {
10703 $w coords text [expr {[winfo width $w] / 2}] [expr {[winfo height $w] / 2}]
10707 global fontparam fontpref prefstop
10709 set f $fontparam(font)
10710 set fontpref($f) [list $fontparam(family) $fontparam(size)]
10711 if {$fontparam(weight) eq "bold"} {
10712 lappend fontpref($f) "bold"
10714 if {$fontparam(slant) eq "italic"} {
10715 lappend fontpref($f) "italic"
10718 $w conf -text $fontparam(family) -font $fontpref($f)
10724 global fonttop fontparam
10726 if {[info exists fonttop]} {
10727 catch {destroy $fonttop}
10728 catch {font delete sample}
10734 if {[package vsatisfies [package provide Tk] 8.6]} {
10735 # In Tk 8.6 we have a native font chooser dialog. Overwrite the above
10736 # function to make use of it.
10737 proc choosefont {font which} {
10738 tk fontchooser configure -title $which -font $font \
10739 -command [list on_choosefont $font $which]
10740 tk fontchooser show
10742 proc on_choosefont {font which newfont} {
10744 puts stderr "$font $newfont"
10745 array set f [font actual $newfont]
10746 set fontparam(which) $which
10747 set fontparam(font) $font
10748 set fontparam(family) $f(-family)
10749 set fontparam(size) $f(-size)
10750 set fontparam(weight) $f(-weight)
10751 set fontparam(slant) $f(-slant)
10756 proc selfontfam {} {
10757 global fonttop fontparam
10759 set i [$fonttop.f.fam curselection]
10761 set fontparam(family) [$fonttop.f.fam get $i]
10765 proc chg_fontparam {v sub op} {
10768 font config sample -$sub $fontparam($sub)
10772 global maxwidth maxgraphpct use_ttk NS
10773 global oldprefs prefstop showneartags showlocalchanges
10774 global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
10775 global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs
10776 global hideremotes want_ttk have_ttk
10780 if {[winfo exists $top]} {
10784 foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
10785 limitdiffs tabstop perfile_attrs hideremotes want_ttk} {
10786 set oldprefs($v) [set $v]
10789 wm title $top [mc "Gitk preferences"]
10790 make_transient $top .
10791 ${NS}::label $top.ldisp -text [mc "Commit list display options"]
10792 grid $top.ldisp - -sticky w -pady 10
10793 ${NS}::label $top.spacer -text " "
10794 ${NS}::label $top.maxwidthl -text [mc "Maximum graph width (lines)"]
10795 spinbox $top.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
10796 grid $top.spacer $top.maxwidthl $top.maxwidth -sticky w
10797 ${NS}::label $top.maxpctl -text [mc "Maximum graph width (% of pane)"]
10798 spinbox $top.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
10799 grid x $top.maxpctl $top.maxpct -sticky w
10800 ${NS}::checkbutton $top.showlocal -text [mc "Show local changes"] \
10801 -variable showlocalchanges
10802 grid x $top.showlocal -sticky w
10803 ${NS}::checkbutton $top.autoselect -text [mc "Auto-select SHA1 (length)"] \
10804 -variable autoselect
10805 spinbox $top.autosellen -from 1 -to 40 -width 4 -textvariable autosellen
10806 grid x $top.autoselect $top.autosellen -sticky w
10807 ${NS}::checkbutton $top.hideremotes -text [mc "Hide remote refs"] \
10808 -variable hideremotes
10809 grid x $top.hideremotes -sticky w
10811 ${NS}::label $top.ddisp -text [mc "Diff display options"]
10812 grid $top.ddisp - -sticky w -pady 10
10813 ${NS}::label $top.tabstopl -text [mc "Tab spacing"]
10814 spinbox $top.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
10815 grid x $top.tabstopl $top.tabstop -sticky w
10816 ${NS}::checkbutton $top.ntag -text [mc "Display nearby tags"] \
10817 -variable showneartags
10818 grid x $top.ntag -sticky w
10819 ${NS}::checkbutton $top.ldiff -text [mc "Limit diffs to listed paths"] \
10820 -variable limitdiffs
10821 grid x $top.ldiff -sticky w
10822 ${NS}::checkbutton $top.lattr -text [mc "Support per-file encodings"] \
10823 -variable perfile_attrs
10824 grid x $top.lattr -sticky w
10826 ${NS}::entry $top.extdifft -textvariable extdifftool
10827 ${NS}::frame $top.extdifff
10828 ${NS}::label $top.extdifff.l -text [mc "External diff tool" ]
10829 ${NS}::button $top.extdifff.b -text [mc "Choose..."] -command choose_extdiff
10830 pack $top.extdifff.l $top.extdifff.b -side left
10831 pack configure $top.extdifff.l -padx 10
10832 grid x $top.extdifff $top.extdifft -sticky ew
10834 ${NS}::label $top.lgen -text [mc "General options"]
10835 grid $top.lgen - -sticky w -pady 10
10836 ${NS}::checkbutton $top.want_ttk -variable want_ttk \
10837 -text [mc "Use themed widgets"]
10839 ${NS}::label $top.ttk_note -text [mc "(change requires restart)"]
10841 ${NS}::label $top.ttk_note -text [mc "(currently unavailable)"]
10843 grid x $top.want_ttk $top.ttk_note -sticky w
10845 ${NS}::label $top.cdisp -text [mc "Colors: press to choose"]
10846 grid $top.cdisp - -sticky w -pady 10
10847 label $top.ui -padx 40 -relief sunk -background $uicolor
10848 ${NS}::button $top.uibut -text [mc "Interface"] \
10849 -command [list choosecolor uicolor {} $top.ui [mc "interface"] setui]
10850 grid x $top.uibut $top.ui -sticky w
10851 label $top.bg -padx 40 -relief sunk -background $bgcolor
10852 ${NS}::button $top.bgbut -text [mc "Background"] \
10853 -command [list choosecolor bgcolor {} $top.bg [mc "background"] setbg]
10854 grid x $top.bgbut $top.bg -sticky w
10855 label $top.fg -padx 40 -relief sunk -background $fgcolor
10856 ${NS}::button $top.fgbut -text [mc "Foreground"] \
10857 -command [list choosecolor fgcolor {} $top.fg [mc "foreground"] setfg]
10858 grid x $top.fgbut $top.fg -sticky w
10859 label $top.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]
10860 ${NS}::button $top.diffoldbut -text [mc "Diff: old lines"] \
10861 -command [list choosecolor diffcolors 0 $top.diffold [mc "diff old lines"] \
10862 [list $ctext tag conf d0 -foreground]]
10863 grid x $top.diffoldbut $top.diffold -sticky w
10864 label $top.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1]
10865 ${NS}::button $top.diffnewbut -text [mc "Diff: new lines"] \
10866 -command [list choosecolor diffcolors 1 $top.diffnew [mc "diff new lines"] \
10867 [list $ctext tag conf dresult -foreground]]
10868 grid x $top.diffnewbut $top.diffnew -sticky w
10869 label $top.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2]
10870 ${NS}::button $top.hunksepbut -text [mc "Diff: hunk header"] \
10871 -command [list choosecolor diffcolors 2 $top.hunksep \
10872 [mc "diff hunk header"] \
10873 [list $ctext tag conf hunksep -foreground]]
10874 grid x $top.hunksepbut $top.hunksep -sticky w
10875 label $top.markbgsep -padx 40 -relief sunk -background $markbgcolor
10876 ${NS}::button $top.markbgbut -text [mc "Marked line bg"] \
10877 -command [list choosecolor markbgcolor {} $top.markbgsep \
10878 [mc "marked line background"] \
10879 [list $ctext tag conf omark -background]]
10880 grid x $top.markbgbut $top.markbgsep -sticky w
10881 label $top.selbgsep -padx 40 -relief sunk -background $selectbgcolor
10882 ${NS}::button $top.selbgbut -text [mc "Select bg"] \
10883 -command [list choosecolor selectbgcolor {} $top.selbgsep [mc "background"] setselbg]
10884 grid x $top.selbgbut $top.selbgsep -sticky w
10886 ${NS}::label $top.cfont -text [mc "Fonts: press to choose"]
10887 grid $top.cfont - -sticky w -pady 10
10888 mkfontdisp mainfont $top [mc "Main font"]
10889 mkfontdisp textfont $top [mc "Diff display font"]
10890 mkfontdisp uifont $top [mc "User interface font"]
10892 ${NS}::frame $top.buts
10893 ${NS}::button $top.buts.ok -text [mc "OK"] -command prefsok -default active
10894 ${NS}::button $top.buts.can -text [mc "Cancel"] -command prefscan -default normal
10895 bind $top <Key-Return> prefsok
10896 bind $top <Key-Escape> prefscan
10897 grid $top.buts.ok $top.buts.can
10898 grid columnconfigure $top.buts 0 -weight 1 -uniform a
10899 grid columnconfigure $top.buts 1 -weight 1 -uniform a
10900 grid $top.buts - - -pady 10 -sticky ew
10901 grid columnconfigure $top 2 -weight 1
10902 bind $top <Visibility> "focus $top.buts.ok"
10905 proc choose_extdiff {} {
10908 set prog [tk_getOpenFile -title [mc "External diff tool"] -multiple false]
10910 set extdifftool $prog
10914 proc choosecolor {v vi w x cmd} {
10917 set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \
10918 -title [mc "Gitk: choose color for %s" $x]]
10919 if {$c eq {}} return
10920 $w conf -background $c
10925 proc setselbg {c} {
10926 global bglist cflist
10927 foreach w $bglist {
10928 $w configure -selectbackground $c
10930 $cflist tag configure highlight \
10931 -background [$cflist cget -selectbackground]
10932 allcanvs itemconf secsel -fill $c
10935 # This sets the background color and the color scheme for the whole UI.
10936 # For some reason, tk_setPalette chooses a nasty dark red for selectColor
10937 # if we don't specify one ourselves, which makes the checkbuttons and
10938 # radiobuttons look bad. This chooses white for selectColor if the
10939 # background color is light, or black if it is dark.
10941 if {[tk windowingsystem] eq "win32"} { return }
10942 set bg [winfo rgb . $c]
10944 if {[lindex $bg 0] + 1.5 * [lindex $bg 1] + 0.5 * [lindex $bg 2] > 100000} {
10947 tk_setPalette background $c selectColor $selc
10953 foreach w $bglist {
10954 $w conf -background $c
10961 foreach w $fglist {
10962 $w conf -foreground $c
10964 allcanvs itemconf text -fill $c
10965 $canv itemconf circle -outline $c
10966 $canv itemconf markid -outline $c
10970 global oldprefs prefstop
10972 foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
10973 limitdiffs tabstop perfile_attrs hideremotes want_ttk} {
10975 set $v $oldprefs($v)
10977 catch {destroy $prefstop}
10983 global maxwidth maxgraphpct
10984 global oldprefs prefstop showneartags showlocalchanges
10985 global fontpref mainfont textfont uifont
10986 global limitdiffs treediffs perfile_attrs
10989 catch {destroy $prefstop}
10993 if {$mainfont ne $fontpref(mainfont)} {
10994 set mainfont $fontpref(mainfont)
10995 parsefont mainfont $mainfont
10996 eval font configure mainfont [fontflags mainfont]
10997 eval font configure mainfontbold [fontflags mainfont 1]
11001 if {$textfont ne $fontpref(textfont)} {
11002 set textfont $fontpref(textfont)
11003 parsefont textfont $textfont
11004 eval font configure textfont [fontflags textfont]
11005 eval font configure textfontbold [fontflags textfont 1]
11007 if {$uifont ne $fontpref(uifont)} {
11008 set uifont $fontpref(uifont)
11009 parsefont uifont $uifont
11010 eval font configure uifont [fontflags uifont]
11013 if {$showlocalchanges != $oldprefs(showlocalchanges)} {
11014 if {$showlocalchanges} {
11020 if {$limitdiffs != $oldprefs(limitdiffs) ||
11021 ($perfile_attrs && !$oldprefs(perfile_attrs))} {
11022 # treediffs elements are limited by path;
11023 # won't have encodings cached if perfile_attrs was just turned on
11024 catch {unset treediffs}
11026 if {$fontchanged || $maxwidth != $oldprefs(maxwidth)
11027 || $maxgraphpct != $oldprefs(maxgraphpct)} {
11029 } elseif {$showneartags != $oldprefs(showneartags) ||
11030 $limitdiffs != $oldprefs(limitdiffs)} {
11033 if {$hideremotes != $oldprefs(hideremotes)} {
11038 proc formatdate {d} {
11039 global datetimeformat
11041 set d [clock format [lindex $d 0] -format $datetimeformat]
11046 # This list of encoding names and aliases is distilled from
11047 # http://www.iana.org/assignments/character-sets.
11048 # Not all of them are supported by Tcl.
11049 set encoding_aliases {
11050 { ANSI_X3.4-1968 iso-ir-6 ANSI_X3.4-1986 ISO_646.irv:1991 ASCII
11051 ISO646-US US-ASCII us IBM367 cp367 csASCII }
11052 { ISO-10646-UTF-1 csISO10646UTF1 }
11053 { ISO_646.basic:1983 ref csISO646basic1983 }
11054 { INVARIANT csINVARIANT }
11055 { ISO_646.irv:1983 iso-ir-2 irv csISO2IntlRefVersion }
11056 { BS_4730 iso-ir-4 ISO646-GB gb uk csISO4UnitedKingdom }
11057 { NATS-SEFI iso-ir-8-1 csNATSSEFI }
11058 { NATS-SEFI-ADD iso-ir-8-2 csNATSSEFIADD }
11059 { NATS-DANO iso-ir-9-1 csNATSDANO }
11060 { NATS-DANO-ADD iso-ir-9-2 csNATSDANOADD }
11061 { SEN_850200_B iso-ir-10 FI ISO646-FI ISO646-SE se csISO10Swedish }
11062 { SEN_850200_C iso-ir-11 ISO646-SE2 se2 csISO11SwedishForNames }
11063 { KS_C_5601-1987 iso-ir-149 KS_C_5601-1989 KSC_5601 korean csKSC56011987 }
11064 { ISO-2022-KR csISO2022KR }
11066 { ISO-2022-JP csISO2022JP }
11067 { ISO-2022-JP-2 csISO2022JP2 }
11068 { JIS_C6220-1969-jp JIS_C6220-1969 iso-ir-13 katakana x0201-7
11069 csISO13JISC6220jp }
11070 { JIS_C6220-1969-ro iso-ir-14 jp ISO646-JP csISO14JISC6220ro }
11071 { IT iso-ir-15 ISO646-IT csISO15Italian }
11072 { PT iso-ir-16 ISO646-PT csISO16Portuguese }
11073 { ES iso-ir-17 ISO646-ES csISO17Spanish }
11074 { greek7-old iso-ir-18 csISO18Greek7Old }
11075 { latin-greek iso-ir-19 csISO19LatinGreek }
11076 { DIN_66003 iso-ir-21 de ISO646-DE csISO21German }
11077 { NF_Z_62-010_(1973) iso-ir-25 ISO646-FR1 csISO25French }
11078 { Latin-greek-1 iso-ir-27 csISO27LatinGreek1 }
11079 { ISO_5427 iso-ir-37 csISO5427Cyrillic }
11080 { JIS_C6226-1978 iso-ir-42 csISO42JISC62261978 }
11081 { BS_viewdata iso-ir-47 csISO47BSViewdata }
11082 { INIS iso-ir-49 csISO49INIS }
11083 { INIS-8 iso-ir-50 csISO50INIS8 }
11084 { INIS-cyrillic iso-ir-51 csISO51INISCyrillic }
11085 { ISO_5427:1981 iso-ir-54 ISO5427Cyrillic1981 }
11086 { ISO_5428:1980 iso-ir-55 csISO5428Greek }
11087 { GB_1988-80 iso-ir-57 cn ISO646-CN csISO57GB1988 }
11088 { GB_2312-80 iso-ir-58 chinese csISO58GB231280 }
11089 { NS_4551-1 iso-ir-60 ISO646-NO no csISO60DanishNorwegian
11090 csISO60Norwegian1 }
11091 { NS_4551-2 ISO646-NO2 iso-ir-61 no2 csISO61Norwegian2 }
11092 { NF_Z_62-010 iso-ir-69 ISO646-FR fr csISO69French }
11093 { videotex-suppl iso-ir-70 csISO70VideotexSupp1 }
11094 { PT2 iso-ir-84 ISO646-PT2 csISO84Portuguese2 }
11095 { ES2 iso-ir-85 ISO646-ES2 csISO85Spanish2 }
11096 { MSZ_7795.3 iso-ir-86 ISO646-HU hu csISO86Hungarian }
11097 { JIS_C6226-1983 iso-ir-87 x0208 JIS_X0208-1983 csISO87JISX0208 }
11098 { greek7 iso-ir-88 csISO88Greek7 }
11099 { ASMO_449 ISO_9036 arabic7 iso-ir-89 csISO89ASMO449 }
11100 { iso-ir-90 csISO90 }
11101 { JIS_C6229-1984-a iso-ir-91 jp-ocr-a csISO91JISC62291984a }
11102 { JIS_C6229-1984-b iso-ir-92 ISO646-JP-OCR-B jp-ocr-b
11103 csISO92JISC62991984b }
11104 { JIS_C6229-1984-b-add iso-ir-93 jp-ocr-b-add csISO93JIS62291984badd }
11105 { JIS_C6229-1984-hand iso-ir-94 jp-ocr-hand csISO94JIS62291984hand }
11106 { JIS_C6229-1984-hand-add iso-ir-95 jp-ocr-hand-add
11107 csISO95JIS62291984handadd }
11108 { JIS_C6229-1984-kana iso-ir-96 csISO96JISC62291984kana }
11109 { ISO_2033-1983 iso-ir-98 e13b csISO2033 }
11110 { ANSI_X3.110-1983 iso-ir-99 CSA_T500-1983 NAPLPS csISO99NAPLPS }
11111 { ISO_8859-1:1987 iso-ir-100 ISO_8859-1 ISO-8859-1 latin1 l1 IBM819
11112 CP819 csISOLatin1 }
11113 { ISO_8859-2:1987 iso-ir-101 ISO_8859-2 ISO-8859-2 latin2 l2 csISOLatin2 }
11114 { T.61-7bit iso-ir-102 csISO102T617bit }
11115 { T.61-8bit T.61 iso-ir-103 csISO103T618bit }
11116 { ISO_8859-3:1988 iso-ir-109 ISO_8859-3 ISO-8859-3 latin3 l3 csISOLatin3 }
11117 { ISO_8859-4:1988 iso-ir-110 ISO_8859-4 ISO-8859-4 latin4 l4 csISOLatin4 }
11118 { ECMA-cyrillic iso-ir-111 KOI8-E csISO111ECMACyrillic }
11119 { CSA_Z243.4-1985-1 iso-ir-121 ISO646-CA csa7-1 ca csISO121Canadian1 }
11120 { CSA_Z243.4-1985-2 iso-ir-122 ISO646-CA2 csa7-2 csISO122Canadian2 }
11121 { CSA_Z243.4-1985-gr iso-ir-123 csISO123CSAZ24341985gr }
11122 { ISO_8859-6:1987 iso-ir-127 ISO_8859-6 ISO-8859-6 ECMA-114 ASMO-708
11123 arabic csISOLatinArabic }
11124 { ISO_8859-6-E csISO88596E ISO-8859-6-E }
11125 { ISO_8859-6-I csISO88596I ISO-8859-6-I }
11126 { ISO_8859-7:1987 iso-ir-126 ISO_8859-7 ISO-8859-7 ELOT_928 ECMA-118
11127 greek greek8 csISOLatinGreek }
11128 { T.101-G2 iso-ir-128 csISO128T101G2 }
11129 { ISO_8859-8:1988 iso-ir-138 ISO_8859-8 ISO-8859-8 hebrew
11131 { ISO_8859-8-E csISO88598E ISO-8859-8-E }
11132 { ISO_8859-8-I csISO88598I ISO-8859-8-I }
11133 { CSN_369103 iso-ir-139 csISO139CSN369103 }
11134 { JUS_I.B1.002 iso-ir-141 ISO646-YU js yu csISO141JUSIB1002 }
11135 { ISO_6937-2-add iso-ir-142 csISOTextComm }
11136 { IEC_P27-1 iso-ir-143 csISO143IECP271 }
11137 { ISO_8859-5:1988 iso-ir-144 ISO_8859-5 ISO-8859-5 cyrillic
11138 csISOLatinCyrillic }
11139 { JUS_I.B1.003-serb iso-ir-146 serbian csISO146Serbian }
11140 { JUS_I.B1.003-mac macedonian iso-ir-147 csISO147Macedonian }
11141 { ISO_8859-9:1989 iso-ir-148 ISO_8859-9 ISO-8859-9 latin5 l5 csISOLatin5 }
11142 { greek-ccitt iso-ir-150 csISO150 csISO150GreekCCITT }
11143 { NC_NC00-10:81 cuba iso-ir-151 ISO646-CU csISO151Cuba }
11144 { ISO_6937-2-25 iso-ir-152 csISO6937Add }
11145 { GOST_19768-74 ST_SEV_358-88 iso-ir-153 csISO153GOST1976874 }
11146 { ISO_8859-supp iso-ir-154 latin1-2-5 csISO8859Supp }
11147 { ISO_10367-box iso-ir-155 csISO10367Box }
11148 { ISO-8859-10 iso-ir-157 l6 ISO_8859-10:1992 csISOLatin6 latin6 }
11149 { latin-lap lap iso-ir-158 csISO158Lap }
11150 { JIS_X0212-1990 x0212 iso-ir-159 csISO159JISX02121990 }
11151 { DS_2089 DS2089 ISO646-DK dk csISO646Danish }
11154 { JIS_X0201 X0201 csHalfWidthKatakana }
11155 { KSC5636 ISO646-KR csKSC5636 }
11156 { ISO-10646-UCS-2 csUnicode }
11157 { ISO-10646-UCS-4 csUCS4 }
11158 { DEC-MCS dec csDECMCS }
11159 { hp-roman8 roman8 r8 csHPRoman8 }
11160 { macintosh mac csMacintosh }
11161 { IBM037 cp037 ebcdic-cp-us ebcdic-cp-ca ebcdic-cp-wt ebcdic-cp-nl
11163 { IBM038 EBCDIC-INT cp038 csIBM038 }
11164 { IBM273 CP273 csIBM273 }
11165 { IBM274 EBCDIC-BE CP274 csIBM274 }
11166 { IBM275 EBCDIC-BR cp275 csIBM275 }
11167 { IBM277 EBCDIC-CP-DK EBCDIC-CP-NO csIBM277 }
11168 { IBM278 CP278 ebcdic-cp-fi ebcdic-cp-se csIBM278 }
11169 { IBM280 CP280 ebcdic-cp-it csIBM280 }
11170 { IBM281 EBCDIC-JP-E cp281 csIBM281 }
11171 { IBM284 CP284 ebcdic-cp-es csIBM284 }
11172 { IBM285 CP285 ebcdic-cp-gb csIBM285 }
11173 { IBM290 cp290 EBCDIC-JP-kana csIBM290 }
11174 { IBM297 cp297 ebcdic-cp-fr csIBM297 }
11175 { IBM420 cp420 ebcdic-cp-ar1 csIBM420 }
11176 { IBM423 cp423 ebcdic-cp-gr csIBM423 }
11177 { IBM424 cp424 ebcdic-cp-he csIBM424 }
11178 { IBM437 cp437 437 csPC8CodePage437 }
11179 { IBM500 CP500 ebcdic-cp-be ebcdic-cp-ch csIBM500 }
11180 { IBM775 cp775 csPC775Baltic }
11181 { IBM850 cp850 850 csPC850Multilingual }
11182 { IBM851 cp851 851 csIBM851 }
11183 { IBM852 cp852 852 csPCp852 }
11184 { IBM855 cp855 855 csIBM855 }
11185 { IBM857 cp857 857 csIBM857 }
11186 { IBM860 cp860 860 csIBM860 }
11187 { IBM861 cp861 861 cp-is csIBM861 }
11188 { IBM862 cp862 862 csPC862LatinHebrew }
11189 { IBM863 cp863 863 csIBM863 }
11190 { IBM864 cp864 csIBM864 }
11191 { IBM865 cp865 865 csIBM865 }
11192 { IBM866 cp866 866 csIBM866 }
11193 { IBM868 CP868 cp-ar csIBM868 }
11194 { IBM869 cp869 869 cp-gr csIBM869 }
11195 { IBM870 CP870 ebcdic-cp-roece ebcdic-cp-yu csIBM870 }
11196 { IBM871 CP871 ebcdic-cp-is csIBM871 }
11197 { IBM880 cp880 EBCDIC-Cyrillic csIBM880 }
11198 { IBM891 cp891 csIBM891 }
11199 { IBM903 cp903 csIBM903 }
11200 { IBM904 cp904 904 csIBBM904 }
11201 { IBM905 CP905 ebcdic-cp-tr csIBM905 }
11202 { IBM918 CP918 ebcdic-cp-ar2 csIBM918 }
11203 { IBM1026 CP1026 csIBM1026 }
11204 { EBCDIC-AT-DE csIBMEBCDICATDE }
11205 { EBCDIC-AT-DE-A csEBCDICATDEA }
11206 { EBCDIC-CA-FR csEBCDICCAFR }
11207 { EBCDIC-DK-NO csEBCDICDKNO }
11208 { EBCDIC-DK-NO-A csEBCDICDKNOA }
11209 { EBCDIC-FI-SE csEBCDICFISE }
11210 { EBCDIC-FI-SE-A csEBCDICFISEA }
11211 { EBCDIC-FR csEBCDICFR }
11212 { EBCDIC-IT csEBCDICIT }
11213 { EBCDIC-PT csEBCDICPT }
11214 { EBCDIC-ES csEBCDICES }
11215 { EBCDIC-ES-A csEBCDICESA }
11216 { EBCDIC-ES-S csEBCDICESS }
11217 { EBCDIC-UK csEBCDICUK }
11218 { EBCDIC-US csEBCDICUS }
11219 { UNKNOWN-8BIT csUnknown8BiT }
11220 { MNEMONIC csMnemonic }
11222 { VISCII csVISCII }
11225 { IBM00858 CCSID00858 CP00858 PC-Multilingual-850+euro }
11226 { IBM00924 CCSID00924 CP00924 ebcdic-Latin9--euro }
11227 { IBM01140 CCSID01140 CP01140 ebcdic-us-37+euro }
11228 { IBM01141 CCSID01141 CP01141 ebcdic-de-273+euro }
11229 { IBM01142 CCSID01142 CP01142 ebcdic-dk-277+euro ebcdic-no-277+euro }
11230 { IBM01143 CCSID01143 CP01143 ebcdic-fi-278+euro ebcdic-se-278+euro }
11231 { IBM01144 CCSID01144 CP01144 ebcdic-it-280+euro }
11232 { IBM01145 CCSID01145 CP01145 ebcdic-es-284+euro }
11233 { IBM01146 CCSID01146 CP01146 ebcdic-gb-285+euro }
11234 { IBM01147 CCSID01147 CP01147 ebcdic-fr-297+euro }
11235 { IBM01148 CCSID01148 CP01148 ebcdic-international-500+euro }
11236 { IBM01149 CCSID01149 CP01149 ebcdic-is-871+euro }
11237 { IBM1047 IBM-1047 }
11238 { PTCP154 csPTCP154 PT154 CP154 Cyrillic-Asian }
11239 { Amiga-1251 Ami1251 Amiga1251 Ami-1251 }
11240 { UNICODE-1-1 csUnicode11 }
11241 { CESU-8 csCESU-8 }
11242 { BOCU-1 csBOCU-1 }
11243 { UNICODE-1-1-UTF-7 csUnicode11UTF7 }
11244 { ISO-8859-14 iso-ir-199 ISO_8859-14:1998 ISO_8859-14 latin8 iso-celtic
11246 { ISO-8859-15 ISO_8859-15 Latin-9 }
11247 { ISO-8859-16 iso-ir-226 ISO_8859-16:2001 ISO_8859-16 latin10 l10 }
11248 { GBK CP936 MS936 windows-936 }
11249 { JIS_Encoding csJISEncoding }
11250 { Shift_JIS MS_Kanji csShiftJIS ShiftJIS Shift-JIS }
11251 { Extended_UNIX_Code_Packed_Format_for_Japanese csEUCPkdFmtJapanese
11253 { Extended_UNIX_Code_Fixed_Width_for_Japanese csEUCFixWidJapanese }
11254 { ISO-10646-UCS-Basic csUnicodeASCII }
11255 { ISO-10646-Unicode-Latin1 csUnicodeLatin1 ISO-10646 }
11256 { ISO-Unicode-IBM-1261 csUnicodeIBM1261 }
11257 { ISO-Unicode-IBM-1268 csUnicodeIBM1268 }
11258 { ISO-Unicode-IBM-1276 csUnicodeIBM1276 }
11259 { ISO-Unicode-IBM-1264 csUnicodeIBM1264 }
11260 { ISO-Unicode-IBM-1265 csUnicodeIBM1265 }
11261 { ISO-8859-1-Windows-3.0-Latin-1 csWindows30Latin1 }
11262 { ISO-8859-1-Windows-3.1-Latin-1 csWindows31Latin1 }
11263 { ISO-8859-2-Windows-Latin-2 csWindows31Latin2 }
11264 { ISO-8859-9-Windows-Latin-5 csWindows31Latin5 }
11265 { Adobe-Standard-Encoding csAdobeStandardEncoding }
11266 { Ventura-US csVenturaUS }
11267 { Ventura-International csVenturaInternational }
11268 { PC8-Danish-Norwegian csPC8DanishNorwegian }
11269 { PC8-Turkish csPC8Turkish }
11270 { IBM-Symbols csIBMSymbols }
11271 { IBM-Thai csIBMThai }
11272 { HP-Legal csHPLegal }
11273 { HP-Pi-font csHPPiFont }
11274 { HP-Math8 csHPMath8 }
11275 { Adobe-Symbol-Encoding csHPPSMath }
11276 { HP-DeskTop csHPDesktop }
11277 { Ventura-Math csVenturaMath }
11278 { Microsoft-Publishing csMicrosoftPublishing }
11279 { Windows-31J csWindows31J }
11280 { GB2312 csGB2312 }
11284 proc tcl_encoding {enc} {
11285 global encoding_aliases tcl_encoding_cache
11286 if {[info exists tcl_encoding_cache($enc)]} {
11287 return $tcl_encoding_cache($enc)
11289 set names [encoding names]
11290 set lcnames [string tolower $names]
11291 set enc [string tolower $enc]
11292 set i [lsearch -exact $lcnames $enc]
11294 # look for "isonnn" instead of "iso-nnn" or "iso_nnn"
11295 if {[regsub {^(iso|cp|ibm|jis)[-_]} $enc {\1} encx]} {
11296 set i [lsearch -exact $lcnames $encx]
11300 foreach l $encoding_aliases {
11301 set ll [string tolower $l]
11302 if {[lsearch -exact $ll $enc] < 0} continue
11303 # look through the aliases for one that tcl knows about
11305 set i [lsearch -exact $lcnames $e]
11307 if {[regsub {^(iso|cp|ibm|jis)[-_]} $e {\1} ex]} {
11308 set i [lsearch -exact $lcnames $ex]
11318 set tclenc [lindex $names $i]
11320 set tcl_encoding_cache($enc) $tclenc
11324 proc gitattr {path attr default} {
11325 global path_attr_cache
11326 if {[info exists path_attr_cache($attr,$path)]} {
11327 set r $path_attr_cache($attr,$path)
11329 set r "unspecified"
11330 if {![catch {set line [exec git check-attr $attr -- $path]}]} {
11331 regexp "(.*): $attr: (.*)" $line m f r
11333 set path_attr_cache($attr,$path) $r
11335 if {$r eq "unspecified"} {
11341 proc cache_gitattr {attr pathlist} {
11342 global path_attr_cache
11344 foreach path $pathlist {
11345 if {![info exists path_attr_cache($attr,$path)]} {
11346 lappend newlist $path
11350 if {[tk windowingsystem] == "win32"} {
11351 # windows has a 32k limit on the arguments to a command...
11354 while {$newlist ne {}} {
11355 set head [lrange $newlist 0 [expr {$lim - 1}]]
11356 set newlist [lrange $newlist $lim end]
11357 if {![catch {set rlist [eval exec git check-attr $attr -- $head]}]} {
11358 foreach row [split $rlist "\n"] {
11359 if {[regexp "(.*): $attr: (.*)" $row m path value]} {
11360 if {[string index $path 0] eq "\""} {
11361 set path [encoding convertfrom [lindex $path 0]]
11363 set path_attr_cache($attr,$path) $value
11370 proc get_path_encoding {path} {
11371 global gui_encoding perfile_attrs
11372 set tcl_enc $gui_encoding
11373 if {$path ne {} && $perfile_attrs} {
11374 set enc2 [tcl_encoding [gitattr $path encoding $tcl_enc]]
11382 # First check that Tcl/Tk is recent enough
11383 if {[catch {package require Tk 8.4} err]} {
11384 show_error {} . "Sorry, gitk cannot run with this version of Tcl/Tk.\n\
11385 Gitk requires at least Tcl/Tk 8.4." list
11390 set wrcomcmd "git diff-tree --stdin -p --pretty"
11394 set gitencoding [exec git config --get i18n.commitencoding]
11397 set gitencoding [exec git config --get i18n.logoutputencoding]
11399 if {$gitencoding == ""} {
11400 set gitencoding "utf-8"
11402 set tclencoding [tcl_encoding $gitencoding]
11403 if {$tclencoding == {}} {
11404 puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
11407 set gui_encoding [encoding system]
11409 set enc [exec git config --get gui.encoding]
11411 set tclenc [tcl_encoding $enc]
11412 if {$tclenc ne {}} {
11413 set gui_encoding $tclenc
11415 puts stderr "Warning: encoding $enc is not supported by Tcl/Tk"
11420 if {[tk windowingsystem] eq "aqua"} {
11421 set mainfont {{Lucida Grande} 9}
11422 set textfont {Monaco 9}
11423 set uifont {{Lucida Grande} 9 bold}
11425 set mainfont {Helvetica 9}
11426 set textfont {Courier 9}
11427 set uifont {Helvetica 9 bold}
11430 set findmergefiles 0
11438 set cmitmode "patch"
11439 set wrapcomment "none"
11444 set showlocalchanges 1
11446 set datetimeformat "%Y-%m-%d %H:%M:%S"
11449 set perfile_attrs 0
11452 if {[tk windowingsystem] eq "aqua"} {
11453 set extdifftool "opendiff"
11455 set extdifftool "meld"
11458 set colors {green red blue magenta darkgrey brown orange}
11459 if {[tk windowingsystem] eq "win32"} {
11460 set uicolor SystemButtonFace
11461 set bgcolor SystemWindow
11462 set fgcolor SystemButtonText
11463 set selectbgcolor SystemHighlight
11468 set selectbgcolor gray85
11470 set diffcolors {red "#00a000" blue}
11474 set markbgcolor "#e0e0ff"
11476 set circlecolors {white blue gray blue blue}
11478 # button for popping up context menus
11479 if {[tk windowingsystem] eq "aqua"} {
11480 set ctxbut <Button-2>
11482 set ctxbut <Button-3>
11485 ## For msgcat loading, first locate the installation location.
11486 if { [info exists ::env(GITK_MSGSDIR)] } {
11487 ## Msgsdir was manually set in the environment.
11488 set gitk_msgsdir $::env(GITK_MSGSDIR)
11490 ## Let's guess the prefix from argv0.
11491 set gitk_prefix [file dirname [file dirname [file normalize $argv0]]]
11492 set gitk_libdir [file join $gitk_prefix share gitk lib]
11493 set gitk_msgsdir [file join $gitk_libdir msgs]
11497 ## Internationalization (i18n) through msgcat and gettext. See
11498 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
11499 package require msgcat
11500 namespace import ::msgcat::mc
11501 ## And eventually load the actual message catalog
11502 ::msgcat::mcload $gitk_msgsdir
11504 catch {source ~/.gitk}
11506 parsefont mainfont $mainfont
11507 eval font create mainfont [fontflags mainfont]
11508 eval font create mainfontbold [fontflags mainfont 1]
11510 parsefont textfont $textfont
11511 eval font create textfont [fontflags textfont]
11512 eval font create textfontbold [fontflags textfont 1]
11514 parsefont uifont $uifont
11515 eval font create uifont [fontflags uifont]
11521 # check that we can find a .git directory somewhere...
11522 if {[catch {set gitdir [exec git rev-parse --git-dir]}]} {
11523 show_error {} . [mc "Cannot find a git repository here."]
11528 set selectheadid {}
11531 set cmdline_files {}
11533 set revtreeargscmd {}
11534 foreach arg $argv {
11535 switch -glob -- $arg {
11538 set cmdline_files [lrange $argv [expr {$i + 1}] end]
11541 "--select-commit=*" {
11542 set selecthead [string range $arg 16 end]
11545 set revtreeargscmd [string range $arg 10 end]
11548 lappend revtreeargs $arg
11554 if {$selecthead eq "HEAD"} {
11558 if {$i >= [llength $argv] && $revtreeargs ne {}} {
11559 # no -- on command line, but some arguments (other than --argscmd)
11561 set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs]
11562 set cmdline_files [split $f "\n"]
11563 set n [llength $cmdline_files]
11564 set revtreeargs [lrange $revtreeargs 0 end-$n]
11565 # Unfortunately git rev-parse doesn't produce an error when
11566 # something is both a revision and a filename. To be consistent
11567 # with git log and git rev-list, check revtreeargs for filenames.
11568 foreach arg $revtreeargs {
11569 if {[file exists $arg]} {
11570 show_error {} . [mc "Ambiguous argument '%s': both revision\
11571 and filename" $arg]
11576 # unfortunately we get both stdout and stderr in $err,
11577 # so look for "fatal:".
11578 set i [string first "fatal:" $err]
11580 set err [string range $err [expr {$i + 6}] end]
11582 show_error {} . "[mc "Bad arguments to gitk:"]\n$err"
11587 set nullid "0000000000000000000000000000000000000000"
11588 set nullid2 "0000000000000000000000000000000000000001"
11589 set nullfile "/dev/null"
11591 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
11592 if {![info exists have_ttk]} {
11593 set have_ttk [llength [info commands ::ttk::style]]
11595 set use_ttk [expr {$have_ttk && $want_ttk}]
11596 set NS [expr {$use_ttk ? "ttk" : ""}]
11598 regexp {^git version ([\d.]*\d)} [exec git version] _ git_version
11601 if {[package vcompare $git_version "1.6.6.2"] >= 0} {
11602 set show_notes "--show-notes"
11610 set highlight_paths {}
11612 set searchdirn -forwards
11615 set diffelide {0 0}
11616 set markingmatches 0
11617 set linkentercount 0
11618 set need_redisplay 0
11625 set selectedhlview [mc "None"]
11626 set highlight_related [mc "None"]
11627 set highlight_files {}
11628 set viewfiles(0) {}
11631 set viewargscmd(0) {}
11633 set selectedline {}
11641 set hasworktree [hasworktree]
11643 if {[expr {[exec git rev-parse --is-inside-work-tree] == "true"}]} {
11644 set cdup [exec git rev-parse --show-cdup]
11646 set worktree [exec git rev-parse --show-toplevel]
11650 image create photo gitlogo -width 16 -height 16
11652 image create photo gitlogominus -width 4 -height 2
11653 gitlogominus put #C00000 -to 0 0 4 2
11654 gitlogo copy gitlogominus -to 1 5
11655 gitlogo copy gitlogominus -to 6 5
11656 gitlogo copy gitlogominus -to 11 5
11657 image delete gitlogominus
11659 image create photo gitlogoplus -width 4 -height 4
11660 gitlogoplus put #008000 -to 1 0 3 4
11661 gitlogoplus put #008000 -to 0 1 4 3
11662 gitlogo copy gitlogoplus -to 1 9
11663 gitlogo copy gitlogoplus -to 6 9
11664 gitlogo copy gitlogoplus -to 11 9
11665 image delete gitlogoplus
11667 image create photo gitlogo32 -width 32 -height 32
11668 gitlogo32 copy gitlogo -zoom 2 2
11670 wm iconphoto . -default gitlogo gitlogo32
11672 # wait for the window to become visible
11673 tkwait visibility .
11674 wm title . "[file tail $argv0]: [file tail [pwd]]"
11678 if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} {
11679 # create a view for the files/dirs specified on the command line
11683 set viewname(1) [mc "Command line"]
11684 set viewfiles(1) $cmdline_files
11685 set viewargs(1) $revtreeargs
11686 set viewargscmd(1) $revtreeargscmd
11690 .bar.view entryconf [mca "Edit view..."] -state normal
11691 .bar.view entryconf [mca "Delete view"] -state normal
11694 if {[info exists permviews]} {
11695 foreach v $permviews {
11698 set viewname($n) [lindex $v 0]
11699 set viewfiles($n) [lindex $v 1]
11700 set viewargs($n) [lindex $v 2]
11701 set viewargscmd($n) [lindex $v 3]
11707 if {[tk windowingsystem] eq "win32"} {
11715 # indent-tabs-mode: t