2 # Tcl ignores the next line -*- tcl -*- \
5 # Copyright © 2005-2009 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.
14 if {[info exists env
(GIT_DIR
)]} {
17 return [exec git rev-parse
--git-dir]
21 # A simple scheduler for compute-intensive stuff.
22 # The aim is to make sure that event handlers for GUI actions can
23 # run at least every 50-100 ms. Unfortunately fileevent handlers are
24 # run before X event handlers, so reading from a fast source can
25 # make the GUI completely unresponsive.
27 global isonrunq runq currunq
30 if {[info exists isonrunq
($script)]} return
31 if {$runq eq
{} && ![info exists currunq
]} {
34 lappend runq
[list
{} $script]
35 set isonrunq
($script) 1
38 proc filerun
{fd
script} {
39 fileevent
$fd readable
[list filereadable
$fd $script]
42 proc filereadable
{fd
script} {
45 fileevent
$fd readable
{}
46 if {$runq eq
{} && ![info exists currunq
]} {
49 lappend runq
[list
$fd $script]
55 for {set i
0} {$i < [llength
$runq]} {} {
56 if {[lindex
$runq $i 0] eq
$fd} {
57 set runq
[lreplace
$runq $i $i]
65 global isonrunq runq currunq
67 set tstart
[clock clicks
-milliseconds]
69 while {[llength
$runq] > 0} {
70 set fd
[lindex
$runq 0 0]
71 set script [lindex
$runq 0 1]
72 set currunq
[lindex
$runq 0]
73 set runq
[lrange
$runq 1 end
]
74 set repeat
[eval $script]
76 set t1
[clock clicks
-milliseconds]
77 set t
[expr {$t1 - $t0}]
78 if {$repeat ne
{} && $repeat} {
79 if {$fd eq
{} ||
$repeat == 2} {
80 # script returns 1 if it wants to be readded
81 # file readers return 2 if they could do more straight away
82 lappend runq
[list
$fd $script]
84 fileevent
$fd readable
[list filereadable
$fd $script]
86 } elseif
{$fd eq
{}} {
87 unset isonrunq
($script)
90 if {$t1 - $tstart >= 80} break
97 proc reg_instance
{fd
} {
98 global commfd leftover loginstance
100 set i
[incr loginstance
]
106 proc unmerged_files
{files
} {
109 # find the list of unmerged files
113 set fd
[open
"| git ls-files -u" r
]
115 show_error
{} .
"[mc "Couldn
't get list of unmerged files:"] $err"
118 while {[gets $fd line] >= 0} {
119 set i [string first "\t" $line]
121 set fname [string range $line [expr {$i+1}] end]
122 if {[lsearch -exact $mlist $fname] >= 0} continue
124 if {$files eq {} || [path_filter $files $fname]} {
132 proc parseviewargs {n arglist} {
133 global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs env
141 set origargs $arglist
145 foreach arg $arglist {
152 switch -glob -- $arg {
156 # remove from origargs in case we hit an unknown option
157 set origargs [lreplace $origargs $i $i]
161 "--no-renames" - "--full-index" - "--binary" - "--abbrev=*" -
162 "--find-copies-harder" - "-l*" - "--ext-diff" - "--no-ext-diff" -
163 "--src-prefix=*" - "--dst-prefix=*" - "--no-prefix" -
164 "-O*" - "--text" - "--full-diff" - "--ignore-space-at-eol" -
165 "--ignore-space-change" - "-U*" - "--unified=*" {
166 # These request or affect diff output, which we don't want.
167 # Some could be used to set our defaults for diff display.
168 lappend diffargs
$arg
170 "--raw" - "--patch-with-raw" - "--patch-with-stat" -
171 "--name-only" - "--name-status" - "--color" - "--color-words" -
172 "--log-size" - "--pretty=*" - "--decorate" - "--abbrev-commit" -
173 "--cc" - "-z" - "--header" - "--parents" - "--boundary" -
174 "--no-color" - "-g" - "--walk-reflogs" - "--no-walk" -
175 "--timestamp" - "relative-date" - "--date=*" - "--stdin" -
176 "--objects" - "--objects-edge" - "--reverse" {
177 # These cause our parsing of git log's output to fail, or else
178 # they're options we want to set ourselves, so ignore them.
180 "--stat=*" - "--numstat" - "--shortstat" - "--summary" -
181 "--check" - "--exit-code" - "--quiet" - "--topo-order" -
182 "--full-history" - "--dense" - "--sparse" -
183 "--follow" - "--left-right" - "--encoding=*" {
184 # These are harmless, and some are even useful
187 "--diff-filter=*" - "--no-merges" - "--unpacked" -
188 "--max-count=*" - "--skip=*" - "--since=*" - "--after=*" -
189 "--until=*" - "--before=*" - "--max-age=*" - "--min-age=*" -
190 "--author=*" - "--committer=*" - "--grep=*" - "-[iE]" -
191 "--remove-empty" - "--first-parent" - "--cherry-pick" -
192 "-S*" - "--pickaxe-all" - "--pickaxe-regex" -
193 "--simplify-by-decoration" {
194 # These mean that we get a subset of the commits
199 # This appears to be the only one that has a value as a
200 # separate word following it
210 # git rev-parse doesn't understand --merge
211 lappend revargs
--gitk-symmetric-diff-marker MERGE_HEAD...HEAD
213 "--no-replace-objects" {
214 set env
(GIT_NO_REPLACE_OBJECTS
) "1"
217 # Other flag arguments including -<n>
218 if {[string is digit
-strict [string range
$arg 1 end
]]} {
221 # a flag argument that we don't recognize;
222 # that means we can't optimize
228 # Non-flag arguments specify commits or ranges of commits
229 if {[string match
"*...*" $arg]} {
230 lappend revargs
--gitk-symmetric-diff-marker
236 set vdflags
($n) $diffargs
237 set vflags
($n) $glflags
238 set vrevs
($n) $revargs
239 set vfiltered
($n) $filtered
240 set vorigargs
($n) $origargs
244 proc parseviewrevs
{view revs
} {
245 global vposids vnegids
250 if {[catch
{set ids
[eval exec git rev-parse
$revs]} err
]} {
251 # we get stdout followed by stderr in $err
252 # for an unknown rev, git rev-parse echoes it and then errors out
253 set errlines
[split $err "\n"]
255 for {set l
0} {$l < [llength
$errlines]} {incr l
} {
256 set line
[lindex
$errlines $l]
257 if {!([string length
$line] == 40 && [string is xdigit
$line])} {
258 if {[string match
"fatal:*" $line]} {
259 if {[string match
"fatal: ambiguous argument*" $line]
261 if {[llength
$badrev] == 1} {
262 set err
"unknown revision $badrev"
264 set err
"unknown revisions: [join $badrev ", "]"
267 set err
[join [lrange
$errlines $l end
] "\n"]
274 error_popup
"[mc "Error parsing revisions
:"] $err"
281 foreach id
[split $ids "\n"] {
282 if {$id eq
"--gitk-symmetric-diff-marker"} {
284 } elseif
{[string match
"^*" $id]} {
291 lappend neg
[string range
$id 1 end
]
296 lset ret end
$id...
[lindex
$ret end
]
302 set vposids
($view) $pos
303 set vnegids
($view) $neg
307 # Start off a git log process and arrange to read its output
308 proc start_rev_list
{view
} {
309 global startmsecs commitidx viewcomplete curview
311 global viewargs viewargscmd viewfiles vfilelimit
312 global showlocalchanges
313 global viewactive viewinstances vmergeonly
314 global mainheadid viewmainheadid viewmainheadid_orig
315 global vcanopt vflags vrevs vorigargs
317 set startmsecs
[clock clicks
-milliseconds]
318 set commitidx
($view) 0
319 # these are set this way for the error exits
320 set viewcomplete
($view) 1
321 set viewactive
($view) 0
324 set args
$viewargs($view)
325 if {$viewargscmd($view) ne
{}} {
327 set str
[exec sh
-c $viewargscmd($view)]
329 error_popup
"[mc "Error executing
--argscmd command:"] $err"
332 set args
[concat
$args [split $str "\n"]]
334 set vcanopt
($view) [parseviewargs
$view $args]
336 set files
$viewfiles($view)
337 if {$vmergeonly($view)} {
338 set files
[unmerged_files
$files]
341 if {$nr_unmerged == 0} {
342 error_popup
[mc
"No files selected: --merge specified but\
343 no files are unmerged."]
345 error_popup
[mc
"No files selected: --merge specified but\
346 no unmerged files are within file limit."]
351 set vfilelimit
($view) $files
353 if {$vcanopt($view)} {
354 set revs
[parseviewrevs
$view $vrevs($view)]
358 set args
[concat
$vflags($view) $revs]
360 set args
$vorigargs($view)
364 set fd
[open
[concat | git log
--no-color -z --pretty=raw
--parents \
365 --boundary $args "--" $files] r
]
367 error_popup
"[mc "Error executing git log
:"] $err"
370 set i
[reg_instance
$fd]
371 set viewinstances
($view) [list
$i]
372 set viewmainheadid
($view) $mainheadid
373 set viewmainheadid_orig
($view) $mainheadid
374 if {$files ne
{} && $mainheadid ne
{}} {
375 get_viewmainhead
$view
377 if {$showlocalchanges && $viewmainheadid($view) ne
{}} {
378 interestedin
$viewmainheadid($view) dodiffindex
380 fconfigure
$fd -blocking 0 -translation lf
-eofchar {}
381 if {$tclencoding != {}} {
382 fconfigure
$fd -encoding $tclencoding
384 filerun
$fd [list getcommitlines
$fd $i $view 0]
385 nowbusy
$view [mc
"Reading"]
386 set viewcomplete
($view) 0
387 set viewactive
($view) 1
391 proc stop_instance
{inst
} {
392 global commfd leftover
394 set fd
$commfd($inst)
398 if {$
::tcl_platform
(platform
) eq
{windows
}} {
407 unset leftover
($inst)
410 proc stop_backends
{} {
413 foreach inst
[array names commfd
] {
418 proc stop_rev_list
{view
} {
421 foreach inst
$viewinstances($view) {
424 set viewinstances
($view) {}
427 proc reset_pending_select
{selid
} {
428 global pending_select mainheadid selectheadid
431 set pending_select
$selid
432 } elseif
{$selectheadid ne
{}} {
433 set pending_select
$selectheadid
435 set pending_select
$mainheadid
439 proc getcommits
{selid
} {
440 global canv curview need_redisplay viewactive
443 if {[start_rev_list
$curview]} {
444 reset_pending_select
$selid
445 show_status
[mc
"Reading commits..."]
448 show_status
[mc
"No commits selected"]
452 proc updatecommits
{} {
453 global curview vcanopt vorigargs vfilelimit viewinstances
454 global viewactive viewcomplete tclencoding
455 global startmsecs showneartags showlocalchanges
456 global mainheadid viewmainheadid viewmainheadid_orig pending_select
458 global varcid vposids vnegids vflags vrevs
460 set isworktree
[expr {[exec git rev-parse
--is-inside-work-tree] == "true"}]
463 if {$mainheadid ne
$viewmainheadid_orig($view)} {
464 if {$showlocalchanges} {
467 set viewmainheadid
($view) $mainheadid
468 set viewmainheadid_orig
($view) $mainheadid
469 if {$vfilelimit($view) ne
{}} {
470 get_viewmainhead
$view
473 if {$showlocalchanges} {
476 if {$vcanopt($view)} {
477 set oldpos
$vposids($view)
478 set oldneg
$vnegids($view)
479 set revs
[parseviewrevs
$view $vrevs($view)]
483 # note: getting the delta when negative refs change is hard,
484 # and could require multiple git log invocations, so in that
485 # case we ask git log for all the commits (not just the delta)
486 if {$oldneg eq
$vnegids($view)} {
489 # take out positive refs that we asked for before or
490 # that we have already seen
492 if {[string length
$rev] == 40} {
493 if {[lsearch
-exact $oldpos $rev] < 0
494 && ![info exists varcid
($view,$rev)]} {
499 lappend
$newrevs $rev
502 if {$npos == 0} return
504 set vposids
($view) [lsort
-unique [concat
$oldpos $vposids($view)]]
506 set args
[concat
$vflags($view) $revs --not $oldpos]
508 set args
$vorigargs($view)
511 set fd
[open
[concat | git log
--no-color -z --pretty=raw
--parents \
512 --boundary $args "--" $vfilelimit($view)] r
]
514 error_popup
"[mc "Error executing git log
:"] $err"
517 if {$viewactive($view) == 0} {
518 set startmsecs
[clock clicks
-milliseconds]
520 set i
[reg_instance
$fd]
521 lappend viewinstances
($view) $i
522 fconfigure
$fd -blocking 0 -translation lf
-eofchar {}
523 if {$tclencoding != {}} {
524 fconfigure
$fd -encoding $tclencoding
526 filerun
$fd [list getcommitlines
$fd $i $view 1]
527 incr viewactive
($view)
528 set viewcomplete
($view) 0
529 reset_pending_select
{}
530 nowbusy
$view [mc
"Reading"]
536 proc reloadcommits
{} {
537 global curview viewcomplete selectedline currentid thickerline
538 global showneartags treediffs commitinterest cached_commitrow
542 if {$selectedline ne
{}} {
546 if {!$viewcomplete($curview)} {
547 stop_rev_list
$curview
551 catch
{unset currentid
}
552 catch
{unset thickerline
}
553 catch
{unset treediffs
}
560 catch
{unset commitinterest
}
561 catch
{unset cached_commitrow
}
562 catch
{unset targetid
}
568 # This makes a string representation of a positive integer which
569 # sorts as a string in numerical order
572 return [format
"%x" $n]
573 } elseif
{$n < 256} {
574 return [format
"x%.2x" $n]
575 } elseif
{$n < 65536} {
576 return [format
"y%.4x" $n]
578 return [format
"z%.8x" $n]
581 # Procedures used in reordering commits from git log (without
582 # --topo-order) into the order for display.
584 proc varcinit
{view
} {
585 global varcstart vupptr vdownptr vleftptr vbackptr varctok varcrow
586 global vtokmod varcmod vrowmod varcix vlastins
588 set varcstart
($view) {{}}
589 set vupptr
($view) {0}
590 set vdownptr
($view) {0}
591 set vleftptr
($view) {0}
592 set vbackptr
($view) {0}
593 set varctok
($view) {{}}
594 set varcrow
($view) {{}}
595 set vtokmod
($view) {}
598 set varcix
($view) {{}}
599 set vlastins
($view) {0}
602 proc resetvarcs
{view
} {
603 global varcid varccommits parents children vseedcount ordertok
605 foreach vid
[array names varcid
$view,*] {
610 # some commits might have children but haven't been seen yet
611 foreach vid
[array names children
$view,*] {
614 foreach va
[array names varccommits
$view,*] {
615 unset varccommits
($va)
617 foreach vd
[array names vseedcount
$view,*] {
618 unset vseedcount
($vd)
620 catch
{unset ordertok
}
623 # returns a list of the commits with no children
625 global vdownptr vleftptr varcstart
628 set a
[lindex
$vdownptr($v) 0]
630 lappend ret
[lindex
$varcstart($v) $a]
631 set a
[lindex
$vleftptr($v) $a]
636 proc newvarc
{view id
} {
637 global varcid varctok parents children vdatemode
638 global vupptr vdownptr vleftptr vbackptr varcrow varcix varcstart
639 global commitdata commitinfo vseedcount varccommits vlastins
641 set a
[llength
$varctok($view)]
643 if {[llength
$children($vid)] == 0 ||
$vdatemode($view)} {
644 if {![info exists commitinfo
($id)]} {
645 parsecommit
$id $commitdata($id) 1
647 set cdate
[lindex
$commitinfo($id) 4]
648 if {![string is integer
-strict $cdate]} {
651 if {![info exists vseedcount
($view,$cdate)]} {
652 set vseedcount
($view,$cdate) -1
654 set c
[incr vseedcount
($view,$cdate)]
655 set cdate
[expr {$cdate ^
0xffffffff}]
656 set tok
"s[strrep $cdate][strrep $c]"
661 if {[llength
$children($vid)] > 0} {
662 set kid
[lindex
$children($vid) end
]
663 set k
$varcid($view,$kid)
664 if {[string compare
[lindex
$varctok($view) $k] $tok] > 0} {
667 set tok
[lindex
$varctok($view) $k]
671 set i
[lsearch
-exact $parents($view,$ki) $id]
672 set j
[expr {[llength
$parents($view,$ki)] - 1 - $i}]
673 append tok
[strrep
$j]
675 set c
[lindex
$vlastins($view) $ka]
676 if {$c == 0 ||
[string compare
$tok [lindex
$varctok($view) $c]] < 0} {
678 set b
[lindex
$vdownptr($view) $ka]
680 set b
[lindex
$vleftptr($view) $c]
682 while {$b != 0 && [string compare
$tok [lindex
$varctok($view) $b]] >= 0} {
684 set b
[lindex
$vleftptr($view) $c]
687 lset vdownptr
($view) $ka $a
688 lappend vbackptr
($view) 0
690 lset vleftptr
($view) $c $a
691 lappend vbackptr
($view) $c
693 lset vlastins
($view) $ka $a
694 lappend vupptr
($view) $ka
695 lappend vleftptr
($view) $b
697 lset vbackptr
($view) $b $a
699 lappend varctok
($view) $tok
700 lappend varcstart
($view) $id
701 lappend vdownptr
($view) 0
702 lappend varcrow
($view) {}
703 lappend varcix
($view) {}
704 set varccommits
($view,$a) {}
705 lappend vlastins
($view) 0
709 proc splitvarc
{p v
} {
710 global varcid varcstart varccommits varctok vtokmod
711 global vupptr vdownptr vleftptr vbackptr varcix varcrow vlastins
713 set oa
$varcid($v,$p)
714 set otok
[lindex
$varctok($v) $oa]
715 set ac
$varccommits($v,$oa)
716 set i
[lsearch
-exact $varccommits($v,$oa) $p]
718 set na
[llength
$varctok($v)]
719 # "%" sorts before "0"...
720 set tok
"$otok%[strrep $i]"
721 lappend varctok
($v) $tok
722 lappend varcrow
($v) {}
723 lappend varcix
($v) {}
724 set varccommits
($v,$oa) [lrange
$ac 0 [expr {$i - 1}]]
725 set varccommits
($v,$na) [lrange
$ac $i end
]
726 lappend varcstart
($v) $p
727 foreach id
$varccommits($v,$na) {
728 set varcid
($v,$id) $na
730 lappend vdownptr
($v) [lindex
$vdownptr($v) $oa]
731 lappend vlastins
($v) [lindex
$vlastins($v) $oa]
732 lset vdownptr
($v) $oa $na
733 lset vlastins
($v) $oa 0
734 lappend vupptr
($v) $oa
735 lappend vleftptr
($v) 0
736 lappend vbackptr
($v) 0
737 for {set b
[lindex
$vdownptr($v) $na]} {$b != 0} {set b
[lindex
$vleftptr($v) $b]} {
738 lset vupptr
($v) $b $na
740 if {[string compare
$otok $vtokmod($v)] <= 0} {
745 proc renumbervarc
{a v
} {
746 global parents children varctok varcstart varccommits
747 global vupptr vdownptr vleftptr vbackptr vlastins varcid vtokmod vdatemode
749 set t1
[clock clicks
-milliseconds]
755 if {[info exists isrelated
($a)]} {
757 set id
[lindex
$varccommits($v,$a) end
]
758 foreach p
$parents($v,$id) {
759 if {[info exists varcid
($v,$p)]} {
760 set isrelated
($varcid($v,$p)) 1
765 set b
[lindex
$vdownptr($v) $a]
768 set b
[lindex
$vleftptr($v) $a]
770 set a
[lindex
$vupptr($v) $a]
776 if {![info exists kidchanged
($a)]} continue
777 set id
[lindex
$varcstart($v) $a]
778 if {[llength
$children($v,$id)] > 1} {
779 set children
($v,$id) [lsort
-command [list vtokcmp
$v] \
782 set oldtok
[lindex
$varctok($v) $a]
783 if {!$vdatemode($v)} {
789 set kid
[last_real_child
$v,$id]
791 set k
$varcid($v,$kid)
792 if {[string compare
[lindex
$varctok($v) $k] $tok] > 0} {
795 set tok
[lindex
$varctok($v) $k]
799 set i
[lsearch
-exact $parents($v,$ki) $id]
800 set j
[expr {[llength
$parents($v,$ki)] - 1 - $i}]
801 append tok
[strrep
$j]
803 if {$tok eq
$oldtok} {
806 set id
[lindex
$varccommits($v,$a) end
]
807 foreach p
$parents($v,$id) {
808 if {[info exists varcid
($v,$p)]} {
809 set kidchanged
($varcid($v,$p)) 1
814 lset varctok
($v) $a $tok
815 set b
[lindex
$vupptr($v) $a]
817 if {[string compare
[lindex
$varctok($v) $ka] $vtokmod($v)] < 0} {
820 if {[string compare
[lindex
$varctok($v) $b] $vtokmod($v)] < 0} {
823 set c
[lindex
$vbackptr($v) $a]
824 set d
[lindex
$vleftptr($v) $a]
826 lset vdownptr
($v) $b $d
828 lset vleftptr
($v) $c $d
831 lset vbackptr
($v) $d $c
833 if {[lindex
$vlastins($v) $b] == $a} {
834 lset vlastins
($v) $b $c
836 lset vupptr
($v) $a $ka
837 set c
[lindex
$vlastins($v) $ka]
839 [string compare
$tok [lindex
$varctok($v) $c]] < 0} {
841 set b
[lindex
$vdownptr($v) $ka]
843 set b
[lindex
$vleftptr($v) $c]
846 [string compare
$tok [lindex
$varctok($v) $b]] >= 0} {
848 set b
[lindex
$vleftptr($v) $c]
851 lset vdownptr
($v) $ka $a
852 lset vbackptr
($v) $a 0
854 lset vleftptr
($v) $c $a
855 lset vbackptr
($v) $a $c
857 lset vleftptr
($v) $a $b
859 lset vbackptr
($v) $b $a
861 lset vlastins
($v) $ka $a
864 foreach id
[array names sortkids
] {
865 if {[llength
$children($v,$id)] > 1} {
866 set children
($v,$id) [lsort
-command [list vtokcmp
$v] \
870 set t2
[clock clicks
-milliseconds]
871 #puts "renumbervarc did [llength $todo] of $ntot arcs in [expr {$t2-$t1}]ms"
874 # Fix up the graph after we have found out that in view $v,
875 # $p (a commit that we have already seen) is actually the parent
876 # of the last commit in arc $a.
877 proc fix_reversal
{p a v
} {
878 global varcid varcstart varctok vupptr
880 set pa
$varcid($v,$p)
881 if {$p ne
[lindex
$varcstart($v) $pa]} {
883 set pa
$varcid($v,$p)
885 # seeds always need to be renumbered
886 if {[lindex
$vupptr($v) $pa] == 0 ||
887 [string compare
[lindex
$varctok($v) $a] \
888 [lindex
$varctok($v) $pa]] > 0} {
893 proc insertrow
{id p v
} {
894 global cmitlisted children parents varcid varctok vtokmod
895 global varccommits ordertok commitidx numcommits curview
896 global targetid targetrow
900 set cmitlisted
($vid) 1
901 set children
($vid) {}
902 set parents
($vid) [list
$p]
903 set a
[newvarc
$v $id]
905 if {[string compare
[lindex
$varctok($v) $a] $vtokmod($v)] < 0} {
908 lappend varccommits
($v,$a) $id
910 if {[llength
[lappend children
($vp) $id]] > 1} {
911 set children
($vp) [lsort
-command [list vtokcmp
$v] $children($vp)]
912 catch
{unset ordertok
}
914 fix_reversal
$p $a $v
916 if {$v == $curview} {
917 set numcommits
$commitidx($v)
919 if {[info exists targetid
]} {
920 if {![comes_before
$targetid $p]} {
927 proc insertfakerow
{id p
} {
928 global varcid varccommits parents children cmitlisted
929 global commitidx varctok vtokmod targetid targetrow curview numcommits
933 set i
[lsearch
-exact $varccommits($v,$a) $p]
935 puts
"oops: insertfakerow can't find [shortids $p] on arc $a"
938 set children
($v,$id) {}
939 set parents
($v,$id) [list
$p]
940 set varcid
($v,$id) $a
941 lappend children
($v,$p) $id
942 set cmitlisted
($v,$id) 1
943 set numcommits
[incr commitidx
($v)]
944 # note we deliberately don't update varcstart($v) even if $i == 0
945 set varccommits
($v,$a) [linsert
$varccommits($v,$a) $i $id]
947 if {[info exists targetid
]} {
948 if {![comes_before
$targetid $p]} {
956 proc removefakerow
{id
} {
957 global varcid varccommits parents children commitidx
958 global varctok vtokmod cmitlisted currentid selectedline
959 global targetid curview numcommits
962 if {[llength
$parents($v,$id)] != 1} {
963 puts
"oops: removefakerow [shortids $id] has [llength $parents($v,$id)] parents"
966 set p
[lindex
$parents($v,$id) 0]
967 set a
$varcid($v,$id)
968 set i
[lsearch
-exact $varccommits($v,$a) $id]
970 puts
"oops: removefakerow can't find [shortids $id] on arc $a"
974 set varccommits
($v,$a) [lreplace
$varccommits($v,$a) $i $i]
975 unset parents
($v,$id)
976 unset children
($v,$id)
977 unset cmitlisted
($v,$id)
978 set numcommits
[incr commitidx
($v) -1]
979 set j
[lsearch
-exact $children($v,$p) $id]
981 set children
($v,$p) [lreplace
$children($v,$p) $j $j]
984 if {[info exist currentid
] && $id eq
$currentid} {
988 if {[info exists targetid
] && $targetid eq
$id} {
995 proc real_children
{vp
} {
996 global children nullid nullid2
999 foreach id
$children($vp) {
1000 if {$id ne
$nullid && $id ne
$nullid2} {
1007 proc first_real_child
{vp
} {
1008 global children nullid nullid2
1010 foreach id
$children($vp) {
1011 if {$id ne
$nullid && $id ne
$nullid2} {
1018 proc last_real_child
{vp
} {
1019 global children nullid nullid2
1021 set kids
$children($vp)
1022 for {set i
[llength
$kids]} {[incr i
-1] >= 0} {} {
1023 set id
[lindex
$kids $i]
1024 if {$id ne
$nullid && $id ne
$nullid2} {
1031 proc vtokcmp
{v a b
} {
1032 global varctok varcid
1034 return [string compare
[lindex
$varctok($v) $varcid($v,$a)] \
1035 [lindex
$varctok($v) $varcid($v,$b)]]
1038 # This assumes that if lim is not given, the caller has checked that
1039 # arc a's token is less than $vtokmod($v)
1040 proc modify_arc
{v a
{lim
{}}} {
1041 global varctok vtokmod varcmod varcrow vupptr curview vrowmod varccommits
1044 set c
[string compare
[lindex
$varctok($v) $a] $vtokmod($v)]
1047 set r
[lindex
$varcrow($v) $a]
1048 if {$r ne
{} && $vrowmod($v) <= $r + $lim} return
1051 set vtokmod
($v) [lindex
$varctok($v) $a]
1053 if {$v == $curview} {
1054 while {$a != 0 && [lindex
$varcrow($v) $a] eq
{}} {
1055 set a
[lindex
$vupptr($v) $a]
1061 set lim
[llength
$varccommits($v,$a)]
1063 set r
[expr {[lindex
$varcrow($v) $a] + $lim}]
1070 proc update_arcrows
{v
} {
1071 global vtokmod varcmod vrowmod varcrow commitidx currentid selectedline
1072 global varcid vrownum varcorder varcix varccommits
1073 global vupptr vdownptr vleftptr varctok
1074 global displayorder parentlist curview cached_commitrow
1076 if {$vrowmod($v) == $commitidx($v)} return
1077 if {$v == $curview} {
1078 if {[llength
$displayorder] > $vrowmod($v)} {
1079 set displayorder
[lrange
$displayorder 0 [expr {$vrowmod($v) - 1}]]
1080 set parentlist
[lrange
$parentlist 0 [expr {$vrowmod($v) - 1}]]
1082 catch
{unset cached_commitrow
}
1084 set narctot
[expr {[llength
$varctok($v)] - 1}]
1086 while {$a != 0 && [lindex
$varcix($v) $a] eq
{}} {
1087 # go up the tree until we find something that has a row number,
1088 # or we get to a seed
1089 set a
[lindex
$vupptr($v) $a]
1092 set a
[lindex
$vdownptr($v) 0]
1095 set varcorder
($v) [list
$a]
1096 lset varcix
($v) $a 0
1097 lset varcrow
($v) $a 0
1101 set arcn
[lindex
$varcix($v) $a]
1102 if {[llength
$vrownum($v)] > $arcn + 1} {
1103 set vrownum
($v) [lrange
$vrownum($v) 0 $arcn]
1104 set varcorder
($v) [lrange
$varcorder($v) 0 $arcn]
1106 set row
[lindex
$varcrow($v) $a]
1110 incr row
[llength
$varccommits($v,$a)]
1111 # go down if possible
1112 set b
[lindex
$vdownptr($v) $a]
1114 # if not, go left, or go up until we can go left
1116 set b
[lindex
$vleftptr($v) $a]
1118 set a
[lindex
$vupptr($v) $a]
1124 lappend vrownum
($v) $row
1125 lappend varcorder
($v) $a
1126 lset varcix
($v) $a $arcn
1127 lset varcrow
($v) $a $row
1129 set vtokmod
($v) [lindex
$varctok($v) $p]
1131 set vrowmod
($v) $row
1132 if {[info exists currentid
]} {
1133 set selectedline
[rowofcommit
$currentid]
1137 # Test whether view $v contains commit $id
1138 proc commitinview
{id v
} {
1141 return [info exists varcid
($v,$id)]
1144 # Return the row number for commit $id in the current view
1145 proc rowofcommit
{id
} {
1146 global varcid varccommits varcrow curview cached_commitrow
1147 global varctok vtokmod
1150 if {![info exists varcid
($v,$id)]} {
1151 puts
"oops rowofcommit no arc for [shortids $id]"
1154 set a
$varcid($v,$id)
1155 if {[string compare
[lindex
$varctok($v) $a] $vtokmod($v)] >= 0} {
1158 if {[info exists cached_commitrow
($id)]} {
1159 return $cached_commitrow($id)
1161 set i
[lsearch
-exact $varccommits($v,$a) $id]
1163 puts
"oops didn't find commit [shortids $id] in arc $a"
1166 incr i
[lindex
$varcrow($v) $a]
1167 set cached_commitrow
($id) $i
1171 # Returns 1 if a is on an earlier row than b, otherwise 0
1172 proc comes_before
{a b
} {
1173 global varcid varctok curview
1176 if {$a eq
$b ||
![info exists varcid
($v,$a)] || \
1177 ![info exists varcid
($v,$b)]} {
1180 if {$varcid($v,$a) != $varcid($v,$b)} {
1181 return [expr {[string compare
[lindex
$varctok($v) $varcid($v,$a)] \
1182 [lindex
$varctok($v) $varcid($v,$b)]] < 0}]
1184 return [expr {[rowofcommit
$a] < [rowofcommit
$b]}]
1187 proc bsearch
{l elt
} {
1188 if {[llength
$l] == 0 ||
$elt <= [lindex
$l 0]} {
1193 while {$hi - $lo > 1} {
1194 set mid
[expr {int
(($lo + $hi) / 2)}]
1195 set t
[lindex
$l $mid]
1198 } elseif
{$elt > $t} {
1207 # Make sure rows $start..$end-1 are valid in displayorder and parentlist
1208 proc make_disporder
{start end
} {
1209 global vrownum curview commitidx displayorder parentlist
1210 global varccommits varcorder parents vrowmod varcrow
1211 global d_valid_start d_valid_end
1213 if {$end > $vrowmod($curview)} {
1214 update_arcrows
$curview
1216 set ai
[bsearch
$vrownum($curview) $start]
1217 set start
[lindex
$vrownum($curview) $ai]
1218 set narc
[llength
$vrownum($curview)]
1219 for {set r
$start} {$ai < $narc && $r < $end} {incr ai
} {
1220 set a
[lindex
$varcorder($curview) $ai]
1221 set l
[llength
$displayorder]
1222 set al
[llength
$varccommits($curview,$a)]
1223 if {$l < $r + $al} {
1225 set pad
[ntimes
[expr {$r - $l}] {}]
1226 set displayorder
[concat
$displayorder $pad]
1227 set parentlist
[concat
$parentlist $pad]
1228 } elseif
{$l > $r} {
1229 set displayorder
[lrange
$displayorder 0 [expr {$r - 1}]]
1230 set parentlist
[lrange
$parentlist 0 [expr {$r - 1}]]
1232 foreach id
$varccommits($curview,$a) {
1233 lappend displayorder
$id
1234 lappend parentlist
$parents($curview,$id)
1236 } elseif
{[lindex
$displayorder [expr {$r + $al - 1}]] eq
{}} {
1238 foreach id
$varccommits($curview,$a) {
1239 lset displayorder
$i $id
1240 lset parentlist
$i $parents($curview,$id)
1248 proc commitonrow
{row
} {
1251 set id
[lindex
$displayorder $row]
1253 make_disporder
$row [expr {$row + 1}]
1254 set id
[lindex
$displayorder $row]
1259 proc closevarcs
{v
} {
1260 global varctok varccommits varcid parents children
1261 global cmitlisted commitidx vtokmod
1263 set missing_parents
0
1265 set narcs
[llength
$varctok($v)]
1266 for {set a
1} {$a < $narcs} {incr a
} {
1267 set id
[lindex
$varccommits($v,$a) end
]
1268 foreach p
$parents($v,$id) {
1269 if {[info exists varcid
($v,$p)]} continue
1270 # add p as a new commit
1271 incr missing_parents
1272 set cmitlisted
($v,$p) 0
1273 set parents
($v,$p) {}
1274 if {[llength
$children($v,$p)] == 1 &&
1275 [llength
$parents($v,$id)] == 1} {
1278 set b
[newvarc
$v $p]
1280 set varcid
($v,$p) $b
1281 if {[string compare
[lindex
$varctok($v) $b] $vtokmod($v)] < 0} {
1284 lappend varccommits
($v,$b) $p
1286 set scripts
[check_interest
$p $scripts]
1289 if {$missing_parents > 0} {
1290 foreach s
$scripts {
1296 # Use $rwid as a substitute for $id, i.e. reparent $id's children to $rwid
1297 # Assumes we already have an arc for $rwid.
1298 proc rewrite_commit
{v id rwid
} {
1299 global children parents varcid varctok vtokmod varccommits
1301 foreach ch
$children($v,$id) {
1302 # make $rwid be $ch's parent in place of $id
1303 set i
[lsearch
-exact $parents($v,$ch) $id]
1305 puts
"oops rewrite_commit didn't find $id in parent list for $ch"
1307 set parents
($v,$ch) [lreplace
$parents($v,$ch) $i $i $rwid]
1308 # add $ch to $rwid's children and sort the list if necessary
1309 if {[llength
[lappend children
($v,$rwid) $ch]] > 1} {
1310 set children
($v,$rwid) [lsort
-command [list vtokcmp
$v] \
1311 $children($v,$rwid)]
1313 # fix the graph after joining $id to $rwid
1314 set a
$varcid($v,$ch)
1315 fix_reversal
$rwid $a $v
1316 # parentlist is wrong for the last element of arc $a
1317 # even if displayorder is right, hence the 3rd arg here
1318 modify_arc
$v $a [expr {[llength
$varccommits($v,$a)] - 1}]
1322 # Mechanism for registering a command to be executed when we come
1323 # across a particular commit. To handle the case when only the
1324 # prefix of the commit is known, the commitinterest array is now
1325 # indexed by the first 4 characters of the ID. Each element is a
1326 # list of id, cmd pairs.
1327 proc interestedin
{id cmd
} {
1328 global commitinterest
1330 lappend commitinterest
([string range
$id 0 3]) $id $cmd
1333 proc check_interest
{id scripts
} {
1334 global commitinterest
1336 set prefix
[string range
$id 0 3]
1337 if {[info exists commitinterest
($prefix)]} {
1339 foreach
{i
script} $commitinterest($prefix) {
1340 if {[string match
"$i*" $id]} {
1341 lappend scripts
[string map
[list
"%I" $id "%P" $i] $script]
1343 lappend newlist
$i $script
1346 if {$newlist ne
{}} {
1347 set commitinterest
($prefix) $newlist
1349 unset commitinterest
($prefix)
1355 proc getcommitlines
{fd inst view updating
} {
1356 global cmitlisted leftover
1357 global commitidx commitdata vdatemode
1358 global parents children curview hlview
1359 global idpending ordertok
1360 global varccommits varcid varctok vtokmod vfilelimit
1362 set stuff
[read $fd 500000]
1363 # git log doesn't terminate the last commit with a null...
1364 if {$stuff == {} && $leftover($inst) ne
{} && [eof
$fd]} {
1371 global commfd viewcomplete viewactive viewname
1372 global viewinstances
1374 set i
[lsearch
-exact $viewinstances($view) $inst]
1376 set viewinstances
($view) [lreplace
$viewinstances($view) $i $i]
1378 # set it blocking so we wait for the process to terminate
1379 fconfigure
$fd -blocking 1
1380 if {[catch
{close
$fd} err
]} {
1382 if {$view != $curview} {
1383 set fv
" for the \"$viewname($view)\" view"
1385 if {[string range
$err 0 4] == "usage"} {
1386 set err
"Gitk: error reading commits$fv:\
1387 bad arguments to git log."
1388 if {$viewname($view) eq
"Command line"} {
1390 " (Note: arguments to gitk are passed to git log\
1391 to allow selection of commits to be displayed.)"
1394 set err
"Error reading commits$fv: $err"
1398 if {[incr viewactive
($view) -1] <= 0} {
1399 set viewcomplete
($view) 1
1400 # Check if we have seen any ids listed as parents that haven't
1401 # appeared in the list
1405 if {$view == $curview} {
1414 set i
[string first
"\0" $stuff $start]
1416 append leftover
($inst) [string range
$stuff $start end
]
1420 set cmit
$leftover($inst)
1421 append cmit
[string range
$stuff 0 [expr {$i - 1}]]
1422 set leftover
($inst) {}
1424 set cmit
[string range
$stuff $start [expr {$i - 1}]]
1426 set start
[expr {$i + 1}]
1427 set j
[string first
"\n" $cmit]
1430 if {$j >= 0 && [string match
"commit *" $cmit]} {
1431 set ids
[string range
$cmit 7 [expr {$j - 1}]]
1432 if {[string match
{[-^
<>]*} $ids]} {
1433 switch
-- [string index
$ids 0] {
1439 set ids
[string range
$ids 1 end
]
1443 if {[string length
$id] != 40} {
1451 if {[string length
$shortcmit] > 80} {
1452 set shortcmit
"[string range $shortcmit 0 80]..."
1454 error_popup
"[mc "Can
't parse git log output:"] {$shortcmit}"
1457 set id [lindex $ids 0]
1460 if {!$listed && $updating && ![info exists varcid($vid)] &&
1461 $vfilelimit($view) ne {}} {
1462 # git log doesn't rewrite parents
for unlisted commits
1463 # when doing path limiting, so work around that here
1464 # by working out the rewritten parent with git rev-list
1465 # and if we already know about it, using the rewritten
1466 # parent as a substitute parent for $id's children.
1468 set rwid
[exec git rev-list
--first-parent --max-count=1 \
1469 $id -- $vfilelimit($view)]
1471 if {$rwid ne
{} && [info exists varcid
($view,$rwid)]} {
1472 # use $rwid in place of $id
1473 rewrite_commit
$view $id $rwid
1480 if {[info exists varcid
($vid)]} {
1481 if {$cmitlisted($vid) ||
!$listed} continue
1485 set olds
[lrange
$ids 1 end
]
1489 set commitdata
($id) [string range
$cmit [expr {$j + 1}] end
]
1490 set cmitlisted
($vid) $listed
1491 set parents
($vid) $olds
1492 if {![info exists children
($vid)]} {
1493 set children
($vid) {}
1494 } elseif
{$a == 0 && [llength
$children($vid)] == 1} {
1495 set k
[lindex
$children($vid) 0]
1496 if {[llength
$parents($view,$k)] == 1 &&
1497 (!$vdatemode($view) ||
1498 $varcid($view,$k) == [llength
$varctok($view)] - 1)} {
1499 set a
$varcid($view,$k)
1504 set a
[newvarc
$view $id]
1506 if {[string compare
[lindex
$varctok($view) $a] $vtokmod($view)] < 0} {
1509 if {![info exists varcid
($vid)]} {
1511 lappend varccommits
($view,$a) $id
1512 incr commitidx
($view)
1517 if {$i == 0 ||
[lsearch
-exact $olds $p] >= $i} {
1519 if {[llength
[lappend children
($vp) $id]] > 1 &&
1520 [vtokcmp
$view [lindex
$children($vp) end-1
] $id] > 0} {
1521 set children
($vp) [lsort
-command [list vtokcmp
$view] \
1523 catch
{unset ordertok
}
1525 if {[info exists varcid
($view,$p)]} {
1526 fix_reversal
$p $a $view
1532 set scripts
[check_interest
$id $scripts]
1536 global numcommits hlview
1538 if {$view == $curview} {
1539 set numcommits
$commitidx($view)
1542 if {[info exists hlview
] && $view == $hlview} {
1543 # we never actually get here...
1546 foreach s
$scripts {
1553 proc chewcommits
{} {
1554 global curview hlview viewcomplete
1555 global pending_select
1558 if {$viewcomplete($curview)} {
1559 global commitidx varctok
1560 global numcommits startmsecs
1562 if {[info exists pending_select
]} {
1564 reset_pending_select
{}
1566 if {[commitinview
$pending_select $curview]} {
1567 selectline
[rowofcommit
$pending_select] 1
1569 set row
[first_real_row
]
1573 if {$commitidx($curview) > 0} {
1574 #set ms [expr {[clock clicks -milliseconds] - $startmsecs}]
1575 #puts "overall $ms ms for $numcommits commits"
1576 #puts "[llength $varctok($view)] arcs, $commitidx($view) commits"
1578 show_status
[mc
"No commits selected"]
1585 proc do_readcommit
{id
} {
1588 # Invoke git-log to handle automatic encoding conversion
1589 set fd
[open
[concat | git log
--no-color --pretty=raw
-1 $id] r
]
1590 # Read the results using i18n.logoutputencoding
1591 fconfigure
$fd -translation lf
-eofchar {}
1592 if {$tclencoding != {}} {
1593 fconfigure
$fd -encoding $tclencoding
1595 set contents
[read $fd]
1597 # Remove the heading line
1598 regsub
{^commit
[0-9a-f]+\n} $contents {} contents
1603 proc readcommit
{id
} {
1604 if {[catch
{set contents
[do_readcommit
$id]}]} return
1605 parsecommit
$id $contents 1
1608 proc parsecommit
{id contents listed
} {
1609 global commitinfo cdate
1618 set hdrend
[string first
"\n\n" $contents]
1620 # should never happen...
1621 set hdrend
[string length
$contents]
1623 set header
[string range
$contents 0 [expr {$hdrend - 1}]]
1624 set comment
[string range
$contents [expr {$hdrend + 2}] end
]
1625 foreach line
[split $header "\n"] {
1626 set line
[split $line " "]
1627 set tag
[lindex
$line 0]
1628 if {$tag == "author"} {
1629 set audate
[lindex
$line end-1
]
1630 set auname
[join [lrange
$line 1 end-2
] " "]
1631 } elseif
{$tag == "committer"} {
1632 set comdate
[lindex
$line end-1
]
1633 set comname
[join [lrange
$line 1 end-2
] " "]
1637 # take the first non-blank line of the comment as the headline
1638 set headline
[string trimleft
$comment]
1639 set i
[string first
"\n" $headline]
1641 set headline
[string range
$headline 0 $i]
1643 set headline
[string trimright
$headline]
1644 set i
[string first
"\r" $headline]
1646 set headline
[string trimright
[string range
$headline 0 $i]]
1649 # git log indents the comment by 4 spaces;
1650 # if we got this via git cat-file, add the indentation
1652 foreach line
[split $comment "\n"] {
1653 append newcomment
" "
1654 append newcomment
$line
1655 append newcomment
"\n"
1657 set comment
$newcomment
1659 if {$comdate != {}} {
1660 set cdate
($id) $comdate
1662 set commitinfo
($id) [list
$headline $auname $audate \
1663 $comname $comdate $comment]
1666 proc getcommit
{id
} {
1667 global commitdata commitinfo
1669 if {[info exists commitdata
($id)]} {
1670 parsecommit
$id $commitdata($id) 1
1673 if {![info exists commitinfo
($id)]} {
1674 set commitinfo
($id) [list
[mc
"No commit information available"]]
1680 # Expand an abbreviated commit ID to a list of full 40-char IDs that match
1681 # and are present in the current view.
1682 # This is fairly slow...
1683 proc longid
{prefix
} {
1684 global varcid curview
1687 foreach match
[array names varcid
"$curview,$prefix*"] {
1688 lappend ids
[lindex
[split $match ","] 1]
1694 global tagids idtags headids idheads tagobjid
1695 global otherrefids idotherrefs mainhead mainheadid
1696 global selecthead selectheadid
1699 foreach v
{tagids idtags headids idheads otherrefids idotherrefs
} {
1702 set refd
[open
[list | git show-ref
-d] r
]
1703 while {[gets
$refd line
] >= 0} {
1704 if {[string index
$line 40] ne
" "} continue
1705 set id
[string range
$line 0 39]
1706 set ref
[string range
$line 41 end
]
1707 if {![string match
"refs/*" $ref]} continue
1708 set name
[string range
$ref 5 end
]
1709 if {[string match
"remotes/*" $name]} {
1710 if {![string match
"*/HEAD" $name] && !$hideremotes} {
1711 set headids
($name) $id
1712 lappend idheads
($id) $name
1714 } elseif
{[string match
"heads/*" $name]} {
1715 set name
[string range
$name 6 end
]
1716 set headids
($name) $id
1717 lappend idheads
($id) $name
1718 } elseif
{[string match
"tags/*" $name]} {
1719 # this lets refs/tags/foo^{} overwrite refs/tags/foo,
1720 # which is what we want since the former is the commit ID
1721 set name
[string range
$name 5 end
]
1722 if {[string match
"*^{}" $name]} {
1723 set name
[string range
$name 0 end-3
]
1725 set tagobjid
($name) $id
1727 set tagids
($name) $id
1728 lappend idtags
($id) $name
1730 set otherrefids
($name) $id
1731 lappend idotherrefs
($id) $name
1738 set mainheadid
[exec git rev-parse HEAD
]
1739 set thehead
[exec git symbolic-ref HEAD
]
1740 if {[string match
"refs/heads/*" $thehead]} {
1741 set mainhead
[string range
$thehead 11 end
]
1745 if {$selecthead ne
{}} {
1747 set selectheadid
[exec git rev-parse
--verify $selecthead]
1752 # skip over fake commits
1753 proc first_real_row
{} {
1754 global nullid nullid2 numcommits
1756 for {set row
0} {$row < $numcommits} {incr row
} {
1757 set id
[commitonrow
$row]
1758 if {$id ne
$nullid && $id ne
$nullid2} {
1765 # update things for a head moved to a child of its previous location
1766 proc movehead
{id name
} {
1767 global headids idheads
1769 removehead
$headids($name) $name
1770 set headids
($name) $id
1771 lappend idheads
($id) $name
1774 # update things when a head has been removed
1775 proc removehead
{id name
} {
1776 global headids idheads
1778 if {$idheads($id) eq
$name} {
1781 set i
[lsearch
-exact $idheads($id) $name]
1783 set idheads
($id) [lreplace
$idheads($id) $i $i]
1786 unset headids
($name)
1789 proc ttk_toplevel
{w args
} {
1791 eval [linsert
$args 0 ::toplevel
$w]
1793 place
[ttk
::frame
$w._toplevel_background
] -x 0 -y 0 -relwidth 1 -relheight 1
1798 proc make_transient
{window origin
} {
1801 # In MacOS Tk 8.4 transient appears to work by setting
1802 # overrideredirect, which is utterly useless, since the
1803 # windows get no border, and are not even kept above
1805 if {!$have_tk85 && [tk windowingsystem
] eq
{aqua
}} return
1807 wm transient
$window $origin
1809 # Windows fails to place transient windows normally, so
1810 # schedule a callback to center them on the parent.
1811 if {[tk windowingsystem
] eq
{win32
}} {
1812 after idle
[list tk
::PlaceWindow
$window widget
$origin]
1816 proc show_error
{w top msg
{mc mc
}} {
1818 if {![info exists NS
]} {set NS
""}
1819 if {[wm state
$top] eq
"withdrawn"} { wm deiconify
$top }
1820 message
$w.m
-text $msg -justify center
-aspect 400
1821 pack
$w.m
-side top
-fill x
-padx 20 -pady 20
1822 ${NS}::button
$w.ok
-default active
-text [$mc OK
] -command "destroy $top"
1823 pack
$w.ok
-side bottom
-fill x
1824 bind $top <Visibility
> "grab $top; focus $top"
1825 bind $top <Key-Return
> "destroy $top"
1826 bind $top <Key-space
> "destroy $top"
1827 bind $top <Key-Escape
> "destroy $top"
1831 proc error_popup
{msg
{owner .
}} {
1832 if {[tk windowingsystem
] eq
"win32"} {
1833 tk_messageBox
-icon error
-type ok
-title [wm title .
] \
1834 -parent $owner -message $msg
1838 make_transient
$w $owner
1839 show_error
$w $w $msg
1843 proc confirm_popup
{msg
{owner .
}} {
1844 global confirm_ok NS
1848 make_transient
$w $owner
1849 message
$w.m
-text $msg -justify center
-aspect 400
1850 pack
$w.m
-side top
-fill x
-padx 20 -pady 20
1851 ${NS}::button
$w.ok
-text [mc OK
] -command "set confirm_ok 1; destroy $w"
1852 pack
$w.ok
-side left
-fill x
1853 ${NS}::button
$w.cancel
-text [mc Cancel
] -command "destroy $w"
1854 pack
$w.cancel
-side right
-fill x
1855 bind $w <Visibility
> "grab $w; focus $w"
1856 bind $w <Key-Return
> "set confirm_ok 1; destroy $w"
1857 bind $w <Key-space
> "set confirm_ok 1; destroy $w"
1858 bind $w <Key-Escape
> "destroy $w"
1859 tk
::PlaceWindow
$w widget
$owner
1864 proc setoptions
{} {
1865 if {[tk windowingsystem
] ne
"win32"} {
1866 option add
*Panedwindow.showHandle
1 startupFile
1867 option add
*Panedwindow.sashRelief raised startupFile
1868 if {[tk windowingsystem
] ne
"aqua"} {
1869 option add
*Menu.font uifont startupFile
1872 option add
*Menu.TearOff
0 startupFile
1874 option add
*Button.font uifont startupFile
1875 option add
*Checkbutton.font uifont startupFile
1876 option add
*Radiobutton.font uifont startupFile
1877 option add
*Menubutton.font uifont startupFile
1878 option add
*Label.font uifont startupFile
1879 option add
*Message.font uifont startupFile
1880 option add
*Entry.font textfont startupFile
1881 option add
*Text.font textfont startupFile
1882 option add
*Labelframe.font uifont startupFile
1883 option add
*Spinbox.font textfont startupFile
1884 option add
*Listbox.font mainfont startupFile
1887 # Make a menu and submenus.
1888 # m is the window name for the menu, items is the list of menu items to add.
1889 # Each item is a list {mc label type description options...}
1890 # mc is ignored; it's so we can put mc there to alert xgettext
1891 # label is the string that appears in the menu
1892 # type is cascade, command or radiobutton (should add checkbutton)
1893 # description depends on type; it's the sublist for cascade, the
1894 # command to invoke for command, or {variable value} for radiobutton
1895 proc makemenu
{m items
} {
1897 if {[tk windowingsystem
] eq
{aqua
}} {
1903 set name
[mc
[lindex
$i 1]]
1904 set type [lindex
$i 2]
1905 set thing
[lindex
$i 3]
1906 set params
[list
$type]
1908 set u
[string first
"&" [string map
{&& x
} $name]]
1909 lappend params
-label [string map
{&& & & {}} $name]
1911 lappend params
-underline $u
1916 set submenu
[string tolower
[string map
{& ""} [lindex
$i 1]]]
1917 lappend params
-menu $m.
$submenu
1920 lappend params
-command $thing
1923 lappend params
-variable [lindex
$thing 0] \
1924 -value [lindex
$thing 1]
1927 set tail [lrange
$i 4 end
]
1928 regsub
-all {\yMeta1\y
} $tail $Meta1 tail
1929 eval $m add
$params $tail
1930 if {$type eq
"cascade"} {
1931 makemenu
$m.
$submenu $thing
1936 # translate string and remove ampersands
1938 return [string map
{&& & & {}} [mc
$str]]
1941 proc makedroplist
{w varname args
} {
1945 foreach label
$args {
1946 set cx
[string length
$label]
1947 if {$cx > $width} {set width
$cx}
1949 set gm
[ttk
::combobox
$w -width $width -state readonly\
1950 -textvariable $varname -values $args]
1952 set gm
[eval [linsert
$args 0 tk_optionMenu
$w $varname]]
1957 proc makewindow
{} {
1958 global canv canv2 canv3 linespc charspc ctext cflist cscroll
1960 global findtype findtypemenu findloc findstring fstring geometry
1961 global entries sha1entry sha1string sha1but
1962 global diffcontextstring diffcontext
1964 global maincursor textcursor curtextcursor
1965 global rowctxmenu fakerowmenu mergemax wrapcomment
1966 global highlight_files gdttype
1967 global searchstring sstring
1968 global bgcolor fgcolor bglist fglist diffcolors selectbgcolor
1969 global headctxmenu progresscanv progressitem progresscoords statusw
1970 global fprogitem fprogcoord lastprogupdate progupdatepending
1971 global rprogitem rprogcoord rownumsel numcommits
1972 global have_tk85 use_ttk NS
1974 # The "mc" arguments here are purely so that xgettext
1975 # sees the following string as needing to be translated
1978 {mc
"Update" command updatecommits
-accelerator F5
}
1979 {mc
"Reload" command reloadcommits
-accelerator Meta1-F5
}
1980 {mc
"Reread references" command rereadrefs
}
1981 {mc
"List references" command showrefs
-accelerator F2
}
1983 {mc
"Start git gui" command {exec git gui
&}}
1985 {mc
"Quit" command doquit
-accelerator Meta1-Q
}
1989 {mc
"Preferences" command doprefs
}
1993 {mc
"New view..." command {newview
0} -accelerator Shift-F4
}
1994 {mc
"Edit view..." command editview
-state disabled
-accelerator F4
}
1995 {mc
"Delete view" command delview
-state disabled
}
1997 {mc
"All files" radiobutton
{selectedview
0} -command {showview
0}}
1999 if {[tk windowingsystem
] ne
"aqua"} {
2002 {mc
"About gitk" command about
}
2003 {mc
"Key bindings" command keys
}
2005 set bar
[list
$file $edit $view $help]
2007 proc
::tk
::mac
::ShowPreferences
{} {doprefs
}
2008 proc
::tk
::mac
::Quit
{} {doquit
}
2009 lset
file end
[lreplace
[lindex
$file end
] end-1 end
]
2011 xx
"Apple" cascade
{
2012 {mc
"About gitk" command about
}
2017 {mc
"Key bindings" command keys
}
2019 set bar
[list
$apple $file $view $help]
2022 . configure
-menu .bar
2025 # cover the non-themed toplevel with a themed frame.
2026 place
[ttk
::frame ._main_background
] -x 0 -y 0 -relwidth 1 -relheight 1
2029 # the gui has upper and lower half, parts of a paned window.
2030 ${NS}::panedwindow .ctop
-orient vertical
2032 # possibly use assumed geometry
2033 if {![info exists geometry
(pwsash0
)]} {
2034 set geometry
(topheight
) [expr {15 * $linespc}]
2035 set geometry
(topwidth
) [expr {80 * $charspc}]
2036 set geometry
(botheight
) [expr {15 * $linespc}]
2037 set geometry
(botwidth
) [expr {50 * $charspc}]
2038 set geometry
(pwsash0
) [list
[expr {40 * $charspc}] 2]
2039 set geometry
(pwsash1
) [list
[expr {60 * $charspc}] 2]
2042 # the upper half will have a paned window, a scroll bar to the right, and some stuff below
2043 ${NS}::frame .tf
-height $geometry(topheight
) -width $geometry(topwidth
)
2044 ${NS}::frame .tf.histframe
2045 ${NS}::panedwindow .tf.histframe.pwclist
-orient horizontal
2047 .tf.histframe.pwclist configure
-sashpad 0 -handlesize 4
2050 # create three canvases
2051 set cscroll .tf.histframe.csb
2052 set canv .tf.histframe.pwclist.canv
2054 -selectbackground $selectbgcolor \
2055 -background $bgcolor -bd 0 \
2056 -yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
2057 .tf.histframe.pwclist add
$canv
2058 set canv2 .tf.histframe.pwclist.canv2
2060 -selectbackground $selectbgcolor \
2061 -background $bgcolor -bd 0 -yscrollincr $linespc
2062 .tf.histframe.pwclist add
$canv2
2063 set canv3 .tf.histframe.pwclist.canv3
2065 -selectbackground $selectbgcolor \
2066 -background $bgcolor -bd 0 -yscrollincr $linespc
2067 .tf.histframe.pwclist add
$canv3
2069 bind .tf.histframe.pwclist
<Map
> {
2071 .tf.histframe.pwclist sashpos
1 [lindex $
::geometry
(pwsash1
) 0]
2072 .tf.histframe.pwclist sashpos
0 [lindex $
::geometry
(pwsash0
) 0]
2075 eval .tf.histframe.pwclist sash place
0 $geometry(pwsash0
)
2076 eval .tf.histframe.pwclist sash place
1 $geometry(pwsash1
)
2079 # a scroll bar to rule them
2080 ${NS}::scrollbar
$cscroll -command {allcanvs yview
}
2081 if {!$use_ttk} {$cscroll configure
-highlightthickness 0}
2082 pack
$cscroll -side right
-fill y
2083 bind .tf.histframe.pwclist
<Configure
> {resizeclistpanes
%W
%w
}
2084 lappend bglist
$canv $canv2 $canv3
2085 pack .tf.histframe.pwclist
-fill both
-expand 1 -side left
2087 # we have two button bars at bottom of top frame. Bar 1
2088 ${NS}::frame .tf.bar
2089 ${NS}::frame .tf.lbar
-height 15
2091 set sha1entry .tf.bar.sha1
2092 set entries
$sha1entry
2093 set sha1but .tf.bar.sha1label
2094 button
$sha1but -text "[mc "SHA1 ID
:"] " -state disabled
-relief flat \
2095 -command gotocommit
-width 8
2096 $sha1but conf
-disabledforeground [$sha1but cget
-foreground]
2097 pack .tf.bar.sha1label
-side left
2098 ${NS}::entry
$sha1entry -width 40 -font textfont
-textvariable sha1string
2099 trace add variable sha1string
write sha1change
2100 pack
$sha1entry -side left
-pady 2
2102 image create bitmap bm-left
-data {
2103 #define left_width 16
2104 #define left_height 16
2105 static unsigned char left_bits
[] = {
2106 0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
2107 0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00,
2108 0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01};
2110 image create bitmap bm-right
-data {
2111 #define right_width 16
2112 #define right_height 16
2113 static unsigned char right_bits
[] = {
2114 0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c,
2115 0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c,
2116 0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01};
2118 ${NS}::button .tf.bar.leftbut
-image bm-left
-command goback \
2119 -state disabled
-width 26
2120 pack .tf.bar.leftbut
-side left
-fill y
2121 ${NS}::button .tf.bar.rightbut
-image bm-right
-command goforw \
2122 -state disabled
-width 26
2123 pack .tf.bar.rightbut
-side left
-fill y
2125 ${NS}::label .tf.bar.rowlabel
-text [mc
"Row"]
2127 ${NS}::label .tf.bar.rownum
-width 7 -textvariable rownumsel \
2128 -relief sunken
-anchor e
2129 ${NS}::label .tf.bar.rowlabel2
-text "/"
2130 ${NS}::label .tf.bar.numcommits
-width 7 -textvariable numcommits \
2131 -relief sunken
-anchor e
2132 pack .tf.bar.rowlabel .tf.bar.rownum .tf.bar.rowlabel2 .tf.bar.numcommits \
2135 foreach w
{rownum numcommits
} {.tf.bar.
$w configure
-font textfont
}
2138 trace add variable selectedline
write selectedline_change
2140 # Status label and progress bar
2141 set statusw .tf.bar.status
2142 ${NS}::label
$statusw -width 15 -relief sunken
2143 pack
$statusw -side left
-padx 5
2145 set progresscanv
[ttk
::progressbar .tf.bar.progress
]
2147 set h
[expr {[font metrics uifont
-linespace] + 2}]
2148 set progresscanv .tf.bar.progress
2149 canvas
$progresscanv -relief sunken
-height $h -borderwidth 2
2150 set progressitem
[$progresscanv create rect
-1 0 0 $h -fill green
]
2151 set fprogitem
[$progresscanv create rect
-1 0 0 $h -fill yellow
]
2152 set rprogitem
[$progresscanv create rect
-1 0 0 $h -fill red
]
2154 pack
$progresscanv -side right
-expand 1 -fill x
-padx {0 2}
2155 set progresscoords
{0 0}
2158 bind $progresscanv <Configure
> adjustprogress
2159 set lastprogupdate
[clock clicks
-milliseconds]
2160 set progupdatepending
0
2162 # build up the bottom bar of upper window
2163 ${NS}::label .tf.lbar.flabel
-text "[mc "Find
"] "
2164 ${NS}::button .tf.lbar.fnext
-text [mc
"next"] -command {dofind
1 1}
2165 ${NS}::button .tf.lbar.fprev
-text [mc
"prev"] -command {dofind
-1 1}
2166 ${NS}::label .tf.lbar.flab2
-text " [mc "commit
"] "
2167 pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \
2169 set gdttype
[mc
"containing:"]
2170 set gm
[makedroplist .tf.lbar.gdttype gdttype \
2171 [mc
"containing:"] \
2172 [mc
"touching paths:"] \
2173 [mc
"adding/removing string:"]]
2174 trace add variable gdttype
write gdttype_change
2175 pack .tf.lbar.gdttype
-side left
-fill y
2178 set fstring .tf.lbar.findstring
2179 lappend entries
$fstring
2180 ${NS}::entry
$fstring -width 30 -textvariable findstring
2181 trace add variable findstring
write find_change
2182 set findtype
[mc
"Exact"]
2183 set findtypemenu
[makedroplist .tf.lbar.findtype \
2184 findtype
[mc
"Exact"] [mc
"IgnCase"] [mc
"Regexp"]]
2185 trace add variable findtype
write findcom_change
2186 set findloc
[mc
"All fields"]
2187 makedroplist .tf.lbar.findloc findloc
[mc
"All fields"] [mc
"Headline"] \
2188 [mc
"Comments"] [mc
"Author"] [mc
"Committer"]
2189 trace add variable findloc
write find_change
2190 pack .tf.lbar.findloc
-side right
2191 pack .tf.lbar.findtype
-side right
2192 pack
$fstring -side left
-expand 1 -fill x
2194 # Finish putting the upper half of the viewer together
2195 pack .tf.lbar
-in .tf
-side bottom
-fill x
2196 pack .tf.bar
-in .tf
-side bottom
-fill x
2197 pack .tf.histframe
-fill both
-side top
-expand 1
2200 .ctop paneconfigure .tf
-height $geometry(topheight
)
2201 .ctop paneconfigure .tf
-width $geometry(topwidth
)
2204 # now build up the bottom
2205 ${NS}::panedwindow .pwbottom
-orient horizontal
2207 # lower left, a text box over search bar, scroll bar to the right
2208 # if we know window height, then that will set the lower text height, otherwise
2209 # we set lower text height which will drive window height
2210 if {[info exists geometry
(main
)]} {
2211 ${NS}::frame .bleft
-width $geometry(botwidth
)
2213 ${NS}::frame .bleft
-width $geometry(botwidth
) -height $geometry(botheight
)
2215 ${NS}::frame .bleft.top
2216 ${NS}::frame .bleft.mid
2217 ${NS}::frame .bleft.bottom
2219 ${NS}::button .bleft.top.search
-text [mc
"Search"] -command dosearch
2220 pack .bleft.top.search
-side left
-padx 5
2221 set sstring .bleft.top.sstring
2223 ${NS}::entry
$sstring -width 20 -textvariable searchstring
2224 lappend entries
$sstring
2225 trace add variable searchstring
write incrsearch
2226 pack
$sstring -side left
-expand 1 -fill x
2227 ${NS}::radiobutton .bleft.mid.
diff -text [mc
"Diff"] \
2228 -command changediffdisp
-variable diffelide
-value {0 0}
2229 ${NS}::radiobutton .bleft.mid.old
-text [mc
"Old version"] \
2230 -command changediffdisp
-variable diffelide
-value {0 1}
2231 ${NS}::radiobutton .bleft.mid.new
-text [mc
"New version"] \
2232 -command changediffdisp
-variable diffelide
-value {1 0}
2233 ${NS}::label .bleft.mid.labeldiffcontext
-text " [mc "Lines of context
"]: "
2234 pack .bleft.mid.
diff .bleft.mid.old .bleft.mid.new
-side left
2235 spinbox .bleft.mid.diffcontext
-width 5 \
2236 -from 0 -increment 1 -to 10000000 \
2237 -validate all
-validatecommand "diffcontextvalidate %P" \
2238 -textvariable diffcontextstring
2239 .bleft.mid.diffcontext
set $diffcontext
2240 trace add variable diffcontextstring
write diffcontextchange
2241 lappend entries .bleft.mid.diffcontext
2242 pack .bleft.mid.labeldiffcontext .bleft.mid.diffcontext
-side left
2243 ${NS}::checkbutton .bleft.mid.ignspace
-text [mc
"Ignore space change"] \
2244 -command changeignorespace
-variable ignorespace
2245 pack .bleft.mid.ignspace
-side left
-padx 5
2246 set ctext .bleft.bottom.ctext
2247 text
$ctext -background $bgcolor -foreground $fgcolor \
2248 -state disabled
-font textfont \
2249 -yscrollcommand scrolltext
-wrap none \
2250 -xscrollcommand ".bleft.bottom.sbhorizontal set"
2252 $ctext conf
-tabstyle wordprocessor
2254 ${NS}::scrollbar .bleft.bottom.sb
-command "$ctext yview"
2255 ${NS}::scrollbar .bleft.bottom.sbhorizontal
-command "$ctext xview" -orient h
2256 pack .bleft.top
-side top
-fill x
2257 pack .bleft.mid
-side top
-fill x
2258 grid
$ctext .bleft.bottom.sb
-sticky nsew
2259 grid .bleft.bottom.sbhorizontal
-sticky ew
2260 grid columnconfigure .bleft.bottom
0 -weight 1
2261 grid rowconfigure .bleft.bottom
0 -weight 1
2262 grid rowconfigure .bleft.bottom
1 -weight 0
2263 pack .bleft.bottom
-side top
-fill both
-expand 1
2264 lappend bglist
$ctext
2265 lappend fglist
$ctext
2267 $ctext tag conf comment
-wrap $wrapcomment
2268 $ctext tag conf filesep
-font textfontbold
-back "#aaaaaa"
2269 $ctext tag conf hunksep
-fore [lindex
$diffcolors 2]
2270 $ctext tag conf d0
-fore [lindex
$diffcolors 0]
2271 $ctext tag conf dresult
-fore [lindex
$diffcolors 1]
2272 $ctext tag conf m0
-fore red
2273 $ctext tag conf m1
-fore blue
2274 $ctext tag conf m2
-fore green
2275 $ctext tag conf m3
-fore purple
2276 $ctext tag conf
m4 -fore brown
2277 $ctext tag conf m5
-fore "#009090"
2278 $ctext tag conf m6
-fore magenta
2279 $ctext tag conf m7
-fore "#808000"
2280 $ctext tag conf m8
-fore "#009000"
2281 $ctext tag conf m9
-fore "#ff0080"
2282 $ctext tag conf m10
-fore cyan
2283 $ctext tag conf m11
-fore "#b07070"
2284 $ctext tag conf m12
-fore "#70b0f0"
2285 $ctext tag conf m13
-fore "#70f0b0"
2286 $ctext tag conf m14
-fore "#f0b070"
2287 $ctext tag conf m15
-fore "#ff70b0"
2288 $ctext tag conf mmax
-fore darkgrey
2290 $ctext tag conf mresult
-font textfontbold
2291 $ctext tag conf msep
-font textfontbold
2292 $ctext tag conf found
-back yellow
2294 .pwbottom add .bleft
2296 .pwbottom paneconfigure .bleft
-width $geometry(botwidth
)
2300 ${NS}::frame .bright
2301 ${NS}::frame .bright.mode
2302 ${NS}::radiobutton .bright.mode.
patch -text [mc
"Patch"] \
2303 -command reselectline
-variable cmitmode
-value "patch"
2304 ${NS}::radiobutton .bright.mode.tree
-text [mc
"Tree"] \
2305 -command reselectline
-variable cmitmode
-value "tree"
2306 grid .bright.mode.
patch .bright.mode.tree
-sticky ew
2307 pack .bright.mode
-side top
-fill x
2308 set cflist .bright.cfiles
2309 set indent
[font measure mainfont
"nn"]
2311 -selectbackground $selectbgcolor \
2312 -background $bgcolor -foreground $fgcolor \
2314 -tabs [list
$indent [expr {2 * $indent}]] \
2315 -yscrollcommand ".bright.sb set" \
2316 -cursor [. cget
-cursor] \
2317 -spacing1 1 -spacing3 1
2318 lappend bglist
$cflist
2319 lappend fglist
$cflist
2320 ${NS}::scrollbar .bright.sb
-command "$cflist yview"
2321 pack .bright.sb
-side right
-fill y
2322 pack
$cflist -side left
-fill both
-expand 1
2323 $cflist tag configure highlight \
2324 -background [$cflist cget
-selectbackground]
2325 $cflist tag configure bold
-font mainfontbold
2327 .pwbottom add .bright
2330 # restore window width & height if known
2331 if {[info exists geometry
(main
)]} {
2332 if {[scan
$geometry(main
) "%dx%d" w h
] >= 2} {
2333 if {$w > [winfo screenwidth .
]} {
2334 set w
[winfo screenwidth .
]
2336 if {$h > [winfo screenheight .
]} {
2337 set h
[winfo screenheight .
]
2339 wm geometry .
"${w}x$h"
2343 if {[info exists geometry
(state
)] && $geometry(state
) eq
"zoomed"} {
2344 wm state .
$geometry(state
)
2347 if {[tk windowingsystem
] eq
{aqua
}} {
2358 %W sashpos
0 $
::geometry
(topheight
)
2360 bind .pwbottom
<Map
> {
2362 %W sashpos
0 $
::geometry
(botwidth
)
2366 bind .pwbottom
<Configure
> {resizecdetpanes
%W
%w
}
2367 pack .ctop
-fill both
-expand 1
2368 bindall
<1> {selcanvline
%W
%x
%y
}
2369 #bindall <B1-Motion> {selcanvline %W %x %y}
2370 if {[tk windowingsystem
] == "win32"} {
2371 bind .
<MouseWheel
> { windows_mousewheel_redirector
%W
%X
%Y
%D
}
2372 bind $ctext <MouseWheel
> { windows_mousewheel_redirector
%W
%X
%Y
%D
; break }
2374 bindall
<ButtonRelease-4
> "allcanvs yview scroll -5 units"
2375 bindall
<ButtonRelease-5
> "allcanvs yview scroll 5 units"
2376 if {[tk windowingsystem
] eq
"aqua"} {
2377 bindall
<MouseWheel
> {
2378 set delta
[expr {- (%D
)}]
2379 allcanvs yview scroll
$delta units
2381 bindall
<Shift-MouseWheel
> {
2382 set delta
[expr {- (%D
)}]
2383 $canv xview scroll
$delta units
2387 bindall
<$
::BM
> "canvscan mark %W %x %y"
2388 bindall
<B$
::BM-Motion
> "canvscan dragto %W %x %y"
2389 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
2390 bind .
<$M1B-Key-w> doquit
2391 bindkey
<Home
> selfirstline
2392 bindkey
<End
> sellastline
2393 bind .
<Key-Up
> "selnextline -1"
2394 bind .
<Key-Down
> "selnextline 1"
2395 bind .
<Shift-Key-Up
> "dofind -1 0"
2396 bind .
<Shift-Key-Down
> "dofind 1 0"
2397 bindkey
<Key-Right
> "goforw"
2398 bindkey
<Key-Left
> "goback"
2399 bind .
<Key-Prior
> "selnextpage -1"
2400 bind .
<Key-Next
> "selnextpage 1"
2401 bind .
<$M1B-Home> "allcanvs yview moveto 0.0"
2402 bind .
<$M1B-End> "allcanvs yview moveto 1.0"
2403 bind .
<$M1B-Key-Up> "allcanvs yview scroll -1 units"
2404 bind .
<$M1B-Key-Down> "allcanvs yview scroll 1 units"
2405 bind .
<$M1B-Key-Prior> "allcanvs yview scroll -1 pages"
2406 bind .
<$M1B-Key-Next> "allcanvs yview scroll 1 pages"
2407 bindkey
<Key-Delete
> "$ctext yview scroll -1 pages"
2408 bindkey
<Key-BackSpace
> "$ctext yview scroll -1 pages"
2409 bindkey
<Key-space
> "$ctext yview scroll 1 pages"
2410 bindkey p
"selnextline -1"
2411 bindkey n
"selnextline 1"
2414 bindkey i
"selnextline -1"
2415 bindkey k
"selnextline 1"
2419 bindkey d
"$ctext yview scroll 18 units"
2420 bindkey u
"$ctext yview scroll -18 units"
2421 bindkey
/ {focus
$fstring}
2422 bindkey
<Key-KP_Divide
> {focus
$fstring}
2423 bindkey
<Key-Return
> {dofind
1 1}
2424 bindkey ?
{dofind
-1 1}
2426 bind .
<F5
> updatecommits
2427 bind .
<$M1B-F5> reloadcommits
2428 bind .
<F2
> showrefs
2429 bind .
<Shift-F4
> {newview
0}
2430 catch
{ bind .
<Shift-Key-XF86_Switch_VT_4
> {newview
0} }
2431 bind .
<F4
> edit_or_newview
2432 bind .
<$M1B-q> doquit
2433 bind .
<$M1B-f> {dofind
1 1}
2434 bind .
<$M1B-g> {dofind
1 0}
2435 bind .
<$M1B-r> dosearchback
2436 bind .
<$M1B-s> dosearch
2437 bind .
<$M1B-equal> {incrfont
1}
2438 bind .
<$M1B-plus> {incrfont
1}
2439 bind .
<$M1B-KP_Add> {incrfont
1}
2440 bind .
<$M1B-minus> {incrfont
-1}
2441 bind .
<$M1B-KP_Subtract> {incrfont
-1}
2442 wm protocol . WM_DELETE_WINDOW doquit
2443 bind .
<Destroy
> {stop_backends
}
2444 bind .
<Button-1
> "click %W"
2445 bind $fstring <Key-Return
> {dofind
1 1}
2446 bind $sha1entry <Key-Return
> {gotocommit
; break}
2447 bind $sha1entry <<PasteSelection>> clearsha1
2448 bind $cflist <1> {sel_flist %W %x %y; break}
2449 bind $cflist <B1-Motion> {sel_flist %W %x %y; break}
2450 bind $cflist <ButtonRelease-1> {treeclick %W %x %y}
2452 bind $cflist $ctxbut {pop_flist_menu %W %X %Y %x %y}
2453 bind $ctext $ctxbut {pop_diff_menu %W %X %Y %x %y}
2455 set maincursor [. cget -cursor]
2456 set textcursor [$ctext cget -cursor]
2457 set curtextcursor $textcursor
2459 set rowctxmenu .rowctxmenu
2460 makemenu $rowctxmenu {
2461 {mc "Diff this -> selected" command {diffvssel 0}}
2462 {mc "Diff selected -> this" command {diffvssel 1}}
2463 {mc "Make patch" command mkpatch}
2464 {mc "Create tag" command mktag}
2465 {mc "Write commit to file" command writecommit}
2466 {mc "Create new branch" command mkbranch}
2467 {mc "Cherry-pick this commit" command cherrypick}
2468 {mc "Reset HEAD branch to here" command resethead}
2469 {mc "Mark this commit" command markhere}
2470 {mc "Return to mark" command gotomark}
2471 {mc "Find descendant of this and mark" command find_common_desc}
2472 {mc "Compare with marked commit" command compare_commits}
2474 $rowctxmenu configure -tearoff 0
2476 set fakerowmenu .fakerowmenu
2477 makemenu $fakerowmenu {
2478 {mc "Diff this -> selected" command {diffvssel 0}}
2479 {mc "Diff selected -> this" command {diffvssel 1}}
2480 {mc "Make patch" command mkpatch}
2482 $fakerowmenu configure -tearoff 0
2484 set headctxmenu .headctxmenu
2485 makemenu $headctxmenu {
2486 {mc "Check out this branch" command cobranch}
2487 {mc "Remove this branch" command rmbranch}
2489 $headctxmenu configure -tearoff 0
2492 set flist_menu .flistctxmenu
2493 makemenu $flist_menu {
2494 {mc "Highlight this too" command {flist_hl 0}}
2495 {mc "Highlight this only" command {flist_hl 1}}
2496 {mc "External diff" command {external_diff}}
2497 {mc "Blame parent commit" command {external_blame 1}}
2499 $flist_menu configure -tearoff 0
2502 set diff_menu .diffctxmenu
2503 makemenu $diff_menu {
2504 {mc "Show origin of this line" command show_line_source}
2505 {mc "Run git gui blame on this line" command {external_blame_diff}}
2507 $diff_menu configure -tearoff 0
2510 # Windows sends all mouse wheel events to the current focused window, not
2511 # the one where the mouse hovers, so bind those events here and redirect
2512 # to the correct window
2513 proc windows_mousewheel_redirector {W X Y D} {
2514 global canv canv2 canv3
2515 set w [winfo containing -displayof $W $X $Y]
2517 set u [expr {$D < 0 ? 5 : -5}]
2518 if {$w == $canv || $w == $canv2 || $w == $canv3} {
2519 allcanvs yview scroll $u units
2522 $w yview scroll $u units
2528 # Update row number label when selectedline changes
2529 proc selectedline_change {n1 n2 op} {
2530 global selectedline rownumsel
2532 if {$selectedline eq {}} {
2535 set rownumsel [expr {$selectedline + 1}]
2539 # mouse-2 makes all windows scan vertically, but only the one
2540 # the cursor is in scans horizontally
2541 proc canvscan {op w x y} {
2542 global canv canv2 canv3
2543 foreach c [list $canv $canv2 $canv3] {
2552 proc scrollcanv {cscroll f0 f1} {
2553 $cscroll set $f0 $f1
2558 # when we make a key binding for the toplevel, make sure
2559 # it doesn't get triggered when that key is pressed in the
2560 # find string entry widget.
2561 proc bindkey {ev script} {
2564 set escript [bind Entry $ev]
2565 if {$escript == {}} {
2566 set escript [bind Entry <Key>]
2568 foreach e $entries {
2569 bind $e $ev "$escript; break"
2573 # set the focus back to the toplevel for any click outside
2576 global ctext entries
2577 foreach e [concat $entries $ctext] {
2578 if {$w == $e} return
2583 # Adjust the progress bar for a change in requested extent or canvas size
2584 proc adjustprogress {} {
2585 global progresscanv progressitem progresscoords
2586 global fprogitem fprogcoord lastprogupdate progupdatepending
2587 global rprogitem rprogcoord use_ttk
2590 $progresscanv configure -value [expr {int($fprogcoord * 100)}]
2594 set w [expr {[winfo width $progresscanv] - 4}]
2595 set x0 [expr {$w * [lindex $progresscoords 0]}]
2596 set x1 [expr {$w * [lindex $progresscoords 1]}]
2597 set h [winfo height $progresscanv]
2598 $progresscanv coords $progressitem $x0 0 $x1 $h
2599 $progresscanv coords $fprogitem 0 0 [expr {$w * $fprogcoord}] $h
2600 $progresscanv coords $rprogitem 0 0 [expr {$w * $rprogcoord}] $h
2601 set now [clock clicks -milliseconds]
2602 if {$now >= $lastprogupdate + 100} {
2603 set progupdatepending 0
2605 } elseif {!$progupdatepending} {
2606 set progupdatepending 1
2607 after [expr {$lastprogupdate + 100 - $now}] doprogupdate
2611 proc doprogupdate {} {
2612 global lastprogupdate progupdatepending
2614 if {$progupdatepending} {
2615 set progupdatepending 0
2616 set lastprogupdate [clock clicks -milliseconds]
2621 proc savestuff {w} {
2622 global canv canv2 canv3 mainfont textfont uifont tabstop
2623 global stuffsaved findmergefiles maxgraphpct
2624 global maxwidth showneartags showlocalchanges
2625 global viewname viewfiles viewargs viewargscmd viewperm nextviewnum
2626 global cmitmode wrapcomment datetimeformat limitdiffs
2627 global colors uicolor bgcolor fgcolor diffcolors diffcontext selectbgcolor
2628 global autoselect extdifftool perfile_attrs markbgcolor use_ttk
2629 global hideremotes want_ttk
2631 if {$stuffsaved} return
2632 if {![winfo viewable .]} return
2634 if {[file exists ~/.gitk-new]} {file delete -force ~/.gitk-new}
2635 set f [open "~/.gitk-new" w]
2636 if {$::tcl_platform(platform) eq {windows}} {
2637 file attributes "~/.gitk-new" -hidden true
2639 puts $f [list set mainfont $mainfont]
2640 puts $f [list set textfont $textfont]
2641 puts $f [list set uifont $uifont]
2642 puts $f [list set tabstop $tabstop]
2643 puts $f [list set findmergefiles $findmergefiles]
2644 puts $f [list set maxgraphpct $maxgraphpct]
2645 puts $f [list set maxwidth $maxwidth]
2646 puts $f [list set cmitmode $cmitmode]
2647 puts $f [list set wrapcomment $wrapcomment]
2648 puts $f [list set autoselect $autoselect]
2649 puts $f [list set showneartags $showneartags]
2650 puts $f [list set hideremotes $hideremotes]
2651 puts $f [list set showlocalchanges $showlocalchanges]
2652 puts $f [list set datetimeformat $datetimeformat]
2653 puts $f [list set limitdiffs $limitdiffs]
2654 puts $f [list set uicolor $uicolor]
2655 puts $f [list set want_ttk $want_ttk]
2656 puts $f [list set bgcolor $bgcolor]
2657 puts $f [list set fgcolor $fgcolor]
2658 puts $f [list set colors $colors]
2659 puts $f [list set diffcolors $diffcolors]
2660 puts $f [list set markbgcolor $markbgcolor]
2661 puts $f [list set diffcontext $diffcontext]
2662 puts $f [list set selectbgcolor $selectbgcolor]
2663 puts $f [list set extdifftool $extdifftool]
2664 puts $f [list set perfile_attrs $perfile_attrs]
2666 puts $f "set geometry(main) [wm geometry .]"
2667 puts $f "set geometry(state) [wm state .]"
2668 puts $f "set geometry(topwidth) [winfo width .tf]"
2669 puts $f "set geometry(topheight) [winfo height .tf]"
2671 puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sashpos 0] 1\""
2672 puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sashpos 1] 1\""
2674 puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\""
2675 puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\""
2677 puts $f "set geometry(botwidth) [winfo width .bleft]"
2678 puts $f "set geometry(botheight) [winfo height .bleft]"
2680 puts -nonewline $f "set permviews {"
2681 for {set v 0} {$v < $nextviewnum} {incr v} {
2682 if {$viewperm($v)} {
2683 puts $f "{[list $viewname($v) $viewfiles($v) $viewargs($v) $viewargscmd($v)]}"
2688 file rename -force "~/.gitk-new" "~/.gitk"
2693 proc resizeclistpanes {win w} {
2694 global oldwidth use_ttk
2695 if {[info exists oldwidth($win)]} {
2697 set s0 [$win sashpos 0]
2698 set s1 [$win sashpos 1]
2700 set s0 [$win sash coord 0]
2701 set s1 [$win sash coord 1]
2704 set sash0 [expr {int($w/2 - 2)}]
2705 set sash1 [expr {int($w*5/6 - 2)}]
2707 set factor [expr {1.0 * $w / $oldwidth($win)}]
2708 set sash0 [expr {int($factor * [lindex $s0 0])}]
2709 set sash1 [expr {int($factor * [lindex $s1 0])}]
2713 if {$sash1 < $sash0 + 20} {
2714 set sash1 [expr {$sash0 + 20}]
2716 if {$sash1 > $w - 10} {
2717 set sash1 [expr {$w - 10}]
2718 if {$sash0 > $sash1 - 20} {
2719 set sash0 [expr {$sash1 - 20}]
2724 $win sashpos 0 $sash0
2725 $win sashpos 1 $sash1
2727 $win sash place 0 $sash0 [lindex $s0 1]
2728 $win sash place 1 $sash1 [lindex $s1 1]
2731 set oldwidth($win) $w
2734 proc resizecdetpanes {win w} {
2735 global oldwidth use_ttk
2736 if {[info exists oldwidth($win)]} {
2738 set s0 [$win sashpos 0]
2740 set s0 [$win sash coord 0]
2743 set sash0 [expr {int($w*3/4 - 2)}]
2745 set factor [expr {1.0 * $w / $oldwidth($win)}]
2746 set sash0 [expr {int($factor * [lindex $s0 0])}]
2750 if {$sash0 > $w - 15} {
2751 set sash0 [expr {$w - 15}]
2755 $win sashpos 0 $sash0
2757 $win sash place 0 $sash0 [lindex $s0 1]
2760 set oldwidth($win) $w
2763 proc allcanvs args {
2764 global canv canv2 canv3
2770 proc bindall {event action} {
2771 global canv canv2 canv3
2772 bind $canv $event $action
2773 bind $canv2 $event $action
2774 bind $canv3 $event $action
2780 if {[winfo exists $w]} {
2785 wm title $w [mc "About gitk"]
2787 message $w.m -text [mc "
2788 Gitk - a commit viewer for git
2790 Copyright \u00a9 2005-2010 Paul Mackerras
2792 Use and redistribute under the terms of the GNU General Public License"] \
2793 -justify center -aspect 400 -border 2 -bg white -relief groove
2794 pack $w.m -side top -fill x -padx 2 -pady 2
2795 ${NS}::button $w.ok -text [mc "Close"] -command "destroy $w" -default active
2796 pack $w.ok -side bottom
2797 bind $w <Visibility> "focus $w.ok"
2798 bind $w <Key-Escape> "destroy $w"
2799 bind $w <Key-Return> "destroy $w"
2800 tk::PlaceWindow $w widget .
2806 if {[winfo exists $w]} {
2810 if {[tk windowingsystem] eq {aqua}} {
2816 wm title $w [mc "Gitk key bindings"]
2818 message $w.m -text "
2819 [mc "Gitk key bindings:"]
2821 [mc "<%s-Q> Quit" $M1T]
2822 [mc "<%s-W> Close window" $M1T]
2823 [mc "<Home> Move to first commit"]
2824 [mc "<End> Move to last commit"]
2825 [mc "<Up>, p, i Move up one commit"]
2826 [mc "<Down>, n, k Move down one commit"]
2827 [mc "<Left>, z, j Go back in history list"]
2828 [mc "<Right>, x, l Go forward in history list"]
2829 [mc "<PageUp> Move up one page in commit list"]
2830 [mc "<PageDown> Move down one page in commit list"]
2831 [mc "<%s-Home> Scroll to top of commit list" $M1T]
2832 [mc "<%s-End> Scroll to bottom of commit list" $M1T]
2833 [mc "<%s-Up> Scroll commit list up one line" $M1T]
2834 [mc "<%s-Down> Scroll commit list down one line" $M1T]
2835 [mc "<%s-PageUp> Scroll commit list up one page" $M1T]
2836 [mc "<%s-PageDown> Scroll commit list down one page" $M1T]
2837 [mc "<Shift-Up> Find backwards (upwards, later commits)"]
2838 [mc "<Shift-Down> Find forwards (downwards, earlier commits)"]
2839 [mc "<Delete>, b Scroll diff view up one page"]
2840 [mc "<Backspace> Scroll diff view up one page"]
2841 [mc "<Space> Scroll diff view down one page"]
2842 [mc "u Scroll diff view up 18 lines"]
2843 [mc "d Scroll diff view down 18 lines"]
2844 [mc "<%s-F> Find" $M1T]
2845 [mc "<%s-G> Move to next find hit" $M1T]
2846 [mc "<Return> Move to next find hit"]
2847 [mc "/ Focus the search box"]
2848 [mc "? Move to previous find hit"]
2849 [mc "f Scroll diff view to next file"]
2850 [mc "<%s-S> Search for next hit in diff view" $M1T]
2851 [mc "<%s-R> Search for previous hit in diff view" $M1T]
2852 [mc "<%s-KP+> Increase font size" $M1T]
2853 [mc "<%s-plus> Increase font size" $M1T]
2854 [mc "<%s-KP-> Decrease font size" $M1T]
2855 [mc "<%s-minus> Decrease font size" $M1T]
2858 -justify left -bg white -border 2 -relief groove
2859 pack $w.m -side top -fill both -padx 2 -pady 2
2860 ${NS}::button $w.ok -text [mc "Close"] -command "destroy $w" -default active
2861 bind $w <Key-Escape> [list destroy $w]
2862 pack $w.ok -side bottom
2863 bind $w <Visibility> "focus $w.ok"
2864 bind $w <Key-Escape> "destroy $w"
2865 bind $w <Key-Return> "destroy $w"
2868 # Procedures for manipulating the file list window at the
2869 # bottom right of the overall window.
2871 proc treeview {w l openlevs} {
2872 global treecontents treediropen treeheight treeparent treeindex
2882 set treecontents() {}
2883 $w conf -state normal
2885 while {[string range $f 0 $prefixend] ne $prefix} {
2886 if {$lev <= $openlevs} {
2887 $w mark set e:$treeindex($prefix) "end -1c"
2888 $w mark gravity e:$treeindex($prefix) left
2890 set treeheight($prefix) $ht
2891 incr ht [lindex $htstack end]
2892 set htstack [lreplace $htstack end end]
2893 set prefixend [lindex $prefendstack end]
2894 set prefendstack [lreplace $prefendstack end end]
2895 set prefix [string range $prefix 0 $prefixend]
2898 set tail [string range $f [expr {$prefixend+1}] end]
2899 while {[set slash [string first "/" $tail]] >= 0} {
2902 lappend prefendstack $prefixend
2903 incr prefixend [expr {$slash + 1}]
2904 set d [string range $tail 0 $slash]
2905 lappend treecontents($prefix) $d
2906 set oldprefix $prefix
2908 set treecontents($prefix) {}
2909 set treeindex($prefix) [incr ix]
2910 set treeparent($prefix) $oldprefix
2911 set tail [string range $tail [expr {$slash+1}] end]
2912 if {$lev <= $openlevs} {
2914 set treediropen($prefix) [expr {$lev < $openlevs}]
2915 set bm [expr {$lev == $openlevs? "tri-rt": "tri-dn"}]
2916 $w mark set d:$ix "end -1c"
2917 $w mark gravity d:$ix left
2919 for {set i 0} {$i < $lev} {incr i} {append str "\t"}
2921 $w image create end -align center -image $bm -padx 1 \
2923 $w insert end $d [highlight_tag $prefix]
2924 $w mark set s:$ix "end -1c"
2925 $w mark gravity s:$ix left
2930 if {$lev <= $openlevs} {
2933 for {set i 0} {$i < $lev} {incr i} {append str "\t"}
2935 $w insert end $tail [highlight_tag $f]
2937 lappend treecontents($prefix) $tail
2940 while {$htstack ne {}} {
2941 set treeheight($prefix) $ht
2942 incr ht [lindex $htstack end]
2943 set htstack [lreplace $htstack end end]
2944 set prefixend [lindex $prefendstack end]
2945 set prefendstack [lreplace $prefendstack end end]
2946 set prefix [string range $prefix 0 $prefixend]
2948 $w conf -state disabled
2951 proc linetoelt {l} {
2952 global treeheight treecontents
2957 foreach e $treecontents($prefix) {
2962 if {[string index $e end] eq "/"} {
2963 set n $treeheight($prefix$e)
2975 proc highlight_tree {y prefix} {
2976 global treeheight treecontents cflist
2978 foreach e $treecontents($prefix) {
2980 if {[highlight_tag $path] ne {}} {
2981 $cflist tag add bold $y.0 "$y.0 lineend"
2984 if {[string index $e end] eq "/" && $treeheight($path) > 1} {
2985 set y [highlight_tree $y $path]
2991 proc treeclosedir {w dir} {
2992 global treediropen treeheight treeparent treeindex
2994 set ix $treeindex($dir)
2995 $w conf -state normal
2996 $w delete s:$ix e:$ix
2997 set treediropen($dir) 0
2998 $w image configure a:$ix -image tri-rt
2999 $w conf -state disabled
3000 set n [expr {1 - $treeheight($dir)}]
3001 while {$dir ne {}} {
3002 incr treeheight($dir) $n
3003 set dir $treeparent($dir)
3007 proc treeopendir {w dir} {
3008 global treediropen treeheight treeparent treecontents treeindex
3010 set ix $treeindex($dir)
3011 $w conf -state normal
3012 $w image configure a:$ix -image tri-dn
3013 $w mark set e:$ix s:$ix
3014 $w mark gravity e:$ix right
3017 set n [llength $treecontents($dir)]
3018 for {set x $dir} {$x ne {}} {set x $treeparent($x)} {
3021 incr treeheight($x) $n
3023 foreach e $treecontents($dir) {
3025 if {[string index $e end] eq "/"} {
3026 set iy $treeindex($de)
3027 $w mark set d:$iy e:$ix
3028 $w mark gravity d:$iy left
3029 $w insert e:$ix $str
3030 set treediropen($de) 0
3031 $w image create e:$ix -align center -image tri-rt -padx 1 \
3033 $w insert e:$ix $e [highlight_tag $de]
3034 $w mark set s:$iy e:$ix
3035 $w mark gravity s:$iy left
3036 set treeheight($de) 1
3038 $w insert e:$ix $str
3039 $w insert e:$ix $e [highlight_tag $de]
3042 $w mark gravity e:$ix right
3043 $w conf -state disabled
3044 set treediropen($dir) 1
3045 set top [lindex [split [$w index @0,0] .] 0]
3046 set ht [$w cget -height]
3047 set l [lindex [split [$w index s:$ix] .] 0]
3050 } elseif {$l + $n + 1 > $top + $ht} {
3051 set top [expr {$l + $n + 2 - $ht}]
3059 proc treeclick {w x y} {
3060 global treediropen cmitmode ctext cflist cflist_top
3062 if {$cmitmode ne "tree"} return
3063 if {![info exists cflist_top]} return
3064 set l [lindex [split [$w index "@$x,$y"] "."] 0]
3065 $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
3066 $cflist tag add highlight $l.0 "$l.0 lineend"
3072 set e [linetoelt $l]
3073 if {[string index $e end] ne "/"} {
3075 } elseif {$treediropen($e)} {
3082 proc setfilelist {id} {
3083 global treefilelist cflist jump_to_here
3085 treeview $cflist $treefilelist($id) 0
3086 if {$jump_to_here ne {}} {
3087 set f [lindex $jump_to_here 0]
3088 if {[lsearch -exact $treefilelist($id) $f] >= 0} {
3094 image create bitmap tri-rt -background black -foreground blue -data {
3095 #define tri-rt_width 13
3096 #define tri-rt_height 13
3097 static unsigned char tri-rt_bits[] = {
3098 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x00, 0x70, 0x00, 0xf0, 0x00,
3099 0xf0, 0x01, 0xf0, 0x00, 0x70, 0x00, 0x30, 0x00, 0x10, 0x00, 0x00, 0x00,
3102 #define tri-rt-mask_width 13
3103 #define tri-rt-mask_height 13
3104 static unsigned char tri-rt-mask_bits[] = {
3105 0x08, 0x00, 0x18, 0x00, 0x38, 0x00, 0x78, 0x00, 0xf8, 0x00, 0xf8, 0x01,
3106 0xf8, 0x03, 0xf8, 0x01, 0xf8, 0x00, 0x78, 0x00, 0x38, 0x00, 0x18, 0x00,
3109 image create bitmap tri-dn -background black -foreground blue -data {
3110 #define tri-dn_width 13
3111 #define tri-dn_height 13
3112 static unsigned char tri-dn_bits[] = {
3113 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x07, 0xf8, 0x03,
3114 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
3117 #define tri-dn-mask_width 13
3118 #define tri-dn-mask_height 13
3119 static unsigned char tri-dn-mask_bits[] = {
3120 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0xfe, 0x0f, 0xfc, 0x07,
3121 0xf8, 0x03, 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
3125 image create bitmap reficon-T -background black -foreground yellow -data {
3126 #define tagicon_width 13
3127 #define tagicon_height 9
3128 static unsigned char tagicon_bits[] = {
3129 0x00, 0x00, 0x00, 0x00, 0xf0, 0x07, 0xf8, 0x07,
3130 0xfc, 0x07, 0xf8, 0x07, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00};
3132 #define tagicon-mask_width 13
3133 #define tagicon-mask_height 9
3134 static unsigned char tagicon-mask_bits[] = {
3135 0x00, 0x00, 0xf0, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
3136 0xfe, 0x0f, 0xfc, 0x0f, 0xf8, 0x0f, 0xf0, 0x0f, 0x00, 0x00};
3139 #define headicon_width 13
3140 #define headicon_height 9
3141 static unsigned char headicon_bits[] = {
3142 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xf8, 0x07,
3143 0xf8, 0x07, 0xf8, 0x07, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00};
3146 #define headicon-mask_width 13
3147 #define headicon-mask_height 9
3148 static unsigned char headicon-mask_bits[] = {
3149 0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
3150 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00};
3152 image create bitmap reficon-H -background black -foreground green \
3153 -data $rectdata -maskdata $rectmask
3154 image create bitmap reficon-o -background black -foreground "#ddddff" \
3155 -data $rectdata -maskdata $rectmask
3157 proc init_flist {first} {
3158 global cflist cflist_top difffilestart
3160 $cflist conf -state normal
3161 $cflist delete 0.0 end
3163 $cflist insert end $first
3165 $cflist tag add highlight 1.0 "1.0 lineend"
3167 catch {unset cflist_top}
3169 $cflist conf -state disabled
3170 set difffilestart {}
3173 proc highlight_tag {f} {
3174 global highlight_paths
3176 foreach p $highlight_paths {
3177 if {[string match $p $f]} {
3184 proc highlight_filelist {} {
3185 global cmitmode cflist
3187 $cflist conf -state normal
3188 if {$cmitmode ne "tree"} {
3189 set end [lindex [split [$cflist index end] .] 0]
3190 for {set l 2} {$l < $end} {incr l} {
3191 set line [$cflist get $l.0 "$l.0 lineend"]
3192 if {[highlight_tag $line] ne {}} {
3193 $cflist tag add bold $l.0 "$l.0 lineend"
3199 $cflist conf -state disabled
3202 proc unhighlight_filelist {} {
3205 $cflist conf -state normal
3206 $cflist tag remove bold 1.0 end
3207 $cflist conf -state disabled
3210 proc add_flist {fl} {
3213 $cflist conf -state normal
3215 $cflist insert end "\n"
3216 $cflist insert end $f [highlight_tag $f]
3218 $cflist conf -state disabled
3221 proc sel_flist {w x y} {
3222 global ctext difffilestart cflist cflist_top cmitmode
3224 if {$cmitmode eq "tree"} return
3225 if {![info exists cflist_top]} return
3226 set l [lindex [split [$w index "@$x,$y"] "."] 0]
3227 $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
3228 $cflist tag add highlight $l.0 "$l.0 lineend"
3233 catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
3237 proc pop_flist_menu {w X Y x y} {
3238 global ctext cflist cmitmode flist_menu flist_menu_file
3239 global treediffs diffids
3242 set l [lindex [split [$w index "@$x,$y"] "."] 0]
3244 if {$cmitmode eq "tree"} {
3245 set e [linetoelt $l]
3246 if {[string index $e end] eq "/"} return
3248 set e [lindex $treediffs($diffids) [expr {$l-2}]]
3250 set flist_menu_file $e
3251 set xdiffstate "normal"
3252 if {$cmitmode eq "tree"} {
3253 set xdiffstate "disabled"
3255 # Disable "External diff" item in tree mode
3256 $flist_menu entryconf 2 -state $xdiffstate
3257 tk_popup $flist_menu $X $Y
3260 proc find_ctext_fileinfo {line} {
3261 global ctext_file_names ctext_file_lines
3263 set ok [bsearch $ctext_file_lines $line]
3264 set tline [lindex $ctext_file_lines $ok]
3266 if {$ok >= [llength $ctext_file_lines] || $line < $tline} {
3269 return [list [lindex $ctext_file_names $ok] $tline]
3273 proc pop_diff_menu {w X Y x y} {
3274 global ctext diff_menu flist_menu_file
3275 global diff_menu_txtpos diff_menu_line
3276 global diff_menu_filebase
3278 set diff_menu_txtpos [split [$w index "@$x,$y"] "."]
3279 set diff_menu_line [lindex $diff_menu_txtpos 0]
3280 # don't pop up the menu on hunk-separator or file-separator lines
3281 if {[lsearch -glob [$ctext tag names $diff_menu_line.0] "*sep"] >= 0} {
3285 set f [find_ctext_fileinfo $diff_menu_line]
3286 if {$f eq {}} return
3287 set flist_menu_file [lindex $f 0]
3288 set diff_menu_filebase [lindex $f 1]
3289 tk_popup $diff_menu $X $Y
3292 proc flist_hl {only} {
3293 global flist_menu_file findstring gdttype
3295 set x [shellquote $flist_menu_file]
3296 if {$only || $findstring eq {} || $gdttype ne [mc "touching paths:"]} {
3299 append findstring " " $x
3301 set gdttype [mc "touching paths:"]
3304 proc gitknewtmpdir {} {
3305 global diffnum gitktmpdir gitdir
3307 if {![info exists gitktmpdir]} {
3308 set gitktmpdir [file join [file dirname $gitdir] \
3309 [format ".gitk-tmp.%s" [pid]]]
3310 if {[catch {file mkdir $gitktmpdir} err]} {
3311 error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err"
3318 set diffdir [file join $gitktmpdir $diffnum]
3319 if {[catch {file mkdir $diffdir} err]} {
3320 error_popup "[mc "Error creating temporary directory %s:" $diffdir] $err"
3326 proc save_file_from_commit {filename output what} {
3329 if {[catch {exec git show $filename -- > $output} err]} {
3330 if {[string match "fatal: bad revision *" $err]} {
3333 error_popup "[mc "Error getting \"%s\" from %s:" $filename $what] $err"
3339 proc external_diff_get_one_file {diffid filename diffdir} {
3340 global nullid nullid2 nullfile
3343 if {$diffid == $nullid} {
3344 set difffile [file join [file dirname $gitdir] $filename]
3345 if {[file exists $difffile]} {
3350 if {$diffid == $nullid2} {
3351 set difffile [file join $diffdir "\[index\] [file tail $filename]"]
3352 return [save_file_from_commit :$filename $difffile index]
3354 set difffile [file join $diffdir "\[$diffid\] [file tail $filename]"]
3355 return [save_file_from_commit $diffid:$filename $difffile \
3359 proc external_diff {} {
3360 global nullid nullid2
3361 global flist_menu_file
3365 if {[llength $diffids] == 1} {
3366 # no reference commit given
3367 set diffidto [lindex $diffids 0]
3368 if {$diffidto eq $nullid} {
3369 # diffing working copy with index
3370 set diffidfrom $nullid2
3371 } elseif {$diffidto eq $nullid2} {
3372 # diffing index with HEAD
3373 set diffidfrom "HEAD"
3375 # use first parent commit
3376 global parentlist selectedline
3377 set diffidfrom [lindex $parentlist $selectedline 0]
3380 set diffidfrom [lindex $diffids 0]
3381 set diffidto [lindex $diffids 1]
3384 # make sure that several diffs wont collide
3385 set diffdir [gitknewtmpdir]
3386 if {$diffdir eq {}} return
3388 # gather files to diff
3389 set difffromfile [external_diff_get_one_file $diffidfrom $flist_menu_file $diffdir]
3390 set difftofile [external_diff_get_one_file $diffidto $flist_menu_file $diffdir]
3392 if {$difffromfile ne {} && $difftofile ne {}} {
3393 set cmd [list [shellsplit $extdifftool] $difffromfile $difftofile]
3394 if {[catch {set fl [open |$cmd r]} err]} {
3395 file delete -force $diffdir
3396 error_popup "$extdifftool: [mc "command failed:"] $err"
3398 fconfigure $fl -blocking 0
3399 filerun $fl [list delete_at_eof $fl $diffdir]
3404 proc find_hunk_blamespec {base line} {
3407 # Find and parse the hunk header
3408 set s_lix [$ctext search -backwards -regexp ^@@ "$line.0 lineend" $base.0]
3409 if {$s_lix eq {}} return
3411 set s_line [$ctext get $s_lix "$s_lix + 1 lines"]
3412 if {![regexp {^@@@*(( -\d+(,\d+)?)+) \+(\d+)(,\d+)? @@} $s_line \
3413 s_line old_specs osz osz1 new_line nsz]} {
3417 # base lines for the parents
3418 set base_lines [list $new_line]
3419 foreach old_spec [lrange [split $old_specs " "] 1 end] {
3420 if {![regexp -- {-(\d+)(,\d+)?} $old_spec \
3421 old_spec old_line osz]} {
3424 lappend base_lines $old_line
3427 # Now scan the lines to determine offset within the hunk
3428 set max_parent [expr {[llength $base_lines]-2}]
3430 set s_lno [lindex [split $s_lix "."] 0]
3432 # Determine if the line is removed
3433 set chunk [$ctext get $line.0 "$line.1 + $max_parent chars"]
3434 if {[string match {[-+ ]*} $chunk]} {
3435 set removed_idx [string first "-" $chunk]
3436 # Choose a parent index
3437 if {$removed_idx >= 0} {
3438 set parent $removed_idx
3440 set unchanged_idx [string first " " $chunk]
3441 if {$unchanged_idx >= 0} {
3442 set parent $unchanged_idx
3444 # blame the current commit
3448 # then count other lines that belong to it
3449 for {set i $line} {[incr i -1] > $s_lno} {} {
3450 set chunk [$ctext get $i.0 "$i.1 + $max_parent chars"]
3451 # Determine if the line is removed
3452 set removed_idx [string first "-" $chunk]
3454 set code [string index $chunk $parent]
3455 if {$code eq "-" || ($removed_idx < 0 && $code ne "+")} {
3459 if {$removed_idx < 0} {
3469 incr dline [lindex $base_lines $parent]
3470 return [list $parent $dline]
3473 proc external_blame_diff {} {
3474 global currentid cmitmode
3475 global diff_menu_txtpos diff_menu_line
3476 global diff_menu_filebase flist_menu_file
3478 if {$cmitmode eq "tree"} {
3480 set line [expr {$diff_menu_line - $diff_menu_filebase}]
3482 set hinfo [find_hunk_blamespec $diff_menu_filebase $diff_menu_line]
3484 set parent_idx [lindex $hinfo 0]
3485 set line [lindex $hinfo 1]
3492 external_blame $parent_idx $line
3495 # Find the SHA1 ID of the blob for file $fname in the index
3497 proc index_sha1 {fname} {
3498 set f [open [list | git ls-files -s $fname] r]
3499 while {[gets $f line] >= 0} {
3500 set info [lindex [split $line "\t"] 0]
3501 set stage [lindex $info 2]
3502 if {$stage eq "0" || $stage eq "2"} {
3504 return [lindex $info 1]
3511 # Turn an absolute path into one relative to the current directory
3512 proc make_relative {f} {
3513 if {[file pathtype $f] eq "relative"} {
3516 set elts [file split $f]
3517 set here [file split [pwd]]
3522 if {$ei < $hi || $ei >= [llength $elts] || [lindex $elts $ei] ne $d} {
3529 set elts [concat $res [lrange $elts $ei end]]
3530 return [eval file join $elts]
3533 proc external_blame {parent_idx {line {}}} {
3534 global flist_menu_file gitdir
3535 global nullid nullid2
3536 global parentlist selectedline currentid
3538 if {$parent_idx > 0} {
3539 set base_commit [lindex $parentlist $selectedline [expr {$parent_idx-1}]]
3541 set base_commit $currentid
3544 if {$base_commit eq {} || $base_commit eq $nullid || $base_commit eq $nullid2} {
3545 error_popup [mc "No such commit"]
3549 set cmdline [list git gui blame]
3550 if {$line ne {} && $line > 1} {
3551 lappend cmdline "--line=$line"
3553 set f [file join [file dirname $gitdir] $flist_menu_file]
3554 # Unfortunately it seems git gui blame doesn't like
3555 # being given an absolute path...
3556 set f [make_relative $f]
3557 lappend cmdline $base_commit $f
3558 if {[catch {eval exec $cmdline &} err]} {
3559 error_popup "[mc "git gui blame: command failed:"] $err"
3563 proc show_line_source {} {
3564 global cmitmode currentid parents curview blamestuff blameinst
3565 global diff_menu_line diff_menu_filebase flist_menu_file
3566 global nullid nullid2 gitdir
3569 if {$cmitmode eq "tree"} {
3571 set line [expr {$diff_menu_line - $diff_menu_filebase}]
3573 set h [find_hunk_blamespec $diff_menu_filebase $diff_menu_line]
3574 if {$h eq {}} return
3575 set pi [lindex $h 0]
3577 mark_ctext_line $diff_menu_line
3581 if {$currentid eq $nullid} {
3583 # must be a merge in progress...
3585 # get the last line from .git/MERGE_HEAD
3586 set f [open [file join $gitdir MERGE_HEAD] r]
3587 set id [lindex [split [read $f] "\n"] end-1]
3590 error_popup [mc "Couldn't read merge head: %s" $err]
3593 } elseif {$parents($curview,$currentid) eq $nullid2} {
3594 # need to do the blame from the index
3596 set from_index [index_sha1 $flist_menu_file]
3598 error_popup [mc "Error reading index: %s" $err]
3602 set id $parents($curview,$currentid)
3605 set id [lindex $parents($curview,$currentid) $pi]
3607 set line [lindex $h 1]
3610 if {$from_index ne {}} {
3611 lappend blameargs | git cat-file blob $from_index
3613 lappend blameargs | git blame -p -L$line,+1
3614 if {$from_index ne {}} {
3615 lappend blameargs --contents -
3617 lappend blameargs $id
3619 lappend blameargs -- [file join [file dirname $gitdir] $flist_menu_file]
3621 set f [open $blameargs r]
3623 error_popup [mc "Couldn't start git blame: %s" $err]
3626 nowbusy blaming [mc "Searching"]
3627 fconfigure $f -blocking 0
3628 set i [reg_instance $f]
3629 set blamestuff($i) {}
3631 filerun $f [list read_line_source $f $i]
3634 proc stopblaming {} {
3637 if {[info exists blameinst]} {
3638 stop_instance $blameinst
3644 proc read_line_source {fd inst} {
3645 global blamestuff curview commfd blameinst nullid nullid2
3647 while {[gets $fd line] >= 0} {
3648 lappend blamestuff($inst) $line
3656 fconfigure $fd -blocking 1
3657 if {[catch {close $fd} err]} {
3658 error_popup [mc "Error running git blame: %s" $err]
3663 set line [split [lindex $blamestuff($inst) 0] " "]
3664 set id [lindex $line 0]
3665 set lnum [lindex $line 1]
3666 if {[string length $id] == 40 && [string is xdigit $id] &&
3667 [string is digit -strict $lnum]} {
3668 # look for "filename" line
3669 foreach l $blamestuff($inst) {
3670 if {[string match "filename *" $l]} {
3671 set fname [string range $l 9 end]
3677 # all looks good, select it
3678 if {$id eq $nullid} {
3679 # blame uses all-zeroes to mean not committed,
3680 # which would mean a change in the index
3683 if {[commitinview $id $curview]} {
3684 selectline [rowofcommit $id] 1 [list $fname $lnum]
3686 error_popup [mc "That line comes from commit %s, \
3687 which is not in this view" [shortids $id]]
3690 puts "oops couldn't parse git blame output"
3695 # delete $dir when we see eof on $f (presumably because the child has exited)
3696 proc delete_at_eof {f dir} {
3697 while {[gets $f line] >= 0} {}
3699 if {[catch {close $f} err]} {
3700 error_popup "[mc "External diff viewer failed:"] $err"
3702 file delete -force $dir
3708 # Functions for adding and removing shell-type quoting
3710 proc shellquote {str} {
3711 if {![string match "*\['\"\\ \t]*" $str]} {
3714 if {![string match "*\['\"\\]*" $str]} {
3717 if {![string match "*'*" $str]} {
3720 return "\"[string map {\" \\\" \\ \\\\} $str]\""
3723 proc shellarglist {l} {
3729 append str [shellquote $a]
3734 proc shelldequote {str} {
3739 if {![regexp -start $used -indices "\['\"\\\\ \t]" $str first]} {
3740 append ret [string range $str $used end]
3741 set used [string length $str]
3744 set first [lindex $first 0]
3745 set ch [string index $str $first]
3746 if {$first > $used} {
3747 append ret [string range $str $used [expr {$first - 1}]]
3750 if {$ch eq " " || $ch eq "\t"} break
3753 set first [string first "'" $str $used]
3755 error "unmatched single-quote"
3757 append ret [string range $str $used [expr {$first - 1}]]
3762 if {$used >= [string length $str]} {
3763 error "trailing backslash"
3765 append ret [string index $str $used]
3770 if {![regexp -start $used -indices "\[\"\\\\]" $str first]} {
3771 error "unmatched double-quote"
3773 set first [lindex $first 0]
3774 set ch [string index $str $first]
3775 if {$first > $used} {
3776 append ret [string range $str $used [expr {$first - 1}]]
3779 if {$ch eq "\""} break
3781 append ret [string index $str $used]
3785 return [list $used $ret]
3788 proc shellsplit {str} {
3791 set str [string trimleft $str]
3792 if {$str eq {}} break
3793 set dq [shelldequote $str]
3794 set n [lindex $dq 0]
3795 set word [lindex $dq 1]
3796 set str [string range $str $n end]
3802 # Code to implement multiple views
3804 proc newview {ishighlight} {
3805 global nextviewnum newviewname newishighlight
3806 global revtreeargs viewargscmd newviewopts curview
3808 set newishighlight $ishighlight
3810 if {[winfo exists $top]} {
3814 decode_view_opts $nextviewnum $revtreeargs
3815 set newviewname($nextviewnum) "[mc "View"] $nextviewnum"
3816 set newviewopts($nextviewnum,perm) 0
3817 set newviewopts($nextviewnum,cmd) $viewargscmd($curview)
3818 vieweditor $top $nextviewnum [mc "Gitk view definition"]
3821 set known_view_options {
3822 {perm b . {} {mc "Remember this view"}}
3823 {reflabel l + {} {mc "References (space separated list):"}}
3824 {refs t15 .. {} {mc "Branches & tags:"}}
3825 {allrefs b *. "--all" {mc "All refs"}}
3826 {branches b . "--branches" {mc "All (local) branches"}}
3827 {tags b . "--tags" {mc "All tags"}}
3828 {remotes b . "--remotes" {mc "All remote-tracking branches"}}
3829 {commitlbl l + {} {mc "Commit Info (regular expressions):"}}
3830 {author t15 .. "--author=*" {mc "Author:"}}
3831 {committer t15 . "--committer=*" {mc "Committer:"}}
3832 {loginfo t15 .. "--grep=*" {mc "Commit Message:"}}
3833 {allmatch b .. "--all-match" {mc "Matches all Commit Info criteria"}}
3834 {changes_l l + {} {mc "Changes to Files:"}}
3835 {pickaxe_s r0 . {} {mc "Fixed String"}}
3836 {pickaxe_t r1 . "--pickaxe-regex" {mc "Regular Expression"}}
3837 {pickaxe t15 .. "-S*" {mc "Search string:"}}
3838 {datelabel l + {} {mc "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 15:27:38\"):"}}
3839 {since t15 .. {"--since=*" "--after=*"} {mc "Since:"}}
3840 {until t15 . {"--until=*" "--before=*"} {mc "Until:"}}
3841 {limit_lbl l + {} {mc "Limit and/or skip a number of revisions (positive integer):"}}
3842 {limit t10 *. "--max-count=*" {mc "Number to show:"}}
3843 {skip t10 . "--skip=*" {mc "Number to skip:"}}
3844 {misc_lbl l + {} {mc "Miscellaneous options:"}}
3845 {dorder b *. {"--date-order" "-d"} {mc "Strictly sort by date"}}
3846 {lright b . "--left-right" {mc "Mark branch sides"}}
3847 {first b . "--first-parent" {mc "Limit to first parent"}}
3848 {smplhst b . "--simplify-by-decoration" {mc "Simple history"}}
3849 {args t50 *. {} {mc "Additional arguments to git log:"}}
3850 {allpaths path + {} {mc "Enter files and directories to include, one per line:"}}
3851 {cmd t50= + {} {mc "Command to generate more commits to include:"}}
3854 # Convert $newviewopts($n, ...) into args for git log.
3855 proc encode_view_opts {n} {
3856 global known_view_options newviewopts
3859 foreach opt $known_view_options {
3860 set patterns [lindex $opt 3]
3861 if {$patterns eq {}} continue
3862 set pattern [lindex $patterns 0]
3864 if {[lindex $opt 1] eq "b"} {
3865 set val $newviewopts($n,[lindex $opt 0])
3867 lappend rargs $pattern
3869 } elseif {[regexp {^r(\d+)$} [lindex $opt 1] type value]} {
3870 regexp {^(.*_)} [lindex $opt 0] uselessvar button_id
3871 set val $newviewopts($n,$button_id)
3872 if {$val eq $value} {
3873 lappend rargs $pattern
3876 set val $newviewopts($n,[lindex $opt 0])
3877 set val [string trim $val]
3879 set pfix [string range $pattern 0 end-1]
3880 lappend rargs $pfix$val
3884 set rargs [concat $rargs [shellsplit $newviewopts($n,refs)]]
3885 return [concat $rargs [shellsplit $newviewopts($n,args)]]
3888 # Fill $newviewopts($n, ...) based on args for git log.
3889 proc decode_view_opts {n view_args} {
3890 global known_view_options newviewopts
3892 foreach opt $known_view_options {
3893 set id [lindex $opt 0]
3894 if {[lindex $opt 1] eq "b"} {
3897 } elseif {[regexp {^r(\d+)$} [lindex $opt 1]]} {
3899 regexp {^(.*_)} $id uselessvar id
3905 set newviewopts($n,$id) $val
3909 foreach arg $view_args {
3910 if {[regexp -- {^-([0-9]+)$} $arg arg cnt]
3911 && ![info exists found(limit)]} {
3912 set newviewopts($n,limit) $cnt
3917 foreach opt $known_view_options {
3918 set id [lindex $opt 0]
3919 if {[info exists found($id)]} continue
3920 foreach pattern [lindex $opt 3] {
3921 if {![string match $pattern $arg]} continue
3922 if {[lindex $opt 1] eq "b"} {
3925 } elseif {[regexp {^r(\d+)$} [lindex $opt 1] match num]} {
3927 regexp {^(.*_)} $id uselessvar id
3931 set size [string length $pattern]
3932 set val [string range $arg [expr {$size-1}] end]
3934 set newviewopts($n,$id) $val
3938 if {[info exists val]} break
3940 if {[info exists val]} continue
3941 if {[regexp {^-} $arg]} {
3944 lappend refargs $arg
3947 set newviewopts($n,refs) [shellarglist $refargs]
3948 set newviewopts($n,args) [shellarglist $oargs]
3951 proc edit_or_newview {} {
3963 global viewname viewperm newviewname newviewopts
3964 global viewargs viewargscmd
3966 set top .gitkvedit-$curview
3967 if {[winfo exists $top]} {
3971 decode_view_opts $curview $viewargs($curview)
3972 set newviewname($curview) $viewname($curview)
3973 set newviewopts($curview,perm) $viewperm($curview)
3974 set newviewopts($curview,cmd) $viewargscmd($curview)
3975 vieweditor $top $curview "[mc "Gitk: edit view"] $viewname($curview)"
3978 proc vieweditor {top n title} {
3979 global newviewname newviewopts viewfiles bgcolor
3980 global known_view_options NS
3983 wm title $top [concat $title [mc "-- criteria for selecting revisions"]]
3984 make_transient $top .
3987 ${NS}::frame $top.nfr
3988 ${NS}::label $top.nl -text [mc "View Name"]
3989 ${NS}::entry $top.name -width 20 -textvariable newviewname($n)
3990 pack $top.nfr -in $top -fill x -pady 5 -padx 3
3991 pack $top.nl -in $top.nfr -side left -padx {0 5}
3992 pack $top.name -in $top.nfr -side left -padx {0 25}
3998 foreach opt $known_view_options {
3999 set id [lindex $opt 0]
4000 set type [lindex $opt 1]
4001 set flags [lindex $opt 2]
4002 set title [eval [lindex $opt 4]]
4005 if {$flags eq "+" || $flags eq "*"} {
4006 set cframe $top.fr$cnt
4008 ${NS}::frame $cframe
4009 pack $cframe -in $top -fill x -pady 3 -padx 3
4010 set cexpand [expr {$flags eq "*"}]
4011 } elseif {$flags eq ".." || $flags eq "*."} {
4012 set cframe $top.fr$cnt
4014 ${NS}::frame $cframe
4015 pack $cframe -in $top -fill x -pady 3 -padx [list 15 3]
4016 set cexpand [expr {$flags eq "*."}]
4022 ${NS}::label $cframe.l_$id -text $title
4023 pack $cframe.l_$id -in $cframe -side left -pady [list 3 0] -anchor w
4024 } elseif {$type eq "b"} {
4025 ${NS}::checkbutton $cframe.c_$id -text $title -variable newviewopts($n,$id)
4026 pack $cframe.c_$id -in $cframe -side left \
4027 -padx [list $lxpad 0] -expand $cexpand -anchor w
4028 } elseif {[regexp {^r(\d+)$} $type type sz]} {
4029 regexp {^(.*_)} $id uselessvar button_id
4030 ${NS}::radiobutton $cframe.c_$id -text $title -variable newviewopts($n,$button_id) -value $sz
4031 pack $cframe.c_$id -in $cframe -side left \
4032 -padx [list $lxpad 0] -expand $cexpand -anchor w
4033 } elseif {[regexp {^t(\d+)$} $type type sz]} {
4034 ${NS}::label $cframe.l_$id -text $title
4035 ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \
4036 -textvariable newviewopts($n,$id)
4037 pack $cframe.l_$id -in $cframe -side left -padx [list $lxpad 0]
4038 pack $cframe.e_$id -in $cframe -side left -expand 1 -fill x
4039 } elseif {[regexp {^t(\d+)=$} $type type sz]} {
4040 ${NS}::label $cframe.l_$id -text $title
4041 ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \
4042 -textvariable newviewopts($n,$id)
4043 pack $cframe.l_$id -in $cframe -side top -pady [list 3 0] -anchor w
4044 pack $cframe.e_$id -in $cframe -side top -fill x
4045 } elseif {$type eq "path"} {
4046 ${NS}::label $top.l -text $title
4047 pack $top.l -in $top -side top -pady [list 3 0] -anchor w -padx 3
4048 text $top.t -width 40 -height 5 -background $bgcolor
4049 if {[info exists viewfiles($n)]} {
4050 foreach f $viewfiles($n) {
4051 $top.t insert end $f
4052 $top.t insert end "\n"
4054 $top.t delete {end - 1c} end
4055 $top.t mark set insert 0.0
4057 pack $top.t -in $top -side top -pady [list 0 5] -fill both -expand 1 -padx 3
4061 ${NS}::frame $top.buts
4062 ${NS}::button $top.buts.ok -text [mc "OK"] -command [list newviewok $top $n]
4063 ${NS}::button $top.buts.apply -text [mc "Apply (F5)"] -command [list newviewok $top $n 1]
4064 ${NS}::button $top.buts.can -text [mc "Cancel"] -command [list destroy $top]
4065 bind $top <Control-Return> [list newviewok $top $n]
4066 bind $top <F5> [list newviewok $top $n 1]
4067 bind $top <Escape> [list destroy $top]
4068 grid $top.buts.ok $top.buts.apply $top.buts.can
4069 grid columnconfigure $top.buts 0 -weight 1 -uniform a
4070 grid columnconfigure $top.buts 1 -weight 1 -uniform a
4071 grid columnconfigure $top.buts 2 -weight 1 -uniform a
4072 pack $top.buts -in $top -side top -fill x
4076 proc doviewmenu {m first cmd op argv} {
4077 set nmenu [$m index end]
4078 for {set i $first} {$i <= $nmenu} {incr i} {
4079 if {[$m entrycget $i -command] eq $cmd} {
4080 eval $m $op $i $argv
4086 proc allviewmenus {n op args} {
4089 doviewmenu .bar.view 5 [list showview $n] $op $args
4090 # doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
4093 proc newviewok {top n {apply 0}} {
4094 global nextviewnum newviewperm newviewname newishighlight
4095 global viewname viewfiles viewperm selectedview curview
4096 global viewargs viewargscmd newviewopts viewhlmenu
4099 set newargs [encode_view_opts $n]
4101 error_popup "[mc "Error in commit selection arguments:"] $err" $top
4105 foreach f [split [$top.t get 0.0 end] "\n"] {
4106 set ft [string trim $f]
4111 if {![info exists viewfiles($n)]} {
4112 # creating a new view
4114 set viewname($n) $newviewname($n)
4115 set viewperm($n) $newviewopts($n,perm)
4116 set viewfiles($n) $files
4117 set viewargs($n) $newargs
4118 set viewargscmd($n) $newviewopts($n,cmd)
4120 if {!$newishighlight} {
4123 run addvhighlight $n
4126 # editing an existing view
4127 set viewperm($n) $newviewopts($n,perm)
4128 if {$newviewname($n) ne $viewname($n)} {
4129 set viewname($n) $newviewname($n)
4130 doviewmenu .bar.view 5 [list showview $n] \
4131 entryconf [list -label $viewname($n)]
4132 # doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
4133 # entryconf [list -label $viewname($n) -value $viewname($n)]
4135 if {$files ne $viewfiles($n) || $newargs ne $viewargs($n) || \
4136 $newviewopts($n,cmd) ne $viewargscmd($n)} {
4137 set viewfiles($n) $files
4138 set viewargs($n) $newargs
4139 set viewargscmd($n) $newviewopts($n,cmd)
4140 if {$curview == $n} {
4146 catch {destroy $top}
4150 global curview viewperm hlview selectedhlview
4152 if {$curview == 0} return
4153 if {[info exists hlview] && $hlview == $curview} {
4154 set selectedhlview [mc "None"]
4157 allviewmenus $curview delete
4158 set viewperm($curview) 0
4162 proc addviewmenu {n} {
4163 global viewname viewhlmenu
4165 .bar.view add radiobutton -label $viewname($n) \
4166 -command [list showview $n] -variable selectedview -value $n
4167 #$viewhlmenu add radiobutton -label $viewname($n) \
4168 # -command [list addvhighlight $n] -variable selectedhlview
4172 global curview cached_commitrow ordertok
4173 global displayorder parentlist rowidlist rowisopt rowfinal
4174 global colormap rowtextx nextcolor canvxmax
4175 global numcommits viewcomplete
4176 global selectedline currentid canv canvy0
4178 global pending_select mainheadid
4181 global hlview selectedhlview commitinterest
4183 if {$n == $curview} return
4185 set ymax [lindex [$canv cget -scrollregion] 3]
4186 set span [$canv yview]
4187 set ytop [expr {[lindex $span 0] * $ymax}]
4188 set ybot [expr {[lindex $span 1] * $ymax}]
4189 set yscreen [expr {($ybot - $ytop) / 2}]
4190 if {$selectedline ne {}} {
4191 set selid $currentid
4192 set y [yc $selectedline]
4193 if {$ytop < $y && $y < $ybot} {
4194 set yscreen [expr {$y - $ytop}]
4196 } elseif {[info exists pending_select]} {
4197 set selid $pending_select
4198 unset pending_select
4202 catch {unset treediffs}
4204 if {[info exists hlview] && $hlview == $n} {
4206 set selectedhlview [mc "None"]
4208 catch {unset commitinterest}
4209 catch {unset cached_commitrow}
4210 catch {unset ordertok}
4214 .bar.view entryconf [mca "Edit view..."] -state [expr {$n == 0? "disabled": "normal"}]
4215 .bar.view entryconf [mca "Delete view"] -state [expr {$n == 0? "disabled": "normal"}]
4218 if {![info exists viewcomplete($n)]} {
4228 set numcommits $commitidx($n)
4230 catch {unset colormap}
4231 catch {unset rowtextx}
4233 set canvxmax [$canv cget -width]
4239 if {$selid ne {} && [commitinview $selid $n]} {
4240 set row [rowofcommit $selid]
4241 # try to get the selected row in the same position on the screen
4242 set ymax [lindex [$canv cget -scrollregion] 3]
4243 set ytop [expr {[yc $row] - $yscreen}]
4247 set yf [expr {$ytop * 1.0 / $ymax}]
4249 allcanvs yview moveto $yf
4253 } elseif {!$viewcomplete($n)} {
4254 reset_pending_select $selid
4256 reset_pending_select {}
4258 if {[commitinview $pending_select $curview]} {
4259 selectline [rowofcommit $pending_select] 1
4261 set row [first_real_row]
4262 if {$row < $numcommits} {
4267 if {!$viewcomplete($n)} {
4268 if {$numcommits == 0} {
4269 show_status [mc "Reading commits..."]
4271 } elseif {$numcommits == 0} {
4272 show_status [mc "No commits selected"]
4276 # Stuff relating to the highlighting facility
4278 proc ishighlighted {id} {
4279 global vhighlights fhighlights nhighlights rhighlights
4281 if {[info exists nhighlights($id)] && $nhighlights($id) > 0} {
4282 return $nhighlights($id)
4284 if {[info exists vhighlights($id)] && $vhighlights($id) > 0} {
4285 return $vhighlights($id)
4287 if {[info exists fhighlights($id)] && $fhighlights($id) > 0} {
4288 return $fhighlights($id)
4290 if {[info exists rhighlights($id)] && $rhighlights($id) > 0} {
4291 return $rhighlights($id)
4296 proc bolden {id font} {
4297 global canv linehtag currentid boldids need_redisplay markedid
4299 # need_redisplay = 1 means the display is stale and about to be redrawn
4300 if {$need_redisplay} return
4302 $canv itemconf $linehtag($id) -font $font
4303 if {[info exists currentid] && $id eq $currentid} {
4305 set t [eval $canv create rect [$canv bbox $linehtag($id)] \
4306 -outline {{}} -tags secsel \
4307 -fill [$canv cget -selectbackground]]
4310 if {[info exists markedid] && $id eq $markedid} {
4315 proc bolden_name {id font} {
4316 global canv2 linentag currentid boldnameids need_redisplay
4318 if {$need_redisplay} return
4319 lappend boldnameids $id
4320 $canv2 itemconf $linentag($id) -font $font
4321 if {[info exists currentid] && $id eq $currentid} {
4322 $canv2 delete secsel
4323 set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] \
4324 -outline {{}} -tags secsel \
4325 -fill [$canv2 cget -selectbackground]]
4334 foreach id $boldids {
4335 if {![ishighlighted $id]} {
4338 lappend stillbold $id
4341 set boldids $stillbold
4344 proc addvhighlight {n} {
4345 global hlview viewcomplete curview vhl_done commitidx
4347 if {[info exists hlview]} {
4351 if {$n != $curview && ![info exists viewcomplete($n)]} {
4354 set vhl_done $commitidx($hlview)
4355 if {$vhl_done > 0} {
4360 proc delvhighlight {} {
4361 global hlview vhighlights
4363 if {![info exists hlview]} return
4365 catch {unset vhighlights}
4369 proc vhighlightmore {} {
4370 global hlview vhl_done commitidx vhighlights curview
4372 set max $commitidx($hlview)
4373 set vr [visiblerows]
4374 set r0 [lindex $vr 0]
4375 set r1 [lindex $vr 1]
4376 for {set i $vhl_done} {$i < $max} {incr i} {
4377 set id [commitonrow $i $hlview]
4378 if {[commitinview $id $curview]} {
4379 set row [rowofcommit $id]
4380 if {$r0 <= $row && $row <= $r1} {
4381 if {![highlighted $row]} {
4382 bolden $id mainfontbold
4384 set vhighlights($id) 1
4392 proc askvhighlight {row id} {
4393 global hlview vhighlights iddrawn
4395 if {[commitinview $id $hlview]} {
4396 if {[info exists iddrawn($id)] && ![ishighlighted $id]} {
4397 bolden $id mainfontbold
4399 set vhighlights($id) 1
4401 set vhighlights($id) 0
4405 proc hfiles_change {} {
4406 global highlight_files filehighlight fhighlights fh_serial
4407 global highlight_paths
4409 if {[info exists filehighlight]} {
4410 # delete previous highlights
4411 catch {close $filehighlight}
4413 catch {unset fhighlights}
4415 unhighlight_filelist
4417 set highlight_paths {}
4418 after cancel do_file_hl $fh_serial
4420 if {$highlight_files ne {}} {
4421 after 300 do_file_hl $fh_serial
4425 proc gdttype_change {name ix op} {
4426 global gdttype highlight_files findstring findpattern
4429 if {$findstring ne {}} {
4430 if {$gdttype eq [mc "containing:"]} {
4431 if {$highlight_files ne {}} {
4432 set highlight_files {}
4437 if {$findpattern ne {}} {
4441 set highlight_files $findstring
4446 # enable/disable findtype/findloc menus too
4449 proc find_change {name ix op} {
4450 global gdttype findstring highlight_files
4453 if {$gdttype eq [mc "containing:"]} {
4456 if {$highlight_files ne $findstring} {
4457 set highlight_files $findstring
4464 proc findcom_change args {
4465 global nhighlights boldnameids
4466 global findpattern findtype findstring gdttype
4469 # delete previous highlights, if any
4470 foreach id $boldnameids {
4471 bolden_name $id mainfont
4474 catch {unset nhighlights}
4477 if {$gdttype ne [mc "containing:"] || $findstring eq {}} {
4479 } elseif {$findtype eq [mc "Regexp"]} {
4480 set findpattern $findstring
4482 set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
4484 set findpattern "*$e*"
4488 proc makepatterns {l} {
4491 set ee [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} $e]
4492 if {[string index $ee end] eq "/"} {
4502 proc do_file_hl {serial} {
4503 global highlight_files filehighlight highlight_paths gdttype fhl_list
4505 if {$gdttype eq [mc "touching paths:"]} {
4506 if {[catch {set paths [shellsplit $highlight_files]}]} return
4507 set highlight_paths [makepatterns $paths]
4509 set gdtargs [concat -- $paths]
4510 } elseif {$gdttype eq [mc "adding/removing string:"]} {
4511 set gdtargs [list "-S$highlight_files"]
4513 # must be "containing:", i.e. we're searching commit info
4516 set cmd [concat | git diff-tree -r -s --stdin $gdtargs]
4517 set filehighlight [open $cmd r+]
4518 fconfigure $filehighlight -blocking 0
4519 filerun $filehighlight readfhighlight
4525 proc flushhighlights {} {
4526 global filehighlight fhl_list
4528 if {[info exists filehighlight]} {
4530 puts $filehighlight ""
4531 flush $filehighlight
4535 proc askfilehighlight {row id} {
4536 global filehighlight fhighlights fhl_list
4538 lappend fhl_list $id
4539 set fhighlights($id) -1
4540 puts $filehighlight $id
4543 proc readfhighlight {} {
4544 global filehighlight fhighlights curview iddrawn
4545 global fhl_list find_dirn
4547 if {![info exists filehighlight]} {
4551 while {[incr nr] <= 100 && [gets $filehighlight line] >= 0} {
4552 set line [string trim $line]
4553 set i [lsearch -exact $fhl_list $line]
4554 if {$i < 0} continue
4555 for {set j 0} {$j < $i} {incr j} {
4556 set id [lindex $fhl_list $j]
4557 set fhighlights($id) 0
4559 set fhl_list [lrange $fhl_list [expr {$i+1}] end]
4560 if {$line eq {}} continue
4561 if {![commitinview $line $curview]} continue
4562 if {[info exists iddrawn($line)] && ![ishighlighted $line]} {
4563 bolden $line mainfontbold
4565 set fhighlights($line) 1
4567 if {[eof $filehighlight]} {
4569 puts "oops, git diff-tree died"
4570 catch {close $filehighlight}
4574 if {[info exists find_dirn]} {
4580 proc doesmatch {f} {
4581 global findtype findpattern
4583 if {$findtype eq [mc "Regexp"]} {
4584 return [regexp $findpattern $f]
4585 } elseif {$findtype eq [mc "IgnCase"]} {
4586 return [string match -nocase $findpattern $f]
4588 return [string match $findpattern $f]
4592 proc askfindhighlight {row id} {
4593 global nhighlights commitinfo iddrawn
4595 global markingmatches
4597 if {![info exists commitinfo($id)]} {
4600 set info $commitinfo($id)
4602 set fldtypes [list [mc Headline] [mc Author] [mc Date] [mc Committer] [mc CDate] [mc Comments]]
4603 foreach f $info ty $fldtypes {
4604 if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
4606 if {$ty eq [mc "Author"]} {
4613 if {$isbold && [info exists iddrawn($id)]} {
4614 if {![ishighlighted $id]} {
4615 bolden $id mainfontbold
4617 bolden_name $id mainfontbold
4620 if {$markingmatches} {
4621 markrowmatches $row $id
4624 set nhighlights($id) $isbold
4627 proc markrowmatches {row id} {
4628 global canv canv2 linehtag linentag commitinfo findloc
4630 set headline [lindex $commitinfo($id) 0]
4631 set author [lindex $commitinfo($id) 1]
4632 $canv delete match$row
4633 $canv2 delete match$row
4634 if {$findloc eq [mc "All fields"] || $findloc eq [mc "Headline"]} {
4635 set m [findmatches $headline]
4637 markmatches $canv $row $headline $linehtag($id) $m \
4638 [$canv itemcget $linehtag($id) -font] $row
4641 if {$findloc eq [mc "All fields"] || $findloc eq [mc "Author"]} {
4642 set m [findmatches $author]
4644 markmatches $canv2 $row $author $linentag($id) $m \
4645 [$canv2 itemcget $linentag($id) -font] $row
4650 proc vrel_change {name ix op} {
4651 global highlight_related
4654 if {$highlight_related ne [mc "None"]} {
4659 # prepare for testing whether commits are descendents or ancestors of a
4660 proc rhighlight_sel {a} {
4661 global descendent desc_todo ancestor anc_todo
4662 global highlight_related
4664 catch {unset descendent}
4665 set desc_todo [list $a]
4666 catch {unset ancestor}
4667 set anc_todo [list $a]
4668 if {$highlight_related ne [mc "None"]} {
4674 proc rhighlight_none {} {
4677 catch {unset rhighlights}
4681 proc is_descendent {a} {
4682 global curview children descendent desc_todo
4685 set la [rowofcommit $a]
4689 for {set i 0} {$i < [llength $todo]} {incr i} {
4690 set do [lindex $todo $i]
4691 if {[rowofcommit $do] < $la} {
4692 lappend leftover $do
4695 foreach nk $children($v,$do) {
4696 if {![info exists descendent($nk)]} {
4697 set descendent($nk) 1
4705 set desc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
4709 set descendent($a) 0
4710 set desc_todo $leftover
4713 proc is_ancestor {a} {
4714 global curview parents ancestor anc_todo
4717 set la [rowofcommit $a]
4721 for {set i 0} {$i < [llength $todo]} {incr i} {
4722 set do [lindex $todo $i]
4723 if {![commitinview $do $v] || [rowofcommit $do] > $la} {
4724 lappend leftover $do
4727 foreach np $parents($v,$do) {
4728 if {![info exists ancestor($np)]} {
4737 set anc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
4742 set anc_todo $leftover
4745 proc askrelhighlight {row id} {
4746 global descendent highlight_related iddrawn rhighlights
4747 global selectedline ancestor
4749 if {$selectedline eq {}} return
4751 if {$highlight_related eq [mc "Descendant"] ||
4752 $highlight_related eq [mc "Not descendant"]} {
4753 if {![info exists descendent($id)]} {
4756 if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} {
4759 } elseif {$highlight_related eq [mc "Ancestor"] ||
4760 $highlight_related eq [mc "Not ancestor"]} {
4761 if {![info exists ancestor($id)]} {
4764 if {$ancestor($id) == ($highlight_related eq [mc "Ancestor"])} {
4768 if {[info exists iddrawn($id)]} {
4769 if {$isbold && ![ishighlighted $id]} {
4770 bolden $id mainfontbold
4773 set rhighlights($id) $isbold
4776 # Graph layout functions
4778 proc shortids {ids} {
4781 if {[llength $id] > 1} {
4782 lappend res [shortids $id]
4783 } elseif {[regexp {^[0-9a-f]{40}$} $id]} {
4784 lappend res [string range $id 0 7]
4795 for {set mask 1} {$mask <= $n} {incr mask $mask} {
4796 if {($n & $mask) != 0} {
4797 set ret [concat $ret $o]
4799 set o [concat $o $o]
4804 proc ordertoken {id} {
4805 global ordertok curview varcid varcstart varctok curview parents children
4806 global nullid nullid2
4808 if {[info exists ordertok($id)]} {
4809 return $ordertok($id)
4814 if {[info exists varcid($curview,$id)]} {
4815 set a $varcid($curview,$id)
4816 set p [lindex $varcstart($curview) $a]
4818 set p [lindex $children($curview,$id) 0]
4820 if {[info exists ordertok($p)]} {
4821 set tok $ordertok($p)
4824 set id [first_real_child $curview,$p]
4827 set tok [lindex $varctok($curview) $varcid($curview,$p)]
4830 if {[llength $parents($curview,$id)] == 1} {
4831 lappend todo [list $p {}]
4833 set j [lsearch -exact $parents($curview,$id) $p]
4835 puts "oops didn't find [shortids $p] in parents of [shortids $id]"
4837 lappend todo [list $p [strrep $j]]
4840 for {set i [llength $todo]} {[incr i -1] >= 0} {} {
4841 set p [lindex $todo $i 0]
4842 append tok [lindex $todo $i 1]
4843 set ordertok($p) $tok
4845 set ordertok($origid) $tok
4849 # Work out where id should go in idlist so that order-token
4850 # values increase from left to right
4851 proc idcol {idlist id {i 0}} {
4852 set t [ordertoken $id]
4856 if {$i >= [llength $idlist] || $t < [ordertoken [lindex $idlist $i]]} {
4857 if {$i > [llength $idlist]} {
4858 set i [llength $idlist]
4860 while {[incr i -1] >= 0 && $t < [ordertoken [lindex $idlist $i]]} {}
4863 if {$t > [ordertoken [lindex $idlist $i]]} {
4864 while {[incr i] < [llength $idlist] &&
4865 $t >= [ordertoken [lindex $idlist $i]]} {}
4871 proc initlayout {} {
4872 global rowidlist rowisopt rowfinal displayorder parentlist
4873 global numcommits canvxmax canv
4875 global colormap rowtextx
4884 set canvxmax [$canv cget -width]
4885 catch {unset colormap}
4886 catch {unset rowtextx}
4890 proc setcanvscroll {} {
4891 global canv canv2 canv3 numcommits linespc canvxmax canvy0
4892 global lastscrollset lastscrollrows
4894 set ymax [expr {$canvy0 + ($numcommits - 0.5) * $linespc + 2}]
4895 $canv conf -scrollregion [list 0 0 $canvxmax $ymax]
4896 $canv2 conf -scrollregion [list 0 0 0 $ymax]
4897 $canv3 conf -scrollregion [list 0 0 0 $ymax]
4898 set lastscrollset [clock clicks -milliseconds]
4899 set lastscrollrows $numcommits
4902 proc visiblerows {} {
4903 global canv numcommits linespc
4905 set ymax [lindex [$canv cget -scrollregion] 3]
4906 if {$ymax eq {} || $ymax == 0} return
4908 set y0 [expr {int([lindex $f 0] * $ymax)}]
4909 set r0 [expr {int(($y0 - 3) / $linespc) - 1}]
4913 set y1 [expr {int([lindex $f 1] * $ymax)}]
4914 set r1 [expr {int(($y1 - 3) / $linespc) + 1}]
4915 if {$r1 >= $numcommits} {
4916 set r1 [expr {$numcommits - 1}]
4918 return [list $r0 $r1]
4921 proc layoutmore {} {
4922 global commitidx viewcomplete curview
4923 global numcommits pending_select curview
4924 global lastscrollset lastscrollrows
4926 if {$lastscrollrows < 100 || $viewcomplete($curview) ||
4927 [clock clicks -milliseconds] - $lastscrollset > 500} {
4930 if {[info exists pending_select] &&
4931 [commitinview $pending_select $curview]} {
4933 selectline [rowofcommit $pending_select] 1
4938 # With path limiting, we mightn't get the actual HEAD commit,
4939 # so ask git rev-list what is the first ancestor of HEAD that
4940 # touches a file in the path limit.
4941 proc get_viewmainhead {view} {
4942 global viewmainheadid vfilelimit viewinstances mainheadid
4945 set rfd [open [concat | git rev-list -1 $mainheadid \
4946 -- $vfilelimit($view)] r]
4947 set j [reg_instance $rfd]
4948 lappend viewinstances($view) $j
4949 fconfigure $rfd -blocking 0
4950 filerun $rfd [list getviewhead $rfd $j $view]
4951 set viewmainheadid($curview) {}
4955 # git rev-list should give us just 1 line to use as viewmainheadid($view)
4956 proc getviewhead {fd inst view} {
4957 global viewmainheadid commfd curview viewinstances showlocalchanges
4960 if {[gets $fd line] < 0} {
4964 } elseif {[string length $line] == 40 && [string is xdigit $line]} {
4967 set viewmainheadid($view) $id
4970 set i [lsearch -exact $viewinstances($view) $inst]
4972 set viewinstances($view) [lreplace $viewinstances($view) $i $i]
4974 if {$showlocalchanges && $id ne {} && $view == $curview} {
4980 proc doshowlocalchanges {} {
4981 global curview viewmainheadid
4983 if {$viewmainheadid($curview) eq {}} return
4984 if {[commitinview $viewmainheadid($curview) $curview]} {
4987 interestedin $viewmainheadid($curview) dodiffindex
4991 proc dohidelocalchanges {} {
4992 global nullid nullid2 lserial curview
4994 if {[commitinview $nullid $curview]} {
4995 removefakerow $nullid
4997 if {[commitinview $nullid2 $curview]} {
4998 removefakerow $nullid2
5003 # spawn off a process to do git diff-index --cached HEAD
5004 proc dodiffindex {} {
5005 global lserial showlocalchanges vfilelimit curview
5008 if {!$showlocalchanges || !$isworktree} return
5010 set cmd "|git diff-index --cached HEAD"
5011 if {$vfilelimit($curview) ne {}} {
5012 set cmd [concat $cmd -- $vfilelimit($curview)]
5014 set fd [open $cmd r]
5015 fconfigure $fd -blocking 0
5016 set i [reg_instance $fd]
5017 filerun $fd [list readdiffindex $fd $lserial $i]
5020 proc readdiffindex {fd serial inst} {
5021 global viewmainheadid nullid nullid2 curview commitinfo commitdata lserial
5025 if {[gets $fd line] < 0} {
5031 # we only need to see one line and we don't really care what it says...
5034 if {$serial != $lserial} {
5038 # now see if there are any local changes not checked in to the index
5039 set cmd "|git diff-files"
5040 if {$vfilelimit($curview) ne {}} {
5041 set cmd [concat $cmd -- $vfilelimit($curview)]
5043 set fd [open $cmd r]
5044 fconfigure $fd -blocking 0
5045 set i [reg_instance $fd]
5046 filerun $fd [list readdifffiles $fd $serial $i]
5048 if {$isdiff && ![commitinview $nullid2 $curview]} {
5049 # add the line for the changes in the index to the graph
5050 set hl [mc "Local changes checked in to index but not committed"]
5051 set commitinfo($nullid2) [list $hl {} {} {} {} " $hl\n"]
5052 set commitdata($nullid2) "\n $hl\n"
5053 if {[commitinview $nullid $curview]} {
5054 removefakerow $nullid
5056 insertfakerow $nullid2 $viewmainheadid($curview)
5057 } elseif {!$isdiff && [commitinview $nullid2 $curview]} {
5058 if {[commitinview $nullid $curview]} {
5059 removefakerow $nullid
5061 removefakerow $nullid2
5066 proc readdifffiles {fd serial inst} {
5067 global viewmainheadid nullid nullid2 curview
5068 global commitinfo commitdata lserial
5071 if {[gets $fd line] < 0} {
5077 # we only need to see one line and we don't really care what it says...
5080 if {$serial != $lserial} {
5084 if {$isdiff && ![commitinview $nullid $curview]} {
5085 # add the line for the local diff to the graph
5086 set hl [mc "Local uncommitted changes, not checked in to index"]
5087 set commitinfo($nullid) [list $hl {} {} {} {} " $hl\n"]
5088 set commitdata($nullid) "\n $hl\n"
5089 if {[commitinview $nullid2 $curview]} {
5092 set p $viewmainheadid($curview)
5094 insertfakerow $nullid $p
5095 } elseif {!$isdiff && [commitinview $nullid $curview]} {
5096 removefakerow $nullid
5101 proc nextuse {id row} {
5102 global curview children
5104 if {[info exists children($curview,$id)]} {
5105 foreach kid $children($curview,$id) {
5106 if {![commitinview $kid $curview]} {
5109 if {[rowofcommit $kid] > $row} {
5110 return [rowofcommit $kid]
5114 if {[commitinview $id $curview]} {
5115 return [rowofcommit $id]
5120 proc prevuse {id row} {
5121 global curview children
5124 if {[info exists children($curview,$id)]} {
5125 foreach kid $children($curview,$id) {
5126 if {![commitinview $kid $curview]} break
5127 if {[rowofcommit $kid] < $row} {
5128 set ret [rowofcommit $kid]
5135 proc make_idlist {row} {
5136 global displayorder parentlist uparrowlen downarrowlen mingaplen
5137 global commitidx curview children
5139 set r [expr {$row - $mingaplen - $downarrowlen - 1}]
5143 set ra [expr {$row - $downarrowlen}]
5147 set rb [expr {$row + $uparrowlen}]
5148 if {$rb > $commitidx($curview)} {
5149 set rb $commitidx($curview)
5151 make_disporder $r [expr {$rb + 1}]
5153 for {} {$r < $ra} {incr r} {
5154 set nextid [lindex $displayorder [expr {$r + 1}]]
5155 foreach p [lindex $parentlist $r] {
5156 if {$p eq $nextid} continue
5157 set rn [nextuse $p $r]
5159 $rn <= $r + $downarrowlen + $mingaplen + $uparrowlen} {
5160 lappend ids [list [ordertoken $p] $p]
5164 for {} {$r < $row} {incr r} {
5165 set nextid [lindex $displayorder [expr {$r + 1}]]
5166 foreach p [lindex $parentlist $r] {
5167 if {$p eq $nextid} continue
5168 set rn [nextuse $p $r]
5169 if {$rn < 0 || $rn >= $row} {
5170 lappend ids [list [ordertoken $p] $p]
5174 set id [lindex $displayorder $row]
5175 lappend ids [list [ordertoken $id] $id]
5177 foreach p [lindex $parentlist $r] {
5178 set firstkid [lindex $children($curview,$p) 0]
5179 if {[rowofcommit $firstkid] < $row} {
5180 lappend ids [list [ordertoken $p] $p]
5184 set id [lindex $displayorder $r]
5186 set firstkid [lindex $children($curview,$id) 0]
5187 if {$firstkid ne {} && [rowofcommit $firstkid] < $row} {
5188 lappend ids [list [ordertoken $id] $id]
5193 foreach idx [lsort -unique $ids] {
5194 lappend idlist [lindex $idx 1]
5199 proc rowsequal {a b} {
5200 while {[set i [lsearch -exact $a {}]] >= 0} {
5201 set a [lreplace $a $i $i]
5203 while {[set i [lsearch -exact $b {}]] >= 0} {
5204 set b [lreplace $b $i $i]
5206 return [expr {$a eq $b}]
5209 proc makeupline {id row rend col} {
5210 global rowidlist uparrowlen downarrowlen mingaplen
5212 for {set r $rend} {1} {set r $rstart} {
5213 set rstart [prevuse $id $r]
5214 if {$rstart < 0} return
5215 if {$rstart < $row} break
5217 if {$rstart + $uparrowlen + $mingaplen + $downarrowlen < $rend} {
5218 set rstart [expr {$rend - $uparrowlen - 1}]
5220 for {set r $rstart} {[incr r] <= $row} {} {
5221 set idlist [lindex $rowidlist $r]
5222 if {$idlist ne {} && [lsearch -exact $idlist $id] < 0} {
5223 set col [idcol $idlist $id $col]
5224 lset rowidlist $r [linsert $idlist $col $id]
5230 proc layoutrows {row endrow} {
5231 global rowidlist rowisopt rowfinal displayorder
5232 global uparrowlen downarrowlen maxwidth mingaplen
5233 global children parentlist
5234 global commitidx viewcomplete curview
5236 make_disporder [expr {$row - 1}] [expr {$endrow + $uparrowlen}]
5239 set rm1 [expr {$row - 1}]
5240 foreach id [lindex $rowidlist $rm1] {
5245 set final [lindex $rowfinal $rm1]
5247 for {} {$row < $endrow} {incr row} {
5248 set rm1 [expr {$row - 1}]
5249 if {$rm1 < 0 || $idlist eq {}} {
5250 set idlist [make_idlist $row]
5253 set id [lindex $displayorder $rm1]
5254 set col [lsearch -exact $idlist $id]
5255 set idlist [lreplace $idlist $col $col]
5256 foreach p [lindex $parentlist $rm1] {
5257 if {[lsearch -exact $idlist $p] < 0} {
5258 set col [idcol $idlist $p $col]
5259 set idlist [linsert $idlist $col $p]
5260 # if not the first child, we have to insert a line going up
5261 if {$id ne [lindex $children($curview,$p) 0]} {
5262 makeupline $p $rm1 $row $col
5266 set id [lindex $displayorder $row]
5267 if {$row > $downarrowlen} {
5268 set termrow [expr {$row - $downarrowlen - 1}]
5269 foreach p [lindex $parentlist $termrow] {
5270 set i [lsearch -exact $idlist $p]
5271 if {$i < 0} continue
5272 set nr [nextuse $p $termrow]
5273 if {$nr < 0 || $nr >= $row + $mingaplen + $uparrowlen} {
5274 set idlist [lreplace $idlist $i $i]
5278 set col [lsearch -exact $idlist $id]
5280 set col [idcol $idlist $id]
5281 set idlist [linsert $idlist $col $id]
5282 if {$children($curview,$id) ne {}} {
5283 makeupline $id $rm1 $row $col
5286 set r [expr {$row + $uparrowlen - 1}]
5287 if {$r < $commitidx($curview)} {
5289 foreach p [lindex $parentlist $r] {
5290 if {[lsearch -exact $idlist $p] >= 0} continue
5291 set fk [lindex $children($curview,$p) 0]
5292 if {[rowofcommit $fk] < $row} {
5293 set x [idcol $idlist $p $x]
5294 set idlist [linsert $idlist $x $p]
5297 if {[incr r] < $commitidx($curview)} {
5298 set p [lindex $displayorder $r]
5299 if {[lsearch -exact $idlist $p] < 0} {
5300 set fk [lindex $children($curview,$p) 0]
5301 if {$fk ne {} && [rowofcommit $fk] < $row} {
5302 set x [idcol $idlist $p $x]
5303 set idlist [linsert $idlist $x $p]
5309 if {$final && !$viewcomplete($curview) &&
5310 $row + $uparrowlen + $mingaplen + $downarrowlen
5311 >= $commitidx($curview)} {
5314 set l [llength $rowidlist]
5316 lappend rowidlist $idlist
5318 lappend rowfinal $final
5319 } elseif {$row < $l} {
5320 if {![rowsequal $idlist [lindex $rowidlist $row]]} {
5321 lset rowidlist $row $idlist
5324 lset rowfinal $row $final
5326 set pad [ntimes [expr {$row - $l}] {}]
5327 set rowidlist [concat $rowidlist $pad]
5328 lappend rowidlist $idlist
5329 set rowfinal [concat $rowfinal $pad]
5330 lappend rowfinal $final
5331 set rowisopt [concat $rowisopt [ntimes [expr {$row - $l + 1}] 0]]
5337 proc changedrow {row} {
5338 global displayorder iddrawn rowisopt need_redisplay
5340 set l [llength $rowisopt]
5342 lset rowisopt $row 0
5343 if {$row + 1 < $l} {
5344 lset rowisopt [expr {$row + 1}] 0
5345 if {$row + 2 < $l} {
5346 lset rowisopt [expr {$row + 2}] 0
5350 set id [lindex $displayorder $row]
5351 if {[info exists iddrawn($id)]} {
5352 set need_redisplay 1
5356 proc insert_pad {row col npad} {
5359 set pad [ntimes $npad {}]
5360 set idlist [lindex $rowidlist $row]
5361 set bef [lrange $idlist 0 [expr {$col - 1}]]
5362 set aft [lrange $idlist $col end]
5363 set i [lsearch -exact $aft {}]
5365 set aft [lreplace $aft $i $i]
5367 lset rowidlist $row [concat $bef $pad $aft]
5371 proc optimize_rows {row col endrow} {
5372 global rowidlist rowisopt displayorder curview children
5377 for {} {$row < $endrow} {incr row; set col 0} {
5378 if {[lindex $rowisopt $row]} continue
5380 set y0 [expr {$row - 1}]
5381 set ym [expr {$row - 2}]
5382 set idlist [lindex $rowidlist $row]
5383 set previdlist [lindex $rowidlist $y0]
5384 if {$idlist eq {} || $previdlist eq {}} continue
5386 set pprevidlist [lindex $rowidlist $ym]
5387 if {$pprevidlist eq {}} continue
5393 for {} {$col < [llength $idlist]} {incr col} {
5394 set id [lindex $idlist $col]
5395 if {[lindex $previdlist $col] eq $id} continue
5400 set x0 [lsearch -exact $previdlist $id]
5401 if {$x0 < 0} continue
5402 set z [expr {$x0 - $col}]
5406 set xm [lsearch -exact $pprevidlist $id]
5408 set z0 [expr {$xm - $x0}]
5412 # if row y0 is the first child of $id then it's not an arrow
5413 if {[lindex $children($curview,$id) 0] ne
5414 [lindex $displayorder $y0]} {
5418 if {!$isarrow && $id ne [lindex $displayorder $row] &&
5419 [lsearch -exact [lindex $rowidlist [expr {$row+1}]] $id] < 0} {
5422 # Looking at lines from this row to the previous row,
5423 # make them go straight up if they end in an arrow on
5424 # the previous row; otherwise make them go straight up
5426 if {$z < -1 || ($z < 0 && $isarrow)} {
5427 # Line currently goes left too much;
5428 # insert pads in the previous row, then optimize it
5429 set npad [expr {-1 - $z + $isarrow}]
5430 insert_pad $y0 $x0 $npad
5432 optimize_rows $y0 $x0 $row
5434 set previdlist [lindex $rowidlist $y0]
5435 set x0 [lsearch -exact $previdlist $id]
5436 set z [expr {$x0 - $col}]
5438 set pprevidlist [lindex $rowidlist $ym]
5439 set xm [lsearch -exact $pprevidlist $id]
5440 set z0 [expr {$xm - $x0}]
5442 } elseif {$z > 1 || ($z > 0 && $isarrow)} {
5443 # Line currently goes right too much;
5444 # insert pads in this line
5445 set npad [expr {$z - 1 + $isarrow}]
5446 insert_pad $row $col $npad
5447 set idlist [lindex $rowidlist $row]
5449 set z [expr {$x0 - $col}]
5452 if {$z0 eq {} && !$isarrow && $ym >= 0} {
5453 # this line links to its first child on row $row-2
5454 set id [lindex $displayorder $ym]
5455 set xc [lsearch -exact $pprevidlist $id]
5457 set z0 [expr {$xc - $x0}]
5460 # avoid lines jigging left then immediately right
5461 if {$z0 ne {} && $z < 0 && $z0 > 0} {
5462 insert_pad $y0 $x0 1
5464 optimize_rows $y0 $x0 $row
5465 set previdlist [lindex $rowidlist $y0]
5469 # Find the first column that doesn't have a line going right
5470 for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
5471 set id [lindex $idlist $col]
5472 if {$id eq {}} break
5473 set x0 [lsearch -exact $previdlist $id]
5475 # check if this is the link to the first child
5476 set kid [lindex $displayorder $y0]
5477 if {[lindex $children($curview,$id) 0] eq $kid} {
5478 # it is, work out offset to child
5479 set x0 [lsearch -exact $previdlist $kid]
5482 if {$x0 <= $col} break
5484 # Insert a pad at that column as long as it has a line and
5485 # isn't the last column
5486 if {$x0 >= 0 && [incr col] < [llength $idlist]} {
5487 set idlist [linsert $idlist $col {}]
5488 lset rowidlist $row $idlist
5496 global canvx0 linespc
5497 return [expr {$canvx0 + $col * $linespc}]
5501 global canvy0 linespc
5502 return [expr {$canvy0 + $row * $linespc}]
5505 proc linewidth {id} {
5506 global thickerline lthickness
5509 if {[info exists thickerline] && $id eq $thickerline} {
5510 set wid [expr {2 * $lthickness}]
5515 proc rowranges {id} {
5516 global curview children uparrowlen downarrowlen
5519 set kids $children($curview,$id)
5525 foreach child $kids {
5526 if {![commitinview $child $curview]} break
5527 set row [rowofcommit $child]
5528 if {![info exists prev]} {
5529 lappend ret [expr {$row + 1}]
5531 if {$row <= $prevrow} {
5532 puts "oops children of [shortids $id] out of order [shortids $child] $row <= [shortids $prev] $prevrow"
5534 # see if the line extends the whole way from prevrow to row
5535 if {$row > $prevrow + $uparrowlen + $downarrowlen &&
5536 [lsearch -exact [lindex $rowidlist \
5537 [expr {int(($row + $prevrow) / 2)}]] $id] < 0} {
5538 # it doesn't, see where it ends
5539 set r [expr {$prevrow + $downarrowlen}]
5540 if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {
5541 while {[incr r -1] > $prevrow &&
5542 [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}
5544 while {[incr r] <= $row &&
5545 [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}
5549 # see where it starts up again
5550 set r [expr {$row - $uparrowlen}]
5551 if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {
5552 while {[incr r] < $row &&
5553 [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}
5555 while {[incr r -1] >= $prevrow &&
5556 [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}
5562 if {$child eq $id} {
5571 proc drawlineseg {id row endrow arrowlow} {
5572 global rowidlist displayorder iddrawn linesegs
5573 global canv colormap linespc curview maxlinelen parentlist
5575 set cols [list [lsearch -exact [lindex $rowidlist $row] $id]]
5576 set le [expr {$row + 1}]
5579 set c [lsearch -exact [lindex $rowidlist $le] $id]
5585 set x [lindex $displayorder $le]
5590 if {[info exists iddrawn($x)] || $le == $endrow} {
5591 set c [lsearch -exact [lindex $rowidlist [expr {$le+1}]] $id]
5607 if {[info exists linesegs($id)]} {
5608 set lines $linesegs($id)
5610 set r0 [lindex $li 0]
5612 if {$r0 == $le && [lindex $li 1] - $row <= $maxlinelen} {
5622 set li [lindex $lines [expr {$i-1}]]
5623 set r1 [lindex $li 1]
5624 if {$r1 == $row && $le - [lindex $li 0] <= $maxlinelen} {
5629 set x [lindex $cols [expr {$le - $row}]]
5630 set xp [lindex $cols [expr {$le - 1 - $row}]]
5631 set dir [expr {$xp - $x}]
5633 set ith [lindex $lines $i 2]
5634 set coords [$canv coords $ith]
5635 set ah [$canv itemcget $ith -arrow]
5636 set arrowhigh [expr {$ah eq "first" || $ah eq "both"}]
5637 set x2 [lindex $cols [expr {$le + 1 - $row}]]
5638 if {$x2 ne {} && $x - $x2 == $dir} {
5639 set coords [lrange $coords 0 end-2]
5642 set coords [list [xc $le $x] [yc $le]]
5645 set itl [lindex $lines [expr {$i-1}] 2]
5646 set al [$canv itemcget $itl -arrow]
5647 set arrowlow [expr {$al eq "last" || $al eq "both"}]
5648 } elseif {$arrowlow} {
5649 if {[lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0 ||
5650 [lsearch -exact [lindex $parentlist [expr {$row-1}]] $id] >= 0} {
5654 set arrow [lindex {none first last both} [expr {$arrowhigh + 2*$arrowlow}]]
5655 for {set y $le} {[incr y -1] > $row} {} {
5657 set xp [lindex $cols [expr {$y - 1 - $row}]]
5658 set ndir [expr {$xp - $x}]
5659 if {$dir != $ndir || $xp < 0} {
5660 lappend coords [xc $y $x] [yc $y]
5666 # join parent line to first child
5667 set ch [lindex $displayorder $row]
5668 set xc [lsearch -exact [lindex $rowidlist $row] $ch]
5670 puts "oops: drawlineseg: child $ch not on row $row"
5671 } elseif {$xc != $x} {
5672 if {($arrowhigh && $le == $row + 1) || $dir == 0} {
5673 set d [expr {int(0.5 * $linespc)}]
5676 set x2 [expr {$x1 - $d}]
5678 set x2 [expr {$x1 + $d}]
5681 set y1 [expr {$y2 + $d}]
5682 lappend coords $x1 $y1 $x2 $y2
5683 } elseif {$xc < $x - 1} {
5684 lappend coords [xc $row [expr {$x-1}]] [yc $row]
5685 } elseif {$xc > $x + 1} {
5686 lappend coords [xc $row [expr {$x+1}]] [yc $row]
5690 lappend coords [xc $row $x] [yc $row]
5692 set xn [xc $row $xp]
5694 lappend coords $xn $yn
5698 set t [$canv create line $coords -width [linewidth $id] \
5699 -fill $colormap($id) -tags lines.$id -arrow $arrow]
5702 set lines [linsert $lines $i [list $row $le $t]]
5704 $canv coords $ith $coords
5705 if {$arrow ne $ah} {
5706 $canv itemconf $ith -arrow $arrow
5708 lset lines $i 0 $row
5711 set xo [lsearch -exact [lindex $rowidlist [expr {$row - 1}]] $id]
5712 set ndir [expr {$xo - $xp}]
5713 set clow [$canv coords $itl]
5714 if {$dir == $ndir} {
5715 set clow [lrange $clow 2 end]
5717 set coords [concat $coords $clow]
5719 lset lines [expr {$i-1}] 1 $le
5721 # coalesce two pieces
5723 set b [lindex $lines [expr {$i-1}] 0]
5724 set e [lindex $lines $i 1]
5725 set lines [lreplace $lines [expr {$i-1}] $i [list $b $e $itl]]
5727 $canv coords $itl $coords
5728 if {$arrow ne $al} {
5729 $canv itemconf $itl -arrow $arrow
5733 set linesegs($id) $lines
5737 proc drawparentlinks {id row} {
5738 global rowidlist canv colormap curview parentlist
5739 global idpos linespc
5741 set rowids [lindex $rowidlist $row]
5742 set col [lsearch -exact $rowids $id]
5743 if {$col < 0} return
5744 set olds [lindex $parentlist $row]
5745 set row2 [expr {$row + 1}]
5746 set x [xc $row $col]
5749 set d [expr {int(0.5 * $linespc)}]
5750 set ymid [expr {$y + $d}]
5751 set ids [lindex $rowidlist $row2]
5752 # rmx = right-most X coord used
5755 set i [lsearch -exact $ids $p]
5757 puts "oops, parent $p of $id not in list"
5760 set x2 [xc $row2 $i]
5764 set j [lsearch -exact $rowids $p]
5766 # drawlineseg will do this one for us
5770 # should handle duplicated parents here...
5771 set coords [list $x $y]
5773 # if attaching to a vertical segment, draw a smaller
5774 # slant for visual distinctness
5777 lappend coords [expr {$x2 + $d}] $y $x2 $ymid
5779 lappend coords [expr {$x2 - $d}] $y $x2 $ymid
5781 } elseif {$i < $col && $i < $j} {
5782 # segment slants towards us already
5783 lappend coords [xc $row $j] $y
5785 if {$i < $col - 1} {
5786 lappend coords [expr {$x2 + $linespc}] $y
5787 } elseif {$i > $col + 1} {
5788 lappend coords [expr {$x2 - $linespc}] $y
5790 lappend coords $x2 $y2
5793 lappend coords $x2 $y2
5795 set t [$canv create line $coords -width [linewidth $p] \
5796 -fill $colormap($p) -tags lines.$p]
5800 if {$rmx > [lindex $idpos($id) 1]} {
5801 lset idpos($id) 1 $rmx
5806 proc drawlines {id} {
5809 $canv itemconf lines.$id -width [linewidth $id]
5812 proc drawcmittext {id row col} {
5813 global linespc canv canv2 canv3 fgcolor curview
5814 global cmitlisted commitinfo rowidlist parentlist
5815 global rowtextx idpos idtags idheads idotherrefs
5816 global linehtag linentag linedtag selectedline
5817 global canvxmax boldids boldnameids fgcolor markedid
5818 global mainheadid nullid nullid2 circleitem circlecolors ctxbut
5820 # listed is 0 for boundary, 1 for normal, 2 for negative, 3 for left, 4 for right
5821 set listed $cmitlisted($curview,$id)
5822 if {$id eq $nullid} {
5824 } elseif {$id eq $nullid2} {
5826 } elseif {$id eq $mainheadid} {
5829 set ofill [lindex $circlecolors $listed]
5831 set x [xc $row $col]
5833 set orad [expr {$linespc / 3}]
5835 set t [$canv create oval [expr {$x - $orad}] [expr {$y - $orad}] \
5836 [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
5837 -fill $ofill -outline $fgcolor -width 1 -tags circle]
5838 } elseif {$listed == 3} {
5839 # triangle pointing left for left-side commits
5840 set t [$canv create polygon \
5841 [expr {$x - $orad}] $y \
5842 [expr {$x + $orad - 1}] [expr {$y - $orad}] \
5843 [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
5844 -fill $ofill -outline $fgcolor -width 1 -tags circle]
5846 # triangle pointing right for right-side commits
5847 set t [$canv create polygon \
5848 [expr {$x + $orad - 1}] $y \
5849 [expr {$x - $orad}] [expr {$y - $orad}] \
5850 [expr {$x - $orad}] [expr {$y + $orad - 1}] \
5851 -fill $ofill -outline $fgcolor -width 1 -tags circle]
5853 set circleitem($row) $t
5855 $canv bind $t <1> {selcanvline {} %x %y}
5856 set rmx [llength [lindex $rowidlist $row]]
5857 set olds [lindex $parentlist $row]
5859 set nextids [lindex $rowidlist [expr {$row + 1}]]
5861 set i [lsearch -exact $nextids $p]
5867 set xt [xc $row $rmx]
5868 set rowtextx($row) $xt
5869 set idpos($id) [list $x $xt $y]
5870 if {[info exists idtags($id)] || [info exists idheads($id)]
5871 || [info exists idotherrefs($id)]} {
5872 set xt [drawtags $id $x $xt $y]
5874 set headline [lindex $commitinfo($id) 0]
5875 set name [lindex $commitinfo($id) 1]
5876 set date [lindex $commitinfo($id) 2]
5877 set date [formatdate $date]
5880 set isbold [ishighlighted $id]
5883 set font mainfontbold
5885 lappend boldnameids $id
5886 set nfont mainfontbold
5889 set linehtag($id) [$canv create text $xt $y -anchor w -fill $fgcolor \
5890 -text $headline -font $font -tags text]
5891 $canv bind $linehtag($id) $ctxbut "rowmenu %X %Y $id"
5892 set linentag($id) [$canv2 create text 3 $y -anchor w -fill $fgcolor \
5893 -text $name -font $nfont -tags text]
5894 set linedtag($id) [$canv3 create text 3 $y -anchor w -fill $fgcolor \
5895 -text $date -font mainfont -tags text]
5896 if {$selectedline == $row} {
5899 if {[info exists markedid] && $markedid eq $id} {
5902 set xr [expr {$xt + [font measure $font $headline]}]
5903 if {$xr > $canvxmax} {
5909 proc drawcmitrow {row} {
5910 global displayorder rowidlist nrows_drawn
5911 global iddrawn markingmatches
5912 global commitinfo numcommits
5913 global filehighlight fhighlights findpattern nhighlights
5914 global hlview vhighlights
5915 global highlight_related rhighlights
5917 if {$row >= $numcommits} return
5919 set id [lindex $displayorder $row]
5920 if {[info exists hlview] && ![info exists vhighlights($id)]} {
5921 askvhighlight $row $id
5923 if {[info exists filehighlight] && ![info exists fhighlights($id)]} {
5924 askfilehighlight $row $id
5926 if {$findpattern ne {} && ![info exists nhighlights($id)]} {
5927 askfindhighlight $row $id
5929 if {$highlight_related ne [mc "None"] && ![info exists rhighlights($id)]} {
5930 askrelhighlight $row $id
5932 if {![info exists iddrawn($id)]} {
5933 set col [lsearch -exact [lindex $rowidlist $row] $id]
5935 puts "oops, row $row id $id not in list"
5938 if {![info exists commitinfo($id)]} {
5942 drawcmittext $id $row $col
5946 if {$markingmatches} {
5947 markrowmatches $row $id
5951 proc drawcommits {row {endrow {}}} {
5952 global numcommits iddrawn displayorder curview need_redisplay
5953 global parentlist rowidlist rowfinal uparrowlen downarrowlen nrows_drawn
5958 if {$endrow eq {}} {
5961 if {$endrow >= $numcommits} {
5962 set endrow [expr {$numcommits - 1}]
5965 set rl1 [expr {$row - $downarrowlen - 3}]
5969 set ro1 [expr {$row - 3}]
5973 set r2 [expr {$endrow + $uparrowlen + 3}]
5974 if {$r2 > $numcommits} {
5977 for {set r $rl1} {$r < $r2} {incr r} {
5978 if {[lindex $rowidlist $r] ne {} && [lindex $rowfinal $r]} {
5982 set rl1 [expr {$r + 1}]
5988 optimize_rows $ro1 0 $r2
5989 if {$need_redisplay || $nrows_drawn > 2000} {
5993 # make the lines join to already-drawn rows either side
5994 set r [expr {$row - 1}]
5995 if {$r < 0 || ![info exists iddrawn([lindex $displayorder $r])]} {
5998 set er [expr {$endrow + 1}]
5999 if {$er >= $numcommits ||
6000 ![info exists iddrawn([lindex $displayorder $er])]} {
6003 for {} {$r <= $er} {incr r} {
6004 set id [lindex $displayorder $r]
6005 set wasdrawn [info exists iddrawn($id)]
6007 if {$r == $er} break
6008 set nextid [lindex $displayorder [expr {$r + 1}]]
6009 if {$wasdrawn && [info exists iddrawn($nextid)]} continue
6010 drawparentlinks $id $r
6012 set rowids [lindex $rowidlist $r]
6013 foreach lid $rowids {
6014 if {$lid eq {}} continue
6015 if {[info exists lineend($lid)] && $lineend($lid) > $r} continue
6017 # see if this is the first child of any of its parents
6018 foreach p [lindex $parentlist $r] {
6019 if {[lsearch -exact $rowids $p] < 0} {
6020 # make this line extend up to the child
6021 set lineend($p) [drawlineseg $p $r $er 0]
6025 set lineend($lid) [drawlineseg $lid $r $er 1]
6031 proc undolayout {row} {
6032 global uparrowlen mingaplen downarrowlen
6033 global rowidlist rowisopt rowfinal need_redisplay
6035 set r [expr {$row - ($uparrowlen + $mingaplen + $downarrowlen)}]
6039 if {[llength $rowidlist] > $r} {
6041 set rowidlist [lrange $rowidlist 0 $r]
6042 set rowfinal [lrange $rowfinal 0 $r]
6043 set rowisopt [lrange $rowisopt 0 $r]
6044 set need_redisplay 1
6049 proc drawvisible {} {
6050 global canv linespc curview vrowmod selectedline targetrow targetid
6051 global need_redisplay cscroll numcommits
6053 set fs [$canv yview]
6054 set ymax [lindex [$canv cget -scrollregion] 3]
6055 if {$ymax eq {} || $ymax == 0 || $numcommits == 0} return
6056 set f0 [lindex $fs 0]
6057 set f1 [lindex $fs 1]
6058 set y0 [expr {int($f0 * $ymax)}]
6059 set y1 [expr {int($f1 * $ymax)}]
6061 if {[info exists targetid]} {
6062 if {[commitinview $targetid $curview]} {
6063 set r [rowofcommit $targetid]
6064 if {$r != $targetrow} {
6065 # Fix up the scrollregion and change the scrolling position
6066 # now that our target row has moved.
6067 set diff [expr {($r - $targetrow) * $linespc}]
6070 set ymax [lindex [$canv cget -scrollregion] 3]
6073 set f0 [expr {$y0 / $ymax}]
6074 set f1 [expr {$y1 / $ymax}]
6075 allcanvs yview moveto $f0
6076 $cscroll set $f0 $f1
6077 set need_redisplay 1
6084 set row [expr {int(($y0 - 3) / $linespc) - 1}]
6085 set endrow [expr {int(($y1 - 3) / $linespc) + 1}]
6086 if {$endrow >= $vrowmod($curview)} {
6087 update_arcrows $curview
6089 if {$selectedline ne {} &&
6090 $row <= $selectedline && $selectedline <= $endrow} {
6091 set targetrow $selectedline
6092 } elseif {[info exists targetid]} {
6093 set targetrow [expr {int(($row + $endrow) / 2)}]
6095 if {[info exists targetrow]} {
6096 if {$targetrow >= $numcommits} {
6097 set targetrow [expr {$numcommits - 1}]
6099 set targetid [commitonrow $targetrow]
6101 drawcommits $row $endrow
6104 proc clear_display {} {
6105 global iddrawn linesegs need_redisplay nrows_drawn
6106 global vhighlights fhighlights nhighlights rhighlights
6107 global linehtag linentag linedtag boldids boldnameids
6110 catch {unset iddrawn}
6111 catch {unset linesegs}
6112 catch {unset linehtag}
6113 catch {unset linentag}
6114 catch {unset linedtag}
6117 catch {unset vhighlights}
6118 catch {unset fhighlights}
6119 catch {unset nhighlights}
6120 catch {unset rhighlights}
6121 set need_redisplay 0
6125 proc findcrossings {id} {
6126 global rowidlist parentlist numcommits displayorder
6130 foreach {s e} [rowranges $id] {
6131 if {$e >= $numcommits} {
6132 set e [expr {$numcommits - 1}]
6134 if {$e <= $s} continue
6135 for {set row $e} {[incr row -1] >= $s} {} {
6136 set x [lsearch -exact [lindex $rowidlist $row] $id]
6138 set olds [lindex $parentlist $row]
6139 set kid [lindex $displayorder $row]
6140 set kidx [lsearch -exact [lindex $rowidlist $row] $kid]
6141 if {$kidx < 0} continue
6142 set nextrow [lindex $rowidlist [expr {$row + 1}]]
6144 set px [lsearch -exact $nextrow $p]
6145 if {$px < 0} continue
6146 if {($kidx < $x && $x < $px) || ($px < $x && $x < $kidx)} {
6147 if {[lsearch -exact $ccross $p] >= 0} continue
6148 if {$x == $px + ($kidx < $px? -1: 1)} {
6150 } elseif {[lsearch -exact $cross $p] < 0} {
6157 return [concat $ccross {{}} $cross]
6160 proc assigncolor {id} {
6161 global colormap colors nextcolor
6162 global parents children children curview
6164 if {[info exists colormap($id)]} return
6165 set ncolors [llength $colors]
6166 if {[info exists children($curview,$id)]} {
6167 set kids $children($curview,$id)
6171 if {[llength $kids] == 1} {
6172 set child [lindex $kids 0]
6173 if {[info exists colormap($child)]
6174 && [llength $parents($curview,$child)] == 1} {
6175 set colormap($id) $colormap($child)
6181 foreach x [findcrossings $id] {
6183 # delimiter between corner crossings and other crossings
6184 if {[llength $badcolors] >= $ncolors - 1} break
6185 set origbad $badcolors
6187 if {[info exists colormap($x)]
6188 && [lsearch -exact $badcolors $colormap($x)] < 0} {
6189 lappend badcolors $colormap($x)
6192 if {[llength $badcolors] >= $ncolors} {
6193 set badcolors $origbad
6195 set origbad $badcolors
6196 if {[llength $badcolors] < $ncolors - 1} {
6197 foreach child $kids {
6198 if {[info exists colormap($child)]
6199 && [lsearch -exact $badcolors $colormap($child)] < 0} {
6200 lappend badcolors $colormap($child)
6202 foreach p $parents($curview,$child) {
6203 if {[info exists colormap($p)]
6204 && [lsearch -exact $badcolors $colormap($p)] < 0} {
6205 lappend badcolors $colormap($p)
6209 if {[llength $badcolors] >= $ncolors} {
6210 set badcolors $origbad
6213 for {set i 0} {$i <= $ncolors} {incr i} {
6214 set c [lindex $colors $nextcolor]
6215 if {[incr nextcolor] >= $ncolors} {
6218 if {[lsearch -exact $badcolors $c]} break
6220 set colormap($id) $c
6223 proc bindline {t id} {
6226 $canv bind $t <Enter> "lineenter %x %y $id"
6227 $canv bind $t <Motion> "linemotion %x %y $id"
6228 $canv bind $t <Leave> "lineleave $id"
6229 $canv bind $t <Button-1> "lineclick %x %y $id 1"
6232 proc drawtags {id x xt y1} {
6233 global idtags idheads idotherrefs mainhead
6234 global linespc lthickness
6235 global canv rowtextx curview fgcolor bgcolor ctxbut
6240 if {[info exists idtags($id)]} {
6241 set marks $idtags($id)
6242 set ntags [llength $marks]
6244 if {[info exists idheads($id)]} {
6245 set marks [concat $marks $idheads($id)]
6246 set nheads [llength $idheads($id)]
6248 if {[info exists idotherrefs($id)]} {
6249 set marks [concat $marks $idotherrefs($id)]
6255 set delta [expr {int(0.5 * ($linespc - $lthickness))}]
6256 set yt [expr {$y1 - 0.5 * $linespc}]
6257 set yb [expr {$yt + $linespc - 1}]
6261 foreach tag $marks {
6263 if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} {
6264 set wid [font measure mainfontbold $tag]
6266 set wid [font measure mainfont $tag]
6270 set xt [expr {$xt + $delta + $wid + $lthickness + $linespc}]
6272 set t [$canv create line $x $y1 [lindex $xvals end] $y1 \
6273 -width $lthickness -fill black -tags tag.$id]
6275 foreach tag $marks x $xvals wid $wvals {
6276 set xl [expr {$x + $delta}]
6277 set xr [expr {$x + $delta + $wid + $lthickness}]
6279 if {[incr ntags -1] >= 0} {
6281 set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
6282 $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
6283 -width 1 -outline black -fill yellow -tags tag.$id]
6284 $canv bind $t <1> [list showtag $tag 1]
6285 set rowtextx([rowofcommit $id]) [expr {$xr + $linespc}]
6287 # draw a head or other ref
6288 if {[incr nheads -1] >= 0} {
6290 if {$tag eq $mainhead} {
6291 set font mainfontbold
6296 set xl [expr {$xl - $delta/2}]
6297 $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
6298 -width 1 -outline black -fill $col -tags tag.$id
6299 if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
6300 set rwid [font measure mainfont $remoteprefix]
6301 set xi [expr {$x + 1}]
6302 set yti [expr {$yt + 1}]
6303 set xri [expr {$x + $rwid}]
6304 $canv create polygon $xi $yti $xri $yti $xri $yb $xi $yb \
6305 -width 0 -fill "#ffddaa" -tags tag.$id
6308 set t [$canv create text $xl $y1 -anchor w -text $tag -fill $fgcolor \
6309 -font $font -tags [list tag.$id text]]
6311 $canv bind $t <1> [list showtag $tag 1]
6312 } elseif {$nheads >= 0} {
6313 $canv bind $t $ctxbut [list headmenu %X %Y $id $tag]
6319 proc xcoord {i level ln} {
6320 global canvx0 xspc1 xspc2
6322 set x [expr {$canvx0 + $i * $xspc1($ln)}]
6323 if {$i > 0 && $i == $level} {
6324 set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}]
6325 } elseif {$i > $level} {
6326 set x [expr {$x + $xspc2 - $xspc1($ln)}]
6331 proc show_status {msg} {
6335 $canv create text 3 3 -anchor nw -text $msg -font mainfont \
6336 -tags text -fill $fgcolor
6339 # Don't change the text pane cursor if it is currently the hand cursor,
6340 # showing that we are over a sha1 ID link.
6341 proc settextcursor {c} {
6342 global ctext curtextcursor
6344 if {[$ctext cget -cursor] == $curtextcursor} {
6345 $ctext config -cursor $c
6347 set curtextcursor $c
6350 proc nowbusy {what {name {}}} {
6351 global isbusy busyname statusw
6353 if {[array names isbusy] eq {}} {
6354 . config -cursor watch
6358 set busyname($what) $name
6360 $statusw conf -text $name
6364 proc notbusy {what} {
6365 global isbusy maincursor textcursor busyname statusw
6369 if {$busyname($what) ne {} &&
6370 [$statusw cget -text] eq $busyname($what)} {
6371 $statusw conf -text {}
6374 if {[array names isbusy] eq {}} {
6375 . config -cursor $maincursor
6376 settextcursor $textcursor
6380 proc findmatches {f} {
6381 global findtype findstring
6382 if {$findtype == [mc "Regexp"]} {
6383 set matches [regexp -indices -all -inline $findstring $f]
6386 if {$findtype == [mc "IgnCase"]} {
6387 set f [string tolower $f]
6388 set fs [string tolower $fs]
6392 set l [string length $fs]
6393 while {[set j [string first $fs $f $i]] >= 0} {
6394 lappend matches [list $j [expr {$j+$l-1}]]
6395 set i [expr {$j + $l}]
6401 proc dofind {{dirn 1} {wrap 1}} {
6402 global findstring findstartline findcurline selectedline numcommits
6403 global gdttype filehighlight fh_serial find_dirn findallowwrap
6405 if {[info exists find_dirn]} {
6406 if {$find_dirn == $dirn} return
6410 if {$findstring eq {} || $numcommits == 0} return
6411 if {$selectedline eq {}} {
6412 set findstartline [lindex [visiblerows] [expr {$dirn < 0}]]
6414 set findstartline $selectedline
6416 set findcurline $findstartline
6417 nowbusy finding [mc "Searching"]
6418 if {$gdttype ne [mc "containing:"] && ![info exists filehighlight]} {
6419 after cancel do_file_hl $fh_serial
6420 do_file_hl $fh_serial
6423 set findallowwrap $wrap
6427 proc stopfinding {} {
6428 global find_dirn findcurline fprogcoord
6430 if {[info exists find_dirn]} {
6441 global commitdata commitinfo numcommits findpattern findloc
6442 global findstartline findcurline findallowwrap
6443 global find_dirn gdttype fhighlights fprogcoord
6444 global curview varcorder vrownum varccommits vrowmod
6446 if {![info exists find_dirn]} {
6449 set fldtypes [list [mc "Headline"] [mc "Author"] [mc "Date"] [mc "Committer"] [mc "CDate"] [mc "Comments"]]
6452 if {$find_dirn > 0} {
6454 if {$l >= $numcommits} {
6457 if {$l <= $findstartline} {
6458 set lim [expr {$findstartline + 1}]
6461 set moretodo $findallowwrap
6468 if {$l >= $findstartline} {
6469 set lim [expr {$findstartline - 1}]
6472 set moretodo $findallowwrap
6475 set n [expr {($lim - $l) * $find_dirn}]
6480 if {$l + ($find_dirn > 0? $n: 1) > $vrowmod($curview)} {
6481 update_arcrows $curview
6485 set ai [bsearch $vrownum($curview) $l]
6486 set a [lindex $varcorder($curview) $ai]
6487 set arow [lindex $vrownum($curview) $ai]
6488 set ids [lindex $varccommits($curview,$a)]
6489 set arowend [expr {$arow + [llength $ids]}]
6490 if {$gdttype eq [mc "containing:"]} {
6491 for {} {$n > 0} {incr n -1; incr l $find_dirn} {
6492 if {$l < $arow || $l >= $arowend} {
6494 set a [lindex $varcorder($curview) $ai]
6495 set arow [lindex $vrownum($curview) $ai]
6496 set ids [lindex $varccommits($curview,$a)]
6497 set arowend [expr {$arow + [llength $ids]}]
6499 set id [lindex $ids [expr {$l - $arow}]]
6500 # shouldn't happen unless git log doesn't give all the commits...
6501 if {![info exists commitdata($id)] ||
6502 ![doesmatch $commitdata($id)]} {
6505 if {![info exists commitinfo($id)]} {
6508 set info $commitinfo($id)
6509 foreach f $info ty $fldtypes {
6510 if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
6519 for {} {$n > 0} {incr n -1; incr l $find_dirn} {
6520 if {$l < $arow || $l >= $arowend} {
6522 set a [lindex $varcorder($curview) $ai]
6523 set arow [lindex $vrownum($curview) $ai]
6524 set ids [lindex $varccommits($curview,$a)]
6525 set arowend [expr {$arow + [llength $ids]}]
6527 set id [lindex $ids [expr {$l - $arow}]]
6528 if {![info exists fhighlights($id)]} {
6529 # this sets fhighlights($id) to -1
6530 askfilehighlight $l $id
6532 if {$fhighlights($id) > 0} {
6536 if {$fhighlights($id) < 0} {
6539 set findcurline [expr {$l - $find_dirn}]
6544 if {$found || ($domore && !$moretodo)} {
6560 set findcurline [expr {$l - $find_dirn}]
6562 set n [expr {($findcurline - $findstartline) * $find_dirn - 1}]
6566 set fprogcoord [expr {$n * 1.0 / $numcommits}]
6571 proc findselectline {l} {
6572 global findloc commentend ctext findcurline markingmatches gdttype
6574 set markingmatches [expr {$gdttype eq [mc "containing:"]}]
6577 if {$markingmatches &&
6578 ($findloc eq [mc "All fields"] || $findloc eq [mc "Comments"])} {
6579 # highlight the matches in the comments
6580 set f [$ctext get 1.0 $commentend]
6581 set matches [findmatches $f]
6582 foreach match $matches {
6583 set start [lindex $match 0]
6584 set end [expr {[lindex $match 1] + 1}]
6585 $ctext tag add found "1.0 + $start c" "1.0 + $end c"
6591 # mark the bits of a headline or author that match a find string
6592 proc markmatches {canv l str tag matches font row} {
6595 set bbox [$canv bbox $tag]
6596 set x0 [lindex $bbox 0]
6597 set y0 [lindex $bbox 1]
6598 set y1 [lindex $bbox 3]
6599 foreach match $matches {
6600 set start [lindex $match 0]
6601 set end [lindex $match 1]
6602 if {$start > $end} continue
6603 set xoff [font measure $font [string range $str 0 [expr {$start-1}]]]
6604 set xlen [font measure $font [string range $str 0 [expr {$end}]]]
6605 set t [$canv create rect [expr {$x0+$xoff}] $y0 \
6606 [expr {$x0+$xlen+2}] $y1 \
6607 -outline {} -tags [list match$l matches] -fill yellow]
6609 if {$row == $selectedline} {
6610 $canv raise $t secsel
6615 proc unmarkmatches {} {
6616 global markingmatches
6618 allcanvs delete matches
6619 set markingmatches 0
6623 proc selcanvline {w x y} {
6624 global canv canvy0 ctext linespc
6626 set ymax [lindex [$canv cget -scrollregion] 3]
6627 if {$ymax == {}} return
6628 set yfrac [lindex [$canv yview] 0]
6629 set y [expr {$y + $yfrac * $ymax}]
6630 set l [expr {int(($y - $canvy0) / $linespc + 0.5)}]
6635 set xmax [lindex [$canv cget -scrollregion] 2]
6636 set xleft [expr {[lindex [$canv xview] 0] * $xmax}]
6637 if {![info exists rowtextx($l)] || $xleft + $x < $rowtextx($l)} return
6643 proc commit_descriptor {p} {
6645 if {![info exists commitinfo($p)]} {
6649 if {[llength $commitinfo($p)] > 1} {
6650 set l [lindex $commitinfo($p) 0]
6655 # append some text to the ctext widget, and make any SHA1 ID
6656 # that we know about be a clickable link.
6657 proc appendwithlinks {text tags} {
6658 global ctext linknum curview
6660 set start [$ctext index "end - 1c"]
6661 $ctext insert end $text $tags
6662 set links [regexp -indices -all -inline {\m[0-9a-f]{6,40}\M} $text]
6666 set linkid [string range $text $s $e]
6668 $ctext tag delete link$linknum
6669 $ctext tag add link$linknum "$start + $s c" "$start + $e c"
6670 setlink $linkid link$linknum
6675 proc setlink {id lk} {
6676 global curview ctext pendinglinks
6679 if {[string length $id] < 40} {
6680 set matches [longid $id]
6681 if {[llength $matches] > 0} {
6682 if {[llength $matches] > 1} return
6684 set id [lindex $matches 0]
6687 set known [commitinview $id $curview]
6690 $ctext tag conf $lk -foreground blue -underline 1
6691 $ctext tag bind $lk <1> [list selbyid $id]
6692 $ctext tag bind $lk <Enter> {linkcursor %W 1}
6693 $ctext tag bind $lk <Leave> {linkcursor %W -1}
6695 lappend pendinglinks($id) $lk
6696 interestedin $id {makelink %P}
6700 proc appendshortlink {id {pre {}} {post {}}} {
6701 global ctext linknum
6703 $ctext insert end $pre
6704 $ctext tag delete link$linknum
6705 $ctext insert end [string range $id 0 7] link$linknum
6706 $ctext insert end $post
6707 setlink $id link$linknum
6711 proc makelink {id} {
6714 if {![info exists pendinglinks($id)]} return
6715 foreach lk $pendinglinks($id) {
6718 unset pendinglinks($id)
6721 proc linkcursor {w inc} {
6722 global linkentercount curtextcursor
6724 if {[incr linkentercount $inc] > 0} {
6725 $w configure -cursor hand2
6727 $w configure -cursor $curtextcursor
6728 if {$linkentercount < 0} {
6729 set linkentercount 0
6734 proc viewnextline {dir} {
6738 set ymax [lindex [$canv cget -scrollregion] 3]
6739 set wnow [$canv yview]
6740 set wtop [expr {[lindex $wnow 0] * $ymax}]
6741 set newtop [expr {$wtop + $dir * $linespc}]
6744 } elseif {$newtop > $ymax} {
6747 allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
6750 # add a list of tag or branch names at position pos
6751 # returns the number of names inserted
6752 proc appendrefs {pos ids var} {
6753 global ctext linknum curview $var maxrefs
6755 if {[catch {$ctext index $pos}]} {
6758 $ctext conf -state normal
6759 $ctext delete $pos "$pos lineend"
6762 foreach tag [set $var\($id\)] {
6763 lappend tags [list $tag $id]
6766 if {[llength $tags] > $maxrefs} {
6767 $ctext insert $pos "[mc "many"] ([llength $tags])"
6769 set tags [lsort -index 0 -decreasing $tags]
6772 set id [lindex $ti 1]
6775 $ctext tag delete $lk
6776 $ctext insert $pos $sep
6777 $ctext insert $pos [lindex $ti 0] $lk
6782 $ctext conf -state disabled
6783 return [llength $tags]
6786 # called when we have finished computing the nearby tags
6787 proc dispneartags {delay} {
6788 global selectedline currentid showneartags tagphase
6790 if {$selectedline eq {} || !$showneartags} return
6791 after cancel dispnexttag
6793 after 200 dispnexttag
6796 after idle dispnexttag
6801 proc dispnexttag {} {
6802 global selectedline currentid showneartags tagphase ctext
6804 if {$selectedline eq {} || !$showneartags} return
6805 switch -- $tagphase {
6807 set dtags [desctags $currentid]
6809 appendrefs precedes $dtags idtags
6813 set atags [anctags $currentid]
6815 appendrefs follows $atags idtags
6819 set dheads [descheads $currentid]
6820 if {$dheads ne {}} {
6821 if {[appendrefs branch $dheads idheads] > 1
6822 && [$ctext get "branch -3c"] eq "h"} {
6823 # turn "Branch" into "Branches"
6824 $ctext conf -state normal
6825 $ctext insert "branch -2c" "es"
6826 $ctext conf -state disabled
6831 if {[incr tagphase] <= 2} {
6832 after idle dispnexttag
6836 proc make_secsel {id} {
6837 global linehtag linentag linedtag canv canv2 canv3
6839 if {![info exists linehtag($id)]} return
6841 set t [eval $canv create rect [$canv bbox $linehtag($id)] -outline {{}} \
6842 -tags secsel -fill [$canv cget -selectbackground]]
6844 $canv2 delete secsel
6845 set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] -outline {{}} \
6846 -tags secsel -fill [$canv2 cget -selectbackground]]
6848 $canv3 delete secsel
6849 set t [eval $canv3 create rect [$canv3 bbox $linedtag($id)] -outline {{}} \
6850 -tags secsel -fill [$canv3 cget -selectbackground]]
6854 proc make_idmark {id} {
6855 global linehtag canv fgcolor
6857 if {![info exists linehtag($id)]} return
6859 set t [eval $canv create rect [$canv bbox $linehtag($id)] \
6860 -tags markid -outline $fgcolor]
6864 proc selectline {l isnew {desired_loc {}}} {
6865 global canv ctext commitinfo selectedline
6866 global canvy0 linespc parents children curview
6867 global currentid sha1entry
6868 global commentend idtags linknum
6869 global mergemax numcommits pending_select
6870 global cmitmode showneartags allcommits
6871 global targetrow targetid lastscrollrows
6872 global autoselect jump_to_here
6874 catch {unset pending_select}
6879 if {$l < 0 || $l >= $numcommits} return
6880 set id [commitonrow $l]
6885 if {$lastscrollrows < $numcommits} {
6889 set y [expr {$canvy0 + $l * $linespc}]
6890 set ymax [lindex [$canv cget -scrollregion] 3]
6891 set ytop [expr {$y - $linespc - 1}]
6892 set ybot [expr {$y + $linespc + 1}]
6893 set wnow [$canv yview]
6894 set wtop [expr {[lindex $wnow 0] * $ymax}]
6895 set wbot [expr {[lindex $wnow 1] * $ymax}]
6896 set wh [expr {$wbot - $wtop}]
6898 if {$ytop < $wtop} {
6899 if {$ybot < $wtop} {
6900 set newtop [expr {$y - $wh / 2.0}]
6903 if {$newtop > $wtop - $linespc} {
6904 set newtop [expr {$wtop - $linespc}]
6907 } elseif {$ybot > $wbot} {
6908 if {$ytop > $wbot} {
6909 set newtop [expr {$y - $wh / 2.0}]
6911 set newtop [expr {$ybot - $wh}]
6912 if {$newtop < $wtop + $linespc} {
6913 set newtop [expr {$wtop + $linespc}]
6917 if {$newtop != $wtop} {
6921 allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
6928 addtohistory [list selbyid $id 0] savecmitpos
6931 $sha1entry delete 0 end
6932 $sha1entry insert 0 $id
6934 $sha1entry selection range 0 end
6938 $ctext conf -state normal
6941 if {![info exists commitinfo($id)]} {
6944 set info $commitinfo($id)
6945 set date [formatdate [lindex $info 2]]
6946 $ctext insert end "[mc "Author"]: [lindex $info 1] $date\n"
6947 set date [formatdate [lindex $info 4]]
6948 $ctext insert end "[mc "Committer"]: [lindex $info 3] $date\n"
6949 if {[info exists idtags($id)]} {
6950 $ctext insert end [mc "Tags:"]
6951 foreach tag $idtags($id) {
6952 $ctext insert end " $tag"
6954 $ctext insert end "\n"
6958 set olds $parents($curview,$id)
6959 if {[llength $olds] > 1} {
6962 if {$np >= $mergemax} {
6967 $ctext insert end "[mc "Parent"]: " $tag
6968 appendwithlinks [commit_descriptor $p] {}
6973 append headers "[mc "Parent"]: [commit_descriptor $p]"
6977 foreach c $children($curview,$id) {
6978 append headers "[mc "Child"]: [commit_descriptor $c]"
6981 # make anything that looks like a SHA1 ID be a clickable link
6982 appendwithlinks $headers {}
6983 if {$showneartags} {
6984 if {![info exists allcommits]} {
6987 $ctext insert end "[mc "Branch"]: "
6988 $ctext mark set branch "end -1c"
6989 $ctext mark gravity branch left
6990 $ctext insert end "\n[mc "Follows"]: "
6991 $ctext mark set follows "end -1c"
6992 $ctext mark gravity follows left
6993 $ctext insert end "\n[mc "Precedes"]: "
6994 $ctext mark set precedes "end -1c"
6995 $ctext mark gravity precedes left
6996 $ctext insert end "\n"
6999 $ctext insert end "\n"
7000 set comment [lindex $info 5]
7001 if {[string first "\r" $comment] >= 0} {
7002 set comment [string map {"\r" "\n "} $comment]
7004 appendwithlinks $comment {comment}
7006 $ctext tag remove found 1.0 end
7007 $ctext conf -state disabled
7008 set commentend [$ctext index "end - 1c"]
7010 set jump_to_here $desired_loc
7011 init_flist [mc "Comments"]
7012 if {$cmitmode eq "tree"} {
7014 } elseif {[llength $olds] <= 1} {
7021 proc selfirstline {} {
7026 proc sellastline {} {
7029 set l [expr {$numcommits - 1}]
7033 proc selnextline {dir} {
7036 if {$selectedline eq {}} return
7037 set l [expr {$selectedline + $dir}]
7042 proc selnextpage {dir} {
7043 global canv linespc selectedline numcommits
7045 set lpp [expr {([winfo height $canv] - 2) / $linespc}]
7049 allcanvs yview scroll [expr {$dir * $lpp}] units
7051 if {$selectedline eq {}} return
7052 set l [expr {$selectedline + $dir * $lpp}]
7055 } elseif {$l >= $numcommits} {
7056 set l [expr $numcommits - 1]
7062 proc unselectline {} {
7063 global selectedline currentid
7066 catch {unset currentid}
7067 allcanvs delete secsel
7071 proc reselectline {} {
7074 if {$selectedline ne {}} {
7075 selectline $selectedline 0
7079 proc addtohistory {cmd {saveproc {}}} {
7080 global history historyindex curview
7084 set elt [list $curview $cmd $saveproc {}]
7085 if {$historyindex > 0
7086 && [lindex $history [expr {$historyindex - 1}]] == $elt} {
7090 if {$historyindex < [llength $history]} {
7091 set history [lreplace $history $historyindex end $elt]
7093 lappend history $elt
7096 if {$historyindex > 1} {
7097 .tf.bar.leftbut conf -state normal
7099 .tf.bar.leftbut conf -state disabled
7101 .tf.bar.rightbut conf -state disabled
7104 # save the scrolling position of the diff display pane
7105 proc save_position {} {
7106 global historyindex history
7108 if {$historyindex < 1} return
7109 set hi [expr {$historyindex - 1}]
7110 set fn [lindex $history $hi 2]
7112 lset history $hi 3 [eval $fn]
7116 proc unset_posvars {} {
7119 if {[info exists last_posvars]} {
7120 foreach {var val} $last_posvars {
7129 global curview last_posvars
7131 set view [lindex $elt 0]
7132 set cmd [lindex $elt 1]
7133 set pv [lindex $elt 3]
7134 if {$curview != $view} {
7138 foreach {var val} $pv {
7142 set last_posvars $pv
7147 global history historyindex
7150 if {$historyindex > 1} {
7152 incr historyindex -1
7153 godo [lindex $history [expr {$historyindex - 1}]]
7154 .tf.bar.rightbut conf -state normal
7156 if {$historyindex <= 1} {
7157 .tf.bar.leftbut conf -state disabled
7162 global history historyindex
7165 if {$historyindex < [llength $history]} {
7167 set cmd [lindex $history $historyindex]
7170 .tf.bar.leftbut conf -state normal
7172 if {$historyindex >= [llength $history]} {
7173 .tf.bar.rightbut conf -state disabled
7178 global treefilelist treeidlist diffids diffmergeid treepending
7179 global nullid nullid2
7182 catch {unset diffmergeid}
7183 if {![info exists treefilelist($id)]} {
7184 if {![info exists treepending]} {
7185 if {$id eq $nullid} {
7186 set cmd [list | git ls-files]
7187 } elseif {$id eq $nullid2} {
7188 set cmd [list | git ls-files --stage -t]
7190 set cmd [list | git ls-tree -r $id]
7192 if {[catch {set gtf [open $cmd r]}]} {
7196 set treefilelist($id) {}
7197 set treeidlist($id) {}
7198 fconfigure $gtf -blocking 0 -encoding binary
7199 filerun $gtf [list gettreeline $gtf $id]
7206 proc gettreeline {gtf id} {
7207 global treefilelist treeidlist treepending cmitmode diffids nullid nullid2
7210 while {[incr nl] <= 1000 && [gets $gtf line] >= 0} {
7211 if {$diffids eq $nullid} {
7214 set i [string first "\t" $line]
7215 if {$i < 0} continue
7216 set fname [string range $line [expr {$i+1}] end]
7217 set line [string range $line 0 [expr {$i-1}]]
7218 if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue
7219 set sha1 [lindex $line 2]
7220 lappend treeidlist($id) $sha1
7222 if {[string index $fname 0] eq "\""} {
7223 set fname [lindex $fname 0]
7225 set fname [encoding convertfrom $fname]
7226 lappend treefilelist($id) $fname
7229 return [expr {$nl >= 1000? 2: 1}]
7233 if {$cmitmode ne "tree"} {
7234 if {![info exists diffmergeid]} {
7235 gettreediffs $diffids
7237 } elseif {$id ne $diffids} {
7246 global treefilelist treeidlist diffids nullid nullid2
7247 global ctext_file_names ctext_file_lines
7248 global ctext commentend
7250 set i [lsearch -exact $treefilelist($diffids) $f]
7252 puts "oops, $f not in list for id $diffids"
7255 if {$diffids eq $nullid} {
7256 if {[catch {set bf [open $f r]} err]} {
7257 puts "oops, can't read $f: $err"
7261 set blob [lindex $treeidlist($diffids) $i]
7262 if {[catch {set bf [open [concat | git cat-file blob $blob] r]} err]} {
7263 puts "oops, error reading blob $blob: $err"
7267 fconfigure $bf -blocking 0 -encoding [get_path_encoding $f]
7268 filerun $bf [list getblobline $bf $diffids]
7269 $ctext config -state normal
7270 clear_ctext $commentend
7271 lappend ctext_file_names $f
7272 lappend ctext_file_lines [lindex [split $commentend "."] 0]
7273 $ctext insert end "\n"
7274 $ctext insert end "$f\n" filesep
7275 $ctext config -state disabled
7276 $ctext yview $commentend
7280 proc getblobline {bf id} {
7281 global diffids cmitmode ctext
7283 if {$id ne $diffids || $cmitmode ne "tree"} {
7287 $ctext config -state normal
7289 while {[incr nl] <= 1000 && [gets $bf line] >= 0} {
7290 $ctext insert end "$line\n"
7293 global jump_to_here ctext_file_names commentend
7295 # delete last newline
7296 $ctext delete "end - 2c" "end - 1c"
7298 if {$jump_to_here ne {} &&
7299 [lindex $jump_to_here 0] eq [lindex $ctext_file_names 0]} {
7300 set lnum [expr {[lindex $jump_to_here 1] +
7301 [lindex [split $commentend .] 0]}]
7302 mark_ctext_line $lnum
7306 $ctext config -state disabled
7307 return [expr {$nl >= 1000? 2: 1}]
7310 proc mark_ctext_line {lnum} {
7311 global ctext markbgcolor
7313 $ctext tag delete omark
7314 $ctext tag add omark $lnum.0 "$lnum.0 + 1 line"
7315 $ctext tag conf omark -background $markbgcolor
7319 proc mergediff {id} {
7321 global diffids treediffs
7322 global parents curview
7326 set treediffs($id) {}
7327 set np [llength $parents($curview,$id)]
7332 proc startdiff {ids} {
7333 global treediffs diffids treepending diffmergeid nullid nullid2
7337 catch {unset diffmergeid}
7338 if {![info exists treediffs($ids)] ||
7339 [lsearch -exact $ids $nullid] >= 0 ||
7340 [lsearch -exact $ids $nullid2] >= 0} {
7341 if {![info exists treepending]} {
7349 proc path_filter {filter name} {
7351 set l [string length $p]
7352 if {[string index $p end] eq "/"} {
7353 if {[string compare -length $l $p $name] == 0} {
7357 if {[string compare -length $l $p $name] == 0 &&
7358 ([string length $name] == $l ||
7359 [string index $name $l] eq "/")} {
7367 proc addtocflist {ids} {
7370 add_flist $treediffs($ids)
7374 proc diffcmd {ids flags} {
7375 global nullid nullid2
7377 set i [lsearch -exact $ids $nullid]
7378 set j [lsearch -exact $ids $nullid2]
7380 if {[llength $ids] > 1 && $j < 0} {
7381 # comparing working directory with some specific revision
7382 set cmd [concat | git diff-index $flags]
7384 lappend cmd -R [lindex $ids 1]
7386 lappend cmd [lindex $ids 0]
7389 # comparing working directory with index
7390 set cmd [concat | git diff-files $flags]
7395 } elseif {$j >= 0} {
7396 set cmd [concat | git diff-index --cached $flags]
7397 if {[llength $ids] > 1} {
7398 # comparing index with specific revision
7400 lappend cmd -R [lindex $ids 1]
7402 lappend cmd [lindex $ids 0]
7405 # comparing index with HEAD
7409 set cmd [concat | git diff-tree -r $flags $ids]
7414 proc gettreediffs {ids} {
7415 global treediff treepending
7417 if {[catch {set gdtf [open [diffcmd $ids {--no-commit-id}] r]}]} return
7419 set treepending $ids
7421 fconfigure $gdtf -blocking 0 -encoding binary
7422 filerun $gdtf [list gettreediffline $gdtf $ids]
7425 proc gettreediffline {gdtf ids} {
7426 global treediff treediffs treepending diffids diffmergeid
7427 global cmitmode vfilelimit curview limitdiffs perfile_attrs
7432 if {$perfile_attrs} {
7433 # cache_gitattr is slow, and even slower on win32 where we
7434 # have to invoke it for only about 30 paths at a time
7436 if {[tk windowingsystem] == "win32"} {
7440 while {[incr nr] <= $max && [gets $gdtf line] >= 0} {
7441 set i [string first "\t" $line]
7443 set file [string range $line [expr {$i+1}] end]
7444 if {[string index $file 0] eq "\""} {
7445 set file [lindex $file 0]
7447 set file [encoding convertfrom $file]
7448 if {$file ne [lindex $treediff end]} {
7449 lappend treediff $file
7450 lappend sublist $file
7454 if {$perfile_attrs} {
7455 cache_gitattr encoding $sublist
7458 return [expr {$nr >= $max? 2: 1}]
7461 if {$limitdiffs && $vfilelimit($curview) ne {}} {
7463 foreach f $treediff {
7464 if {[path_filter $vfilelimit($curview) $f]} {
7468 set treediffs($ids) $flist
7470 set treediffs($ids) $treediff
7473 if {$cmitmode eq "tree" && [llength $diffids] == 1} {
7475 } elseif {$ids != $diffids} {
7476 if {![info exists diffmergeid]} {
7477 gettreediffs $diffids
7485 # empty string or positive integer
7486 proc diffcontextvalidate {v} {
7487 return [regexp {^(|[1-9][0-9]*)$} $v]
7490 proc diffcontextchange {n1 n2 op} {
7491 global diffcontextstring diffcontext
7493 if {[string is integer -strict $diffcontextstring]} {
7494 if {$diffcontextstring >= 0} {
7495 set diffcontext $diffcontextstring
7501 proc changeignorespace {} {
7505 proc getblobdiffs {ids} {
7506 global blobdifffd diffids env
7507 global diffinhdr treediffs
7510 global limitdiffs vfilelimit curview
7511 global diffencoding targetline diffnparents
7512 global git_version currdiffsubmod
7515 if {[package vcompare $git_version "1.6.1"] >= 0} {
7516 set textconv "--textconv"
7519 if {[package vcompare $git_version "1.6.6"] >= 0} {
7520 set submodule "--submodule"
7522 set cmd [diffcmd $ids "-p $textconv $submodule -C --cc --no-commit-id -U$diffcontext"]
7526 if {$limitdiffs && $vfilelimit($curview) ne {}} {
7527 set cmd [concat $cmd -- $vfilelimit($curview)]
7529 if {[catch {set bdf [open $cmd r]} err]} {
7530 error_popup [mc "Error getting diffs: %s" $err]
7536 set diffencoding [get_path_encoding {}]
7537 fconfigure $bdf -blocking 0 -encoding binary -eofchar {}
7538 set blobdifffd($ids) $bdf
7539 set currdiffsubmod ""
7540 filerun $bdf [list getblobdiffline $bdf $diffids]
7543 proc savecmitpos {} {
7544 global ctext cmitmode
7546 if {$cmitmode eq "tree"} {
7549 return [list target_scrollpos [$ctext index @0,0]]
7552 proc savectextpos {} {
7555 return [list target_scrollpos [$ctext index @0,0]]
7558 proc maybe_scroll_ctext {ateof} {
7559 global ctext target_scrollpos
7561 if {![info exists target_scrollpos]} return
7563 set nlines [expr {[winfo height $ctext]
7564 / [font metrics textfont -linespace]}]
7565 if {[$ctext compare "$target_scrollpos + $nlines lines" <= end]} return
7567 $ctext yview $target_scrollpos
7568 unset target_scrollpos
7571 proc setinlist {var i val} {
7574 while {[llength [set $var]] < $i} {
7577 if {[llength [set $var]] == $i} {
7584 proc makediffhdr {fname ids} {
7585 global ctext curdiffstart treediffs diffencoding
7586 global ctext_file_names jump_to_here targetline diffline
7588 set fname [encoding convertfrom $fname]
7589 set diffencoding [get_path_encoding $fname]
7590 set i [lsearch -exact $treediffs($ids) $fname]
7592 setinlist difffilestart $i $curdiffstart
7594 lset ctext_file_names end $fname
7595 set l [expr {(78 - [string length $fname]) / 2}]
7596 set pad [string range "----------------------------------------" 1 $l]
7597 $ctext insert $curdiffstart "$pad $fname $pad" filesep
7599 if {$jump_to_here ne {} && [lindex $jump_to_here 0] eq $fname} {
7600 set targetline [lindex $jump_to_here 1]
7605 proc getblobdiffline {bdf ids} {
7606 global diffids blobdifffd ctext curdiffstart
7607 global diffnexthead diffnextnote difffilestart
7608 global ctext_file_names ctext_file_lines
7609 global diffinhdr treediffs mergemax diffnparents
7610 global diffencoding jump_to_here targetline diffline currdiffsubmod
7613 $ctext conf -state normal
7614 while {[incr nr] <= 1000 && [gets $bdf line] >= 0} {
7615 if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
7619 if {![string compare -length 5 "diff " $line]} {
7620 if {![regexp {^diff (--cc|--git) } $line m type]} {
7621 set line [encoding convertfrom $line]
7622 $ctext insert end "$line\n" hunksep
7625 # start of a new file
7627 $ctext insert end "\n"
7628 set curdiffstart [$ctext index "end - 1c"]
7629 lappend ctext_file_names ""
7630 lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
7631 $ctext insert end "\n" filesep
7633 if {$type eq "--cc"} {
7634 # start of a new file in a merge diff
7635 set fname [string range $line 10 end]
7636 if {[lsearch -exact $treediffs($ids) $fname] < 0} {
7637 lappend treediffs($ids) $fname
7638 add_flist [list $fname]
7642 set line [string range $line 11 end]
7643 # If the name hasn't changed the length will be odd,
7644 # the middle char will be a space, and the two bits either
7645 # side will be a/name and b/name, or "a/name" and "b/name".
7646 # If the name has changed we'll get "rename from" and
7647 # "rename to" or "copy from" and "copy to" lines following
7648 # this, and we'll use them to get the filenames.
7649 # This complexity is necessary because spaces in the
7650 # filename(s) don't get escaped.
7651 set l [string length $line]
7652 set i [expr {$l / 2}]
7653 if {!(($l & 1) && [string index $line $i] eq " " &&
7654 [string range $line 2 [expr {$i - 1}]] eq \
7655 [string range $line [expr {$i + 3}] end])} {
7658 # unescape if quoted and chop off the a/ from the front
7659 if {[string index $line 0] eq "\""} {
7660 set fname [string range [lindex $line 0] 2 end]
7662 set fname [string range $line 2 [expr {$i - 1}]]
7665 makediffhdr $fname $ids
7667 } elseif {![string compare -length 16 "* Unmerged path " $line]} {
7668 set fname [encoding convertfrom [string range $line 16 end]]
7669 $ctext insert end "\n"
7670 set curdiffstart [$ctext index "end - 1c"]
7671 lappend ctext_file_names $fname
7672 lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
7673 $ctext insert end "$line\n" filesep
7674 set i [lsearch -exact $treediffs($ids) $fname]
7676 setinlist difffilestart $i $curdiffstart
7679 } elseif {![string compare -length 2 "@@" $line]} {
7680 regexp {^@@+} $line ats
7681 set line [encoding convertfrom $diffencoding $line]
7682 $ctext insert end "$line\n" hunksep
7683 if {[regexp { \+(\d+),\d+ @@} $line m nl]} {
7686 set diffnparents [expr {[string length $ats] - 1}]
7689 } elseif {![string compare -length 10 "Submodule " $line]} {
7690 # start of a new submodule
7691 if {[regexp -indices "\[0-9a-f\]+\\.\\." $line nameend]} {
7692 set fname [string range $line 10 [expr [lindex $nameend 0] - 2]]
7694 set fname [string range $line 10 [expr [string first "contains " $line] - 2]]
7696 if {$currdiffsubmod != $fname} {
7697 $ctext insert end "\n"; # Add newline after commit message
7699 set curdiffstart [$ctext index "end - 1c"]
7700 lappend ctext_file_names ""
7701 if {$currdiffsubmod != $fname} {
7702 lappend ctext_file_lines $fname
7703 makediffhdr $fname $ids
7704 set currdiffsubmod $fname
7705 $ctext insert end "\n$line\n" filesep
7707 $ctext insert end "$line\n" filesep
7709 } elseif {![string compare -length 3 " >" $line]} {
7710 set $currdiffsubmod ""
7711 set line [encoding convertfrom $diffencoding $line]
7712 $ctext insert end "$line\n" dresult
7713 } elseif {![string compare -length 3 " <" $line]} {
7714 set $currdiffsubmod ""
7715 set line [encoding convertfrom $diffencoding $line]
7716 $ctext insert end "$line\n" d0
7717 } elseif {$diffinhdr} {
7718 if {![string compare -length 12 "rename from " $line]} {
7719 set fname [string range $line [expr 6 + [string first " from " $line] ] end]
7720 if {[string index $fname 0] eq "\""} {
7721 set fname [lindex $fname 0]
7723 set fname [encoding convertfrom $fname]
7724 set i [lsearch -exact $treediffs($ids) $fname]
7726 setinlist difffilestart $i $curdiffstart
7728 } elseif {![string compare -length 10 $line "rename to "] ||
7729 ![string compare -length 8 $line "copy to "]} {
7730 set fname [string range $line [expr 4 + [string first " to " $line] ] end]
7731 if {[string index $fname 0] eq "\""} {
7732 set fname [lindex $fname 0]
7734 makediffhdr $fname $ids
7735 } elseif {[string compare -length 3 $line "---"] == 0} {
7738 } elseif {[string compare -length 3 $line "+++"] == 0} {
7742 $ctext insert end "$line\n" filesep
7745 set line [string map {\x1A ^Z} \
7746 [encoding convertfrom $diffencoding $line]]
7747 # parse the prefix - one ' ', '-' or '+' for each parent
7748 set prefix [string range $line 0 [expr {$diffnparents - 1}]]
7749 set tag [expr {$diffnparents > 1? "m": "d"}]
7750 if {[string trim $prefix " -+"] eq {}} {
7751 # prefix only has " ", "-" and "+" in it: normal diff line
7752 set num [string first "-" $prefix]
7754 # removed line, first parent with line is $num
7755 if {$num >= $mergemax} {
7758 $ctext insert end "$line\n" $tag$num
7761 if {[string first "+" $prefix] >= 0} {
7763 lappend tags ${tag}result
7764 if {$diffnparents > 1} {
7765 set num [string first " " $prefix]
7767 if {$num >= $mergemax} {
7774 if {$targetline ne {}} {
7775 if {$diffline == $targetline} {
7776 set seehere [$ctext index "end - 1 chars"]
7782 $ctext insert end "$line\n" $tags
7785 # "\ No newline at end of file",
7786 # or something else we don't recognize
7787 $ctext insert end "$line\n" hunksep
7791 if {[info exists seehere]} {
7792 mark_ctext_line [lindex [split $seehere .] 0]
7794 maybe_scroll_ctext [eof $bdf]
7795 $ctext conf -state disabled
7800 return [expr {$nr >= 1000? 2: 1}]
7803 proc changediffdisp {} {
7804 global ctext diffelide
7806 $ctext tag conf d0 -elide [lindex $diffelide 0]
7807 $ctext tag conf dresult -elide [lindex $diffelide 1]
7810 proc highlightfile {loc cline} {
7811 global ctext cflist cflist_top
7814 $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
7815 $cflist tag add highlight $cline.0 "$cline.0 lineend"
7816 $cflist see $cline.0
7817 set cflist_top $cline
7821 global difffilestart ctext cmitmode
7823 if {$cmitmode eq "tree"} return
7826 set here [$ctext index @0,0]
7827 foreach loc $difffilestart {
7828 if {[$ctext compare $loc >= $here]} {
7829 highlightfile $prev $prevline
7835 highlightfile $prev $prevline
7839 global difffilestart ctext cmitmode
7841 if {$cmitmode eq "tree"} return
7842 set here [$ctext index @0,0]
7844 foreach loc $difffilestart {
7846 if {[$ctext compare $loc > $here]} {
7847 highlightfile $loc $line
7853 proc clear_ctext {{first 1.0}} {
7854 global ctext smarktop smarkbot
7855 global ctext_file_names ctext_file_lines
7858 set l [lindex [split $first .] 0]
7859 if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} {
7862 if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} {
7865 $ctext delete $first end
7866 if {$first eq "1.0"} {
7867 catch {unset pendinglinks}
7869 set ctext_file_names {}
7870 set ctext_file_lines {}
7873 proc settabs {{firstab {}}} {
7874 global firsttabstop tabstop ctext have_tk85
7876 if {$firstab ne {} && $have_tk85} {
7877 set firsttabstop $firstab
7879 set w [font measure textfont "0"]
7880 if {$firsttabstop != 0} {
7881 $ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \
7882 [expr {($firsttabstop + 2 * $tabstop) * $w}]]
7883 } elseif {$have_tk85 || $tabstop != 8} {
7884 $ctext conf -tabs [expr {$tabstop * $w}]
7886 $ctext conf -tabs {}
7890 proc incrsearch {name ix op} {
7891 global ctext searchstring searchdirn
7893 $ctext tag remove found 1.0 end
7894 if {[catch {$ctext index anchor}]} {
7895 # no anchor set, use start of selection, or of visible area
7896 set sel [$ctext tag ranges sel]
7898 $ctext mark set anchor [lindex $sel 0]
7899 } elseif {$searchdirn eq "-forwards"} {
7900 $ctext mark set anchor @0,0
7902 $ctext mark set anchor @0,[winfo height $ctext]
7905 if {$searchstring ne {}} {
7906 set here [$ctext search $searchdirn -- $searchstring anchor]
7915 global sstring ctext searchstring searchdirn
7918 $sstring icursor end
7919 set searchdirn -forwards
7920 if {$searchstring ne {}} {
7921 set sel [$ctext tag ranges sel]
7923 set start "[lindex $sel 0] + 1c"
7924 } elseif {[catch {set start [$ctext index anchor]}]} {
7927 set match [$ctext search -count mlen -- $searchstring $start]
7928 $ctext tag remove sel 1.0 end
7934 set mend "$match + $mlen c"
7935 $ctext tag add sel $match $mend
7936 $ctext mark unset anchor
7940 proc dosearchback {} {
7941 global sstring ctext searchstring searchdirn
7944 $sstring icursor end
7945 set searchdirn -backwards
7946 if {$searchstring ne {}} {
7947 set sel [$ctext tag ranges sel]
7949 set start [lindex $sel 0]
7950 } elseif {[catch {set start [$ctext index anchor]}]} {
7951 set start @0,[winfo height $ctext]
7953 set match [$ctext search -backwards -count ml -- $searchstring $start]
7954 $ctext tag remove sel 1.0 end
7960 set mend "$match + $ml c"
7961 $ctext tag add sel $match $mend
7962 $ctext mark unset anchor
7966 proc searchmark {first last} {
7967 global ctext searchstring
7971 set match [$ctext search -count mlen -- $searchstring $mend $last.end]
7972 if {$match eq {}} break
7973 set mend "$match + $mlen c"
7974 $ctext tag add found $match $mend
7978 proc searchmarkvisible {doall} {
7979 global ctext smarktop smarkbot
7981 set topline [lindex [split [$ctext index @0,0] .] 0]
7982 set botline [lindex [split [$ctext index @0,[winfo height $ctext]] .] 0]
7983 if {$doall || $botline < $smarktop || $topline > $smarkbot} {
7984 # no overlap with previous
7985 searchmark $topline $botline
7986 set smarktop $topline
7987 set smarkbot $botline
7989 if {$topline < $smarktop} {
7990 searchmark $topline [expr {$smarktop-1}]
7991 set smarktop $topline
7993 if {$botline > $smarkbot} {
7994 searchmark [expr {$smarkbot+1}] $botline
7995 set smarkbot $botline
8000 proc scrolltext {f0 f1} {
8003 .bleft.bottom.sb set $f0 $f1
8004 if {$searchstring ne {}} {
8010 global linespc charspc canvx0 canvy0
8011 global xspc1 xspc2 lthickness
8013 set linespc [font metrics mainfont -linespace]
8014 set charspc [font measure mainfont "m"]
8015 set canvy0 [expr {int(3 + 0.5 * $linespc)}]
8016 set canvx0 [expr {int(3 + 0.5 * $linespc)}]
8017 set lthickness [expr {int($linespc / 9) + 1}]
8018 set xspc1(0) $linespc
8026 set ymax [lindex [$canv cget -scrollregion] 3]
8027 if {$ymax eq {} || $ymax == 0} return
8028 set span [$canv yview]
8031 allcanvs yview moveto [lindex $span 0]
8033 if {$selectedline ne {}} {
8034 selectline $selectedline 0
8035 allcanvs yview moveto [lindex $span 0]
8039 proc parsefont {f n} {
8042 set fontattr($f,family) [lindex $n 0]
8044 if {$s eq {} || $s == 0} {
8047 set s [expr {int(-$s / [winfo fpixels . 1p] + 0.5)}]
8049 set fontattr($f,size) $s
8050 set fontattr($f,weight) normal
8051 set fontattr($f,slant) roman
8052 foreach style [lrange $n 2 end] {
8055 "bold" {set fontattr($f,weight) $style}
8057 "italic" {set fontattr($f,slant) $style}
8062 proc fontflags {f {isbold 0}} {
8065 return [list -family $fontattr($f,family) -size $fontattr($f,size) \
8066 -weight [expr {$isbold? "bold": $fontattr($f,weight)}] \
8067 -slant $fontattr($f,slant)]
8073 set n [list $fontattr($f,family) $fontattr($f,size)]
8074 if {$fontattr($f,weight) eq "bold"} {
8077 if {$fontattr($f,slant) eq "italic"} {
8083 proc incrfont {inc} {
8084 global mainfont textfont ctext canv cflist showrefstop
8085 global stopped entries fontattr
8088 set s $fontattr(mainfont,size)
8093 set fontattr(mainfont,size) $s
8094 font config mainfont -size $s
8095 font config mainfontbold -size $s
8096 set mainfont [fontname mainfont]
8097 set s $fontattr(textfont,size)
8102 set fontattr(textfont,size) $s
8103 font config textfont -size $s
8104 font config textfontbold -size $s
8105 set textfont [fontname textfont]
8112 global sha1entry sha1string
8113 if {[string length $sha1string] == 40} {
8114 $sha1entry delete 0 end
8118 proc sha1change {n1 n2 op} {
8119 global sha1string currentid sha1but
8120 if {$sha1string == {}
8121 || ([info exists currentid] && $sha1string == $currentid)} {
8126 if {[$sha1but cget -state] == $state} return
8127 if {$state == "normal"} {
8128 $sha1but conf -state normal -relief raised -text "[mc "Goto:"] "
8130 $sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] "
8134 proc gotocommit {} {
8135 global sha1string tagids headids curview varcid
8137 if {$sha1string == {}
8138 || ([info exists currentid] && $sha1string == $currentid)} return
8139 if {[info exists tagids($sha1string)]} {
8140 set id $tagids($sha1string)
8141 } elseif {[info exists headids($sha1string)]} {
8142 set id $headids($sha1string)
8144 set id [string tolower $sha1string]
8145 if {[regexp {^[0-9a-f]{4,39}$} $id]} {
8146 set matches [longid $id]
8147 if {$matches ne {}} {
8148 if {[llength $matches] > 1} {
8149 error_popup [mc "Short SHA1 id %s is ambiguous" $id]
8152 set id [lindex $matches 0]
8155 if {[catch {set id [exec git rev-parse --verify $sha1string]}]} {
8156 error_popup [mc "Revision %s is not known" $sha1string]
8161 if {[commitinview $id $curview]} {
8162 selectline [rowofcommit $id] 1
8165 if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
8166 set msg [mc "SHA1 id %s is not known" $sha1string]
8168 set msg [mc "Revision %s is not in the current view" $sha1string]
8173 proc lineenter {x y id} {
8174 global hoverx hovery hoverid hovertimer
8175 global commitinfo canv
8177 if {![info exists commitinfo($id)] && ![getcommit $id]} return
8181 if {[info exists hovertimer]} {
8182 after cancel $hovertimer
8184 set hovertimer [after 500 linehover]
8188 proc linemotion {x y id} {
8189 global hoverx hovery hoverid hovertimer
8191 if {[info exists hoverid] && $id == $hoverid} {
8194 if {[info exists hovertimer]} {
8195 after cancel $hovertimer
8197 set hovertimer [after 500 linehover]
8201 proc lineleave {id} {
8202 global hoverid hovertimer canv
8204 if {[info exists hoverid] && $id == $hoverid} {
8206 if {[info exists hovertimer]} {
8207 after cancel $hovertimer
8215 global hoverx hovery hoverid hovertimer
8216 global canv linespc lthickness
8219 set text [lindex $commitinfo($hoverid) 0]
8220 set ymax [lindex [$canv cget -scrollregion] 3]
8221 if {$ymax == {}} return
8222 set yfrac [lindex [$canv yview] 0]
8223 set x [expr {$hoverx + 2 * $linespc}]
8224 set y [expr {$hovery + $yfrac * $ymax - $linespc / 2}]
8225 set x0 [expr {$x - 2 * $lthickness}]
8226 set y0 [expr {$y - 2 * $lthickness}]
8227 set x1 [expr {$x + [font measure mainfont $text] + 2 * $lthickness}]
8228 set y1 [expr {$y + $linespc + 2 * $lthickness}]
8229 set t [$canv create rectangle $x0 $y0 $x1 $y1 \
8230 -fill \#ffff80 -outline black -width 1 -tags hover]
8232 set t [$canv create text $x $y -anchor nw -text $text -tags hover \
8237 proc clickisonarrow {id y} {
8240 set ranges [rowranges $id]
8241 set thresh [expr {2 * $lthickness + 6}]
8242 set n [expr {[llength $ranges] - 1}]
8243 for {set i 1} {$i < $n} {incr i} {
8244 set row [lindex $ranges $i]
8245 if {abs([yc $row] - $y) < $thresh} {
8252 proc arrowjump {id n y} {
8255 # 1 <-> 2, 3 <-> 4, etc...
8256 set n [expr {(($n - 1) ^ 1) + 1}]
8257 set row [lindex [rowranges $id] $n]
8259 set ymax [lindex [$canv cget -scrollregion] 3]
8260 if {$ymax eq {} || $ymax <= 0} return
8261 set view [$canv yview]
8262 set yspan [expr {[lindex $view 1] - [lindex $view 0]}]
8263 set yfrac [expr {$yt / $ymax - $yspan / 2}]
8267 allcanvs yview moveto $yfrac
8270 proc lineclick {x y id isnew} {
8271 global ctext commitinfo children canv thickerline curview
8273 if {![info exists commitinfo($id)] && ![getcommit $id]} return
8278 # draw this line thicker than normal
8282 set ymax [lindex [$canv cget -scrollregion] 3]
8283 if {$ymax eq {}} return
8284 set yfrac [lindex [$canv yview] 0]
8285 set y [expr {$y + $yfrac * $ymax}]
8287 set dirn [clickisonarrow $id $y]
8289 arrowjump $id $dirn $y
8294 addtohistory [list lineclick $x $y $id 0] savectextpos
8296 # fill the details pane with info about this line
8297 $ctext conf -state normal
8300 $ctext insert end "[mc "Parent"]:\t"
8301 $ctext insert end $id link0
8303 set info $commitinfo($id)
8304 $ctext insert end "\n\t[lindex $info 0]\n"
8305 $ctext insert end "\t[mc "Author"]:\t[lindex $info 1]\n"
8306 set date [formatdate [lindex $info 2]]
8307 $ctext insert end "\t[mc "Date"]:\t$date\n"
8308 set kids $children($curview,$id)
8310 $ctext insert end "\n[mc "Children"]:"
8312 foreach child $kids {
8314 if {![info exists commitinfo($child)] && ![getcommit $child]} continue
8315 set info $commitinfo($child)
8316 $ctext insert end "\n\t"
8317 $ctext insert end $child link$i
8318 setlink $child link$i
8319 $ctext insert end "\n\t[lindex $info 0]"
8320 $ctext insert end "\n\t[mc "Author"]:\t[lindex $info 1]"
8321 set date [formatdate [lindex $info 2]]
8322 $ctext insert end "\n\t[mc "Date"]:\t$date\n"
8325 maybe_scroll_ctext 1
8326 $ctext conf -state disabled
8330 proc normalline {} {
8332 if {[info exists thickerline]} {
8339 proc selbyid {id {isnew 1}} {
8341 if {[commitinview $id $curview]} {
8342 selectline [rowofcommit $id] $isnew
8348 if {![info exists startmstime]} {
8349 set startmstime [clock clicks -milliseconds]
8351 return [format "%.3f" [expr {([clock click -milliseconds] - $startmstime) / 1000.0}]]
8354 proc rowmenu {x y id} {
8355 global rowctxmenu selectedline rowmenuid curview
8356 global nullid nullid2 fakerowmenu mainhead markedid
8360 if {$selectedline eq {} || [rowofcommit $id] eq $selectedline} {
8365 if {$id ne $nullid && $id ne $nullid2} {
8366 set menu $rowctxmenu
8367 if {$mainhead ne {}} {
8368 $menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead] -state normal
8370 $menu entryconfigure 7 -label [mc "Detached head: can't reset" $mainhead] -state disabled
8372 if {[info exists markedid] && $markedid ne $id} {
8373 $menu entryconfigure 9 -state normal
8374 $menu entryconfigure 10 -state normal
8375 $menu entryconfigure 11 -state normal
8377 $menu entryconfigure 9 -state disabled
8378 $menu entryconfigure 10 -state disabled
8379 $menu entryconfigure 11 -state disabled
8382 set menu $fakerowmenu
8384 $menu entryconfigure [mca "Diff this -> selected"] -state $state
8385 $menu entryconfigure [mca "Diff selected -> this"] -state $state
8386 $menu entryconfigure [mca "Make patch"] -state $state
8387 tk_popup $menu $x $y
8391 global rowmenuid markedid canv
8393 set markedid $rowmenuid
8394 make_idmark $markedid
8400 if {[info exists markedid]} {
8405 proc replace_by_kids {l r} {
8406 global curview children
8408 set id [commitonrow $r]
8409 set l [lreplace $l 0 0]
8410 foreach kid $children($curview,$id) {
8411 lappend l [rowofcommit $kid]
8413 return [lsort -integer -decreasing -unique $l]
8416 proc find_common_desc {} {
8417 global markedid rowmenuid curview children
8419 if {![info exists markedid]} return
8420 if {![commitinview $markedid $curview] ||
8421 ![commitinview $rowmenuid $curview]} return
8422 #set t1 [clock clicks -milliseconds]
8423 set l1 [list [rowofcommit $markedid]]
8424 set l2 [list [rowofcommit $rowmenuid]]
8426 set r1 [lindex $l1 0]
8427 set r2 [lindex $l2 0]
8428 if {$r1 eq {} || $r2 eq {}} break
8434 set l1 [replace_by_kids $l1 $r1]
8436 set l2 [replace_by_kids $l2 $r2]
8439 #set t2 [clock clicks -milliseconds]
8440 #puts "took [expr {$t2-$t1}]ms"
8443 proc compare_commits {} {
8444 global markedid rowmenuid curview children
8446 if {![info exists markedid]} return
8447 if {![commitinview $markedid $curview]} return
8448 addtohistory [list do_cmp_commits $markedid $rowmenuid]
8449 do_cmp_commits $markedid $rowmenuid
8452 proc getpatchid {id} {
8455 if {![info exists patchids($id)]} {
8456 set cmd [diffcmd [list $id] {-p --root}]
8457 # trim off the initial "|"
8458 set cmd [lrange $cmd 1 end]
8460 set x [eval exec $cmd | git patch-id]
8461 set patchids($id) [lindex $x 0]
8463 set patchids($id) "error"
8466 return $patchids($id)
8469 proc do_cmp_commits {a b} {
8470 global ctext curview parents children patchids commitinfo
8472 $ctext conf -state normal
8475 for {set i 0} {$i < 100} {incr i} {
8478 if {[llength $parents($curview,$a)] > 1} {
8479 appendshortlink $a [mc "Skipping merge commit "] "\n"
8482 set patcha [getpatchid $a]
8484 if {[llength $parents($curview,$b)] > 1} {
8485 appendshortlink $b [mc "Skipping merge commit "] "\n"
8488 set patchb [getpatchid $b]
8490 if {!$skipa && !$skipb} {
8491 set heada [lindex $commitinfo($a) 0]
8492 set headb [lindex $commitinfo($b) 0]
8493 if {$patcha eq "error"} {
8494 appendshortlink $a [mc "Error getting patch ID for "] \
8495 [mc " - stopping\n"]
8498 if {$patchb eq "error"} {
8499 appendshortlink $b [mc "Error getting patch ID for "] \
8500 [mc " - stopping\n"]
8503 if {$patcha eq $patchb} {
8504 if {$heada eq $headb} {
8505 appendshortlink $a [mc "Commit "]
8506 appendshortlink $b " == " " $heada\n"
8508 appendshortlink $a [mc "Commit "] " $heada\n"
8509 appendshortlink $b [mc " is the same patch as\n "] \
8515 $ctext insert end "\n"
8516 appendshortlink $a [mc "Commit "] " $heada\n"
8517 appendshortlink $b [mc " differs from\n "] \
8519 $ctext insert end [mc "Diff of commits:\n\n"]
8520 $ctext conf -state disabled
8527 set kids [real_children $curview,$a]
8528 if {[llength $kids] != 1} {
8529 $ctext insert end "\n"
8530 appendshortlink $a [mc "Commit "] \
8531 [mc " has %s children - stopping\n" [llength $kids]]
8534 set a [lindex $kids 0]
8537 set kids [real_children $curview,$b]
8538 if {[llength $kids] != 1} {
8539 appendshortlink $b [mc "Commit "] \
8540 [mc " has %s children - stopping\n" [llength $kids]]
8543 set b [lindex $kids 0]
8546 $ctext conf -state disabled
8549 proc diffcommits {a b} {
8550 global diffcontext diffids blobdifffd diffinhdr currdiffsubmod
8552 set tmpdir [gitknewtmpdir]
8553 set fna [file join $tmpdir "commit-[string range $a 0 7]"]
8554 set fnb [file join $tmpdir "commit-[string range $b 0 7]"]
8556 exec git diff-tree -p --pretty $a >$fna
8557 exec git diff-tree -p --pretty $b >$fnb
8559 error_popup [mc "Error writing commit to file: %s" $err]
8563 set fd [open "| diff -U$diffcontext $fna $fnb" r]
8565 error_popup [mc "Error diffing commits: %s" $err]
8568 set diffids [list commits $a $b]
8569 set blobdifffd($diffids) $fd
8571 set currdiffsubmod ""
8572 filerun $fd [list getblobdiffline $fd $diffids]
8575 proc diffvssel {dirn} {
8576 global rowmenuid selectedline
8578 if {$selectedline eq {}} return
8580 set oldid [commitonrow $selectedline]
8581 set newid $rowmenuid
8583 set oldid $rowmenuid
8584 set newid [commitonrow $selectedline]
8586 addtohistory [list doseldiff $oldid $newid] savectextpos
8587 doseldiff $oldid $newid
8590 proc doseldiff {oldid newid} {
8594 $ctext conf -state normal
8596 init_flist [mc "Top"]
8597 $ctext insert end "[mc "From"] "
8598 $ctext insert end $oldid link0
8599 setlink $oldid link0
8600 $ctext insert end "\n "
8601 $ctext insert end [lindex $commitinfo($oldid) 0]
8602 $ctext insert end "\n\n[mc "To"] "
8603 $ctext insert end $newid link1
8604 setlink $newid link1
8605 $ctext insert end "\n "
8606 $ctext insert end [lindex $commitinfo($newid) 0]
8607 $ctext insert end "\n"
8608 $ctext conf -state disabled
8609 $ctext tag remove found 1.0 end
8610 startdiff [list $oldid $newid]
8614 global rowmenuid currentid commitinfo patchtop patchnum NS
8616 if {![info exists currentid]} return
8617 set oldid $currentid
8618 set oldhead [lindex $commitinfo($oldid) 0]
8619 set newid $rowmenuid
8620 set newhead [lindex $commitinfo($newid) 0]
8623 catch {destroy $top}
8625 make_transient $top .
8626 ${NS}::label $top.title -text [mc "Generate patch"]
8627 grid $top.title - -pady 10
8628 ${NS}::label $top.from -text [mc "From:"]
8629 ${NS}::entry $top.fromsha1 -width 40
8630 $top.fromsha1 insert 0 $oldid
8631 $top.fromsha1 conf -state readonly
8632 grid $top.from $top.fromsha1 -sticky w
8633 ${NS}::entry $top.fromhead -width 60
8634 $top.fromhead insert 0 $oldhead
8635 $top.fromhead conf -state readonly
8636 grid x $top.fromhead -sticky w
8637 ${NS}::label $top.to -text [mc "To:"]
8638 ${NS}::entry $top.tosha1 -width 40
8639 $top.tosha1 insert 0 $newid
8640 $top.tosha1 conf -state readonly
8641 grid $top.to $top.tosha1 -sticky w
8642 ${NS}::entry $top.tohead -width 60
8643 $top.tohead insert 0 $newhead
8644 $top.tohead conf -state readonly
8645 grid x $top.tohead -sticky w
8646 ${NS}::button $top.rev -text [mc "Reverse"] -command mkpatchrev
8647 grid $top.rev x -pady 10 -padx 5
8648 ${NS}::label $top.flab -text [mc "Output file:"]
8649 ${NS}::entry $top.fname -width 60
8650 $top.fname insert 0 [file normalize "patch$patchnum.patch"]
8652 grid $top.flab $top.fname -sticky w
8653 ${NS}::frame $top.buts
8654 ${NS}::button $top.buts.gen -text [mc "Generate"] -command mkpatchgo
8655 ${NS}::button $top.buts.can -text [mc "Cancel"] -command mkpatchcan
8656 bind $top <Key-Return> mkpatchgo
8657 bind $top <Key-Escape> mkpatchcan
8658 grid $top.buts.gen $top.buts.can
8659 grid columnconfigure $top.buts 0 -weight 1 -uniform a
8660 grid columnconfigure $top.buts 1 -weight 1 -uniform a
8661 grid $top.buts - -pady 10 -sticky ew
8665 proc mkpatchrev {} {
8668 set oldid [$patchtop.fromsha1 get]
8669 set oldhead [$patchtop.fromhead get]
8670 set newid [$patchtop.tosha1 get]
8671 set newhead [$patchtop.tohead get]
8672 foreach e [list fromsha1 fromhead tosha1 tohead] \
8673 v [list $newid $newhead $oldid $oldhead] {
8674 $patchtop.$e conf -state normal
8675 $patchtop.$e delete 0 end
8676 $patchtop.$e insert 0 $v
8677 $patchtop.$e conf -state readonly
8682 global patchtop nullid nullid2
8684 set oldid [$patchtop.fromsha1 get]
8685 set newid [$patchtop.tosha1 get]
8686 set fname [$patchtop.fname get]
8687 set cmd [diffcmd [list $oldid $newid] -p]
8688 # trim off the initial "|"
8689 set cmd [lrange $cmd 1 end]
8690 lappend cmd >$fname &
8691 if {[catch {eval exec $cmd} err]} {
8692 error_popup "[mc "Error creating patch:"] $err" $patchtop
8694 catch {destroy $patchtop}
8698 proc mkpatchcan {} {
8701 catch {destroy $patchtop}
8706 global rowmenuid mktagtop commitinfo NS
8710 catch {destroy $top}
8712 make_transient $top .
8713 ${NS}::label $top.title -text [mc "Create tag"]
8714 grid $top.title - -pady 10
8715 ${NS}::label $top.id -text [mc "ID:"]
8716 ${NS}::entry $top.sha1 -width 40
8717 $top.sha1 insert 0 $rowmenuid
8718 $top.sha1 conf -state readonly
8719 grid $top.id $top.sha1 -sticky w
8720 ${NS}::entry $top.head -width 60
8721 $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
8722 $top.head conf -state readonly
8723 grid x $top.head -sticky w
8724 ${NS}::label $top.tlab -text [mc "Tag name:"]
8725 ${NS}::entry $top.tag -width 60
8726 grid $top.tlab $top.tag -sticky w
8727 ${NS}::label $top.op -text [mc "Tag message is optional"]
8728 grid $top.op -columnspan 2 -sticky we
8729 ${NS}::label $top.mlab -text [mc "Tag message:"]
8730 ${NS}::entry $top.msg -width 60
8731 grid $top.mlab $top.msg -sticky w
8732 ${NS}::frame $top.buts
8733 ${NS}::button $top.buts.gen -text [mc "Create"] -command mktaggo
8734 ${NS}::button $top.buts.can -text [mc "Cancel"] -command mktagcan
8735 bind $top <Key-Return> mktaggo
8736 bind $top <Key-Escape> mktagcan
8737 grid $top.buts.gen $top.buts.can
8738 grid columnconfigure $top.buts 0 -weight 1 -uniform a
8739 grid columnconfigure $top.buts 1 -weight 1 -uniform a
8740 grid $top.buts - -pady 10 -sticky ew
8745 global mktagtop env tagids idtags
8747 set id [$mktagtop.sha1 get]
8748 set tag [$mktagtop.tag get]
8749 set msg [$mktagtop.msg get]
8751 error_popup [mc "No tag name specified"] $mktagtop
8754 if {[info exists tagids($tag)]} {
8755 error_popup [mc "Tag \"%s\" already exists" $tag] $mktagtop
8760 exec git tag -a -m $msg $tag $id
8762 exec git tag $tag $id
8765 error_popup "[mc "Error creating tag:"] $err" $mktagtop
8769 set tagids($tag) $id
8770 lappend idtags($id) $tag
8778 proc redrawtags {id} {
8779 global canv linehtag idpos currentid curview cmitlisted markedid
8780 global canvxmax iddrawn circleitem mainheadid circlecolors
8782 if {![commitinview $id $curview]} return
8783 if {![info exists iddrawn($id)]} return
8784 set row [rowofcommit $id]
8785 if {$id eq $mainheadid} {
8788 set ofill [lindex $circlecolors $cmitlisted($curview,$id)]
8790 $canv itemconf $circleitem($row) -fill $ofill
8791 $canv delete tag.$id
8792 set xt [eval drawtags $id $idpos($id)]
8793 $canv coords $linehtag($id) $xt [lindex $idpos($id) 2]
8794 set text [$canv itemcget $linehtag($id) -text]
8795 set font [$canv itemcget $linehtag($id) -font]
8796 set xr [expr {$xt + [font measure $font $text]}]
8797 if {$xr > $canvxmax} {
8801 if {[info exists currentid] && $currentid == $id} {
8804 if {[info exists markedid] && $markedid eq $id} {
8812 catch {destroy $mktagtop}
8817 if {![domktag]} return
8821 proc writecommit {} {
8822 global rowmenuid wrcomtop commitinfo wrcomcmd NS
8824 set top .writecommit
8826 catch {destroy $top}
8828 make_transient $top .
8829 ${NS}::label $top.title -text [mc "Write commit to file"]
8830 grid $top.title - -pady 10
8831 ${NS}::label $top.id -text [mc "ID:"]
8832 ${NS}::entry $top.sha1 -width 40
8833 $top.sha1 insert 0 $rowmenuid
8834 $top.sha1 conf -state readonly
8835 grid $top.id $top.sha1 -sticky w
8836 ${NS}::entry $top.head -width 60
8837 $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
8838 $top.head conf -state readonly
8839 grid x $top.head -sticky w
8840 ${NS}::label $top.clab -text [mc "Command:"]
8841 ${NS}::entry $top.cmd -width 60 -textvariable wrcomcmd
8842 grid $top.clab $top.cmd -sticky w -pady 10
8843 ${NS}::label $top.flab -text [mc "Output file:"]
8844 ${NS}::entry $top.fname -width 60
8845 $top.fname insert 0 [file normalize "commit-[string range $rowmenuid 0 6]"]
8846 grid $top.flab $top.fname -sticky w
8847 ${NS}::frame $top.buts
8848 ${NS}::button $top.buts.gen -text [mc "Write"] -command wrcomgo
8849 ${NS}::button $top.buts.can -text [mc "Cancel"] -command wrcomcan
8850 bind $top <Key-Return> wrcomgo
8851 bind $top <Key-Escape> wrcomcan
8852 grid $top.buts.gen $top.buts.can
8853 grid columnconfigure $top.buts 0 -weight 1 -uniform a
8854 grid columnconfigure $top.buts 1 -weight 1 -uniform a
8855 grid $top.buts - -pady 10 -sticky ew
8862 set id [$wrcomtop.sha1 get]
8863 set cmd "echo $id | [$wrcomtop.cmd get]"
8864 set fname [$wrcomtop.fname get]
8865 if {[catch {exec sh -c $cmd >$fname &} err]} {
8866 error_popup "[mc "Error writing commit:"] $err" $wrcomtop
8868 catch {destroy $wrcomtop}
8875 catch {destroy $wrcomtop}
8880 global rowmenuid mkbrtop NS
8883 catch {destroy $top}
8885 make_transient $top .
8886 ${NS}::label $top.title -text [mc "Create new branch"]
8887 grid $top.title - -pady 10
8888 ${NS}::label $top.id -text [mc "ID:"]
8889 ${NS}::entry $top.sha1 -width 40
8890 $top.sha1 insert 0 $rowmenuid
8891 $top.sha1 conf -state readonly
8892 grid $top.id $top.sha1 -sticky w
8893 ${NS}::label $top.nlab -text [mc "Name:"]
8894 ${NS}::entry $top.name -width 40
8895 grid $top.nlab $top.name -sticky w
8896 ${NS}::frame $top.buts
8897 ${NS}::button $top.buts.go -text [mc "Create"] -command [list mkbrgo $top]
8898 ${NS}::button $top.buts.can -text [mc "Cancel"] -command "catch {destroy $top}"
8899 bind $top <Key-Return> [list mkbrgo $top]
8900 bind $top <Key-Escape> "catch {destroy $top}"
8901 grid $top.buts.go $top.buts.can
8902 grid columnconfigure $top.buts 0 -weight 1 -uniform a
8903 grid columnconfigure $top.buts 1 -weight 1 -uniform a
8904 grid $top.buts - -pady 10 -sticky ew
8909 global headids idheads
8911 set name [$top.name get]
8912 set id [$top.sha1 get]
8916 error_popup [mc "Please specify a name for the new branch"] $top
8919 if {[info exists headids($name)]} {
8920 if {![confirm_popup [mc \
8921 "Branch '%s' already exists. Overwrite?" $name] $top]} {
8924 set old_id $headids($name)
8927 catch {destroy $top}
8928 lappend cmdargs $name $id
8932 eval exec git branch $cmdargs
8938 if {$old_id ne {}} {
8944 set headids($name) $id
8945 lappend idheads($id) $name
8954 proc exec_citool {tool_args {baseid {}}} {
8955 global commitinfo env
8957 set save_env [array get env GIT_AUTHOR_*]
8959 if {$baseid ne {}} {
8960 if {![info exists commitinfo($baseid)]} {
8963 set author [lindex $commitinfo($baseid) 1]
8964 set date [lindex $commitinfo($baseid) 2]
8965 if {[regexp {^\s*(\S.*\S|\S)\s*<(.*)>\s*$} \
8966 $author author name email]
8968 set env(GIT_AUTHOR_NAME) $name
8969 set env(GIT_AUTHOR_EMAIL) $email
8970 set env(GIT_AUTHOR_DATE) $date
8974 eval exec git citool $tool_args &
8976 array unset env GIT_AUTHOR_*
8977 array set env $save_env
8980 proc cherrypick {} {
8981 global rowmenuid curview
8982 global mainhead mainheadid
8984 set oldhead [exec git rev-parse HEAD]
8985 set dheads [descheads $rowmenuid]
8986 if {$dheads ne {} && [lsearch -exact $dheads $oldhead] >= 0} {
8987 set ok [confirm_popup [mc "Commit %s is already\
8988 included in branch %s -- really re-apply it?" \
8989 [string range $rowmenuid 0 7] $mainhead]]
8992 nowbusy cherrypick [mc "Cherry-picking"]
8994 # Unfortunately git-cherry-pick writes stuff to stderr even when
8995 # no error occurs, and exec takes that as an indication of error...
8996 if {[catch {exec sh -c "git cherry-pick -r $rowmenuid 2>&1"} err]} {
8999 {Entry '(.*)' (would be overwritten by merge|not uptodate)} \
9001 error_popup [mc "Cherry-pick failed because of local changes\
9002 to file '%s'.\nPlease commit, reset or stash\
9003 your changes and try again." $fname]
9004 } elseif {[regexp -line \
9005 {^(CONFLICT \(.*\):|Automatic cherry-pick failed)} \
9007 if {[confirm_popup [mc "Cherry-pick failed because of merge\
9008 conflict.\nDo you wish to run git citool to\
9010 # Force citool to read MERGE_MSG
9011 file delete [file join [gitdir] "GITGUI_MSG"]
9012 exec_citool {} $rowmenuid
9020 set newhead [exec git rev-parse HEAD]
9021 if {$newhead eq $oldhead} {
9023 error_popup [mc "No changes committed"]
9026 addnewchild $newhead $oldhead
9027 if {[commitinview $oldhead $curview]} {
9028 # XXX this isn't right if we have a path limit...
9029 insertrow $newhead $oldhead $curview
9030 if {$mainhead ne {}} {
9031 movehead $newhead $mainhead
9032 movedhead $newhead $mainhead
9034 set mainheadid $newhead
9043 global mainhead rowmenuid confirm_ok resettype NS
9046 set w ".confirmreset"
9049 wm title $w [mc "Confirm reset"]
9050 ${NS}::label $w.m -text \
9051 [mc "Reset branch %s to %s?" $mainhead [string range $rowmenuid 0 7]]
9052 pack $w.m -side top -fill x -padx 20 -pady 20
9053 ${NS}::labelframe $w.f -text [mc "Reset type:"]
9055 ${NS}::radiobutton $w.f.soft -value soft -variable resettype \
9056 -text [mc "Soft: Leave working tree and index untouched"]
9057 grid $w.f.soft -sticky w
9058 ${NS}::radiobutton $w.f.mixed -value mixed -variable resettype \
9059 -text [mc "Mixed: Leave working tree untouched, reset index"]
9060 grid $w.f.mixed -sticky w
9061 ${NS}::radiobutton $w.f.hard -value hard -variable resettype \
9062 -text [mc "Hard: Reset working tree and index\n(discard ALL local changes)"]
9063 grid $w.f.hard -sticky w
9064 pack $w.f -side top -fill x -padx 4
9065 ${NS}::button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w"
9066 pack $w.ok -side left -fill x -padx 20 -pady 20
9067 ${NS}::button $w.cancel -text [mc Cancel] -command "destroy $w"
9068 bind $w <Key-Escape> [list destroy $w]
9069 pack $w.cancel -side right -fill x -padx 20 -pady 20
9070 bind $w <Visibility> "grab $w; focus $w"
9072 if {!$confirm_ok} return
9073 if {[catch {set fd [open \
9074 [list | git reset --$resettype $rowmenuid 2>@1] r]} err]} {
9078 filerun $fd [list readresetstat $fd]
9079 nowbusy reset [mc "Resetting"]
9084 proc readresetstat {fd} {
9085 global mainhead mainheadid showlocalchanges rprogcoord
9087 if {[gets $fd line] >= 0} {
9088 if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
9089 set rprogcoord [expr {1.0 * $m / $n}]
9097 if {[catch {close $fd} err]} {
9100 set oldhead $mainheadid
9101 set newhead [exec git rev-parse HEAD]
9102 if {$newhead ne $oldhead} {
9103 movehead $newhead $mainhead
9104 movedhead $newhead $mainhead
9105 set mainheadid $newhead
9109 if {$showlocalchanges} {
9115 # context menu for a head
9116 proc headmenu {x y id head} {
9117 global headmenuid headmenuhead headctxmenu mainhead
9121 set headmenuhead $head
9123 if {[string match "remotes/*" $head]} {
9126 if {$head eq $mainhead} {
9129 $headctxmenu entryconfigure 0 -state $state
9130 $headctxmenu entryconfigure 1 -state $state
9131 tk_popup $headctxmenu $x $y
9135 global headmenuid headmenuhead headids
9136 global showlocalchanges
9138 # check the tree is clean first??
9139 nowbusy checkout [mc "Checking out"]
9143 set fd [open [list | git checkout $headmenuhead 2>@1] r]
9147 if {$showlocalchanges} {
9151 filerun $fd [list readcheckoutstat $fd $headmenuhead $headmenuid]
9155 proc readcheckoutstat {fd newhead newheadid} {
9156 global mainhead mainheadid headids showlocalchanges progresscoords
9157 global viewmainheadid curview
9159 if {[gets $fd line] >= 0} {
9160 if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
9161 set progresscoords [list 0 [expr {1.0 * $m / $n}]]
9166 set progresscoords {0 0}
9169 if {[catch {close $fd} err]} {
9172 set oldmainid $mainheadid
9173 set mainhead $newhead
9174 set mainheadid $newheadid
9175 set viewmainheadid($curview) $newheadid
9176 redrawtags $oldmainid
9177 redrawtags $newheadid
9179 if {$showlocalchanges} {
9185 global headmenuid headmenuhead mainhead
9188 set head $headmenuhead
9190 # this check shouldn't be needed any more...
9191 if {$head eq $mainhead} {
9192 error_popup [mc "Cannot delete the currently checked-out branch"]
9195 set dheads [descheads $id]
9196 if {[llength $dheads] == 1 && $idheads($dheads) eq $head} {
9197 # the stuff on this branch isn't on any other branch
9198 if {![confirm_popup [mc "The commits on branch %s aren't on any other\
9199 branch.\nReally delete branch %s?" $head $head]]} return
9203 if {[catch {exec git branch -D $head} err]} {
9208 removehead $id $head
9209 removedhead $id $head
9216 # Display a list of tags and heads
9218 global showrefstop bgcolor fgcolor selectbgcolor NS
9219 global bglist fglist reflistfilter reflist maincursor
9222 set showrefstop $top
9223 if {[winfo exists $top]} {
9229 wm title $top [mc "Tags and heads: %s" [file tail [pwd]]]
9230 make_transient $top .
9231 text $top.list -background $bgcolor -foreground $fgcolor \
9232 -selectbackground $selectbgcolor -font mainfont \
9233 -xscrollcommand "$top.xsb set" -yscrollcommand "$top.ysb set" \
9234 -width 30 -height 20 -cursor $maincursor \
9235 -spacing1 1 -spacing3 1 -state disabled
9236 $top.list tag configure highlight -background $selectbgcolor
9237 lappend bglist $top.list
9238 lappend fglist $top.list
9239 ${NS}::scrollbar $top.ysb -command "$top.list yview" -orient vertical
9240 ${NS}::scrollbar $top.xsb -command "$top.list xview" -orient horizontal
9241 grid $top.list $top.ysb -sticky nsew
9242 grid $top.xsb x -sticky ew
9244 ${NS}::label $top.f.l -text "[mc "Filter"]: "
9245 ${NS}::entry $top.f.e -width 20 -textvariable reflistfilter
9246 set reflistfilter "*"
9247 trace add variable reflistfilter write reflistfilter_change
9248 pack $top.f.e -side right -fill x -expand 1
9249 pack $top.f.l -side left
9250 grid $top.f - -sticky ew -pady 2
9251 ${NS}::button $top.close -command [list destroy $top] -text [mc "Close"]
9252 bind $top <Key-Escape> [list destroy $top]
9254 grid columnconfigure $top 0 -weight 1
9255 grid rowconfigure $top 0 -weight 1
9256 bind $top.list <1> {break}
9257 bind $top.list <B1-Motion> {break}
9258 bind $top.list <ButtonRelease-1> {sel_reflist %W %x %y; break}
9263 proc sel_reflist {w x y} {
9264 global showrefstop reflist headids tagids otherrefids
9266 if {![winfo exists $showrefstop]} return
9267 set l [lindex [split [$w index "@$x,$y"] "."] 0]
9268 set ref [lindex $reflist [expr {$l-1}]]
9269 set n [lindex $ref 0]
9270 switch -- [lindex $ref 1] {
9271 "H" {selbyid $headids($n)}
9272 "T" {selbyid $tagids($n)}
9273 "o" {selbyid $otherrefids($n)}
9275 $showrefstop.list tag add highlight $l.0 "$l.0 lineend"
9278 proc unsel_reflist {} {
9281 if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
9282 $showrefstop.list tag remove highlight 0.0 end
9285 proc reflistfilter_change {n1 n2 op} {
9286 global reflistfilter
9288 after cancel refill_reflist
9289 after 200 refill_reflist
9292 proc refill_reflist {} {
9293 global reflist reflistfilter showrefstop headids tagids otherrefids
9296 if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
9298 foreach n [array names headids] {
9299 if {[string match $reflistfilter $n]} {
9300 if {[commitinview $headids($n) $curview]} {
9301 lappend refs [list $n H]
9303 interestedin $headids($n) {run refill_reflist}
9307 foreach n [array names tagids] {
9308 if {[string match $reflistfilter $n]} {
9309 if {[commitinview $tagids($n) $curview]} {
9310 lappend refs [list $n T]
9312 interestedin $tagids($n) {run refill_reflist}
9316 foreach n [array names otherrefids] {
9317 if {[string match $reflistfilter $n]} {
9318 if {[commitinview $otherrefids($n) $curview]} {
9319 lappend refs [list $n o]
9321 interestedin $otherrefids($n) {run refill_reflist}
9325 set refs [lsort -index 0 $refs]
9326 if {$refs eq $reflist} return
9328 # Update the contents of $showrefstop.list according to the
9329 # differences between $reflist (old) and $refs (new)
9330 $showrefstop.list conf -state normal
9331 $showrefstop.list insert end "\n"
9334 while {$i < [llength $reflist] || $j < [llength $refs]} {
9335 if {$i < [llength $reflist]} {
9336 if {$j < [llength $refs]} {
9337 set cmp [string compare [lindex $reflist $i 0] \
9338 [lindex $refs $j 0]]
9340 set cmp [string compare [lindex $reflist $i 1] \
9341 [lindex $refs $j 1]]
9351 $showrefstop.list delete "[expr {$j+1}].0" "[expr {$j+2}].0"
9359 set l [expr {$j + 1}]
9360 $showrefstop.list image create $l.0 -align baseline \
9361 -image reficon-[lindex $refs $j 1] -padx 2
9362 $showrefstop.list insert $l.1 "[lindex $refs $j 0]\n"
9368 # delete last newline
9369 $showrefstop.list delete end-2c end-1c
9370 $showrefstop.list conf -state disabled
9373 # Stuff for finding nearby tags
9374 proc getallcommits {} {
9375 global allcommits nextarc seeds allccache allcwait cachedarcs allcupdate
9376 global idheads idtags idotherrefs allparents tagobjid
9378 if {![info exists allcommits]} {
9384 set allccache [file join [gitdir] "gitk.cache"]
9386 set f [open $allccache r]
9395 set cmd [list | git rev-list --parents]
9396 set allcupdate [expr {$seeds ne {}}]
9400 set refs [concat [array names idheads] [array names idtags] \
9401 [array names idotherrefs]]
9404 foreach name [array names tagobjid] {
9405 lappend tagobjs $tagobjid($name)
9407 foreach id [lsort -unique $refs] {
9408 if {![info exists allparents($id)] &&
9409 [lsearch -exact $tagobjs $id] < 0} {
9420 set cmd [concat $cmd $ids]
9421 # The maximum command line length for the CreateProcess function is 32767 characters, see
9422 # http://blogs.msdn.com/oldnewthing/archive/2003/12/10/56028.aspx
9423 # Be a little conservative in case Tcl adds some more stuff to the command line we do not
9424 # know about and truncate the command line at a SHA1-boundary below 32000 characters.
9425 if {[tk windowingsystem] == "win32" &&
9426 [string length $cmd] > 32000} {
9427 set ndx [string last " " $cmd 32000]
9429 set cmd [string range $cmd 0 $ndx]
9432 set fd [open $cmd r]
9433 fconfigure $fd -blocking 0
9436 filerun $fd [list getallclines $fd]
9442 # Since most commits have 1 parent and 1 child, we group strings of
9443 # such commits into "arcs" joining branch/merge points (BMPs), which
9444 # are commits that either don't have 1 parent or don't have 1 child.
9446 # arcnos(id) - incoming arcs for BMP, arc we're on for other nodes
9447 # arcout(id) - outgoing arcs for BMP
9448 # arcids(a) - list of IDs on arc including end but not start
9449 # arcstart(a) - BMP ID at start of arc
9450 # arcend(a) - BMP ID at end of arc
9451 # growing(a) - arc a is still growing
9452 # arctags(a) - IDs out of arcids (excluding end) that have tags
9453 # archeads(a) - IDs out of arcids (excluding end) that have heads
9454 # The start of an arc is at the descendent end, so "incoming" means
9455 # coming from descendents, and "outgoing" means going towards ancestors.
9457 proc getallclines {fd} {
9458 global allparents allchildren idtags idheads nextarc
9459 global arcnos arcids arctags arcout arcend arcstart archeads growing
9460 global seeds allcommits cachedarcs allcupdate
9463 while {[incr nid] <= 1000 && [gets $fd line] >= 0} {
9464 set id [lindex $line 0]
9465 if {[info exists allparents($id)]} {
9470 set olds [lrange $line 1 end]
9471 set allparents($id) $olds
9472 if {![info exists allchildren($id)]} {
9473 set allchildren($id) {}
9478 if {[llength $olds] == 1 && [llength $a] == 1} {
9479 lappend arcids($a) $id
9480 if {[info exists idtags($id)]} {
9481 lappend arctags($a) $id
9483 if {[info exists idheads($id)]} {
9484 lappend archeads($a) $id
9486 if {[info exists allparents($olds)]} {
9487 # seen parent already
9488 if {![info exists arcout($olds)]} {
9491 lappend arcids($a) $olds
9492 set arcend($a) $olds
9495 lappend allchildren($olds) $id
9496 lappend arcnos($olds) $a
9500 foreach a $arcnos($id) {
9501 lappend arcids($a) $id
9508 lappend allchildren($p) $id
9509 set a [incr nextarc]
9510 set arcstart($a) $id
9517 if {[info exists allparents($p)]} {
9518 # seen it already, may need to make a new branch
9519 if {![info exists arcout($p)]} {
9522 lappend arcids($a) $p
9526 lappend arcnos($p) $a
9531 global cached_dheads cached_dtags cached_atags
9532 catch {unset cached_dheads}
9533 catch {unset cached_dtags}
9534 catch {unset cached_atags}
9537 return [expr {$nid >= 1000? 2: 1}]
9541 fconfigure $fd -blocking 1
9544 # got an error reading the list of commits
9545 # if we were updating, try rereading the whole thing again
9551 error_popup "[mc "Error reading commit topology information;\
9552 branch and preceding/following tag information\
9553 will be incomplete."]\n($err)"
9556 if {[incr allcommits -1] == 0} {
9566 proc recalcarc {a} {
9567 global arctags archeads arcids idtags idheads
9571 foreach id [lrange $arcids($a) 0 end-1] {
9572 if {[info exists idtags($id)]} {
9575 if {[info exists idheads($id)]} {
9580 set archeads($a) $ah
9584 global arcnos arcids nextarc arctags archeads idtags idheads
9585 global arcstart arcend arcout allparents growing
9588 if {[llength $a] != 1} {
9589 puts "oops splitarc called but [llength $a] arcs already"
9593 set i [lsearch -exact $arcids($a) $p]
9595 puts "oops splitarc $p not in arc $a"
9598 set na [incr nextarc]
9599 if {[info exists arcend($a)]} {
9600 set arcend($na) $arcend($a)
9602 set l [lindex $allparents([lindex $arcids($a) end]) 0]
9603 set j [lsearch -exact $arcnos($l) $a]
9604 set arcnos($l) [lreplace $arcnos($l) $j $j $na]
9606 set tail [lrange $arcids($a) [expr {$i+1}] end]
9607 set arcids($a) [lrange $arcids($a) 0 $i]
9609 set arcstart($na) $p
9611 set arcids($na) $tail
9612 if {[info exists growing($a)]} {
9618 if {[llength $arcnos($id)] == 1} {
9621 set j [lsearch -exact $arcnos($id) $a]
9622 set arcnos($id) [lreplace $arcnos($id) $j $j $na]
9626 # reconstruct tags and heads lists
9627 if {$arctags($a) ne {} || $archeads($a) ne {}} {
9632 set archeads($na) {}
9636 # Update things for a new commit added that is a child of one
9637 # existing commit. Used when cherry-picking.
9638 proc addnewchild {id p} {
9639 global allparents allchildren idtags nextarc
9640 global arcnos arcids arctags arcout arcend arcstart archeads growing
9641 global seeds allcommits
9643 if {![info exists allcommits] || ![info exists arcnos($p)]} return
9644 set allparents($id) [list $p]
9645 set allchildren($id) {}
9648 lappend allchildren($p) $id
9649 set a [incr nextarc]
9650 set arcstart($a) $id
9653 set arcids($a) [list $p]
9655 if {![info exists arcout($p)]} {
9658 lappend arcnos($p) $a
9659 set arcout($id) [list $a]
9662 # This implements a cache for the topology information.
9663 # The cache saves, for each arc, the start and end of the arc,
9664 # the ids on the arc, and the outgoing arcs from the end.
9665 proc readcache {f} {
9666 global arcnos arcids arcout arcstart arcend arctags archeads nextarc
9667 global idtags idheads allparents cachedarcs possible_seeds seeds growing
9672 if {$lim - $a > 500} {
9673 set lim [expr {$a + 500}]
9677 # finish reading the cache and setting up arctags, etc.
9679 if {$line ne "1"} {error "bad final version"}
9681 foreach id [array names idtags] {
9682 if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 &&
9683 [llength $allparents($id)] == 1} {
9684 set a [lindex $arcnos($id) 0]
9685 if {$arctags($a) eq {}} {
9690 foreach id [array names idheads] {
9691 if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 &&
9692 [llength $allparents($id)] == 1} {
9693 set a [lindex $arcnos($id) 0]
9694 if {$archeads($a) eq {}} {
9699 foreach id [lsort -unique $possible_seeds] {
9700 if {$arcnos($id) eq {}} {
9706 while {[incr a] <= $lim} {
9708 if {[llength $line] != 3} {error "bad line"}
9709 set s [lindex $line 0]
9711 lappend arcout($s) $a
9712 if {![info exists arcnos($s)]} {
9713 lappend possible_seeds $s
9716 set e [lindex $line 1]
9721 if {![info exists arcout($e)]} {
9725 set arcids($a) [lindex $line 2]
9726 foreach id $arcids($a) {
9727 lappend allparents($s) $id
9729 lappend arcnos($id) $a
9731 if {![info exists allparents($s)]} {
9732 set allparents($s) {}
9737 set nextarc [expr {$a - 1}]
9750 global nextarc cachedarcs possible_seeds
9754 if {[llength $line] != 2 || [lindex $line 0] ne "1"} {error "bad version"}
9755 # make sure it's an integer
9756 set cachedarcs [expr {int([lindex $line 1])}]
9757 if {$cachedarcs < 0} {error "bad number of arcs"}
9759 set possible_seeds {}
9767 proc dropcache {err} {
9768 global allcwait nextarc cachedarcs seeds
9770 #puts "dropping cache ($err)"
9771 foreach v {arcnos arcout arcids arcstart arcend growing \
9772 arctags archeads allparents allchildren} {
9783 proc writecache {f} {
9784 global cachearc cachedarcs allccache
9785 global arcstart arcend arcnos arcids arcout
9789 if {$lim - $a > 1000} {
9790 set lim [expr {$a + 1000}]
9793 while {[incr a] <= $lim} {
9794 if {[info exists arcend($a)]} {
9795 puts $f [list $arcstart($a) $arcend($a) $arcids($a)]
9797 puts $f [list $arcstart($a) {} $arcids($a)]
9802 catch {file delete $allccache}
9803 #puts "writing cache failed ($err)"
9806 set cachearc [expr {$a - 1}]
9807 if {$a > $cachedarcs} {
9816 global nextarc cachedarcs cachearc allccache
9818 if {$nextarc == $cachedarcs} return
9820 set cachedarcs $nextarc
9822 set f [open $allccache w]
9823 puts $f [list 1 $cachedarcs]
9828 # Returns 1 if a is an ancestor of b, -1 if b is an ancestor of a,
9829 # or 0 if neither is true.
9830 proc anc_or_desc {a b} {
9831 global arcout arcstart arcend arcnos cached_isanc
9833 if {$arcnos($a) eq $arcnos($b)} {
9834 # Both are on the same arc(s); either both are the same BMP,
9835 # or if one is not a BMP, the other is also not a BMP or is
9836 # the BMP at end of the arc (and it only has 1 incoming arc).
9837 # Or both can be BMPs with no incoming arcs.
9838 if {$a eq $b || $arcnos($a) eq {}} {
9841 # assert {[llength $arcnos($a)] == 1}
9842 set arc [lindex $arcnos($a) 0]
9843 set i [lsearch -exact $arcids($arc) $a]
9844 set j [lsearch -exact $arcids($arc) $b]
9845 if {$i < 0 || $i > $j} {
9852 if {![info exists arcout($a)]} {
9853 set arc [lindex $arcnos($a) 0]
9854 if {[info exists arcend($arc)]} {
9855 set aend $arcend($arc)
9859 set a $arcstart($arc)
9863 if {![info exists arcout($b)]} {
9864 set arc [lindex $arcnos($b) 0]
9865 if {[info exists arcend($arc)]} {
9866 set bend $arcend($arc)
9870 set b $arcstart($arc)
9880 if {[info exists cached_isanc($a,$bend)]} {
9881 if {$cached_isanc($a,$bend)} {
9885 if {[info exists cached_isanc($b,$aend)]} {
9886 if {$cached_isanc($b,$aend)} {
9889 if {[info exists cached_isanc($a,$bend)]} {
9894 set todo [list $a $b]
9897 for {set i 0} {$i < [llength $todo]} {incr i} {
9898 set x [lindex $todo $i]
9899 if {$anc($x) eq {}} {
9902 foreach arc $arcnos($x) {
9903 set xd $arcstart($arc)
9905 set cached_isanc($a,$bend) 1
9906 set cached_isanc($b,$aend) 0
9908 } elseif {$xd eq $aend} {
9909 set cached_isanc($b,$aend) 1
9910 set cached_isanc($a,$bend) 0
9913 if {![info exists anc($xd)]} {
9914 set anc($xd) $anc($x)
9916 } elseif {$anc($xd) ne $anc($x)} {
9921 set cached_isanc($a,$bend) 0
9922 set cached_isanc($b,$aend) 0
9926 # This identifies whether $desc has an ancestor that is
9927 # a growing tip of the graph and which is not an ancestor of $anc
9928 # and returns 0 if so and 1 if not.
9929 # If we subsequently discover a tag on such a growing tip, and that
9930 # turns out to be a descendent of $anc (which it could, since we
9931 # don't necessarily see children before parents), then $desc
9932 # isn't a good choice to display as a descendent tag of
9933 # $anc (since it is the descendent of another tag which is
9934 # a descendent of $anc). Similarly, $anc isn't a good choice to
9935 # display as a ancestor tag of $desc.
9937 proc is_certain {desc anc} {
9938 global arcnos arcout arcstart arcend growing problems
9941 if {[llength $arcnos($anc)] == 1} {
9942 # tags on the same arc are certain
9943 if {$arcnos($desc) eq $arcnos($anc)} {
9946 if {![info exists arcout($anc)]} {
9947 # if $anc is partway along an arc, use the start of the arc instead
9948 set a [lindex $arcnos($anc) 0]
9949 set anc $arcstart($a)
9952 if {[llength $arcnos($desc)] > 1 || [info exists arcout($desc)]} {
9955 set a [lindex $arcnos($desc) 0]
9961 set anclist [list $x]
9965 for {set i 0} {$i < [llength $anclist] && ($nnh > 0 || $ngrowanc > 0)} {incr i} {
9966 set x [lindex $anclist $i]
9971 foreach a $arcout($x) {
9972 if {[info exists growing($a)]} {
9973 if {![info exists growanc($x)] && $dl($x)} {
9979 if {[info exists dl($y)]} {
9983 if {![info exists done($y)]} {
9986 if {[info exists growanc($x)]} {
9990 for {set k 0} {$k < [llength $xl]} {incr k} {
9991 set z [lindex $xl $k]
9992 foreach c $arcout($z) {
9993 if {[info exists arcend($c)]} {
9995 if {[info exists dl($v)] && $dl($v)} {
9997 if {![info exists done($v)]} {
10000 if {[info exists growanc($v)]} {
10010 } elseif {$y eq $anc || !$dl($x)} {
10021 foreach x [array names growanc] {
10030 proc validate_arctags {a} {
10031 global arctags idtags
10034 set na $arctags($a)
10035 foreach id $arctags($a) {
10037 if {![info exists idtags($id)]} {
10038 set na [lreplace $na $i $i]
10042 set arctags($a) $na
10045 proc validate_archeads {a} {
10046 global archeads idheads
10049 set na $archeads($a)
10050 foreach id $archeads($a) {
10052 if {![info exists idheads($id)]} {
10053 set na [lreplace $na $i $i]
10057 set archeads($a) $na
10060 # Return the list of IDs that have tags that are descendents of id,
10061 # ignoring IDs that are descendents of IDs already reported.
10062 proc desctags {id} {
10063 global arcnos arcstart arcids arctags idtags allparents
10064 global growing cached_dtags
10066 if {![info exists allparents($id)]} {
10069 set t1 [clock clicks -milliseconds]
10071 if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
10072 # part-way along an arc; check that arc first
10073 set a [lindex $arcnos($id) 0]
10074 if {$arctags($a) ne {}} {
10075 validate_arctags $a
10076 set i [lsearch -exact $arcids($a) $id]
10078 foreach t $arctags($a) {
10079 set j [lsearch -exact $arcids($a) $t]
10080 if {$j >= $i} break
10087 set id $arcstart($a)
10088 if {[info exists idtags($id)]} {
10092 if {[info exists cached_dtags($id)]} {
10093 return $cached_dtags($id)
10097 set todo [list $id]
10100 for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} {
10101 set id [lindex $todo $i]
10103 set ta [info exists hastaggedancestor($id)]
10107 # ignore tags on starting node
10108 if {!$ta && $i > 0} {
10109 if {[info exists idtags($id)]} {
10110 set tagloc($id) $id
10112 } elseif {[info exists cached_dtags($id)]} {
10113 set tagloc($id) $cached_dtags($id)
10117 foreach a $arcnos($id) {
10118 set d $arcstart($a)
10119 if {!$ta && $arctags($a) ne {}} {
10120 validate_arctags $a
10121 if {$arctags($a) ne {}} {
10122 lappend tagloc($id) [lindex $arctags($a) end]
10125 if {$ta || $arctags($a) ne {}} {
10126 set tomark [list $d]
10127 for {set j 0} {$j < [llength $tomark]} {incr j} {
10128 set dd [lindex $tomark $j]
10129 if {![info exists hastaggedancestor($dd)]} {
10130 if {[info exists done($dd)]} {
10131 foreach b $arcnos($dd) {
10132 lappend tomark $arcstart($b)
10134 if {[info exists tagloc($dd)]} {
10137 } elseif {[info exists queued($dd)]} {
10140 set hastaggedancestor($dd) 1
10144 if {![info exists queued($d)]} {
10147 if {![info exists hastaggedancestor($d)]} {
10154 foreach id [array names tagloc] {
10155 if {![info exists hastaggedancestor($id)]} {
10156 foreach t $tagloc($id) {
10157 if {[lsearch -exact $tags $t] < 0} {
10163 set t2 [clock clicks -milliseconds]
10166 # remove tags that are descendents of other tags
10167 for {set i 0} {$i < [llength $tags]} {incr i} {
10168 set a [lindex $tags $i]
10169 for {set j 0} {$j < $i} {incr j} {
10170 set b [lindex $tags $j]
10171 set r [anc_or_desc $a $b]
10173 set tags [lreplace $tags $j $j]
10176 } elseif {$r == -1} {
10177 set tags [lreplace $tags $i $i]
10184 if {[array names growing] ne {}} {
10185 # graph isn't finished, need to check if any tag could get
10186 # eclipsed by another tag coming later. Simply ignore any
10187 # tags that could later get eclipsed.
10190 if {[is_certain $t $origid]} {
10194 if {$tags eq $ctags} {
10195 set cached_dtags($origid) $tags
10200 set cached_dtags($origid) $tags
10202 set t3 [clock clicks -milliseconds]
10203 if {0 && $t3 - $t1 >= 100} {
10204 puts "iterating descendents ($loopix/[llength $todo] nodes) took\
10205 [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left"
10210 proc anctags {id} {
10211 global arcnos arcids arcout arcend arctags idtags allparents
10212 global growing cached_atags
10214 if {![info exists allparents($id)]} {
10217 set t1 [clock clicks -milliseconds]
10219 if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
10220 # part-way along an arc; check that arc first
10221 set a [lindex $arcnos($id) 0]
10222 if {$arctags($a) ne {}} {
10223 validate_arctags $a
10224 set i [lsearch -exact $arcids($a) $id]
10225 foreach t $arctags($a) {
10226 set j [lsearch -exact $arcids($a) $t]
10232 if {![info exists arcend($a)]} {
10236 if {[info exists idtags($id)]} {
10240 if {[info exists cached_atags($id)]} {
10241 return $cached_atags($id)
10245 set todo [list $id]
10249 for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} {
10250 set id [lindex $todo $i]
10252 set td [info exists hastaggeddescendent($id)]
10256 # ignore tags on starting node
10257 if {!$td && $i > 0} {
10258 if {[info exists idtags($id)]} {
10259 set tagloc($id) $id
10261 } elseif {[info exists cached_atags($id)]} {
10262 set tagloc($id) $cached_atags($id)
10266 foreach a $arcout($id) {
10267 if {!$td && $arctags($a) ne {}} {
10268 validate_arctags $a
10269 if {$arctags($a) ne {}} {
10270 lappend tagloc($id) [lindex $arctags($a) 0]
10273 if {![info exists arcend($a)]} continue
10275 if {$td || $arctags($a) ne {}} {
10276 set tomark [list $d]
10277 for {set j 0} {$j < [llength $tomark]} {incr j} {
10278 set dd [lindex $tomark $j]
10279 if {![info exists hastaggeddescendent($dd)]} {
10280 if {[info exists done($dd)]} {
10281 foreach b $arcout($dd) {
10282 if {[info exists arcend($b)]} {
10283 lappend tomark $arcend($b)
10286 if {[info exists tagloc($dd)]} {
10289 } elseif {[info exists queued($dd)]} {
10292 set hastaggeddescendent($dd) 1
10296 if {![info exists queued($d)]} {
10299 if {![info exists hastaggeddescendent($d)]} {
10305 set t2 [clock clicks -milliseconds]
10308 foreach id [array names tagloc] {
10309 if {![info exists hastaggeddescendent($id)]} {
10310 foreach t $tagloc($id) {
10311 if {[lsearch -exact $tags $t] < 0} {
10318 # remove tags that are ancestors of other tags
10319 for {set i 0} {$i < [llength $tags]} {incr i} {
10320 set a [lindex $tags $i]
10321 for {set j 0} {$j < $i} {incr j} {
10322 set b [lindex $tags $j]
10323 set r [anc_or_desc $a $b]
10325 set tags [lreplace $tags $j $j]
10328 } elseif {$r == 1} {
10329 set tags [lreplace $tags $i $i]
10336 if {[array names growing] ne {}} {
10337 # graph isn't finished, need to check if any tag could get
10338 # eclipsed by another tag coming later. Simply ignore any
10339 # tags that could later get eclipsed.
10342 if {[is_certain $origid $t]} {
10346 if {$tags eq $ctags} {
10347 set cached_atags($origid) $tags
10352 set cached_atags($origid) $tags
10354 set t3 [clock clicks -milliseconds]
10355 if {0 && $t3 - $t1 >= 100} {
10356 puts "iterating ancestors ($loopix/[llength $todo] nodes) took\
10357 [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left"
10362 # Return the list of IDs that have heads that are descendents of id,
10363 # including id itself if it has a head.
10364 proc descheads {id} {
10365 global arcnos arcstart arcids archeads idheads cached_dheads
10368 if {![info exists allparents($id)]} {
10372 if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
10373 # part-way along an arc; check it first
10374 set a [lindex $arcnos($id) 0]
10375 if {$archeads($a) ne {}} {
10376 validate_archeads $a
10377 set i [lsearch -exact $arcids($a) $id]
10378 foreach t $archeads($a) {
10379 set j [lsearch -exact $arcids($a) $t]
10384 set id $arcstart($a)
10387 set todo [list $id]
10390 for {set i 0} {$i < [llength $todo]} {incr i} {
10391 set id [lindex $todo $i]
10392 if {[info exists cached_dheads($id)]} {
10393 set ret [concat $ret $cached_dheads($id)]
10395 if {[info exists idheads($id)]} {
10398 foreach a $arcnos($id) {
10399 if {$archeads($a) ne {}} {
10400 validate_archeads $a
10401 if {$archeads($a) ne {}} {
10402 set ret [concat $ret $archeads($a)]
10405 set d $arcstart($a)
10406 if {![info exists seen($d)]} {
10413 set ret [lsort -unique $ret]
10414 set cached_dheads($origid) $ret
10415 return [concat $ret $aret]
10418 proc addedtag {id} {
10419 global arcnos arcout cached_dtags cached_atags
10421 if {![info exists arcnos($id)]} return
10422 if {![info exists arcout($id)]} {
10423 recalcarc [lindex $arcnos($id) 0]
10425 catch {unset cached_dtags}
10426 catch {unset cached_atags}
10429 proc addedhead {hid head} {
10430 global arcnos arcout cached_dheads
10432 if {![info exists arcnos($hid)]} return
10433 if {![info exists arcout($hid)]} {
10434 recalcarc [lindex $arcnos($hid) 0]
10436 catch {unset cached_dheads}
10439 proc removedhead {hid head} {
10440 global cached_dheads
10442 catch {unset cached_dheads}
10445 proc movedhead {hid head} {
10446 global arcnos arcout cached_dheads
10448 if {![info exists arcnos($hid)]} return
10449 if {![info exists arcout($hid)]} {
10450 recalcarc [lindex $arcnos($hid) 0]
10452 catch {unset cached_dheads}
10455 proc changedrefs {} {
10456 global cached_dheads cached_dtags cached_atags
10457 global arctags archeads arcnos arcout idheads idtags
10459 foreach id [concat [array names idheads] [array names idtags]] {
10460 if {[info exists arcnos($id)] && ![info exists arcout($id)]} {
10461 set a [lindex $arcnos($id) 0]
10462 if {![info exists donearc($a)]} {
10468 catch {unset cached_dtags}
10469 catch {unset cached_atags}
10470 catch {unset cached_dheads}
10473 proc rereadrefs {} {
10474 global idtags idheads idotherrefs mainheadid
10476 set refids [concat [array names idtags] \
10477 [array names idheads] [array names idotherrefs]]
10478 foreach id $refids {
10479 if {![info exists ref($id)]} {
10480 set ref($id) [listrefs $id]
10483 set oldmainhead $mainheadid
10486 set refids [lsort -unique [concat $refids [array names idtags] \
10487 [array names idheads] [array names idotherrefs]]]
10488 foreach id $refids {
10489 set v [listrefs $id]
10490 if {![info exists ref($id)] || $ref($id) != $v} {
10494 if {$oldmainhead ne $mainheadid} {
10495 redrawtags $oldmainhead
10496 redrawtags $mainheadid
10501 proc listrefs {id} {
10502 global idtags idheads idotherrefs
10505 if {[info exists idtags($id)]} {
10509 if {[info exists idheads($id)]} {
10510 set y $idheads($id)
10513 if {[info exists idotherrefs($id)]} {
10514 set z $idotherrefs($id)
10516 return [list $x $y $z]
10519 proc showtag {tag isnew} {
10520 global ctext tagcontents tagids linknum tagobjid
10523 addtohistory [list showtag $tag 0] savectextpos
10525 $ctext conf -state normal
10529 if {![info exists tagcontents($tag)]} {
10531 set tagcontents($tag) [exec git cat-file tag $tag]
10534 if {[info exists tagcontents($tag)]} {
10535 set text $tagcontents($tag)
10537 set text "[mc "Tag"]: $tag\n[mc "Id"]: $tagids($tag)"
10539 appendwithlinks $text {}
10540 maybe_scroll_ctext 1
10541 $ctext conf -state disabled
10553 if {[info exists gitktmpdir]} {
10554 catch {file delete -force $gitktmpdir}
10558 proc mkfontdisp {font top which} {
10559 global fontattr fontpref $font NS use_ttk
10561 set fontpref($font) [set $font]
10562 ${NS}::button $top.${font}but -text $which \
10563 -command [list choosefont $font $which]
10564 ${NS}::label $top.$font -relief flat -font $font \
10565 -text $fontattr($font,family) -justify left
10566 grid x $top.${font}but $top.$font -sticky w
10569 proc choosefont {font which} {
10570 global fontparam fontlist fonttop fontattr
10573 set fontparam(which) $which
10574 set fontparam(font) $font
10575 set fontparam(family) [font actual $font -family]
10576 set fontparam(size) $fontattr($font,size)
10577 set fontparam(weight) $fontattr($font,weight)
10578 set fontparam(slant) $fontattr($font,slant)
10581 if {![winfo exists $top]} {
10583 eval font config sample [font actual $font]
10585 make_transient $top $prefstop
10586 wm title $top [mc "Gitk font chooser"]
10587 ${NS}::label $top.l -textvariable fontparam(which)
10588 pack $top.l -side top
10589 set fontlist [lsort [font families]]
10590 ${NS}::frame $top.f
10591 listbox $top.f.fam -listvariable fontlist \
10592 -yscrollcommand [list $top.f.sb set]
10593 bind $top.f.fam <<ListboxSelect>> selfontfam
10594 ${NS}::scrollbar $top.f.sb -command [list $top.f.fam yview]
10595 pack $top.f.sb -side right -fill y
10596 pack $top.f.fam -side left -fill both -expand 1
10597 pack $top.f -side top -fill both -expand 1
10598 ${NS}::frame $top.g
10599 spinbox $top.g.size -from 4 -to 40 -width 4 \
10600 -textvariable fontparam(size) \
10601 -validatecommand {string is integer -strict %s}
10602 checkbutton $top.g.bold -padx 5 \
10603 -font {{Times New Roman} 12 bold} -text [mc "B"] -indicatoron 0 \
10604 -variable fontparam(weight) -onvalue bold -offvalue normal
10605 checkbutton $top.g.ital -padx 5 \
10606 -font {{Times New Roman} 12 italic} -text [mc "I"] -indicatoron 0 \
10607 -variable fontparam(slant) -onvalue italic -offvalue roman
10608 pack $top.g.size $top.g.bold $top.g.ital -side left
10609 pack $top.g -side top
10610 canvas $top.c -width 150 -height 50 -border 2 -relief sunk \
10612 $top.c create text 100 25 -anchor center -text $which -font sample \
10613 -fill black -tags text
10614 bind $top.c <Configure> [list centertext $top.c]
10615 pack $top.c -side top -fill x
10616 ${NS}::frame $top.buts
10617 ${NS}::button $top.buts.ok -text [mc "OK"] -command fontok -default active
10618 ${NS}::button $top.buts.can -text [mc "Cancel"] -command fontcan -default normal
10619 bind $top <Key-Return> fontok
10620 bind $top <Key-Escape> fontcan
10621 grid $top.buts.ok $top.buts.can
10622 grid columnconfigure $top.buts 0 -weight 1 -uniform a
10623 grid columnconfigure $top.buts 1 -weight 1 -uniform a
10624 pack $top.buts -side bottom -fill x
10625 trace add variable fontparam write chg_fontparam
10628 $top.c itemconf text -text $which
10630 set i [lsearch -exact $fontlist $fontparam(family)]
10632 $top.f.fam selection set $i
10637 proc centertext {w} {
10638 $w coords text [expr {[winfo width $w] / 2}] [expr {[winfo height $w] / 2}]
10642 global fontparam fontpref prefstop
10644 set f $fontparam(font)
10645 set fontpref($f) [list $fontparam(family) $fontparam(size)]
10646 if {$fontparam(weight) eq "bold"} {
10647 lappend fontpref($f) "bold"
10649 if {$fontparam(slant) eq "italic"} {
10650 lappend fontpref($f) "italic"
10653 $w conf -text $fontparam(family) -font $fontpref($f)
10659 global fonttop fontparam
10661 if {[info exists fonttop]} {
10662 catch {destroy $fonttop}
10663 catch {font delete sample}
10669 if {[package vsatisfies [package provide Tk] 8.6]} {
10670 # In Tk 8.6 we have a native font chooser dialog. Overwrite the above
10671 # function to make use of it.
10672 proc choosefont {font which} {
10673 tk fontchooser configure -title $which -font $font \
10674 -command [list on_choosefont $font $which]
10675 tk fontchooser show
10677 proc on_choosefont {font which newfont} {
10679 puts stderr "$font $newfont"
10680 array set f [font actual $newfont]
10681 set fontparam(which) $which
10682 set fontparam(font) $font
10683 set fontparam(family) $f(-family)
10684 set fontparam(size) $f(-size)
10685 set fontparam(weight) $f(-weight)
10686 set fontparam(slant) $f(-slant)
10691 proc selfontfam {} {
10692 global fonttop fontparam
10694 set i [$fonttop.f.fam curselection]
10696 set fontparam(family) [$fonttop.f.fam get $i]
10700 proc chg_fontparam {v sub op} {
10703 font config sample -$sub $fontparam($sub)
10707 global maxwidth maxgraphpct use_ttk NS
10708 global oldprefs prefstop showneartags showlocalchanges
10709 global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
10710 global tabstop limitdiffs autoselect extdifftool perfile_attrs
10711 global hideremotes want_ttk have_ttk
10715 if {[winfo exists $top]} {
10719 foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
10720 limitdiffs tabstop perfile_attrs hideremotes want_ttk} {
10721 set oldprefs($v) [set $v]
10724 wm title $top [mc "Gitk preferences"]
10725 make_transient $top .
10726 ${NS}::label $top.ldisp -text [mc "Commit list display options"]
10727 grid $top.ldisp - -sticky w -pady 10
10728 ${NS}::label $top.spacer -text " "
10729 ${NS}::label $top.maxwidthl -text [mc "Maximum graph width (lines)"]
10730 spinbox $top.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
10731 grid $top.spacer $top.maxwidthl $top.maxwidth -sticky w
10732 ${NS}::label $top.maxpctl -text [mc "Maximum graph width (% of pane)"]
10733 spinbox $top.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
10734 grid x $top.maxpctl $top.maxpct -sticky w
10735 ${NS}::checkbutton $top.showlocal -text [mc "Show local changes"] \
10736 -variable showlocalchanges
10737 grid x $top.showlocal -sticky w
10738 ${NS}::checkbutton $top.autoselect -text [mc "Auto-select SHA1"] \
10739 -variable autoselect
10740 grid x $top.autoselect -sticky w
10741 ${NS}::checkbutton $top.hideremotes -text [mc "Hide remote refs"] \
10742 -variable hideremotes
10743 grid x $top.hideremotes -sticky w
10745 ${NS}::label $top.ddisp -text [mc "Diff display options"]
10746 grid $top.ddisp - -sticky w -pady 10
10747 ${NS}::label $top.tabstopl -text [mc "Tab spacing"]
10748 spinbox $top.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
10749 grid x $top.tabstopl $top.tabstop -sticky w
10750 ${NS}::checkbutton $top.ntag -text [mc "Display nearby tags"] \
10751 -variable showneartags
10752 grid x $top.ntag -sticky w
10753 ${NS}::checkbutton $top.ldiff -text [mc "Limit diffs to listed paths"] \
10754 -variable limitdiffs
10755 grid x $top.ldiff -sticky w
10756 ${NS}::checkbutton $top.lattr -text [mc "Support per-file encodings"] \
10757 -variable perfile_attrs
10758 grid x $top.lattr -sticky w
10760 ${NS}::entry $top.extdifft -textvariable extdifftool
10761 ${NS}::frame $top.extdifff
10762 ${NS}::label $top.extdifff.l -text [mc "External diff tool" ]
10763 ${NS}::button $top.extdifff.b -text [mc "Choose..."] -command choose_extdiff
10764 pack $top.extdifff.l $top.extdifff.b -side left
10765 pack configure $top.extdifff.l -padx 10
10766 grid x $top.extdifff $top.extdifft -sticky ew
10768 ${NS}::label $top.lgen -text [mc "General options"]
10769 grid $top.lgen - -sticky w -pady 10
10770 ${NS}::checkbutton $top.want_ttk -variable want_ttk \
10771 -text [mc "Use themed widgets"]
10773 ${NS}::label $top.ttk_note -text [mc "(change requires restart)"]
10775 ${NS}::label $top.ttk_note -text [mc "(currently unavailable)"]
10777 grid x $top.want_ttk $top.ttk_note -sticky w
10779 ${NS}::label $top.cdisp -text [mc "Colors: press to choose"]
10780 grid $top.cdisp - -sticky w -pady 10
10781 label $top.ui -padx 40 -relief sunk -background $uicolor
10782 ${NS}::button $top.uibut -text [mc "Interface"] \
10783 -command [list choosecolor uicolor {} $top.ui [mc "interface"] setui]
10784 grid x $top.uibut $top.ui -sticky w
10785 label $top.bg -padx 40 -relief sunk -background $bgcolor
10786 ${NS}::button $top.bgbut -text [mc "Background"] \
10787 -command [list choosecolor bgcolor {} $top.bg [mc "background"] setbg]
10788 grid x $top.bgbut $top.bg -sticky w
10789 label $top.fg -padx 40 -relief sunk -background $fgcolor
10790 ${NS}::button $top.fgbut -text [mc "Foreground"] \
10791 -command [list choosecolor fgcolor {} $top.fg [mc "foreground"] setfg]
10792 grid x $top.fgbut $top.fg -sticky w
10793 label $top.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]
10794 ${NS}::button $top.diffoldbut -text [mc "Diff: old lines"] \
10795 -command [list choosecolor diffcolors 0 $top.diffold [mc "diff old lines"] \
10796 [list $ctext tag conf d0 -foreground]]
10797 grid x $top.diffoldbut $top.diffold -sticky w
10798 label $top.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1]
10799 ${NS}::button $top.diffnewbut -text [mc "Diff: new lines"] \
10800 -command [list choosecolor diffcolors 1 $top.diffnew [mc "diff new lines"] \
10801 [list $ctext tag conf dresult -foreground]]
10802 grid x $top.diffnewbut $top.diffnew -sticky w
10803 label $top.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2]
10804 ${NS}::button $top.hunksepbut -text [mc "Diff: hunk header"] \
10805 -command [list choosecolor diffcolors 2 $top.hunksep \
10806 [mc "diff hunk header"] \
10807 [list $ctext tag conf hunksep -foreground]]
10808 grid x $top.hunksepbut $top.hunksep -sticky w
10809 label $top.markbgsep -padx 40 -relief sunk -background $markbgcolor
10810 ${NS}::button $top.markbgbut -text [mc "Marked line bg"] \
10811 -command [list choosecolor markbgcolor {} $top.markbgsep \
10812 [mc "marked line background"] \
10813 [list $ctext tag conf omark -background]]
10814 grid x $top.markbgbut $top.markbgsep -sticky w
10815 label $top.selbgsep -padx 40 -relief sunk -background $selectbgcolor
10816 ${NS}::button $top.selbgbut -text [mc "Select bg"] \
10817 -command [list choosecolor selectbgcolor {} $top.selbgsep [mc "background"] setselbg]
10818 grid x $top.selbgbut $top.selbgsep -sticky w
10820 ${NS}::label $top.cfont -text [mc "Fonts: press to choose"]
10821 grid $top.cfont - -sticky w -pady 10
10822 mkfontdisp mainfont $top [mc "Main font"]
10823 mkfontdisp textfont $top [mc "Diff display font"]
10824 mkfontdisp uifont $top [mc "User interface font"]
10826 ${NS}::frame $top.buts
10827 ${NS}::button $top.buts.ok -text [mc "OK"] -command prefsok -default active
10828 ${NS}::button $top.buts.can -text [mc "Cancel"] -command prefscan -default normal
10829 bind $top <Key-Return> prefsok
10830 bind $top <Key-Escape> prefscan
10831 grid $top.buts.ok $top.buts.can
10832 grid columnconfigure $top.buts 0 -weight 1 -uniform a
10833 grid columnconfigure $top.buts 1 -weight 1 -uniform a
10834 grid $top.buts - - -pady 10 -sticky ew
10835 grid columnconfigure $top 2 -weight 1
10836 bind $top <Visibility> "focus $top.buts.ok"
10839 proc choose_extdiff {} {
10842 set prog [tk_getOpenFile -title [mc "External diff tool"] -multiple false]
10844 set extdifftool $prog
10848 proc choosecolor {v vi w x cmd} {
10851 set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \
10852 -title [mc "Gitk: choose color for %s" $x]]
10853 if {$c eq {}} return
10854 $w conf -background $c
10859 proc setselbg {c} {
10860 global bglist cflist
10861 foreach w $bglist {
10862 $w configure -selectbackground $c
10864 $cflist tag configure highlight \
10865 -background [$cflist cget -selectbackground]
10866 allcanvs itemconf secsel -fill $c
10869 # This sets the background color and the color scheme for the whole UI.
10870 # For some reason, tk_setPalette chooses a nasty dark red for selectColor
10871 # if we don't specify one ourselves, which makes the checkbuttons and
10872 # radiobuttons look bad. This chooses white for selectColor if the
10873 # background color is light, or black if it is dark.
10875 if {[tk windowingsystem] eq "win32"} { return }
10876 set bg [winfo rgb . $c]
10878 if {[lindex $bg 0] + 1.5 * [lindex $bg 1] + 0.5 * [lindex $bg 2] > 100000} {
10881 tk_setPalette background $c selectColor $selc
10887 foreach w $bglist {
10888 $w conf -background $c
10895 foreach w $fglist {
10896 $w conf -foreground $c
10898 allcanvs itemconf text -fill $c
10899 $canv itemconf circle -outline $c
10900 $canv itemconf markid -outline $c
10904 global oldprefs prefstop
10906 foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
10907 limitdiffs tabstop perfile_attrs hideremotes want_ttk} {
10909 set $v $oldprefs($v)
10911 catch {destroy $prefstop}
10917 global maxwidth maxgraphpct
10918 global oldprefs prefstop showneartags showlocalchanges
10919 global fontpref mainfont textfont uifont
10920 global limitdiffs treediffs perfile_attrs
10923 catch {destroy $prefstop}
10927 if {$mainfont ne $fontpref(mainfont)} {
10928 set mainfont $fontpref(mainfont)
10929 parsefont mainfont $mainfont
10930 eval font configure mainfont [fontflags mainfont]
10931 eval font configure mainfontbold [fontflags mainfont 1]
10935 if {$textfont ne $fontpref(textfont)} {
10936 set textfont $fontpref(textfont)
10937 parsefont textfont $textfont
10938 eval font configure textfont [fontflags textfont]
10939 eval font configure textfontbold [fontflags textfont 1]
10941 if {$uifont ne $fontpref(uifont)} {
10942 set uifont $fontpref(uifont)
10943 parsefont uifont $uifont
10944 eval font configure uifont [fontflags uifont]
10947 if {$showlocalchanges != $oldprefs(showlocalchanges)} {
10948 if {$showlocalchanges} {
10954 if {$limitdiffs != $oldprefs(limitdiffs) ||
10955 ($perfile_attrs && !$oldprefs(perfile_attrs))} {
10956 # treediffs elements are limited by path;
10957 # won't have encodings cached if perfile_attrs was just turned on
10958 catch {unset treediffs}
10960 if {$fontchanged || $maxwidth != $oldprefs(maxwidth)
10961 || $maxgraphpct != $oldprefs(maxgraphpct)} {
10963 } elseif {$showneartags != $oldprefs(showneartags) ||
10964 $limitdiffs != $oldprefs(limitdiffs)} {
10967 if {$hideremotes != $oldprefs(hideremotes)} {
10972 proc formatdate {d} {
10973 global datetimeformat
10975 set d [clock format $d -format $datetimeformat]
10980 # This list of encoding names and aliases is distilled from
10981 # http://www.iana.org/assignments/character-sets.
10982 # Not all of them are supported by Tcl.
10983 set encoding_aliases {
10984 { ANSI_X3.4-1968 iso-ir-6 ANSI_X3.4-1986 ISO_646.irv:1991 ASCII
10985 ISO646-US US-ASCII us IBM367 cp367 csASCII }
10986 { ISO-10646-UTF-1 csISO10646UTF1 }
10987 { ISO_646.basic:1983 ref csISO646basic1983 }
10988 { INVARIANT csINVARIANT }
10989 { ISO_646.irv:1983 iso-ir-2 irv csISO2IntlRefVersion }
10990 { BS_4730 iso-ir-4 ISO646-GB gb uk csISO4UnitedKingdom }
10991 { NATS-SEFI iso-ir-8-1 csNATSSEFI }
10992 { NATS-SEFI-ADD iso-ir-8-2 csNATSSEFIADD }
10993 { NATS-DANO iso-ir-9-1 csNATSDANO }
10994 { NATS-DANO-ADD iso-ir-9-2 csNATSDANOADD }
10995 { SEN_850200_B iso-ir-10 FI ISO646-FI ISO646-SE se csISO10Swedish }
10996 { SEN_850200_C iso-ir-11 ISO646-SE2 se2 csISO11SwedishForNames }
10997 { KS_C_5601-1987 iso-ir-149 KS_C_5601-1989 KSC_5601 korean csKSC56011987 }
10998 { ISO-2022-KR csISO2022KR }
11000 { ISO-2022-JP csISO2022JP }
11001 { ISO-2022-JP-2 csISO2022JP2 }
11002 { JIS_C6220-1969-jp JIS_C6220-1969 iso-ir-13 katakana x0201-7
11003 csISO13JISC6220jp }
11004 { JIS_C6220-1969-ro iso-ir-14 jp ISO646-JP csISO14JISC6220ro }
11005 { IT iso-ir-15 ISO646-IT csISO15Italian }
11006 { PT iso-ir-16 ISO646-PT csISO16Portuguese }
11007 { ES iso-ir-17 ISO646-ES csISO17Spanish }
11008 { greek7-old iso-ir-18 csISO18Greek7Old }
11009 { latin-greek iso-ir-19 csISO19LatinGreek }
11010 { DIN_66003 iso-ir-21 de ISO646-DE csISO21German }
11011 { NF_Z_62-010_(1973) iso-ir-25 ISO646-FR1 csISO25French }
11012 { Latin-greek-1 iso-ir-27 csISO27LatinGreek1 }
11013 { ISO_5427 iso-ir-37 csISO5427Cyrillic }
11014 { JIS_C6226-1978 iso-ir-42 csISO42JISC62261978 }
11015 { BS_viewdata iso-ir-47 csISO47BSViewdata }
11016 { INIS iso-ir-49 csISO49INIS }
11017 { INIS-8 iso-ir-50 csISO50INIS8 }
11018 { INIS-cyrillic iso-ir-51 csISO51INISCyrillic }
11019 { ISO_5427:1981 iso-ir-54 ISO5427Cyrillic1981 }
11020 { ISO_5428:1980 iso-ir-55 csISO5428Greek }
11021 { GB_1988-80 iso-ir-57 cn ISO646-CN csISO57GB1988 }
11022 { GB_2312-80 iso-ir-58 chinese csISO58GB231280 }
11023 { NS_4551-1 iso-ir-60 ISO646-NO no csISO60DanishNorwegian
11024 csISO60Norwegian1 }
11025 { NS_4551-2 ISO646-NO2 iso-ir-61 no2 csISO61Norwegian2 }
11026 { NF_Z_62-010 iso-ir-69 ISO646-FR fr csISO69French }
11027 { videotex-suppl iso-ir-70 csISO70VideotexSupp1 }
11028 { PT2 iso-ir-84 ISO646-PT2 csISO84Portuguese2 }
11029 { ES2 iso-ir-85 ISO646-ES2 csISO85Spanish2 }
11030 { MSZ_7795.3 iso-ir-86 ISO646-HU hu csISO86Hungarian }
11031 { JIS_C6226-1983 iso-ir-87 x0208 JIS_X0208-1983 csISO87JISX0208 }
11032 { greek7 iso-ir-88 csISO88Greek7 }
11033 { ASMO_449 ISO_9036 arabic7 iso-ir-89 csISO89ASMO449 }
11034 { iso-ir-90 csISO90 }
11035 { JIS_C6229-1984-a iso-ir-91 jp-ocr-a csISO91JISC62291984a }
11036 { JIS_C6229-1984-b iso-ir-92 ISO646-JP-OCR-B jp-ocr-b
11037 csISO92JISC62991984b }
11038 { JIS_C6229-1984-b-add iso-ir-93 jp-ocr-b-add csISO93JIS62291984badd }
11039 { JIS_C6229-1984-hand iso-ir-94 jp-ocr-hand csISO94JIS62291984hand }
11040 { JIS_C6229-1984-hand-add iso-ir-95 jp-ocr-hand-add
11041 csISO95JIS62291984handadd }
11042 { JIS_C6229-1984-kana iso-ir-96 csISO96JISC62291984kana }
11043 { ISO_2033-1983 iso-ir-98 e13b csISO2033 }
11044 { ANSI_X3.110-1983 iso-ir-99 CSA_T500-1983 NAPLPS csISO99NAPLPS }
11045 { ISO_8859-1:1987 iso-ir-100 ISO_8859-1 ISO-8859-1 latin1 l1 IBM819
11046 CP819 csISOLatin1 }
11047 { ISO_8859-2:1987 iso-ir-101 ISO_8859-2 ISO-8859-2 latin2 l2 csISOLatin2 }
11048 { T.61-7bit iso-ir-102 csISO102T617bit }
11049 { T.61-8bit T.61 iso-ir-103 csISO103T618bit }
11050 { ISO_8859-3:1988 iso-ir-109 ISO_8859-3 ISO-8859-3 latin3 l3 csISOLatin3 }
11051 { ISO_8859-4:1988 iso-ir-110 ISO_8859-4 ISO-8859-4 latin4 l4 csISOLatin4 }
11052 { ECMA-cyrillic iso-ir-111 KOI8-E csISO111ECMACyrillic }
11053 { CSA_Z243.4-1985-1 iso-ir-121 ISO646-CA csa7-1 ca csISO121Canadian1 }
11054 { CSA_Z243.4-1985-2 iso-ir-122 ISO646-CA2 csa7-2 csISO122Canadian2 }
11055 { CSA_Z243.4-1985-gr iso-ir-123 csISO123CSAZ24341985gr }
11056 { ISO_8859-6:1987 iso-ir-127 ISO_8859-6 ISO-8859-6 ECMA-114 ASMO-708
11057 arabic csISOLatinArabic }
11058 { ISO_8859-6-E csISO88596E ISO-8859-6-E }
11059 { ISO_8859-6-I csISO88596I ISO-8859-6-I }
11060 { ISO_8859-7:1987 iso-ir-126 ISO_8859-7 ISO-8859-7 ELOT_928 ECMA-118
11061 greek greek8 csISOLatinGreek }
11062 { T.101-G2 iso-ir-128 csISO128T101G2 }
11063 { ISO_8859-8:1988 iso-ir-138 ISO_8859-8 ISO-8859-8 hebrew
11065 { ISO_8859-8-E csISO88598E ISO-8859-8-E }
11066 { ISO_8859-8-I csISO88598I ISO-8859-8-I }
11067 { CSN_369103 iso-ir-139 csISO139CSN369103 }
11068 { JUS_I.B1.002 iso-ir-141 ISO646-YU js yu csISO141JUSIB1002 }
11069 { ISO_6937-2-add iso-ir-142 csISOTextComm }
11070 { IEC_P27-1 iso-ir-143 csISO143IECP271 }
11071 { ISO_8859-5:1988 iso-ir-144 ISO_8859-5 ISO-8859-5 cyrillic
11072 csISOLatinCyrillic }
11073 { JUS_I.B1.003-serb iso-ir-146 serbian csISO146Serbian }
11074 { JUS_I.B1.003-mac macedonian iso-ir-147 csISO147Macedonian }
11075 { ISO_8859-9:1989 iso-ir-148 ISO_8859-9 ISO-8859-9 latin5 l5 csISOLatin5 }
11076 { greek-ccitt iso-ir-150 csISO150 csISO150GreekCCITT }
11077 { NC_NC00-10:81 cuba iso-ir-151 ISO646-CU csISO151Cuba }
11078 { ISO_6937-2-25 iso-ir-152 csISO6937Add }
11079 { GOST_19768-74 ST_SEV_358-88 iso-ir-153 csISO153GOST1976874 }
11080 { ISO_8859-supp iso-ir-154 latin1-2-5 csISO8859Supp }
11081 { ISO_10367-box iso-ir-155 csISO10367Box }
11082 { ISO-8859-10 iso-ir-157 l6 ISO_8859-10:1992 csISOLatin6 latin6 }
11083 { latin-lap lap iso-ir-158 csISO158Lap }
11084 { JIS_X0212-1990 x0212 iso-ir-159 csISO159JISX02121990 }
11085 { DS_2089 DS2089 ISO646-DK dk csISO646Danish }
11088 { JIS_X0201 X0201 csHalfWidthKatakana }
11089 { KSC5636 ISO646-KR csKSC5636 }
11090 { ISO-10646-UCS-2 csUnicode }
11091 { ISO-10646-UCS-4 csUCS4 }
11092 { DEC-MCS dec csDECMCS }
11093 { hp-roman8 roman8 r8 csHPRoman8 }
11094 { macintosh mac csMacintosh }
11095 { IBM037 cp037 ebcdic-cp-us ebcdic-cp-ca ebcdic-cp-wt ebcdic-cp-nl
11097 { IBM038 EBCDIC-INT cp038 csIBM038 }
11098 { IBM273 CP273 csIBM273 }
11099 { IBM274 EBCDIC-BE CP274 csIBM274 }
11100 { IBM275 EBCDIC-BR cp275 csIBM275 }
11101 { IBM277 EBCDIC-CP-DK EBCDIC-CP-NO csIBM277 }
11102 { IBM278 CP278 ebcdic-cp-fi ebcdic-cp-se csIBM278 }
11103 { IBM280 CP280 ebcdic-cp-it csIBM280 }
11104 { IBM281 EBCDIC-JP-E cp281 csIBM281 }
11105 { IBM284 CP284 ebcdic-cp-es csIBM284 }
11106 { IBM285 CP285 ebcdic-cp-gb csIBM285 }
11107 { IBM290 cp290 EBCDIC-JP-kana csIBM290 }
11108 { IBM297 cp297 ebcdic-cp-fr csIBM297 }
11109 { IBM420 cp420 ebcdic-cp-ar1 csIBM420 }
11110 { IBM423 cp423 ebcdic-cp-gr csIBM423 }
11111 { IBM424 cp424 ebcdic-cp-he csIBM424 }
11112 { IBM437 cp437 437 csPC8CodePage437 }
11113 { IBM500 CP500 ebcdic-cp-be ebcdic-cp-ch csIBM500 }
11114 { IBM775 cp775 csPC775Baltic }
11115 { IBM850 cp850 850 csPC850Multilingual }
11116 { IBM851 cp851 851 csIBM851 }
11117 { IBM852 cp852 852 csPCp852 }
11118 { IBM855 cp855 855 csIBM855 }
11119 { IBM857 cp857 857 csIBM857 }
11120 { IBM860 cp860 860 csIBM860 }
11121 { IBM861 cp861 861 cp-is csIBM861 }
11122 { IBM862 cp862 862 csPC862LatinHebrew }
11123 { IBM863 cp863 863 csIBM863 }
11124 { IBM864 cp864 csIBM864 }
11125 { IBM865 cp865 865 csIBM865 }
11126 { IBM866 cp866 866 csIBM866 }
11127 { IBM868 CP868 cp-ar csIBM868 }
11128 { IBM869 cp869 869 cp-gr csIBM869 }
11129 { IBM870 CP870 ebcdic-cp-roece ebcdic-cp-yu csIBM870 }
11130 { IBM871 CP871 ebcdic-cp-is csIBM871 }
11131 { IBM880 cp880 EBCDIC-Cyrillic csIBM880 }
11132 { IBM891 cp891 csIBM891 }
11133 { IBM903 cp903 csIBM903 }
11134 { IBM904 cp904 904 csIBBM904 }
11135 { IBM905 CP905 ebcdic-cp-tr csIBM905 }
11136 { IBM918 CP918 ebcdic-cp-ar2 csIBM918 }
11137 { IBM1026 CP1026 csIBM1026 }
11138 { EBCDIC-AT-DE csIBMEBCDICATDE }
11139 { EBCDIC-AT-DE-A csEBCDICATDEA }
11140 { EBCDIC-CA-FR csEBCDICCAFR }
11141 { EBCDIC-DK-NO csEBCDICDKNO }
11142 { EBCDIC-DK-NO-A csEBCDICDKNOA }
11143 { EBCDIC-FI-SE csEBCDICFISE }
11144 { EBCDIC-FI-SE-A csEBCDICFISEA }
11145 { EBCDIC-FR csEBCDICFR }
11146 { EBCDIC-IT csEBCDICIT }
11147 { EBCDIC-PT csEBCDICPT }
11148 { EBCDIC-ES csEBCDICES }
11149 { EBCDIC-ES-A csEBCDICESA }
11150 { EBCDIC-ES-S csEBCDICESS }
11151 { EBCDIC-UK csEBCDICUK }
11152 { EBCDIC-US csEBCDICUS }
11153 { UNKNOWN-8BIT csUnknown8BiT }
11154 { MNEMONIC csMnemonic }
11156 { VISCII csVISCII }
11159 { IBM00858 CCSID00858 CP00858 PC-Multilingual-850+euro }
11160 { IBM00924 CCSID00924 CP00924 ebcdic-Latin9--euro }
11161 { IBM01140 CCSID01140 CP01140 ebcdic-us-37+euro }
11162 { IBM01141 CCSID01141 CP01141 ebcdic-de-273+euro }
11163 { IBM01142 CCSID01142 CP01142 ebcdic-dk-277+euro ebcdic-no-277+euro }
11164 { IBM01143 CCSID01143 CP01143 ebcdic-fi-278+euro ebcdic-se-278+euro }
11165 { IBM01144 CCSID01144 CP01144 ebcdic-it-280+euro }
11166 { IBM01145 CCSID01145 CP01145 ebcdic-es-284+euro }
11167 { IBM01146 CCSID01146 CP01146 ebcdic-gb-285+euro }
11168 { IBM01147 CCSID01147 CP01147 ebcdic-fr-297+euro }
11169 { IBM01148 CCSID01148 CP01148 ebcdic-international-500+euro }
11170 { IBM01149 CCSID01149 CP01149 ebcdic-is-871+euro }
11171 { IBM1047 IBM-1047 }
11172 { PTCP154 csPTCP154 PT154 CP154 Cyrillic-Asian }
11173 { Amiga-1251 Ami1251 Amiga1251 Ami-1251 }
11174 { UNICODE-1-1 csUnicode11 }
11175 { CESU-8 csCESU-8 }
11176 { BOCU-1 csBOCU-1 }
11177 { UNICODE-1-1-UTF-7 csUnicode11UTF7 }
11178 { ISO-8859-14 iso-ir-199 ISO_8859-14:1998 ISO_8859-14 latin8 iso-celtic
11180 { ISO-8859-15 ISO_8859-15 Latin-9 }
11181 { ISO-8859-16 iso-ir-226 ISO_8859-16:2001 ISO_8859-16 latin10 l10 }
11182 { GBK CP936 MS936 windows-936 }
11183 { JIS_Encoding csJISEncoding }
11184 { Shift_JIS MS_Kanji csShiftJIS ShiftJIS Shift-JIS }
11185 { Extended_UNIX_Code_Packed_Format_for_Japanese csEUCPkdFmtJapanese
11187 { Extended_UNIX_Code_Fixed_Width_for_Japanese csEUCFixWidJapanese }
11188 { ISO-10646-UCS-Basic csUnicodeASCII }
11189 { ISO-10646-Unicode-Latin1 csUnicodeLatin1 ISO-10646 }
11190 { ISO-Unicode-IBM-1261 csUnicodeIBM1261 }
11191 { ISO-Unicode-IBM-1268 csUnicodeIBM1268 }
11192 { ISO-Unicode-IBM-1276 csUnicodeIBM1276 }
11193 { ISO-Unicode-IBM-1264 csUnicodeIBM1264 }
11194 { ISO-Unicode-IBM-1265 csUnicodeIBM1265 }
11195 { ISO-8859-1-Windows-3.0-Latin-1 csWindows30Latin1 }
11196 { ISO-8859-1-Windows-3.1-Latin-1 csWindows31Latin1 }
11197 { ISO-8859-2-Windows-Latin-2 csWindows31Latin2 }
11198 { ISO-8859-9-Windows-Latin-5 csWindows31Latin5 }
11199 { Adobe-Standard-Encoding csAdobeStandardEncoding }
11200 { Ventura-US csVenturaUS }
11201 { Ventura-International csVenturaInternational }
11202 { PC8-Danish-Norwegian csPC8DanishNorwegian }
11203 { PC8-Turkish csPC8Turkish }
11204 { IBM-Symbols csIBMSymbols }
11205 { IBM-Thai csIBMThai }
11206 { HP-Legal csHPLegal }
11207 { HP-Pi-font csHPPiFont }
11208 { HP-Math8 csHPMath8 }
11209 { Adobe-Symbol-Encoding csHPPSMath }
11210 { HP-DeskTop csHPDesktop }
11211 { Ventura-Math csVenturaMath }
11212 { Microsoft-Publishing csMicrosoftPublishing }
11213 { Windows-31J csWindows31J }
11214 { GB2312 csGB2312 }
11218 proc tcl_encoding {enc} {
11219 global encoding_aliases tcl_encoding_cache
11220 if {[info exists tcl_encoding_cache($enc)]} {
11221 return $tcl_encoding_cache($enc)
11223 set names [encoding names]
11224 set lcnames [string tolower $names]
11225 set enc [string tolower $enc]
11226 set i [lsearch -exact $lcnames $enc]
11228 # look for "isonnn" instead of "iso-nnn" or "iso_nnn"
11229 if {[regsub {^(iso|cp|ibm|jis)[-_]} $enc {\1} encx]} {
11230 set i [lsearch -exact $lcnames $encx]
11234 foreach l $encoding_aliases {
11235 set ll [string tolower $l]
11236 if {[lsearch -exact $ll $enc] < 0} continue
11237 # look through the aliases for one that tcl knows about
11239 set i [lsearch -exact $lcnames $e]
11241 if {[regsub {^(iso|cp|ibm|jis)[-_]} $e {\1} ex]} {
11242 set i [lsearch -exact $lcnames $ex]
11252 set tclenc [lindex $names $i]
11254 set tcl_encoding_cache($enc) $tclenc
11258 proc gitattr {path attr default} {
11259 global path_attr_cache
11260 if {[info exists path_attr_cache($attr,$path)]} {
11261 set r $path_attr_cache($attr,$path)
11263 set r "unspecified"
11264 if {![catch {set line [exec git check-attr $attr -- $path]}]} {
11265 regexp "(.*): $attr: (.*)" $line m f r
11267 set path_attr_cache($attr,$path) $r
11269 if {$r eq "unspecified"} {
11275 proc cache_gitattr {attr pathlist} {
11276 global path_attr_cache
11278 foreach path $pathlist {
11279 if {![info exists path_attr_cache($attr,$path)]} {
11280 lappend newlist $path
11284 if {[tk windowingsystem] == "win32"} {
11285 # windows has a 32k limit on the arguments to a command...
11288 while {$newlist ne {}} {
11289 set head [lrange $newlist 0 [expr {$lim - 1}]]
11290 set newlist [lrange $newlist $lim end]
11291 if {![catch {set rlist [eval exec git check-attr $attr -- $head]}]} {
11292 foreach row [split $rlist "\n"] {
11293 if {[regexp "(.*): $attr: (.*)" $row m path value]} {
11294 if {[string index $path 0] eq "\""} {
11295 set path [encoding convertfrom [lindex $path 0]]
11297 set path_attr_cache($attr,$path) $value
11304 proc get_path_encoding {path} {
11305 global gui_encoding perfile_attrs
11306 set tcl_enc $gui_encoding
11307 if {$path ne {} && $perfile_attrs} {
11308 set enc2 [tcl_encoding [gitattr $path encoding $tcl_enc]]
11316 # First check that Tcl/Tk is recent enough
11317 if {[catch {package require Tk 8.4} err]} {
11318 show_error {} . "Sorry, gitk cannot run with this version of Tcl/Tk.\n\
11319 Gitk requires at least Tcl/Tk 8.4." list
11324 set wrcomcmd "git diff-tree --stdin -p --pretty"
11328 set gitencoding [exec git config --get i18n.commitencoding]
11331 set gitencoding [exec git config --get i18n.logoutputencoding]
11333 if {$gitencoding == ""} {
11334 set gitencoding "utf-8"
11336 set tclencoding [tcl_encoding $gitencoding]
11337 if {$tclencoding == {}} {
11338 puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
11341 set gui_encoding [encoding system]
11343 set enc [exec git config --get gui.encoding]
11345 set tclenc [tcl_encoding $enc]
11346 if {$tclenc ne {}} {
11347 set gui_encoding $tclenc
11349 puts stderr "Warning: encoding $enc is not supported by Tcl/Tk"
11354 if {[tk windowingsystem] eq "aqua"} {
11355 set mainfont {{Lucida Grande} 9}
11356 set textfont {Monaco 9}
11357 set uifont {{Lucida Grande} 9 bold}
11359 set mainfont {Helvetica 9}
11360 set textfont {Courier 9}
11361 set uifont {Helvetica 9 bold}
11364 set findmergefiles 0
11372 set cmitmode "patch"
11373 set wrapcomment "none"
11378 set showlocalchanges 1
11380 set datetimeformat "%Y-%m-%d %H:%M:%S"
11382 set perfile_attrs 0
11385 if {[tk windowingsystem] eq "aqua"} {
11386 set extdifftool "opendiff"
11388 set extdifftool "meld"
11391 set colors {green red blue magenta darkgrey brown orange}
11392 if {[tk windowingsystem] eq "win32"} {
11393 set uicolor SystemButtonFace
11394 set bgcolor SystemWindow
11395 set fgcolor SystemButtonText
11396 set selectbgcolor SystemHighlight
11401 set selectbgcolor gray85
11403 set diffcolors {red "#00a000" blue}
11406 set markbgcolor "#e0e0ff"
11408 set circlecolors {white blue gray blue blue}
11410 # button for popping up context menus
11411 if {[tk windowingsystem] eq "aqua"} {
11412 set ctxbut <Button-2>
11414 set ctxbut <Button-3>
11417 ## For msgcat loading, first locate the installation location.
11418 if { [info exists ::env(GITK_MSGSDIR)] } {
11419 ## Msgsdir was manually set in the environment.
11420 set gitk_msgsdir $::env(GITK_MSGSDIR)
11422 ## Let's guess the prefix from argv0.
11423 set gitk_prefix [file dirname [file dirname [file normalize $argv0]]]
11424 set gitk_libdir [file join $gitk_prefix share gitk lib]
11425 set gitk_msgsdir [file join $gitk_libdir msgs]
11429 ## Internationalization (i18n) through msgcat and gettext. See
11430 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
11431 package require msgcat
11432 namespace import ::msgcat::mc
11433 ## And eventually load the actual message catalog
11434 ::msgcat::mcload $gitk_msgsdir
11436 catch {source ~/.gitk}
11438 parsefont mainfont $mainfont
11439 eval font create mainfont [fontflags mainfont]
11440 eval font create mainfontbold [fontflags mainfont 1]
11442 parsefont textfont $textfont
11443 eval font create textfont [fontflags textfont]
11444 eval font create textfontbold [fontflags textfont 1]
11446 parsefont uifont $uifont
11447 eval font create uifont [fontflags uifont]
11453 # check that we can find a .git directory somewhere...
11454 if {[catch {set gitdir [gitdir]}]} {
11455 show_error {} . [mc "Cannot find a git repository here."]
11458 if {![file isdirectory $gitdir]} {
11459 show_error {} . [mc "Cannot find the git directory \"%s\"." $gitdir]
11464 set selectheadid {}
11467 set cmdline_files {}
11469 set revtreeargscmd {}
11470 foreach arg $argv {
11471 switch -glob -- $arg {
11474 set cmdline_files [lrange $argv [expr {$i + 1}] end]
11477 "--select-commit=*" {
11478 set selecthead [string range $arg 16 end]
11481 set revtreeargscmd [string range $arg 10 end]
11484 lappend revtreeargs $arg
11490 if {$selecthead eq "HEAD"} {
11494 if {$i >= [llength $argv] && $revtreeargs ne {}} {
11495 # no -- on command line, but some arguments (other than --argscmd)
11497 set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs]
11498 set cmdline_files [split $f "\n"]
11499 set n [llength $cmdline_files]
11500 set revtreeargs [lrange $revtreeargs 0 end-$n]
11501 # Unfortunately git rev-parse doesn't produce an error when
11502 # something is both a revision and a filename. To be consistent
11503 # with git log and git rev-list, check revtreeargs for filenames.
11504 foreach arg $revtreeargs {
11505 if {[file exists $arg]} {
11506 show_error {} . [mc "Ambiguous argument '%s': both revision\
11507 and filename" $arg]
11512 # unfortunately we get both stdout and stderr in $err,
11513 # so look for "fatal:".
11514 set i [string first "fatal:" $err]
11516 set err [string range $err [expr {$i + 6}] end]
11518 show_error {} . "[mc "Bad arguments to gitk:"]\n$err"
11523 set nullid "0000000000000000000000000000000000000000"
11524 set nullid2 "0000000000000000000000000000000000000001"
11525 set nullfile "/dev/null"
11527 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
11528 if {![info exists have_ttk]} {
11529 set have_ttk [llength [info commands ::ttk::style]]
11531 set use_ttk [expr {$have_ttk && $want_ttk}]
11532 set NS [expr {$use_ttk ? "ttk" : ""}]
11534 set git_version [join [lrange [split [lindex [exec git version] end] .] 0 2] .]
11541 set highlight_paths {}
11543 set searchdirn -forwards
11546 set diffelide {0 0}
11547 set markingmatches 0
11548 set linkentercount 0
11549 set need_redisplay 0
11556 set selectedhlview [mc "None"]
11557 set highlight_related [mc "None"]
11558 set highlight_files {}
11559 set viewfiles(0) {}
11562 set viewargscmd(0) {}
11564 set selectedline {}
11572 set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}]
11576 image create photo gitlogo -width 16 -height 16
11578 image create photo gitlogominus -width 4 -height 2
11579 gitlogominus put #C00000 -to 0 0 4 2
11580 gitlogo copy gitlogominus -to 1 5
11581 gitlogo copy gitlogominus -to 6 5
11582 gitlogo copy gitlogominus -to 11 5
11583 image delete gitlogominus
11585 image create photo gitlogoplus -width 4 -height 4
11586 gitlogoplus put #008000 -to 1 0 3 4
11587 gitlogoplus put #008000 -to 0 1 4 3
11588 gitlogo copy gitlogoplus -to 1 9
11589 gitlogo copy gitlogoplus -to 6 9
11590 gitlogo copy gitlogoplus -to 11 9
11591 image delete gitlogoplus
11593 image create photo gitlogo32 -width 32 -height 32
11594 gitlogo32 copy gitlogo -zoom 2 2
11596 wm iconphoto . -default gitlogo gitlogo32
11598 # wait for the window to become visible
11599 tkwait visibility .
11600 wm title . "[file tail $argv0]: [file tail [pwd]]"
11604 if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} {
11605 # create a view for the files/dirs specified on the command line
11609 set viewname(1) [mc "Command line"]
11610 set viewfiles(1) $cmdline_files
11611 set viewargs(1) $revtreeargs
11612 set viewargscmd(1) $revtreeargscmd
11616 .bar.view entryconf [mca "Edit view..."] -state normal
11617 .bar.view entryconf [mca "Delete view"] -state normal
11620 if {[info exists permviews]} {
11621 foreach v $permviews {
11624 set viewname($n) [lindex $v 0]
11625 set viewfiles($n) [lindex $v 1]
11626 set viewargs($n) [lindex $v 2]
11627 set viewargscmd($n) [lindex $v 3]
11633 if {[tk windowingsystem] eq "win32"} {
11641 # indent-tabs-mode: t