2 # Tcl ignores the next line -*- tcl -*- \
5 # Copyright © 2005-2008 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.
12 if {[info exists env
(GIT_DIR
)]} {
15 return [exec git rev-parse
--git-dir]
19 # A simple scheduler for compute-intensive stuff.
20 # The aim is to make sure that event handlers for GUI actions can
21 # run at least every 50-100 ms. Unfortunately fileevent handlers are
22 # run before X event handlers, so reading from a fast source can
23 # make the GUI completely unresponsive.
25 global isonrunq runq currunq
28 if {[info exists isonrunq
($script)]} return
29 if {$runq eq
{} && ![info exists currunq
]} {
32 lappend runq
[list
{} $script]
33 set isonrunq
($script) 1
36 proc filerun
{fd
script} {
37 fileevent
$fd readable
[list filereadable
$fd $script]
40 proc filereadable
{fd
script} {
43 fileevent
$fd readable
{}
44 if {$runq eq
{} && ![info exists currunq
]} {
47 lappend runq
[list
$fd $script]
53 for {set i
0} {$i < [llength
$runq]} {} {
54 if {[lindex
$runq $i 0] eq
$fd} {
55 set runq
[lreplace
$runq $i $i]
63 global isonrunq runq currunq
65 set tstart
[clock clicks
-milliseconds]
67 while {[llength
$runq] > 0} {
68 set fd
[lindex
$runq 0 0]
69 set script [lindex
$runq 0 1]
70 set currunq
[lindex
$runq 0]
71 set runq
[lrange
$runq 1 end
]
72 set repeat
[eval $script]
74 set t1
[clock clicks
-milliseconds]
75 set t
[expr {$t1 - $t0}]
76 if {$repeat ne
{} && $repeat} {
77 if {$fd eq
{} ||
$repeat == 2} {
78 # script returns 1 if it wants to be readded
79 # file readers return 2 if they could do more straight away
80 lappend runq
[list
$fd $script]
82 fileevent
$fd readable
[list filereadable
$fd $script]
84 } elseif
{$fd eq
{}} {
85 unset isonrunq
($script)
88 if {$t1 - $tstart >= 80} break
95 proc reg_instance
{fd
} {
96 global commfd leftover loginstance
98 set i
[incr loginstance
]
104 proc unmerged_files
{files
} {
107 # find the list of unmerged files
111 set fd
[open
"| git ls-files -u" r
]
113 show_error
{} .
"[mc "Couldn
't get list of unmerged files:"] $err"
116 while {[gets $fd line] >= 0} {
117 set i [string first "\t" $line]
119 set fname [string range $line [expr {$i+1}] end]
120 if {[lsearch -exact $mlist $fname] >= 0} continue
122 if {$files eq {} || [path_filter $files $fname]} {
130 proc parseviewargs {n arglist} {
131 global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs
139 set origargs $arglist
143 foreach arg $arglist {
150 switch -glob -- $arg {
154 # remove from origargs in case we hit an unknown option
155 set origargs [lreplace $origargs $i $i]
159 "--no-renames" - "--full-index" - "--binary" - "--abbrev=*" -
160 "--find-copies-harder" - "-l*" - "--ext-diff" - "--no-ext-diff" -
161 "--src-prefix=*" - "--dst-prefix=*" - "--no-prefix" -
162 "-O*" - "--text" - "--full-diff" - "--ignore-space-at-eol" -
163 "--ignore-space-change" - "-U*" - "--unified=*" {
164 # These request or affect diff output, which we don't want.
165 # Some could be used to set our defaults for diff display.
166 lappend diffargs
$arg
168 "--raw" - "--patch-with-raw" - "--patch-with-stat" -
169 "--name-only" - "--name-status" - "--color" - "--color-words" -
170 "--log-size" - "--pretty=*" - "--decorate" - "--abbrev-commit" -
171 "--cc" - "-z" - "--header" - "--parents" - "--boundary" -
172 "--no-color" - "-g" - "--walk-reflogs" - "--no-walk" -
173 "--timestamp" - "relative-date" - "--date=*" - "--stdin" -
174 "--objects" - "--objects-edge" - "--reverse" {
175 # These cause our parsing of git log's output to fail, or else
176 # they're options we want to set ourselves, so ignore them.
178 "--stat=*" - "--numstat" - "--shortstat" - "--summary" -
179 "--check" - "--exit-code" - "--quiet" - "--topo-order" -
180 "--full-history" - "--dense" - "--sparse" -
181 "--follow" - "--left-right" - "--encoding=*" {
182 # These are harmless, and some are even useful
185 "--diff-filter=*" - "--no-merges" - "--unpacked" -
186 "--max-count=*" - "--skip=*" - "--since=*" - "--after=*" -
187 "--until=*" - "--before=*" - "--max-age=*" - "--min-age=*" -
188 "--author=*" - "--committer=*" - "--grep=*" - "-[iE]" -
189 "--remove-empty" - "--first-parent" - "--cherry-pick" -
190 "-S*" - "--pickaxe-all" - "--pickaxe-regex" {
191 # These mean that we get a subset of the commits
196 # This appears to be the only one that has a value as a
197 # separate word following it
207 # git rev-parse doesn't understand --merge
208 lappend revargs
--gitk-symmetric-diff-marker MERGE_HEAD...HEAD
211 # Other flag arguments including -<n>
212 if {[string is digit
-strict [string range
$arg 1 end
]]} {
215 # a flag argument that we don't recognize;
216 # that means we can't optimize
222 # Non-flag arguments specify commits or ranges of commits
223 if {[string match
"*...*" $arg]} {
224 lappend revargs
--gitk-symmetric-diff-marker
230 set vdflags
($n) $diffargs
231 set vflags
($n) $glflags
232 set vrevs
($n) $revargs
233 set vfiltered
($n) $filtered
234 set vorigargs
($n) $origargs
238 proc parseviewrevs
{view revs
} {
239 global vposids vnegids
244 if {[catch
{set ids
[eval exec git rev-parse
$revs]} err
]} {
245 # we get stdout followed by stderr in $err
246 # for an unknown rev, git rev-parse echoes it and then errors out
247 set errlines
[split $err "\n"]
249 for {set l
0} {$l < [llength
$errlines]} {incr l
} {
250 set line
[lindex
$errlines $l]
251 if {!([string length
$line] == 40 && [string is xdigit
$line])} {
252 if {[string match
"fatal:*" $line]} {
253 if {[string match
"fatal: ambiguous argument*" $line]
255 if {[llength
$badrev] == 1} {
256 set err
"unknown revision $badrev"
258 set err
"unknown revisions: [join $badrev ", "]"
261 set err
[join [lrange
$errlines $l end
] "\n"]
268 error_popup
"[mc "Error parsing revisions
:"] $err"
275 foreach id
[split $ids "\n"] {
276 if {$id eq
"--gitk-symmetric-diff-marker"} {
278 } elseif
{[string match
"^*" $id]} {
285 lappend neg
[string range
$id 1 end
]
290 lset ret end
[lindex
$ret end
]...
$id
296 set vposids
($view) $pos
297 set vnegids
($view) $neg
301 # Start off a git log process and arrange to read its output
302 proc start_rev_list
{view
} {
303 global startmsecs commitidx viewcomplete curview
305 global viewargs viewargscmd viewfiles vfilelimit
306 global showlocalchanges
307 global viewactive viewinstances vmergeonly
308 global mainheadid viewmainheadid viewmainheadid_orig
309 global vcanopt vflags vrevs vorigargs
311 set startmsecs
[clock clicks
-milliseconds]
312 set commitidx
($view) 0
313 # these are set this way for the error exits
314 set viewcomplete
($view) 1
315 set viewactive
($view) 0
318 set args
$viewargs($view)
319 if {$viewargscmd($view) ne
{}} {
321 set str
[exec sh
-c $viewargscmd($view)]
323 error_popup
"[mc "Error executing
--argscmd command:"] $err"
326 set args
[concat
$args [split $str "\n"]]
328 set vcanopt
($view) [parseviewargs
$view $args]
330 set files
$viewfiles($view)
331 if {$vmergeonly($view)} {
332 set files
[unmerged_files
$files]
335 if {$nr_unmerged == 0} {
336 error_popup
[mc
"No files selected: --merge specified but\
337 no files are unmerged."]
339 error_popup
[mc
"No files selected: --merge specified but\
340 no unmerged files are within file limit."]
345 set vfilelimit
($view) $files
347 if {$vcanopt($view)} {
348 set revs
[parseviewrevs
$view $vrevs($view)]
352 set args
[concat
$vflags($view) $revs]
354 set args
$vorigargs($view)
358 set fd
[open
[concat | git log
--no-color -z --pretty=raw
--parents \
359 --boundary $args "--" $files] r
]
361 error_popup
"[mc "Error executing git log
:"] $err"
364 set i
[reg_instance
$fd]
365 set viewinstances
($view) [list
$i]
366 set viewmainheadid
($view) $mainheadid
367 set viewmainheadid_orig
($view) $mainheadid
368 if {$files ne
{} && $mainheadid ne
{}} {
369 get_viewmainhead
$view
371 if {$showlocalchanges && $viewmainheadid($view) ne
{}} {
372 interestedin
$viewmainheadid($view) dodiffindex
374 fconfigure
$fd -blocking 0 -translation lf
-eofchar {}
375 if {$tclencoding != {}} {
376 fconfigure
$fd -encoding $tclencoding
378 filerun
$fd [list getcommitlines
$fd $i $view 0]
379 nowbusy
$view [mc
"Reading"]
380 set viewcomplete
($view) 0
381 set viewactive
($view) 1
385 proc stop_instance
{inst
} {
386 global commfd leftover
388 set fd
$commfd($inst)
392 if {$
::tcl_platform
(platform
) eq
{windows
}} {
401 unset leftover
($inst)
404 proc stop_backends
{} {
407 foreach inst
[array names commfd
] {
412 proc stop_rev_list
{view
} {
415 foreach inst
$viewinstances($view) {
418 set viewinstances
($view) {}
421 proc reset_pending_select
{selid
} {
422 global pending_select mainheadid selectheadid
425 set pending_select
$selid
426 } elseif
{$selectheadid ne
{}} {
427 set pending_select
$selectheadid
429 set pending_select
$mainheadid
433 proc getcommits
{selid
} {
434 global canv curview need_redisplay viewactive
437 if {[start_rev_list
$curview]} {
438 reset_pending_select
$selid
439 show_status
[mc
"Reading commits..."]
442 show_status
[mc
"No commits selected"]
446 proc updatecommits
{} {
447 global curview vcanopt vorigargs vfilelimit viewinstances
448 global viewactive viewcomplete tclencoding
449 global startmsecs showneartags showlocalchanges
450 global mainheadid viewmainheadid viewmainheadid_orig pending_select
452 global varcid vposids vnegids vflags vrevs
454 set isworktree
[expr {[exec git rev-parse
--is-inside-work-tree] == "true"}]
457 if {$mainheadid ne
$viewmainheadid_orig($view)} {
458 if {$showlocalchanges} {
461 set viewmainheadid
($view) $mainheadid
462 set viewmainheadid_orig
($view) $mainheadid
463 if {$vfilelimit($view) ne
{}} {
464 get_viewmainhead
$view
467 if {$showlocalchanges} {
470 if {$vcanopt($view)} {
471 set oldpos
$vposids($view)
472 set oldneg
$vnegids($view)
473 set revs
[parseviewrevs
$view $vrevs($view)]
477 # note: getting the delta when negative refs change is hard,
478 # and could require multiple git log invocations, so in that
479 # case we ask git log for all the commits (not just the delta)
480 if {$oldneg eq
$vnegids($view)} {
483 # take out positive refs that we asked for before or
484 # that we have already seen
486 if {[string length
$rev] == 40} {
487 if {[lsearch
-exact $oldpos $rev] < 0
488 && ![info exists varcid
($view,$rev)]} {
493 lappend
$newrevs $rev
496 if {$npos == 0} return
498 set vposids
($view) [lsort
-unique [concat
$oldpos $vposids($view)]]
500 set args
[concat
$vflags($view) $revs --not $oldpos]
502 set args
$vorigargs($view)
505 set fd
[open
[concat | git log
--no-color -z --pretty=raw
--parents \
506 --boundary $args "--" $vfilelimit($view)] r
]
508 error_popup
"[mc "Error executing git log
:"] $err"
511 if {$viewactive($view) == 0} {
512 set startmsecs
[clock clicks
-milliseconds]
514 set i
[reg_instance
$fd]
515 lappend viewinstances
($view) $i
516 fconfigure
$fd -blocking 0 -translation lf
-eofchar {}
517 if {$tclencoding != {}} {
518 fconfigure
$fd -encoding $tclencoding
520 filerun
$fd [list getcommitlines
$fd $i $view 1]
521 incr viewactive
($view)
522 set viewcomplete
($view) 0
523 reset_pending_select
{}
524 nowbusy
$view "Reading"
530 proc reloadcommits
{} {
531 global curview viewcomplete selectedline currentid thickerline
532 global showneartags treediffs commitinterest cached_commitrow
536 if {$selectedline ne
{}} {
540 if {!$viewcomplete($curview)} {
541 stop_rev_list
$curview
545 catch
{unset currentid
}
546 catch
{unset thickerline
}
547 catch
{unset treediffs
}
554 catch
{unset commitinterest
}
555 catch
{unset cached_commitrow
}
556 catch
{unset targetid
}
562 # This makes a string representation of a positive integer which
563 # sorts as a string in numerical order
566 return [format
"%x" $n]
567 } elseif
{$n < 256} {
568 return [format
"x%.2x" $n]
569 } elseif
{$n < 65536} {
570 return [format
"y%.4x" $n]
572 return [format
"z%.8x" $n]
575 # Procedures used in reordering commits from git log (without
576 # --topo-order) into the order for display.
578 proc varcinit
{view
} {
579 global varcstart vupptr vdownptr vleftptr vbackptr varctok varcrow
580 global vtokmod varcmod vrowmod varcix vlastins
582 set varcstart
($view) {{}}
583 set vupptr
($view) {0}
584 set vdownptr
($view) {0}
585 set vleftptr
($view) {0}
586 set vbackptr
($view) {0}
587 set varctok
($view) {{}}
588 set varcrow
($view) {{}}
589 set vtokmod
($view) {}
592 set varcix
($view) {{}}
593 set vlastins
($view) {0}
596 proc resetvarcs
{view
} {
597 global varcid varccommits parents children vseedcount ordertok
599 foreach vid
[array names varcid
$view,*] {
604 # some commits might have children but haven't been seen yet
605 foreach vid
[array names children
$view,*] {
608 foreach va
[array names varccommits
$view,*] {
609 unset varccommits
($va)
611 foreach vd
[array names vseedcount
$view,*] {
612 unset vseedcount
($vd)
614 catch
{unset ordertok
}
617 # returns a list of the commits with no children
619 global vdownptr vleftptr varcstart
622 set a
[lindex
$vdownptr($v) 0]
624 lappend ret
[lindex
$varcstart($v) $a]
625 set a
[lindex
$vleftptr($v) $a]
630 proc newvarc
{view id
} {
631 global varcid varctok parents children vdatemode
632 global vupptr vdownptr vleftptr vbackptr varcrow varcix varcstart
633 global commitdata commitinfo vseedcount varccommits vlastins
635 set a
[llength
$varctok($view)]
637 if {[llength
$children($vid)] == 0 ||
$vdatemode($view)} {
638 if {![info exists commitinfo
($id)]} {
639 parsecommit
$id $commitdata($id) 1
641 set cdate
[lindex
$commitinfo($id) 4]
642 if {![string is integer
-strict $cdate]} {
645 if {![info exists vseedcount
($view,$cdate)]} {
646 set vseedcount
($view,$cdate) -1
648 set c
[incr vseedcount
($view,$cdate)]
649 set cdate
[expr {$cdate ^
0xffffffff}]
650 set tok
"s[strrep $cdate][strrep $c]"
655 if {[llength
$children($vid)] > 0} {
656 set kid
[lindex
$children($vid) end
]
657 set k
$varcid($view,$kid)
658 if {[string compare
[lindex
$varctok($view) $k] $tok] > 0} {
661 set tok
[lindex
$varctok($view) $k]
665 set i
[lsearch
-exact $parents($view,$ki) $id]
666 set j
[expr {[llength
$parents($view,$ki)] - 1 - $i}]
667 append tok
[strrep
$j]
669 set c
[lindex
$vlastins($view) $ka]
670 if {$c == 0 ||
[string compare
$tok [lindex
$varctok($view) $c]] < 0} {
672 set b
[lindex
$vdownptr($view) $ka]
674 set b
[lindex
$vleftptr($view) $c]
676 while {$b != 0 && [string compare
$tok [lindex
$varctok($view) $b]] >= 0} {
678 set b
[lindex
$vleftptr($view) $c]
681 lset vdownptr
($view) $ka $a
682 lappend vbackptr
($view) 0
684 lset vleftptr
($view) $c $a
685 lappend vbackptr
($view) $c
687 lset vlastins
($view) $ka $a
688 lappend vupptr
($view) $ka
689 lappend vleftptr
($view) $b
691 lset vbackptr
($view) $b $a
693 lappend varctok
($view) $tok
694 lappend varcstart
($view) $id
695 lappend vdownptr
($view) 0
696 lappend varcrow
($view) {}
697 lappend varcix
($view) {}
698 set varccommits
($view,$a) {}
699 lappend vlastins
($view) 0
703 proc splitvarc
{p v
} {
704 global varcid varcstart varccommits varctok
705 global vupptr vdownptr vleftptr vbackptr varcix varcrow vlastins
707 set oa
$varcid($v,$p)
708 set ac
$varccommits($v,$oa)
709 set i
[lsearch
-exact $varccommits($v,$oa) $p]
711 set na
[llength
$varctok($v)]
712 # "%" sorts before "0"...
713 set tok
"[lindex $varctok($v) $oa]%[strrep $i]"
714 lappend varctok
($v) $tok
715 lappend varcrow
($v) {}
716 lappend varcix
($v) {}
717 set varccommits
($v,$oa) [lrange
$ac 0 [expr {$i - 1}]]
718 set varccommits
($v,$na) [lrange
$ac $i end
]
719 lappend varcstart
($v) $p
720 foreach id
$varccommits($v,$na) {
721 set varcid
($v,$id) $na
723 lappend vdownptr
($v) [lindex
$vdownptr($v) $oa]
724 lappend vlastins
($v) [lindex
$vlastins($v) $oa]
725 lset vdownptr
($v) $oa $na
726 lset vlastins
($v) $oa 0
727 lappend vupptr
($v) $oa
728 lappend vleftptr
($v) 0
729 lappend vbackptr
($v) 0
730 for {set b
[lindex
$vdownptr($v) $na]} {$b != 0} {set b
[lindex
$vleftptr($v) $b]} {
731 lset vupptr
($v) $b $na
735 proc renumbervarc
{a v
} {
736 global parents children varctok varcstart varccommits
737 global vupptr vdownptr vleftptr vbackptr vlastins varcid vtokmod vdatemode
739 set t1
[clock clicks
-milliseconds]
745 if {[info exists isrelated
($a)]} {
747 set id
[lindex
$varccommits($v,$a) end
]
748 foreach p
$parents($v,$id) {
749 if {[info exists varcid
($v,$p)]} {
750 set isrelated
($varcid($v,$p)) 1
755 set b
[lindex
$vdownptr($v) $a]
758 set b
[lindex
$vleftptr($v) $a]
760 set a
[lindex
$vupptr($v) $a]
766 if {![info exists kidchanged
($a)]} continue
767 set id
[lindex
$varcstart($v) $a]
768 if {[llength
$children($v,$id)] > 1} {
769 set children
($v,$id) [lsort
-command [list vtokcmp
$v] \
772 set oldtok
[lindex
$varctok($v) $a]
773 if {!$vdatemode($v)} {
779 set kid
[last_real_child
$v,$id]
781 set k
$varcid($v,$kid)
782 if {[string compare
[lindex
$varctok($v) $k] $tok] > 0} {
785 set tok
[lindex
$varctok($v) $k]
789 set i
[lsearch
-exact $parents($v,$ki) $id]
790 set j
[expr {[llength
$parents($v,$ki)] - 1 - $i}]
791 append tok
[strrep
$j]
793 if {$tok eq
$oldtok} {
796 set id
[lindex
$varccommits($v,$a) end
]
797 foreach p
$parents($v,$id) {
798 if {[info exists varcid
($v,$p)]} {
799 set kidchanged
($varcid($v,$p)) 1
804 lset varctok
($v) $a $tok
805 set b
[lindex
$vupptr($v) $a]
807 if {[string compare
[lindex
$varctok($v) $ka] $vtokmod($v)] < 0} {
810 if {[string compare
[lindex
$varctok($v) $b] $vtokmod($v)] < 0} {
813 set c
[lindex
$vbackptr($v) $a]
814 set d
[lindex
$vleftptr($v) $a]
816 lset vdownptr
($v) $b $d
818 lset vleftptr
($v) $c $d
821 lset vbackptr
($v) $d $c
823 if {[lindex
$vlastins($v) $b] == $a} {
824 lset vlastins
($v) $b $c
826 lset vupptr
($v) $a $ka
827 set c
[lindex
$vlastins($v) $ka]
829 [string compare
$tok [lindex
$varctok($v) $c]] < 0} {
831 set b
[lindex
$vdownptr($v) $ka]
833 set b
[lindex
$vleftptr($v) $c]
836 [string compare
$tok [lindex
$varctok($v) $b]] >= 0} {
838 set b
[lindex
$vleftptr($v) $c]
841 lset vdownptr
($v) $ka $a
842 lset vbackptr
($v) $a 0
844 lset vleftptr
($v) $c $a
845 lset vbackptr
($v) $a $c
847 lset vleftptr
($v) $a $b
849 lset vbackptr
($v) $b $a
851 lset vlastins
($v) $ka $a
854 foreach id
[array names sortkids
] {
855 if {[llength
$children($v,$id)] > 1} {
856 set children
($v,$id) [lsort
-command [list vtokcmp
$v] \
860 set t2
[clock clicks
-milliseconds]
861 #puts "renumbervarc did [llength $todo] of $ntot arcs in [expr {$t2-$t1}]ms"
864 # Fix up the graph after we have found out that in view $v,
865 # $p (a commit that we have already seen) is actually the parent
866 # of the last commit in arc $a.
867 proc fix_reversal
{p a v
} {
868 global varcid varcstart varctok vupptr
870 set pa
$varcid($v,$p)
871 if {$p ne
[lindex
$varcstart($v) $pa]} {
873 set pa
$varcid($v,$p)
875 # seeds always need to be renumbered
876 if {[lindex
$vupptr($v) $pa] == 0 ||
877 [string compare
[lindex
$varctok($v) $a] \
878 [lindex
$varctok($v) $pa]] > 0} {
883 proc insertrow
{id p v
} {
884 global cmitlisted children parents varcid varctok vtokmod
885 global varccommits ordertok commitidx numcommits curview
886 global targetid targetrow
890 set cmitlisted
($vid) 1
891 set children
($vid) {}
892 set parents
($vid) [list
$p]
893 set a
[newvarc
$v $id]
895 if {[string compare
[lindex
$varctok($v) $a] $vtokmod($v)] < 0} {
898 lappend varccommits
($v,$a) $id
900 if {[llength
[lappend children
($vp) $id]] > 1} {
901 set children
($vp) [lsort
-command [list vtokcmp
$v] $children($vp)]
902 catch
{unset ordertok
}
904 fix_reversal
$p $a $v
906 if {$v == $curview} {
907 set numcommits
$commitidx($v)
909 if {[info exists targetid
]} {
910 if {![comes_before
$targetid $p]} {
917 proc insertfakerow
{id p
} {
918 global varcid varccommits parents children cmitlisted
919 global commitidx varctok vtokmod targetid targetrow curview numcommits
923 set i
[lsearch
-exact $varccommits($v,$a) $p]
925 puts
"oops: insertfakerow can't find [shortids $p] on arc $a"
928 set children
($v,$id) {}
929 set parents
($v,$id) [list
$p]
930 set varcid
($v,$id) $a
931 lappend children
($v,$p) $id
932 set cmitlisted
($v,$id) 1
933 set numcommits
[incr commitidx
($v)]
934 # note we deliberately don't update varcstart($v) even if $i == 0
935 set varccommits
($v,$a) [linsert
$varccommits($v,$a) $i $id]
937 if {[info exists targetid
]} {
938 if {![comes_before
$targetid $p]} {
946 proc removefakerow
{id
} {
947 global varcid varccommits parents children commitidx
948 global varctok vtokmod cmitlisted currentid selectedline
949 global targetid curview numcommits
952 if {[llength
$parents($v,$id)] != 1} {
953 puts
"oops: removefakerow [shortids $id] has [llength $parents($v,$id)] parents"
956 set p
[lindex
$parents($v,$id) 0]
957 set a
$varcid($v,$id)
958 set i
[lsearch
-exact $varccommits($v,$a) $id]
960 puts
"oops: removefakerow can't find [shortids $id] on arc $a"
964 set varccommits
($v,$a) [lreplace
$varccommits($v,$a) $i $i]
965 unset parents
($v,$id)
966 unset children
($v,$id)
967 unset cmitlisted
($v,$id)
968 set numcommits
[incr commitidx
($v) -1]
969 set j
[lsearch
-exact $children($v,$p) $id]
971 set children
($v,$p) [lreplace
$children($v,$p) $j $j]
974 if {[info exist currentid
] && $id eq
$currentid} {
978 if {[info exists targetid
] && $targetid eq
$id} {
985 proc first_real_child
{vp
} {
986 global children nullid nullid2
988 foreach id
$children($vp) {
989 if {$id ne
$nullid && $id ne
$nullid2} {
996 proc last_real_child
{vp
} {
997 global children nullid nullid2
999 set kids
$children($vp)
1000 for {set i
[llength
$kids]} {[incr i
-1] >= 0} {} {
1001 set id
[lindex
$kids $i]
1002 if {$id ne
$nullid && $id ne
$nullid2} {
1009 proc vtokcmp
{v a b
} {
1010 global varctok varcid
1012 return [string compare
[lindex
$varctok($v) $varcid($v,$a)] \
1013 [lindex
$varctok($v) $varcid($v,$b)]]
1016 # This assumes that if lim is not given, the caller has checked that
1017 # arc a's token is less than $vtokmod($v)
1018 proc modify_arc
{v a
{lim
{}}} {
1019 global varctok vtokmod varcmod varcrow vupptr curview vrowmod varccommits
1022 set c
[string compare
[lindex
$varctok($v) $a] $vtokmod($v)]
1025 set r
[lindex
$varcrow($v) $a]
1026 if {$r ne
{} && $vrowmod($v) <= $r + $lim} return
1029 set vtokmod
($v) [lindex
$varctok($v) $a]
1031 if {$v == $curview} {
1032 while {$a != 0 && [lindex
$varcrow($v) $a] eq
{}} {
1033 set a
[lindex
$vupptr($v) $a]
1039 set lim
[llength
$varccommits($v,$a)]
1041 set r
[expr {[lindex
$varcrow($v) $a] + $lim}]
1048 proc update_arcrows
{v
} {
1049 global vtokmod varcmod vrowmod varcrow commitidx currentid selectedline
1050 global varcid vrownum varcorder varcix varccommits
1051 global vupptr vdownptr vleftptr varctok
1052 global displayorder parentlist curview cached_commitrow
1054 if {$vrowmod($v) == $commitidx($v)} return
1055 if {$v == $curview} {
1056 if {[llength
$displayorder] > $vrowmod($v)} {
1057 set displayorder
[lrange
$displayorder 0 [expr {$vrowmod($v) - 1}]]
1058 set parentlist
[lrange
$parentlist 0 [expr {$vrowmod($v) - 1}]]
1060 catch
{unset cached_commitrow
}
1062 set narctot
[expr {[llength
$varctok($v)] - 1}]
1064 while {$a != 0 && [lindex
$varcix($v) $a] eq
{}} {
1065 # go up the tree until we find something that has a row number,
1066 # or we get to a seed
1067 set a
[lindex
$vupptr($v) $a]
1070 set a
[lindex
$vdownptr($v) 0]
1073 set varcorder
($v) [list
$a]
1074 lset varcix
($v) $a 0
1075 lset varcrow
($v) $a 0
1079 set arcn
[lindex
$varcix($v) $a]
1080 if {[llength
$vrownum($v)] > $arcn + 1} {
1081 set vrownum
($v) [lrange
$vrownum($v) 0 $arcn]
1082 set varcorder
($v) [lrange
$varcorder($v) 0 $arcn]
1084 set row
[lindex
$varcrow($v) $a]
1088 incr row
[llength
$varccommits($v,$a)]
1089 # go down if possible
1090 set b
[lindex
$vdownptr($v) $a]
1092 # if not, go left, or go up until we can go left
1094 set b
[lindex
$vleftptr($v) $a]
1096 set a
[lindex
$vupptr($v) $a]
1102 lappend vrownum
($v) $row
1103 lappend varcorder
($v) $a
1104 lset varcix
($v) $a $arcn
1105 lset varcrow
($v) $a $row
1107 set vtokmod
($v) [lindex
$varctok($v) $p]
1109 set vrowmod
($v) $row
1110 if {[info exists currentid
]} {
1111 set selectedline
[rowofcommit
$currentid]
1115 # Test whether view $v contains commit $id
1116 proc commitinview
{id v
} {
1119 return [info exists varcid
($v,$id)]
1122 # Return the row number for commit $id in the current view
1123 proc rowofcommit
{id
} {
1124 global varcid varccommits varcrow curview cached_commitrow
1125 global varctok vtokmod
1128 if {![info exists varcid
($v,$id)]} {
1129 puts
"oops rowofcommit no arc for [shortids $id]"
1132 set a
$varcid($v,$id)
1133 if {[string compare
[lindex
$varctok($v) $a] $vtokmod($v)] >= 0} {
1136 if {[info exists cached_commitrow
($id)]} {
1137 return $cached_commitrow($id)
1139 set i
[lsearch
-exact $varccommits($v,$a) $id]
1141 puts
"oops didn't find commit [shortids $id] in arc $a"
1144 incr i
[lindex
$varcrow($v) $a]
1145 set cached_commitrow
($id) $i
1149 # Returns 1 if a is on an earlier row than b, otherwise 0
1150 proc comes_before
{a b
} {
1151 global varcid varctok curview
1154 if {$a eq
$b ||
![info exists varcid
($v,$a)] || \
1155 ![info exists varcid
($v,$b)]} {
1158 if {$varcid($v,$a) != $varcid($v,$b)} {
1159 return [expr {[string compare
[lindex
$varctok($v) $varcid($v,$a)] \
1160 [lindex
$varctok($v) $varcid($v,$b)]] < 0}]
1162 return [expr {[rowofcommit
$a] < [rowofcommit
$b]}]
1165 proc bsearch
{l elt
} {
1166 if {[llength
$l] == 0 ||
$elt <= [lindex
$l 0]} {
1171 while {$hi - $lo > 1} {
1172 set mid
[expr {int
(($lo + $hi) / 2)}]
1173 set t
[lindex
$l $mid]
1176 } elseif
{$elt > $t} {
1185 # Make sure rows $start..$end-1 are valid in displayorder and parentlist
1186 proc make_disporder
{start end
} {
1187 global vrownum curview commitidx displayorder parentlist
1188 global varccommits varcorder parents vrowmod varcrow
1189 global d_valid_start d_valid_end
1191 if {$end > $vrowmod($curview)} {
1192 update_arcrows
$curview
1194 set ai
[bsearch
$vrownum($curview) $start]
1195 set start
[lindex
$vrownum($curview) $ai]
1196 set narc
[llength
$vrownum($curview)]
1197 for {set r
$start} {$ai < $narc && $r < $end} {incr ai
} {
1198 set a
[lindex
$varcorder($curview) $ai]
1199 set l
[llength
$displayorder]
1200 set al
[llength
$varccommits($curview,$a)]
1201 if {$l < $r + $al} {
1203 set pad
[ntimes
[expr {$r - $l}] {}]
1204 set displayorder
[concat
$displayorder $pad]
1205 set parentlist
[concat
$parentlist $pad]
1206 } elseif
{$l > $r} {
1207 set displayorder
[lrange
$displayorder 0 [expr {$r - 1}]]
1208 set parentlist
[lrange
$parentlist 0 [expr {$r - 1}]]
1210 foreach id
$varccommits($curview,$a) {
1211 lappend displayorder
$id
1212 lappend parentlist
$parents($curview,$id)
1214 } elseif
{[lindex
$displayorder [expr {$r + $al - 1}]] eq
{}} {
1216 foreach id
$varccommits($curview,$a) {
1217 lset displayorder
$i $id
1218 lset parentlist
$i $parents($curview,$id)
1226 proc commitonrow
{row
} {
1229 set id
[lindex
$displayorder $row]
1231 make_disporder
$row [expr {$row + 1}]
1232 set id
[lindex
$displayorder $row]
1237 proc closevarcs
{v
} {
1238 global varctok varccommits varcid parents children
1239 global cmitlisted commitidx vtokmod
1241 set missing_parents
0
1243 set narcs
[llength
$varctok($v)]
1244 for {set a
1} {$a < $narcs} {incr a
} {
1245 set id
[lindex
$varccommits($v,$a) end
]
1246 foreach p
$parents($v,$id) {
1247 if {[info exists varcid
($v,$p)]} continue
1248 # add p as a new commit
1249 incr missing_parents
1250 set cmitlisted
($v,$p) 0
1251 set parents
($v,$p) {}
1252 if {[llength
$children($v,$p)] == 1 &&
1253 [llength
$parents($v,$id)] == 1} {
1256 set b
[newvarc
$v $p]
1258 set varcid
($v,$p) $b
1259 if {[string compare
[lindex
$varctok($v) $b] $vtokmod($v)] < 0} {
1262 lappend varccommits
($v,$b) $p
1264 set scripts
[check_interest
$p $scripts]
1267 if {$missing_parents > 0} {
1268 foreach s
$scripts {
1274 # Use $rwid as a substitute for $id, i.e. reparent $id's children to $rwid
1275 # Assumes we already have an arc for $rwid.
1276 proc rewrite_commit
{v id rwid
} {
1277 global children parents varcid varctok vtokmod varccommits
1279 foreach ch
$children($v,$id) {
1280 # make $rwid be $ch's parent in place of $id
1281 set i
[lsearch
-exact $parents($v,$ch) $id]
1283 puts
"oops rewrite_commit didn't find $id in parent list for $ch"
1285 set parents
($v,$ch) [lreplace
$parents($v,$ch) $i $i $rwid]
1286 # add $ch to $rwid's children and sort the list if necessary
1287 if {[llength
[lappend children
($v,$rwid) $ch]] > 1} {
1288 set children
($v,$rwid) [lsort
-command [list vtokcmp
$v] \
1289 $children($v,$rwid)]
1291 # fix the graph after joining $id to $rwid
1292 set a
$varcid($v,$ch)
1293 fix_reversal
$rwid $a $v
1294 # parentlist is wrong for the last element of arc $a
1295 # even if displayorder is right, hence the 3rd arg here
1296 modify_arc
$v $a [expr {[llength
$varccommits($v,$a)] - 1}]
1300 # Mechanism for registering a command to be executed when we come
1301 # across a particular commit. To handle the case when only the
1302 # prefix of the commit is known, the commitinterest array is now
1303 # indexed by the first 4 characters of the ID. Each element is a
1304 # list of id, cmd pairs.
1305 proc interestedin
{id cmd
} {
1306 global commitinterest
1308 lappend commitinterest
([string range
$id 0 3]) $id $cmd
1311 proc check_interest
{id scripts
} {
1312 global commitinterest
1314 set prefix
[string range
$id 0 3]
1315 if {[info exists commitinterest
($prefix)]} {
1317 foreach
{i
script} $commitinterest($prefix) {
1318 if {[string match
"$i*" $id]} {
1319 lappend scripts
[string map
[list
"%I" $id "%P" $i] $script]
1321 lappend newlist
$i $script
1324 if {$newlist ne
{}} {
1325 set commitinterest
($prefix) $newlist
1327 unset commitinterest
($prefix)
1333 proc getcommitlines
{fd inst view updating
} {
1334 global cmitlisted leftover
1335 global commitidx commitdata vdatemode
1336 global parents children curview hlview
1337 global idpending ordertok
1338 global varccommits varcid varctok vtokmod vfilelimit
1340 set stuff
[read $fd 500000]
1341 # git log doesn't terminate the last commit with a null...
1342 if {$stuff == {} && $leftover($inst) ne
{} && [eof
$fd]} {
1349 global commfd viewcomplete viewactive viewname
1350 global viewinstances
1352 set i
[lsearch
-exact $viewinstances($view) $inst]
1354 set viewinstances
($view) [lreplace
$viewinstances($view) $i $i]
1356 # set it blocking so we wait for the process to terminate
1357 fconfigure
$fd -blocking 1
1358 if {[catch
{close
$fd} err
]} {
1360 if {$view != $curview} {
1361 set fv
" for the \"$viewname($view)\" view"
1363 if {[string range
$err 0 4] == "usage"} {
1364 set err
"Gitk: error reading commits$fv:\
1365 bad arguments to git log."
1366 if {$viewname($view) eq
"Command line"} {
1368 " (Note: arguments to gitk are passed to git log\
1369 to allow selection of commits to be displayed.)"
1372 set err
"Error reading commits$fv: $err"
1376 if {[incr viewactive
($view) -1] <= 0} {
1377 set viewcomplete
($view) 1
1378 # Check if we have seen any ids listed as parents that haven't
1379 # appeared in the list
1383 if {$view == $curview} {
1392 set i
[string first
"\0" $stuff $start]
1394 append leftover
($inst) [string range
$stuff $start end
]
1398 set cmit
$leftover($inst)
1399 append cmit
[string range
$stuff 0 [expr {$i - 1}]]
1400 set leftover
($inst) {}
1402 set cmit
[string range
$stuff $start [expr {$i - 1}]]
1404 set start
[expr {$i + 1}]
1405 set j
[string first
"\n" $cmit]
1408 if {$j >= 0 && [string match
"commit *" $cmit]} {
1409 set ids
[string range
$cmit 7 [expr {$j - 1}]]
1410 if {[string match
{[-^
<>]*} $ids]} {
1411 switch
-- [string index
$ids 0] {
1417 set ids
[string range
$ids 1 end
]
1421 if {[string length
$id] != 40} {
1429 if {[string length
$shortcmit] > 80} {
1430 set shortcmit
"[string range $shortcmit 0 80]..."
1432 error_popup
"[mc "Can
't parse git log output:"] {$shortcmit}"
1435 set id [lindex $ids 0]
1438 if {!$listed && $updating && ![info exists varcid($vid)] &&
1439 $vfilelimit($view) ne {}} {
1440 # git log doesn't rewrite parents
for unlisted commits
1441 # when doing path limiting, so work around that here
1442 # by working out the rewritten parent with git rev-list
1443 # and if we already know about it, using the rewritten
1444 # parent as a substitute parent for $id's children.
1446 set rwid
[exec git rev-list
--first-parent --max-count=1 \
1447 $id -- $vfilelimit($view)]
1449 if {$rwid ne
{} && [info exists varcid
($view,$rwid)]} {
1450 # use $rwid in place of $id
1451 rewrite_commit
$view $id $rwid
1458 if {[info exists varcid
($vid)]} {
1459 if {$cmitlisted($vid) ||
!$listed} continue
1463 set olds
[lrange
$ids 1 end
]
1467 set commitdata
($id) [string range
$cmit [expr {$j + 1}] end
]
1468 set cmitlisted
($vid) $listed
1469 set parents
($vid) $olds
1470 if {![info exists children
($vid)]} {
1471 set children
($vid) {}
1472 } elseif
{$a == 0 && [llength
$children($vid)] == 1} {
1473 set k
[lindex
$children($vid) 0]
1474 if {[llength
$parents($view,$k)] == 1 &&
1475 (!$vdatemode($view) ||
1476 $varcid($view,$k) == [llength
$varctok($view)] - 1)} {
1477 set a
$varcid($view,$k)
1482 set a
[newvarc
$view $id]
1484 if {[string compare
[lindex
$varctok($view) $a] $vtokmod($view)] < 0} {
1487 if {![info exists varcid
($vid)]} {
1489 lappend varccommits
($view,$a) $id
1490 incr commitidx
($view)
1495 if {$i == 0 ||
[lsearch
-exact $olds $p] >= $i} {
1497 if {[llength
[lappend children
($vp) $id]] > 1 &&
1498 [vtokcmp
$view [lindex
$children($vp) end-1
] $id] > 0} {
1499 set children
($vp) [lsort
-command [list vtokcmp
$view] \
1501 catch
{unset ordertok
}
1503 if {[info exists varcid
($view,$p)]} {
1504 fix_reversal
$p $a $view
1510 set scripts
[check_interest
$id $scripts]
1514 global numcommits hlview
1516 if {$view == $curview} {
1517 set numcommits
$commitidx($view)
1520 if {[info exists hlview
] && $view == $hlview} {
1521 # we never actually get here...
1524 foreach s
$scripts {
1531 proc chewcommits
{} {
1532 global curview hlview viewcomplete
1533 global pending_select
1536 if {$viewcomplete($curview)} {
1537 global commitidx varctok
1538 global numcommits startmsecs
1540 if {[info exists pending_select
]} {
1542 reset_pending_select
{}
1544 if {[commitinview
$pending_select $curview]} {
1545 selectline
[rowofcommit
$pending_select] 1
1547 set row
[first_real_row
]
1551 if {$commitidx($curview) > 0} {
1552 #set ms [expr {[clock clicks -milliseconds] - $startmsecs}]
1553 #puts "overall $ms ms for $numcommits commits"
1554 #puts "[llength $varctok($view)] arcs, $commitidx($view) commits"
1556 show_status
[mc
"No commits selected"]
1563 proc do_readcommit
{id
} {
1566 # Invoke git-log to handle automatic encoding conversion
1567 set fd
[open
[concat | git log
--no-color --pretty=raw
-1 $id] r
]
1568 # Read the results using i18n.logoutputencoding
1569 fconfigure
$fd -translation lf
-eofchar {}
1570 if {$tclencoding != {}} {
1571 fconfigure
$fd -encoding $tclencoding
1573 set contents
[read $fd]
1575 # Remove the heading line
1576 regsub
{^commit
[0-9a-f]+\n} $contents {} contents
1581 proc readcommit
{id
} {
1582 if {[catch
{set contents
[do_readcommit
$id]}]} return
1583 parsecommit
$id $contents 1
1586 proc parsecommit
{id contents listed
} {
1587 global commitinfo cdate
1596 set hdrend
[string first
"\n\n" $contents]
1598 # should never happen...
1599 set hdrend
[string length
$contents]
1601 set header
[string range
$contents 0 [expr {$hdrend - 1}]]
1602 set comment
[string range
$contents [expr {$hdrend + 2}] end
]
1603 foreach line
[split $header "\n"] {
1604 set tag
[lindex
$line 0]
1605 if {$tag == "author"} {
1606 set audate
[lindex
$line end-1
]
1607 set auname
[lrange
$line 1 end-2
]
1608 } elseif
{$tag == "committer"} {
1609 set comdate
[lindex
$line end-1
]
1610 set comname
[lrange
$line 1 end-2
]
1614 # take the first non-blank line of the comment as the headline
1615 set headline
[string trimleft
$comment]
1616 set i
[string first
"\n" $headline]
1618 set headline
[string range
$headline 0 $i]
1620 set headline
[string trimright
$headline]
1621 set i
[string first
"\r" $headline]
1623 set headline
[string trimright
[string range
$headline 0 $i]]
1626 # git log indents the comment by 4 spaces;
1627 # if we got this via git cat-file, add the indentation
1629 foreach line
[split $comment "\n"] {
1630 append newcomment
" "
1631 append newcomment
$line
1632 append newcomment
"\n"
1634 set comment
$newcomment
1636 if {$comdate != {}} {
1637 set cdate
($id) $comdate
1639 set commitinfo
($id) [list
$headline $auname $audate \
1640 $comname $comdate $comment]
1643 proc getcommit
{id
} {
1644 global commitdata commitinfo
1646 if {[info exists commitdata
($id)]} {
1647 parsecommit
$id $commitdata($id) 1
1650 if {![info exists commitinfo
($id)]} {
1651 set commitinfo
($id) [list
[mc
"No commit information available"]]
1657 # Expand an abbreviated commit ID to a list of full 40-char IDs that match
1658 # and are present in the current view.
1659 # This is fairly slow...
1660 proc longid
{prefix
} {
1661 global varcid curview
1664 foreach match
[array names varcid
"$curview,$prefix*"] {
1665 lappend ids
[lindex
[split $match ","] 1]
1671 global tagids idtags headids idheads tagobjid
1672 global otherrefids idotherrefs mainhead mainheadid
1673 global selecthead selectheadid
1675 foreach v
{tagids idtags headids idheads otherrefids idotherrefs
} {
1678 set refd
[open
[list | git show-ref
-d] r
]
1679 while {[gets
$refd line
] >= 0} {
1680 if {[string index
$line 40] ne
" "} continue
1681 set id
[string range
$line 0 39]
1682 set ref
[string range
$line 41 end
]
1683 if {![string match
"refs/*" $ref]} continue
1684 set name
[string range
$ref 5 end
]
1685 if {[string match
"remotes/*" $name]} {
1686 if {![string match
"*/HEAD" $name]} {
1687 set headids
($name) $id
1688 lappend idheads
($id) $name
1690 } elseif
{[string match
"heads/*" $name]} {
1691 set name
[string range
$name 6 end
]
1692 set headids
($name) $id
1693 lappend idheads
($id) $name
1694 } elseif
{[string match
"tags/*" $name]} {
1695 # this lets refs/tags/foo^{} overwrite refs/tags/foo,
1696 # which is what we want since the former is the commit ID
1697 set name
[string range
$name 5 end
]
1698 if {[string match
"*^{}" $name]} {
1699 set name
[string range
$name 0 end-3
]
1701 set tagobjid
($name) $id
1703 set tagids
($name) $id
1704 lappend idtags
($id) $name
1706 set otherrefids
($name) $id
1707 lappend idotherrefs
($id) $name
1714 set mainheadid
[exec git rev-parse HEAD
]
1715 set thehead
[exec git symbolic-ref HEAD
]
1716 if {[string match
"refs/heads/*" $thehead]} {
1717 set mainhead
[string range
$thehead 11 end
]
1721 if {$selecthead ne
{}} {
1723 set selectheadid
[exec git rev-parse
--verify $selecthead]
1728 # skip over fake commits
1729 proc first_real_row
{} {
1730 global nullid nullid2 numcommits
1732 for {set row
0} {$row < $numcommits} {incr row
} {
1733 set id
[commitonrow
$row]
1734 if {$id ne
$nullid && $id ne
$nullid2} {
1741 # update things for a head moved to a child of its previous location
1742 proc movehead
{id name
} {
1743 global headids idheads
1745 removehead
$headids($name) $name
1746 set headids
($name) $id
1747 lappend idheads
($id) $name
1750 # update things when a head has been removed
1751 proc removehead
{id name
} {
1752 global headids idheads
1754 if {$idheads($id) eq
$name} {
1757 set i
[lsearch
-exact $idheads($id) $name]
1759 set idheads
($id) [lreplace
$idheads($id) $i $i]
1762 unset headids
($name)
1765 proc make_transient
{window origin
} {
1768 # In MacOS Tk 8.4 transient appears to work by setting
1769 # overrideredirect, which is utterly useless, since the
1770 # windows get no border, and are not even kept above
1772 if {!$have_tk85 && [tk windowingsystem
] eq
{aqua
}} return
1774 wm transient
$window $origin
1776 # Windows fails to place transient windows normally, so
1777 # schedule a callback to center them on the parent.
1778 if {[tk windowingsystem
] eq
{win32
}} {
1779 after idle
[list tk
::PlaceWindow
$window widget
$origin]
1783 proc show_error
{w top msg
} {
1784 message
$w.m
-text $msg -justify center
-aspect 400
1785 pack
$w.m
-side top
-fill x
-padx 20 -pady 20
1786 button
$w.ok
-text [mc OK
] -command "destroy $top"
1787 pack
$w.ok
-side bottom
-fill x
1788 bind $top <Visibility
> "grab $top; focus $top"
1789 bind $top <Key-Return
> "destroy $top"
1790 bind $top <Key-space
> "destroy $top"
1791 bind $top <Key-Escape
> "destroy $top"
1795 proc error_popup
{msg
{owner .
}} {
1798 make_transient
$w $owner
1799 show_error
$w $w $msg
1802 proc confirm_popup
{msg
{owner .
}} {
1807 make_transient
$w $owner
1808 message
$w.m
-text $msg -justify center
-aspect 400
1809 pack
$w.m
-side top
-fill x
-padx 20 -pady 20
1810 button
$w.ok
-text [mc OK
] -command "set confirm_ok 1; destroy $w"
1811 pack
$w.ok
-side left
-fill x
1812 button
$w.cancel
-text [mc Cancel
] -command "destroy $w"
1813 pack
$w.cancel
-side right
-fill x
1814 bind $w <Visibility
> "grab $w; focus $w"
1815 bind $w <Key-Return
> "set confirm_ok 1; destroy $w"
1816 bind $w <Key-space
> "set confirm_ok 1; destroy $w"
1817 bind $w <Key-Escape
> "destroy $w"
1822 proc setoptions
{} {
1823 option add
*Panedwindow.showHandle
1 startupFile
1824 option add
*Panedwindow.sashRelief raised startupFile
1825 option add
*Button.font uifont startupFile
1826 option add
*Checkbutton.font uifont startupFile
1827 option add
*Radiobutton.font uifont startupFile
1828 option add
*Menu.font uifont startupFile
1829 option add
*Menubutton.font uifont startupFile
1830 option add
*Label.font uifont startupFile
1831 option add
*Message.font uifont startupFile
1832 option add
*Entry.font uifont startupFile
1835 # Make a menu and submenus.
1836 # m is the window name for the menu, items is the list of menu items to add.
1837 # Each item is a list {mc label type description options...}
1838 # mc is ignored; it's so we can put mc there to alert xgettext
1839 # label is the string that appears in the menu
1840 # type is cascade, command or radiobutton (should add checkbutton)
1841 # description depends on type; it's the sublist for cascade, the
1842 # command to invoke for command, or {variable value} for radiobutton
1843 proc makemenu
{m items
} {
1845 if {[tk windowingsystem
] eq
{aqua
}} {
1851 set name
[mc
[lindex
$i 1]]
1852 set type [lindex
$i 2]
1853 set thing
[lindex
$i 3]
1854 set params
[list
$type]
1856 set u
[string first
"&" [string map
{&& x
} $name]]
1857 lappend params
-label [string map
{&& & & {}} $name]
1859 lappend params
-underline $u
1864 set submenu
[string tolower
[string map
{& ""} [lindex
$i 1]]]
1865 lappend params
-menu $m.
$submenu
1868 lappend params
-command $thing
1871 lappend params
-variable [lindex
$thing 0] \
1872 -value [lindex
$thing 1]
1875 set tail [lrange
$i 4 end
]
1876 regsub
-all {\yMeta1\y
} $tail $Meta1 tail
1877 eval $m add
$params $tail
1878 if {$type eq
"cascade"} {
1879 makemenu
$m.
$submenu $thing
1884 # translate string and remove ampersands
1886 return [string map
{&& & & {}} [mc
$str]]
1889 proc makewindow
{} {
1890 global canv canv2 canv3 linespc charspc ctext cflist cscroll
1892 global findtype findtypemenu findloc findstring fstring geometry
1893 global entries sha1entry sha1string sha1but
1894 global diffcontextstring diffcontext
1896 global maincursor textcursor curtextcursor
1897 global rowctxmenu fakerowmenu mergemax wrapcomment
1898 global highlight_files gdttype
1899 global searchstring sstring
1900 global bgcolor fgcolor bglist fglist diffcolors selectbgcolor
1901 global headctxmenu progresscanv progressitem progresscoords statusw
1902 global fprogitem fprogcoord lastprogupdate progupdatepending
1903 global rprogitem rprogcoord rownumsel numcommits
1906 # The "mc" arguments here are purely so that xgettext
1907 # sees the following string as needing to be translated
1909 {mc
"File" cascade
{
1910 {mc
"Update" command updatecommits
-accelerator F5
}
1911 {mc
"Reload" command reloadcommits
-accelerator Meta1-F5
}
1912 {mc
"Reread references" command rereadrefs
}
1913 {mc
"List references" command showrefs
-accelerator F2
}
1915 {mc
"Start git gui" command {exec git gui
&}}
1917 {mc
"Quit" command doquit
-accelerator Meta1-Q
}
1919 {mc
"Edit" cascade
{
1920 {mc
"Preferences" command doprefs
}
1922 {mc
"View" cascade
{
1923 {mc
"New view..." command {newview
0} -accelerator Shift-F4
}
1924 {mc
"Edit view..." command editview
-state disabled
-accelerator F4
}
1925 {mc
"Delete view" command delview
-state disabled
}
1927 {mc
"All files" radiobutton
{selectedview
0} -command {showview
0}}
1929 {mc
"Help" cascade
{
1930 {mc
"About gitk" command about
}
1931 {mc
"Key bindings" command keys
}
1934 . configure
-menu .bar
1936 # the gui has upper and lower half, parts of a paned window.
1937 panedwindow .ctop
-orient vertical
1939 # possibly use assumed geometry
1940 if {![info exists geometry
(pwsash0
)]} {
1941 set geometry
(topheight
) [expr {15 * $linespc}]
1942 set geometry
(topwidth
) [expr {80 * $charspc}]
1943 set geometry
(botheight
) [expr {15 * $linespc}]
1944 set geometry
(botwidth
) [expr {50 * $charspc}]
1945 set geometry
(pwsash0
) "[expr {40 * $charspc}] 2"
1946 set geometry
(pwsash1
) "[expr {60 * $charspc}] 2"
1949 # the upper half will have a paned window, a scroll bar to the right, and some stuff below
1950 frame .tf
-height $geometry(topheight
) -width $geometry(topwidth
)
1952 panedwindow .tf.histframe.pwclist
-orient horizontal
-sashpad 0 -handlesize 4
1954 # create three canvases
1955 set cscroll .tf.histframe.csb
1956 set canv .tf.histframe.pwclist.canv
1958 -selectbackground $selectbgcolor \
1959 -background $bgcolor -bd 0 \
1960 -yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
1961 .tf.histframe.pwclist add
$canv
1962 set canv2 .tf.histframe.pwclist.canv2
1964 -selectbackground $selectbgcolor \
1965 -background $bgcolor -bd 0 -yscrollincr $linespc
1966 .tf.histframe.pwclist add
$canv2
1967 set canv3 .tf.histframe.pwclist.canv3
1969 -selectbackground $selectbgcolor \
1970 -background $bgcolor -bd 0 -yscrollincr $linespc
1971 .tf.histframe.pwclist add
$canv3
1972 eval .tf.histframe.pwclist sash place
0 $geometry(pwsash0
)
1973 eval .tf.histframe.pwclist sash place
1 $geometry(pwsash1
)
1975 # a scroll bar to rule them
1976 scrollbar
$cscroll -command {allcanvs yview
} -highlightthickness 0
1977 pack
$cscroll -side right
-fill y
1978 bind .tf.histframe.pwclist
<Configure
> {resizeclistpanes
%W
%w
}
1979 lappend bglist
$canv $canv2 $canv3
1980 pack .tf.histframe.pwclist
-fill both
-expand 1 -side left
1982 # we have two button bars at bottom of top frame. Bar 1
1984 frame .tf.lbar
-height 15
1986 set sha1entry .tf.bar.sha1
1987 set entries
$sha1entry
1988 set sha1but .tf.bar.sha1label
1989 button
$sha1but -text [mc
"SHA1 ID: "] -state disabled
-relief flat \
1990 -command gotocommit
-width 8
1991 $sha1but conf
-disabledforeground [$sha1but cget
-foreground]
1992 pack .tf.bar.sha1label
-side left
1993 entry
$sha1entry -width 40 -font textfont
-textvariable sha1string
1994 trace add variable sha1string
write sha1change
1995 pack
$sha1entry -side left
-pady 2
1997 image create bitmap bm-left
-data {
1998 #define left_width 16
1999 #define left_height 16
2000 static unsigned char left_bits
[] = {
2001 0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
2002 0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00,
2003 0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01};
2005 image create bitmap bm-right
-data {
2006 #define right_width 16
2007 #define right_height 16
2008 static unsigned char right_bits
[] = {
2009 0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c,
2010 0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c,
2011 0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01};
2013 button .tf.bar.leftbut
-image bm-left
-command goback \
2014 -state disabled
-width 26
2015 pack .tf.bar.leftbut
-side left
-fill y
2016 button .tf.bar.rightbut
-image bm-right
-command goforw \
2017 -state disabled
-width 26
2018 pack .tf.bar.rightbut
-side left
-fill y
2020 label .tf.bar.rowlabel
-text [mc
"Row"]
2022 label .tf.bar.rownum
-width 7 -font textfont
-textvariable rownumsel \
2023 -relief sunken
-anchor e
2024 label .tf.bar.rowlabel2
-text "/"
2025 label .tf.bar.numcommits
-width 7 -font textfont
-textvariable numcommits \
2026 -relief sunken
-anchor e
2027 pack .tf.bar.rowlabel .tf.bar.rownum .tf.bar.rowlabel2 .tf.bar.numcommits \
2030 trace add variable selectedline
write selectedline_change
2032 # Status label and progress bar
2033 set statusw .tf.bar.status
2034 label
$statusw -width 15 -relief sunken
2035 pack
$statusw -side left
-padx 5
2036 set h
[expr {[font metrics uifont
-linespace] + 2}]
2037 set progresscanv .tf.bar.progress
2038 canvas
$progresscanv -relief sunken
-height $h -borderwidth 2
2039 set progressitem
[$progresscanv create rect
-1 0 0 $h -fill green
]
2040 set fprogitem
[$progresscanv create rect
-1 0 0 $h -fill yellow
]
2041 set rprogitem
[$progresscanv create rect
-1 0 0 $h -fill red
]
2042 pack
$progresscanv -side right
-expand 1 -fill x
2043 set progresscoords
{0 0}
2046 bind $progresscanv <Configure
> adjustprogress
2047 set lastprogupdate
[clock clicks
-milliseconds]
2048 set progupdatepending
0
2050 # build up the bottom bar of upper window
2051 label .tf.lbar.flabel
-text "[mc "Find
"] "
2052 button .tf.lbar.fnext
-text [mc
"next"] -command {dofind
1 1}
2053 button .tf.lbar.fprev
-text [mc
"prev"] -command {dofind
-1 1}
2054 label .tf.lbar.flab2
-text " [mc "commit
"] "
2055 pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \
2057 set gdttype
[mc
"containing:"]
2058 set gm
[tk_optionMenu .tf.lbar.gdttype gdttype \
2059 [mc
"containing:"] \
2060 [mc
"touching paths:"] \
2061 [mc
"adding/removing string:"]]
2062 trace add variable gdttype
write gdttype_change
2063 pack .tf.lbar.gdttype
-side left
-fill y
2066 set fstring .tf.lbar.findstring
2067 lappend entries
$fstring
2068 entry
$fstring -width 30 -font textfont
-textvariable findstring
2069 trace add variable findstring
write find_change
2070 set findtype
[mc
"Exact"]
2071 set findtypemenu
[tk_optionMenu .tf.lbar.findtype \
2072 findtype
[mc
"Exact"] [mc
"IgnCase"] [mc
"Regexp"]]
2073 trace add variable findtype
write findcom_change
2074 set findloc
[mc
"All fields"]
2075 tk_optionMenu .tf.lbar.findloc findloc
[mc
"All fields"] [mc
"Headline"] \
2076 [mc
"Comments"] [mc
"Author"] [mc
"Committer"]
2077 trace add variable findloc
write find_change
2078 pack .tf.lbar.findloc
-side right
2079 pack .tf.lbar.findtype
-side right
2080 pack
$fstring -side left
-expand 1 -fill x
2082 # Finish putting the upper half of the viewer together
2083 pack .tf.lbar
-in .tf
-side bottom
-fill x
2084 pack .tf.bar
-in .tf
-side bottom
-fill x
2085 pack .tf.histframe
-fill both
-side top
-expand 1
2087 .ctop paneconfigure .tf
-height $geometry(topheight
)
2088 .ctop paneconfigure .tf
-width $geometry(topwidth
)
2090 # now build up the bottom
2091 panedwindow .pwbottom
-orient horizontal
2093 # lower left, a text box over search bar, scroll bar to the right
2094 # if we know window height, then that will set the lower text height, otherwise
2095 # we set lower text height which will drive window height
2096 if {[info exists geometry
(main
)]} {
2097 frame .bleft
-width $geometry(botwidth
)
2099 frame .bleft
-width $geometry(botwidth
) -height $geometry(botheight
)
2105 button .bleft.top.search
-text [mc
"Search"] -command dosearch
2106 pack .bleft.top.search
-side left
-padx 5
2107 set sstring .bleft.top.sstring
2108 entry
$sstring -width 20 -font textfont
-textvariable searchstring
2109 lappend entries
$sstring
2110 trace add variable searchstring
write incrsearch
2111 pack
$sstring -side left
-expand 1 -fill x
2112 radiobutton .bleft.mid.
diff -text [mc
"Diff"] \
2113 -command changediffdisp
-variable diffelide
-value {0 0}
2114 radiobutton .bleft.mid.old
-text [mc
"Old version"] \
2115 -command changediffdisp
-variable diffelide
-value {0 1}
2116 radiobutton .bleft.mid.new
-text [mc
"New version"] \
2117 -command changediffdisp
-variable diffelide
-value {1 0}
2118 label .bleft.mid.labeldiffcontext
-text " [mc "Lines of context
"]: "
2119 pack .bleft.mid.
diff .bleft.mid.old .bleft.mid.new
-side left
2120 spinbox .bleft.mid.diffcontext
-width 5 -font textfont \
2121 -from 1 -increment 1 -to 10000000 \
2122 -validate all
-validatecommand "diffcontextvalidate %P" \
2123 -textvariable diffcontextstring
2124 .bleft.mid.diffcontext
set $diffcontext
2125 trace add variable diffcontextstring
write diffcontextchange
2126 lappend entries .bleft.mid.diffcontext
2127 pack .bleft.mid.labeldiffcontext .bleft.mid.diffcontext
-side left
2128 checkbutton .bleft.mid.ignspace
-text [mc
"Ignore space change"] \
2129 -command changeignorespace
-variable ignorespace
2130 pack .bleft.mid.ignspace
-side left
-padx 5
2131 set ctext .bleft.bottom.ctext
2132 text
$ctext -background $bgcolor -foreground $fgcolor \
2133 -state disabled
-font textfont \
2134 -yscrollcommand scrolltext
-wrap none \
2135 -xscrollcommand ".bleft.bottom.sbhorizontal set"
2137 $ctext conf
-tabstyle wordprocessor
2139 scrollbar .bleft.bottom.sb
-command "$ctext yview"
2140 scrollbar .bleft.bottom.sbhorizontal
-command "$ctext xview" -orient h \
2142 pack .bleft.top
-side top
-fill x
2143 pack .bleft.mid
-side top
-fill x
2144 grid
$ctext .bleft.bottom.sb
-sticky nsew
2145 grid .bleft.bottom.sbhorizontal
-sticky ew
2146 grid columnconfigure .bleft.bottom
0 -weight 1
2147 grid rowconfigure .bleft.bottom
0 -weight 1
2148 grid rowconfigure .bleft.bottom
1 -weight 0
2149 pack .bleft.bottom
-side top
-fill both
-expand 1
2150 lappend bglist
$ctext
2151 lappend fglist
$ctext
2153 $ctext tag conf comment
-wrap $wrapcomment
2154 $ctext tag conf filesep
-font textfontbold
-back "#aaaaaa"
2155 $ctext tag conf hunksep
-fore [lindex
$diffcolors 2]
2156 $ctext tag conf d0
-fore [lindex
$diffcolors 0]
2157 $ctext tag conf dresult
-fore [lindex
$diffcolors 1]
2158 $ctext tag conf m0
-fore red
2159 $ctext tag conf m1
-fore blue
2160 $ctext tag conf m2
-fore green
2161 $ctext tag conf m3
-fore purple
2162 $ctext tag conf
m4 -fore brown
2163 $ctext tag conf m5
-fore "#009090"
2164 $ctext tag conf m6
-fore magenta
2165 $ctext tag conf m7
-fore "#808000"
2166 $ctext tag conf m8
-fore "#009000"
2167 $ctext tag conf m9
-fore "#ff0080"
2168 $ctext tag conf m10
-fore cyan
2169 $ctext tag conf m11
-fore "#b07070"
2170 $ctext tag conf m12
-fore "#70b0f0"
2171 $ctext tag conf m13
-fore "#70f0b0"
2172 $ctext tag conf m14
-fore "#f0b070"
2173 $ctext tag conf m15
-fore "#ff70b0"
2174 $ctext tag conf mmax
-fore darkgrey
2176 $ctext tag conf mresult
-font textfontbold
2177 $ctext tag conf msep
-font textfontbold
2178 $ctext tag conf found
-back yellow
2180 .pwbottom add .bleft
2181 .pwbottom paneconfigure .bleft
-width $geometry(botwidth
)
2186 radiobutton .bright.mode.
patch -text [mc
"Patch"] \
2187 -command reselectline
-variable cmitmode
-value "patch"
2188 radiobutton .bright.mode.tree
-text [mc
"Tree"] \
2189 -command reselectline
-variable cmitmode
-value "tree"
2190 grid .bright.mode.
patch .bright.mode.tree
-sticky ew
2191 pack .bright.mode
-side top
-fill x
2192 set cflist .bright.cfiles
2193 set indent
[font measure mainfont
"nn"]
2195 -selectbackground $selectbgcolor \
2196 -background $bgcolor -foreground $fgcolor \
2198 -tabs [list
$indent [expr {2 * $indent}]] \
2199 -yscrollcommand ".bright.sb set" \
2200 -cursor [. cget
-cursor] \
2201 -spacing1 1 -spacing3 1
2202 lappend bglist
$cflist
2203 lappend fglist
$cflist
2204 scrollbar .bright.sb
-command "$cflist yview"
2205 pack .bright.sb
-side right
-fill y
2206 pack
$cflist -side left
-fill both
-expand 1
2207 $cflist tag configure highlight \
2208 -background [$cflist cget
-selectbackground]
2209 $cflist tag configure bold
-font mainfontbold
2211 .pwbottom add .bright
2214 # restore window width & height if known
2215 if {[info exists geometry
(main
)]} {
2216 if {[scan
$geometry(main
) "%dx%d" w h
] >= 2} {
2217 if {$w > [winfo screenwidth .
]} {
2218 set w
[winfo screenwidth .
]
2220 if {$h > [winfo screenheight .
]} {
2221 set h
[winfo screenheight .
]
2223 wm geometry .
"${w}x$h"
2227 if {[tk windowingsystem
] eq
{aqua
}} {
2233 bind .pwbottom
<Configure
> {resizecdetpanes
%W
%w
}
2234 pack .ctop
-fill both
-expand 1
2235 bindall
<1> {selcanvline
%W
%x
%y
}
2236 #bindall <B1-Motion> {selcanvline %W %x %y}
2237 if {[tk windowingsystem
] == "win32"} {
2238 bind .
<MouseWheel
> { windows_mousewheel_redirector
%W
%X
%Y
%D
}
2239 bind $ctext <MouseWheel
> { windows_mousewheel_redirector
%W
%X
%Y
%D
; break }
2241 bindall
<ButtonRelease-4
> "allcanvs yview scroll -5 units"
2242 bindall
<ButtonRelease-5
> "allcanvs yview scroll 5 units"
2243 if {[tk windowingsystem
] eq
"aqua"} {
2244 bindall
<MouseWheel
> {
2245 set delta
[expr {- (%D
)}]
2246 allcanvs yview scroll
$delta units
2250 bindall
<2> "canvscan mark %W %x %y"
2251 bindall
<B2-Motion
> "canvscan dragto %W %x %y"
2252 bindkey
<Home
> selfirstline
2253 bindkey
<End
> sellastline
2254 bind .
<Key-Up
> "selnextline -1"
2255 bind .
<Key-Down
> "selnextline 1"
2256 bind .
<Shift-Key-Up
> "dofind -1 0"
2257 bind .
<Shift-Key-Down
> "dofind 1 0"
2258 bindkey
<Key-Right
> "goforw"
2259 bindkey
<Key-Left
> "goback"
2260 bind .
<Key-Prior
> "selnextpage -1"
2261 bind .
<Key-Next
> "selnextpage 1"
2262 bind .
<$M1B-Home> "allcanvs yview moveto 0.0"
2263 bind .
<$M1B-End> "allcanvs yview moveto 1.0"
2264 bind .
<$M1B-Key-Up> "allcanvs yview scroll -1 units"
2265 bind .
<$M1B-Key-Down> "allcanvs yview scroll 1 units"
2266 bind .
<$M1B-Key-Prior> "allcanvs yview scroll -1 pages"
2267 bind .
<$M1B-Key-Next> "allcanvs yview scroll 1 pages"
2268 bindkey
<Key-Delete
> "$ctext yview scroll -1 pages"
2269 bindkey
<Key-BackSpace
> "$ctext yview scroll -1 pages"
2270 bindkey
<Key-space
> "$ctext yview scroll 1 pages"
2271 bindkey p
"selnextline -1"
2272 bindkey n
"selnextline 1"
2275 bindkey i
"selnextline -1"
2276 bindkey k
"selnextline 1"
2280 bindkey d
"$ctext yview scroll 18 units"
2281 bindkey u
"$ctext yview scroll -18 units"
2282 bindkey
/ {dofind
1 1}
2283 bindkey
<Key-Return
> {dofind
1 1}
2284 bindkey ?
{dofind
-1 1}
2286 bind .
<F5
> updatecommits
2287 bind .
<$M1B-F5> reloadcommits
2288 bind .
<F2
> showrefs
2289 bind .
<Shift-F4
> {newview
0}
2290 catch
{ bind .
<Shift-Key-XF86_Switch_VT_4
> {newview
0} }
2291 bind .
<F4
> edit_or_newview
2292 bind .
<$M1B-q> doquit
2293 bind .
<$M1B-f> {dofind
1 1}
2294 bind .
<$M1B-g> {dofind
1 0}
2295 bind .
<$M1B-r> dosearchback
2296 bind .
<$M1B-s> dosearch
2297 bind .
<$M1B-equal> {incrfont
1}
2298 bind .
<$M1B-plus> {incrfont
1}
2299 bind .
<$M1B-KP_Add> {incrfont
1}
2300 bind .
<$M1B-minus> {incrfont
-1}
2301 bind .
<$M1B-KP_Subtract> {incrfont
-1}
2302 wm protocol . WM_DELETE_WINDOW doquit
2303 bind .
<Destroy
> {stop_backends
}
2304 bind .
<Button-1
> "click %W"
2305 bind $fstring <Key-Return
> {dofind
1 1}
2306 bind $sha1entry <Key-Return
> {gotocommit
; break}
2307 bind $sha1entry <<PasteSelection>> clearsha1
2308 bind $cflist <1> {sel_flist %W %x %y; break}
2309 bind $cflist <B1-Motion> {sel_flist %W %x %y; break}
2310 bind $cflist <ButtonRelease-1> {treeclick %W %x %y}
2312 bind $cflist $ctxbut {pop_flist_menu %W %X %Y %x %y}
2313 bind $ctext $ctxbut {pop_diff_menu %W %X %Y %x %y}
2315 set maincursor [. cget -cursor]
2316 set textcursor [$ctext cget -cursor]
2317 set curtextcursor $textcursor
2319 set rowctxmenu .rowctxmenu
2320 makemenu $rowctxmenu {
2321 {mc "Diff this -> selected" command {diffvssel 0}}
2322 {mc "Diff selected -> this" command {diffvssel 1}}
2323 {mc "Make patch" command mkpatch}
2324 {mc "Create tag" command mktag}
2325 {mc "Write commit to file" command writecommit}
2326 {mc "Create new branch" command mkbranch}
2327 {mc "Cherry-pick this commit" command cherrypick}
2328 {mc "Reset HEAD branch to here" command resethead}
2330 $rowctxmenu configure -tearoff 0
2332 set fakerowmenu .fakerowmenu
2333 makemenu $fakerowmenu {
2334 {mc "Diff this -> selected" command {diffvssel 0}}
2335 {mc "Diff selected -> this" command {diffvssel 1}}
2336 {mc "Make patch" command mkpatch}
2338 $fakerowmenu configure -tearoff 0
2340 set headctxmenu .headctxmenu
2341 makemenu $headctxmenu {
2342 {mc "Check out this branch" command cobranch}
2343 {mc "Remove this branch" command rmbranch}
2345 $headctxmenu configure -tearoff 0
2348 set flist_menu .flistctxmenu
2349 makemenu $flist_menu {
2350 {mc "Highlight this too" command {flist_hl 0}}
2351 {mc "Highlight this only" command {flist_hl 1}}
2352 {mc "External diff" command {external_diff}}
2353 {mc "Blame parent commit" command {external_blame 1}}
2355 $flist_menu configure -tearoff 0
2358 set diff_menu .diffctxmenu
2359 makemenu $diff_menu {
2360 {mc "Show origin of this line" command show_line_source}
2361 {mc "Run git gui blame on this line" command {external_blame_diff}}
2363 $diff_menu configure -tearoff 0
2366 # Windows sends all mouse wheel events to the current focused window, not
2367 # the one where the mouse hovers, so bind those events here and redirect
2368 # to the correct window
2369 proc windows_mousewheel_redirector {W X Y D} {
2370 global canv canv2 canv3
2371 set w [winfo containing -displayof $W $X $Y]
2373 set u [expr {$D < 0 ? 5 : -5}]
2374 if {$w == $canv || $w == $canv2 || $w == $canv3} {
2375 allcanvs yview scroll $u units
2378 $w yview scroll $u units
2384 # Update row number label when selectedline changes
2385 proc selectedline_change {n1 n2 op} {
2386 global selectedline rownumsel
2388 if {$selectedline eq {}} {
2391 set rownumsel [expr {$selectedline + 1}]
2395 # mouse-2 makes all windows scan vertically, but only the one
2396 # the cursor is in scans horizontally
2397 proc canvscan {op w x y} {
2398 global canv canv2 canv3
2399 foreach c [list $canv $canv2 $canv3] {
2408 proc scrollcanv {cscroll f0 f1} {
2409 $cscroll set $f0 $f1
2414 # when we make a key binding for the toplevel, make sure
2415 # it doesn't get triggered when that key is pressed in the
2416 # find string entry widget.
2417 proc bindkey {ev script} {
2420 set escript [bind Entry $ev]
2421 if {$escript == {}} {
2422 set escript [bind Entry <Key>]
2424 foreach e $entries {
2425 bind $e $ev "$escript; break"
2429 # set the focus back to the toplevel for any click outside
2432 global ctext entries
2433 foreach e [concat $entries $ctext] {
2434 if {$w == $e} return
2439 # Adjust the progress bar for a change in requested extent or canvas size
2440 proc adjustprogress {} {
2441 global progresscanv progressitem progresscoords
2442 global fprogitem fprogcoord lastprogupdate progupdatepending
2443 global rprogitem rprogcoord
2445 set w [expr {[winfo width $progresscanv] - 4}]
2446 set x0 [expr {$w * [lindex $progresscoords 0]}]
2447 set x1 [expr {$w * [lindex $progresscoords 1]}]
2448 set h [winfo height $progresscanv]
2449 $progresscanv coords $progressitem $x0 0 $x1 $h
2450 $progresscanv coords $fprogitem 0 0 [expr {$w * $fprogcoord}] $h
2451 $progresscanv coords $rprogitem 0 0 [expr {$w * $rprogcoord}] $h
2452 set now [clock clicks -milliseconds]
2453 if {$now >= $lastprogupdate + 100} {
2454 set progupdatepending 0
2456 } elseif {!$progupdatepending} {
2457 set progupdatepending 1
2458 after [expr {$lastprogupdate + 100 - $now}] doprogupdate
2462 proc doprogupdate {} {
2463 global lastprogupdate progupdatepending
2465 if {$progupdatepending} {
2466 set progupdatepending 0
2467 set lastprogupdate [clock clicks -milliseconds]
2472 proc savestuff {w} {
2473 global canv canv2 canv3 mainfont textfont uifont tabstop
2474 global stuffsaved findmergefiles maxgraphpct
2475 global maxwidth showneartags showlocalchanges
2476 global viewname viewfiles viewargs viewargscmd viewperm nextviewnum
2477 global cmitmode wrapcomment datetimeformat limitdiffs
2478 global colors bgcolor fgcolor diffcolors diffcontext selectbgcolor
2479 global autoselect extdifftool perfile_attrs markbgcolor
2481 if {$stuffsaved} return
2482 if {![winfo viewable .]} return
2484 set f [open "~/.gitk-new" w]
2485 puts $f [list set mainfont $mainfont]
2486 puts $f [list set textfont $textfont]
2487 puts $f [list set uifont $uifont]
2488 puts $f [list set tabstop $tabstop]
2489 puts $f [list set findmergefiles $findmergefiles]
2490 puts $f [list set maxgraphpct $maxgraphpct]
2491 puts $f [list set maxwidth $maxwidth]
2492 puts $f [list set cmitmode $cmitmode]
2493 puts $f [list set wrapcomment $wrapcomment]
2494 puts $f [list set autoselect $autoselect]
2495 puts $f [list set showneartags $showneartags]
2496 puts $f [list set showlocalchanges $showlocalchanges]
2497 puts $f [list set datetimeformat $datetimeformat]
2498 puts $f [list set limitdiffs $limitdiffs]
2499 puts $f [list set bgcolor $bgcolor]
2500 puts $f [list set fgcolor $fgcolor]
2501 puts $f [list set colors $colors]
2502 puts $f [list set diffcolors $diffcolors]
2503 puts $f [list set markbgcolor $markbgcolor]
2504 puts $f [list set diffcontext $diffcontext]
2505 puts $f [list set selectbgcolor $selectbgcolor]
2506 puts $f [list set extdifftool $extdifftool]
2507 puts $f [list set perfile_attrs $perfile_attrs]
2509 puts $f "set geometry(main) [wm geometry .]"
2510 puts $f "set geometry(topwidth) [winfo width .tf]"
2511 puts $f "set geometry(topheight) [winfo height .tf]"
2512 puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\""
2513 puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\""
2514 puts $f "set geometry(botwidth) [winfo width .bleft]"
2515 puts $f "set geometry(botheight) [winfo height .bleft]"
2517 puts -nonewline $f "set permviews {"
2518 for {set v 0} {$v < $nextviewnum} {incr v} {
2519 if {$viewperm($v)} {
2520 puts $f "{[list $viewname($v) $viewfiles($v) $viewargs($v) $viewargscmd($v)]}"
2525 file rename -force "~/.gitk-new" "~/.gitk"
2530 proc resizeclistpanes {win w} {
2532 if {[info exists oldwidth($win)]} {
2533 set s0 [$win sash coord 0]
2534 set s1 [$win sash coord 1]
2536 set sash0 [expr {int($w/2 - 2)}]
2537 set sash1 [expr {int($w*5/6 - 2)}]
2539 set factor [expr {1.0 * $w / $oldwidth($win)}]
2540 set sash0 [expr {int($factor * [lindex $s0 0])}]
2541 set sash1 [expr {int($factor * [lindex $s1 0])}]
2545 if {$sash1 < $sash0 + 20} {
2546 set sash1 [expr {$sash0 + 20}]
2548 if {$sash1 > $w - 10} {
2549 set sash1 [expr {$w - 10}]
2550 if {$sash0 > $sash1 - 20} {
2551 set sash0 [expr {$sash1 - 20}]
2555 $win sash place 0 $sash0 [lindex $s0 1]
2556 $win sash place 1 $sash1 [lindex $s1 1]
2558 set oldwidth($win) $w
2561 proc resizecdetpanes {win w} {
2563 if {[info exists oldwidth($win)]} {
2564 set s0 [$win sash coord 0]
2566 set sash0 [expr {int($w*3/4 - 2)}]
2568 set factor [expr {1.0 * $w / $oldwidth($win)}]
2569 set sash0 [expr {int($factor * [lindex $s0 0])}]
2573 if {$sash0 > $w - 15} {
2574 set sash0 [expr {$w - 15}]
2577 $win sash place 0 $sash0 [lindex $s0 1]
2579 set oldwidth($win) $w
2582 proc allcanvs args {
2583 global canv canv2 canv3
2589 proc bindall {event action} {
2590 global canv canv2 canv3
2591 bind $canv $event $action
2592 bind $canv2 $event $action
2593 bind $canv3 $event $action
2599 if {[winfo exists $w]} {
2604 wm title $w [mc "About gitk"]
2606 message $w.m -text [mc "
2607 Gitk - a commit viewer for git
2609 Copyright © 2005-2008 Paul Mackerras
2611 Use and redistribute under the terms of the GNU General Public License"] \
2612 -justify center -aspect 400 -border 2 -bg white -relief groove
2613 pack $w.m -side top -fill x -padx 2 -pady 2
2614 button $w.ok -text [mc "Close"] -command "destroy $w" -default active
2615 pack $w.ok -side bottom
2616 bind $w <Visibility> "focus $w.ok"
2617 bind $w <Key-Escape> "destroy $w"
2618 bind $w <Key-Return> "destroy $w"
2623 if {[winfo exists $w]} {
2627 if {[tk windowingsystem] eq {aqua}} {
2633 wm title $w [mc "Gitk key bindings"]
2635 message $w.m -text "
2636 [mc "Gitk key bindings:"]
2638 [mc "<%s-Q> Quit" $M1T]
2639 [mc "<Home> Move to first commit"]
2640 [mc "<End> Move to last commit"]
2641 [mc "<Up>, p, i Move up one commit"]
2642 [mc "<Down>, n, k Move down one commit"]
2643 [mc "<Left>, z, j Go back in history list"]
2644 [mc "<Right>, x, l Go forward in history list"]
2645 [mc "<PageUp> Move up one page in commit list"]
2646 [mc "<PageDown> Move down one page in commit list"]
2647 [mc "<%s-Home> Scroll to top of commit list" $M1T]
2648 [mc "<%s-End> Scroll to bottom of commit list" $M1T]
2649 [mc "<%s-Up> Scroll commit list up one line" $M1T]
2650 [mc "<%s-Down> Scroll commit list down one line" $M1T]
2651 [mc "<%s-PageUp> Scroll commit list up one page" $M1T]
2652 [mc "<%s-PageDown> Scroll commit list down one page" $M1T]
2653 [mc "<Shift-Up> Find backwards (upwards, later commits)"]
2654 [mc "<Shift-Down> Find forwards (downwards, earlier commits)"]
2655 [mc "<Delete>, b Scroll diff view up one page"]
2656 [mc "<Backspace> Scroll diff view up one page"]
2657 [mc "<Space> Scroll diff view down one page"]
2658 [mc "u Scroll diff view up 18 lines"]
2659 [mc "d Scroll diff view down 18 lines"]
2660 [mc "<%s-F> Find" $M1T]
2661 [mc "<%s-G> Move to next find hit" $M1T]
2662 [mc "<Return> Move to next find hit"]
2663 [mc "/ Move to next find hit, or redo find"]
2664 [mc "? Move to previous find hit"]
2665 [mc "f Scroll diff view to next file"]
2666 [mc "<%s-S> Search for next hit in diff view" $M1T]
2667 [mc "<%s-R> Search for previous hit in diff view" $M1T]
2668 [mc "<%s-KP+> Increase font size" $M1T]
2669 [mc "<%s-plus> Increase font size" $M1T]
2670 [mc "<%s-KP-> Decrease font size" $M1T]
2671 [mc "<%s-minus> Decrease font size" $M1T]
2674 -justify left -bg white -border 2 -relief groove
2675 pack $w.m -side top -fill both -padx 2 -pady 2
2676 button $w.ok -text [mc "Close"] -command "destroy $w" -default active
2677 bind $w <Key-Escape> [list destroy $w]
2678 pack $w.ok -side bottom
2679 bind $w <Visibility> "focus $w.ok"
2680 bind $w <Key-Escape> "destroy $w"
2681 bind $w <Key-Return> "destroy $w"
2684 # Procedures for manipulating the file list window at the
2685 # bottom right of the overall window.
2687 proc treeview {w l openlevs} {
2688 global treecontents treediropen treeheight treeparent treeindex
2698 set treecontents() {}
2699 $w conf -state normal
2701 while {[string range $f 0 $prefixend] ne $prefix} {
2702 if {$lev <= $openlevs} {
2703 $w mark set e:$treeindex($prefix) "end -1c"
2704 $w mark gravity e:$treeindex($prefix) left
2706 set treeheight($prefix) $ht
2707 incr ht [lindex $htstack end]
2708 set htstack [lreplace $htstack end end]
2709 set prefixend [lindex $prefendstack end]
2710 set prefendstack [lreplace $prefendstack end end]
2711 set prefix [string range $prefix 0 $prefixend]
2714 set tail [string range $f [expr {$prefixend+1}] end]
2715 while {[set slash [string first "/" $tail]] >= 0} {
2718 lappend prefendstack $prefixend
2719 incr prefixend [expr {$slash + 1}]
2720 set d [string range $tail 0 $slash]
2721 lappend treecontents($prefix) $d
2722 set oldprefix $prefix
2724 set treecontents($prefix) {}
2725 set treeindex($prefix) [incr ix]
2726 set treeparent($prefix) $oldprefix
2727 set tail [string range $tail [expr {$slash+1}] end]
2728 if {$lev <= $openlevs} {
2730 set treediropen($prefix) [expr {$lev < $openlevs}]
2731 set bm [expr {$lev == $openlevs? "tri-rt": "tri-dn"}]
2732 $w mark set d:$ix "end -1c"
2733 $w mark gravity d:$ix left
2735 for {set i 0} {$i < $lev} {incr i} {append str "\t"}
2737 $w image create end -align center -image $bm -padx 1 \
2739 $w insert end $d [highlight_tag $prefix]
2740 $w mark set s:$ix "end -1c"
2741 $w mark gravity s:$ix left
2746 if {$lev <= $openlevs} {
2749 for {set i 0} {$i < $lev} {incr i} {append str "\t"}
2751 $w insert end $tail [highlight_tag $f]
2753 lappend treecontents($prefix) $tail
2756 while {$htstack ne {}} {
2757 set treeheight($prefix) $ht
2758 incr ht [lindex $htstack end]
2759 set htstack [lreplace $htstack end end]
2760 set prefixend [lindex $prefendstack end]
2761 set prefendstack [lreplace $prefendstack end end]
2762 set prefix [string range $prefix 0 $prefixend]
2764 $w conf -state disabled
2767 proc linetoelt {l} {
2768 global treeheight treecontents
2773 foreach e $treecontents($prefix) {
2778 if {[string index $e end] eq "/"} {
2779 set n $treeheight($prefix$e)
2791 proc highlight_tree {y prefix} {
2792 global treeheight treecontents cflist
2794 foreach e $treecontents($prefix) {
2796 if {[highlight_tag $path] ne {}} {
2797 $cflist tag add bold $y.0 "$y.0 lineend"
2800 if {[string index $e end] eq "/" && $treeheight($path) > 1} {
2801 set y [highlight_tree $y $path]
2807 proc treeclosedir {w dir} {
2808 global treediropen treeheight treeparent treeindex
2810 set ix $treeindex($dir)
2811 $w conf -state normal
2812 $w delete s:$ix e:$ix
2813 set treediropen($dir) 0
2814 $w image configure a:$ix -image tri-rt
2815 $w conf -state disabled
2816 set n [expr {1 - $treeheight($dir)}]
2817 while {$dir ne {}} {
2818 incr treeheight($dir) $n
2819 set dir $treeparent($dir)
2823 proc treeopendir {w dir} {
2824 global treediropen treeheight treeparent treecontents treeindex
2826 set ix $treeindex($dir)
2827 $w conf -state normal
2828 $w image configure a:$ix -image tri-dn
2829 $w mark set e:$ix s:$ix
2830 $w mark gravity e:$ix right
2833 set n [llength $treecontents($dir)]
2834 for {set x $dir} {$x ne {}} {set x $treeparent($x)} {
2837 incr treeheight($x) $n
2839 foreach e $treecontents($dir) {
2841 if {[string index $e end] eq "/"} {
2842 set iy $treeindex($de)
2843 $w mark set d:$iy e:$ix
2844 $w mark gravity d:$iy left
2845 $w insert e:$ix $str
2846 set treediropen($de) 0
2847 $w image create e:$ix -align center -image tri-rt -padx 1 \
2849 $w insert e:$ix $e [highlight_tag $de]
2850 $w mark set s:$iy e:$ix
2851 $w mark gravity s:$iy left
2852 set treeheight($de) 1
2854 $w insert e:$ix $str
2855 $w insert e:$ix $e [highlight_tag $de]
2858 $w mark gravity e:$ix right
2859 $w conf -state disabled
2860 set treediropen($dir) 1
2861 set top [lindex [split [$w index @0,0] .] 0]
2862 set ht [$w cget -height]
2863 set l [lindex [split [$w index s:$ix] .] 0]
2866 } elseif {$l + $n + 1 > $top + $ht} {
2867 set top [expr {$l + $n + 2 - $ht}]
2875 proc treeclick {w x y} {
2876 global treediropen cmitmode ctext cflist cflist_top
2878 if {$cmitmode ne "tree"} return
2879 if {![info exists cflist_top]} return
2880 set l [lindex [split [$w index "@$x,$y"] "."] 0]
2881 $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
2882 $cflist tag add highlight $l.0 "$l.0 lineend"
2888 set e [linetoelt $l]
2889 if {[string index $e end] ne "/"} {
2891 } elseif {$treediropen($e)} {
2898 proc setfilelist {id} {
2899 global treefilelist cflist jump_to_here
2901 treeview $cflist $treefilelist($id) 0
2902 if {$jump_to_here ne {}} {
2903 set f [lindex $jump_to_here 0]
2904 if {[lsearch -exact $treefilelist($id) $f] >= 0} {
2910 image create bitmap tri-rt -background black -foreground blue -data {
2911 #define tri-rt_width 13
2912 #define tri-rt_height 13
2913 static unsigned char tri-rt_bits[] = {
2914 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x00, 0x70, 0x00, 0xf0, 0x00,
2915 0xf0, 0x01, 0xf0, 0x00, 0x70, 0x00, 0x30, 0x00, 0x10, 0x00, 0x00, 0x00,
2918 #define tri-rt-mask_width 13
2919 #define tri-rt-mask_height 13
2920 static unsigned char tri-rt-mask_bits[] = {
2921 0x08, 0x00, 0x18, 0x00, 0x38, 0x00, 0x78, 0x00, 0xf8, 0x00, 0xf8, 0x01,
2922 0xf8, 0x03, 0xf8, 0x01, 0xf8, 0x00, 0x78, 0x00, 0x38, 0x00, 0x18, 0x00,
2925 image create bitmap tri-dn -background black -foreground blue -data {
2926 #define tri-dn_width 13
2927 #define tri-dn_height 13
2928 static unsigned char tri-dn_bits[] = {
2929 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x07, 0xf8, 0x03,
2930 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
2933 #define tri-dn-mask_width 13
2934 #define tri-dn-mask_height 13
2935 static unsigned char tri-dn-mask_bits[] = {
2936 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0xfe, 0x0f, 0xfc, 0x07,
2937 0xf8, 0x03, 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
2941 image create bitmap reficon-T -background black -foreground yellow -data {
2942 #define tagicon_width 13
2943 #define tagicon_height 9
2944 static unsigned char tagicon_bits[] = {
2945 0x00, 0x00, 0x00, 0x00, 0xf0, 0x07, 0xf8, 0x07,
2946 0xfc, 0x07, 0xf8, 0x07, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00};
2948 #define tagicon-mask_width 13
2949 #define tagicon-mask_height 9
2950 static unsigned char tagicon-mask_bits[] = {
2951 0x00, 0x00, 0xf0, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
2952 0xfe, 0x0f, 0xfc, 0x0f, 0xf8, 0x0f, 0xf0, 0x0f, 0x00, 0x00};
2955 #define headicon_width 13
2956 #define headicon_height 9
2957 static unsigned char headicon_bits[] = {
2958 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xf8, 0x07,
2959 0xf8, 0x07, 0xf8, 0x07, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00};
2962 #define headicon-mask_width 13
2963 #define headicon-mask_height 9
2964 static unsigned char headicon-mask_bits[] = {
2965 0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
2966 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00};
2968 image create bitmap reficon-H -background black -foreground green \
2969 -data $rectdata -maskdata $rectmask
2970 image create bitmap reficon-o -background black -foreground "#ddddff" \
2971 -data $rectdata -maskdata $rectmask
2973 proc init_flist {first} {
2974 global cflist cflist_top difffilestart
2976 $cflist conf -state normal
2977 $cflist delete 0.0 end
2979 $cflist insert end $first
2981 $cflist tag add highlight 1.0 "1.0 lineend"
2983 catch {unset cflist_top}
2985 $cflist conf -state disabled
2986 set difffilestart {}
2989 proc highlight_tag {f} {
2990 global highlight_paths
2992 foreach p $highlight_paths {
2993 if {[string match $p $f]} {
3000 proc highlight_filelist {} {
3001 global cmitmode cflist
3003 $cflist conf -state normal
3004 if {$cmitmode ne "tree"} {
3005 set end [lindex [split [$cflist index end] .] 0]
3006 for {set l 2} {$l < $end} {incr l} {
3007 set line [$cflist get $l.0 "$l.0 lineend"]
3008 if {[highlight_tag $line] ne {}} {
3009 $cflist tag add bold $l.0 "$l.0 lineend"
3015 $cflist conf -state disabled
3018 proc unhighlight_filelist {} {
3021 $cflist conf -state normal
3022 $cflist tag remove bold 1.0 end
3023 $cflist conf -state disabled
3026 proc add_flist {fl} {
3029 $cflist conf -state normal
3031 $cflist insert end "\n"
3032 $cflist insert end $f [highlight_tag $f]
3034 $cflist conf -state disabled
3037 proc sel_flist {w x y} {
3038 global ctext difffilestart cflist cflist_top cmitmode
3040 if {$cmitmode eq "tree"} return
3041 if {![info exists cflist_top]} return
3042 set l [lindex [split [$w index "@$x,$y"] "."] 0]
3043 $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
3044 $cflist tag add highlight $l.0 "$l.0 lineend"
3049 catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
3053 proc pop_flist_menu {w X Y x y} {
3054 global ctext cflist cmitmode flist_menu flist_menu_file
3055 global treediffs diffids
3058 set l [lindex [split [$w index "@$x,$y"] "."] 0]
3060 if {$cmitmode eq "tree"} {
3061 set e [linetoelt $l]
3062 if {[string index $e end] eq "/"} return
3064 set e [lindex $treediffs($diffids) [expr {$l-2}]]
3066 set flist_menu_file $e
3067 set xdiffstate "normal"
3068 if {$cmitmode eq "tree"} {
3069 set xdiffstate "disabled"
3071 # Disable "External diff" item in tree mode
3072 $flist_menu entryconf 2 -state $xdiffstate
3073 tk_popup $flist_menu $X $Y
3076 proc find_ctext_fileinfo {line} {
3077 global ctext_file_names ctext_file_lines
3079 set ok [bsearch $ctext_file_lines $line]
3080 set tline [lindex $ctext_file_lines $ok]
3082 if {$ok >= [llength $ctext_file_lines] || $line < $tline} {
3085 return [list [lindex $ctext_file_names $ok] $tline]
3089 proc pop_diff_menu {w X Y x y} {
3090 global ctext diff_menu flist_menu_file
3091 global diff_menu_txtpos diff_menu_line
3092 global diff_menu_filebase
3094 set diff_menu_txtpos [split [$w index "@$x,$y"] "."]
3095 set diff_menu_line [lindex $diff_menu_txtpos 0]
3096 # don't pop up the menu on hunk-separator or file-separator lines
3097 if {[lsearch -glob [$ctext tag names $diff_menu_line.0] "*sep"] >= 0} {
3101 set f [find_ctext_fileinfo $diff_menu_line]
3102 if {$f eq {}} return
3103 set flist_menu_file [lindex $f 0]
3104 set diff_menu_filebase [lindex $f 1]
3105 tk_popup $diff_menu $X $Y
3108 proc flist_hl {only} {
3109 global flist_menu_file findstring gdttype
3111 set x [shellquote $flist_menu_file]
3112 if {$only || $findstring eq {} || $gdttype ne [mc "touching paths:"]} {
3115 append findstring " " $x
3117 set gdttype [mc "touching paths:"]
3120 proc save_file_from_commit {filename output what} {
3123 if {[catch {exec git show $filename -- > $output} err]} {
3124 if {[string match "fatal: bad revision *" $err]} {
3127 error_popup "[mc "Error getting \"%s\" from %s:" $filename $what] $err"
3133 proc external_diff_get_one_file {diffid filename diffdir} {
3134 global nullid nullid2 nullfile
3137 if {$diffid == $nullid} {
3138 set difffile [file join [file dirname $gitdir] $filename]
3139 if {[file exists $difffile]} {
3144 if {$diffid == $nullid2} {
3145 set difffile [file join $diffdir "\[index\] [file tail $filename]"]
3146 return [save_file_from_commit :$filename $difffile index]
3148 set difffile [file join $diffdir "\[$diffid\] [file tail $filename]"]
3149 return [save_file_from_commit $diffid:$filename $difffile \
3153 proc external_diff {} {
3154 global gitktmpdir nullid nullid2
3155 global flist_menu_file
3158 global gitdir extdifftool
3160 if {[llength $diffids] == 1} {
3161 # no reference commit given
3162 set diffidto [lindex $diffids 0]
3163 if {$diffidto eq $nullid} {
3164 # diffing working copy with index
3165 set diffidfrom $nullid2
3166 } elseif {$diffidto eq $nullid2} {
3167 # diffing index with HEAD
3168 set diffidfrom "HEAD"
3170 # use first parent commit
3171 global parentlist selectedline
3172 set diffidfrom [lindex $parentlist $selectedline 0]
3175 set diffidfrom [lindex $diffids 0]
3176 set diffidto [lindex $diffids 1]
3179 # make sure that several diffs wont collide
3180 if {![info exists gitktmpdir]} {
3181 set gitktmpdir [file join [file dirname $gitdir] \
3182 [format ".gitk-tmp.%s" [pid]]]
3183 if {[catch {file mkdir $gitktmpdir} err]} {
3184 error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err"
3191 set diffdir [file join $gitktmpdir $diffnum]
3192 if {[catch {file mkdir $diffdir} err]} {
3193 error_popup "[mc "Error creating temporary directory %s:" $diffdir] $err"
3197 # gather files to diff
3198 set difffromfile [external_diff_get_one_file $diffidfrom $flist_menu_file $diffdir]
3199 set difftofile [external_diff_get_one_file $diffidto $flist_menu_file $diffdir]
3201 if {$difffromfile ne {} && $difftofile ne {}} {
3202 set cmd [concat | [shellsplit $extdifftool] \
3203 [list $difffromfile $difftofile]]
3204 if {[catch {set fl [open $cmd r]} err]} {
3205 file delete -force $diffdir
3206 error_popup "$extdifftool: [mc "command failed:"] $err"
3208 fconfigure $fl -blocking 0
3209 filerun $fl [list delete_at_eof $fl $diffdir]
3214 proc find_hunk_blamespec {base line} {
3217 # Find and parse the hunk header
3218 set s_lix [$ctext search -backwards -regexp ^@@ "$line.0 lineend" $base.0]
3219 if {$s_lix eq {}} return
3221 set s_line [$ctext get $s_lix "$s_lix + 1 lines"]
3222 if {![regexp {^@@@*(( -\d+(,\d+)?)+) \+(\d+)(,\d+)? @@} $s_line \
3223 s_line old_specs osz osz1 new_line nsz]} {
3227 # base lines for the parents
3228 set base_lines [list $new_line]
3229 foreach old_spec [lrange [split $old_specs " "] 1 end] {
3230 if {![regexp -- {-(\d+)(,\d+)?} $old_spec \
3231 old_spec old_line osz]} {
3234 lappend base_lines $old_line
3237 # Now scan the lines to determine offset within the hunk
3238 set max_parent [expr {[llength $base_lines]-2}]
3240 set s_lno [lindex [split $s_lix "."] 0]
3242 # Determine if the line is removed
3243 set chunk [$ctext get $line.0 "$line.1 + $max_parent chars"]
3244 if {[string match {[-+ ]*} $chunk]} {
3245 set removed_idx [string first "-" $chunk]
3246 # Choose a parent index
3247 if {$removed_idx >= 0} {
3248 set parent $removed_idx
3250 set unchanged_idx [string first " " $chunk]
3251 if {$unchanged_idx >= 0} {
3252 set parent $unchanged_idx
3254 # blame the current commit
3258 # then count other lines that belong to it
3259 for {set i $line} {[incr i -1] > $s_lno} {} {
3260 set chunk [$ctext get $i.0 "$i.1 + $max_parent chars"]
3261 # Determine if the line is removed
3262 set removed_idx [string first "-" $chunk]
3264 set code [string index $chunk $parent]
3265 if {$code eq "-" || ($removed_idx < 0 && $code ne "+")} {
3269 if {$removed_idx < 0} {
3279 incr dline [lindex $base_lines $parent]
3280 return [list $parent $dline]
3283 proc external_blame_diff {} {
3284 global currentid cmitmode
3285 global diff_menu_txtpos diff_menu_line
3286 global diff_menu_filebase flist_menu_file
3288 if {$cmitmode eq "tree"} {
3290 set line [expr {$diff_menu_line - $diff_menu_filebase}]
3292 set hinfo [find_hunk_blamespec $diff_menu_filebase $diff_menu_line]
3294 set parent_idx [lindex $hinfo 0]
3295 set line [lindex $hinfo 1]
3302 external_blame $parent_idx $line
3305 # Find the SHA1 ID of the blob for file $fname in the index
3307 proc index_sha1 {fname} {
3308 set f [open [list | git ls-files -s $fname] r]
3309 while {[gets $f line] >= 0} {
3310 set info [lindex [split $line "\t"] 0]
3311 set stage [lindex $info 2]
3312 if {$stage eq "0" || $stage eq "2"} {
3314 return [lindex $info 1]
3321 proc external_blame {parent_idx {line {}}} {
3322 global flist_menu_file
3323 global nullid nullid2
3324 global parentlist selectedline currentid
3326 if {$parent_idx > 0} {
3327 set base_commit [lindex $parentlist $selectedline [expr {$parent_idx-1}]]
3329 set base_commit $currentid
3332 if {$base_commit eq {} || $base_commit eq $nullid || $base_commit eq $nullid2} {
3333 error_popup [mc "No such commit"]
3337 set cmdline [list git gui blame]
3338 if {$line ne {} && $line > 1} {
3339 lappend cmdline "--line=$line"
3341 lappend cmdline $base_commit $flist_menu_file
3342 if {[catch {eval exec $cmdline &} err]} {
3343 error_popup "[mc "git gui blame: command failed:"] $err"
3347 proc show_line_source {} {
3348 global cmitmode currentid parents curview blamestuff blameinst
3349 global diff_menu_line diff_menu_filebase flist_menu_file
3350 global nullid nullid2 gitdir
3353 if {$cmitmode eq "tree"} {
3355 set line [expr {$diff_menu_line - $diff_menu_filebase}]
3357 set h [find_hunk_blamespec $diff_menu_filebase $diff_menu_line]
3358 if {$h eq {}} return
3359 set pi [lindex $h 0]
3361 mark_ctext_line $diff_menu_line
3365 if {$currentid eq $nullid} {
3367 # must be a merge in progress...
3369 # get the last line from .git/MERGE_HEAD
3370 set f [open [file join $gitdir MERGE_HEAD] r]
3371 set id [lindex [split [read $f] "\n"] end-1]
3374 error_popup [mc "Couldn't read merge head: %s" $err]
3377 } elseif {$parents($curview,$currentid) eq $nullid2} {
3378 # need to do the blame from the index
3380 set from_index [index_sha1 $flist_menu_file]
3382 error_popup [mc "Error reading index: %s" $err]
3387 set id [lindex $parents($curview,$currentid) $pi]
3389 set line [lindex $h 1]
3392 if {$from_index ne {}} {
3393 lappend blameargs | git cat-file blob $from_index
3395 lappend blameargs | git blame -p -L$line,+1
3396 if {$from_index ne {}} {
3397 lappend blameargs --contents -
3399 lappend blameargs $id
3401 lappend blameargs -- $flist_menu_file
3403 set f [open $blameargs r]
3405 error_popup [mc "Couldn't start git blame: %s" $err]
3408 nowbusy blaming [mc "Searching"]
3409 fconfigure $f -blocking 0
3410 set i [reg_instance $f]
3411 set blamestuff($i) {}
3413 filerun $f [list read_line_source $f $i]
3416 proc stopblaming {} {
3419 if {[info exists blameinst]} {
3420 stop_instance $blameinst
3426 proc read_line_source {fd inst} {
3427 global blamestuff curview commfd blameinst nullid nullid2
3429 while {[gets $fd line] >= 0} {
3430 lappend blamestuff($inst) $line
3438 fconfigure $fd -blocking 1
3439 if {[catch {close $fd} err]} {
3440 error_popup [mc "Error running git blame: %s" $err]
3445 set line [split [lindex $blamestuff($inst) 0] " "]
3446 set id [lindex $line 0]
3447 set lnum [lindex $line 1]
3448 if {[string length $id] == 40 && [string is xdigit $id] &&
3449 [string is digit -strict $lnum]} {
3450 # look for "filename" line
3451 foreach l $blamestuff($inst) {
3452 if {[string match "filename *" $l]} {
3453 set fname [string range $l 9 end]
3459 # all looks good, select it
3460 if {$id eq $nullid} {
3461 # blame uses all-zeroes to mean not committed,
3462 # which would mean a change in the index
3465 if {[commitinview $id $curview]} {
3466 selectline [rowofcommit $id] 1 [list $fname $lnum]
3468 error_popup [mc "That line comes from commit %s, \
3469 which is not in this view" [shortids $id]]
3472 puts "oops couldn't parse git blame output"
3477 # delete $dir when we see eof on $f (presumably because the child has exited)
3478 proc delete_at_eof {f dir} {
3479 while {[gets $f line] >= 0} {}
3481 if {[catch {close $f} err]} {
3482 error_popup "[mc "External diff viewer failed:"] $err"
3484 file delete -force $dir
3490 # Functions for adding and removing shell-type quoting
3492 proc shellquote {str} {
3493 if {![string match "*\['\"\\ \t]*" $str]} {
3496 if {![string match "*\['\"\\]*" $str]} {
3499 if {![string match "*'*" $str]} {
3502 return "\"[string map {\" \\\" \\ \\\\} $str]\""
3505 proc shellarglist {l} {
3511 append str [shellquote $a]
3516 proc shelldequote {str} {
3521 if {![regexp -start $used -indices "\['\"\\\\ \t]" $str first]} {
3522 append ret [string range $str $used end]
3523 set used [string length $str]
3526 set first [lindex $first 0]
3527 set ch [string index $str $first]
3528 if {$first > $used} {
3529 append ret [string range $str $used [expr {$first - 1}]]
3532 if {$ch eq " " || $ch eq "\t"} break
3535 set first [string first "'" $str $used]
3537 error "unmatched single-quote"
3539 append ret [string range $str $used [expr {$first - 1}]]
3544 if {$used >= [string length $str]} {
3545 error "trailing backslash"
3547 append ret [string index $str $used]
3552 if {![regexp -start $used -indices "\[\"\\\\]" $str first]} {
3553 error "unmatched double-quote"
3555 set first [lindex $first 0]
3556 set ch [string index $str $first]
3557 if {$first > $used} {
3558 append ret [string range $str $used [expr {$first - 1}]]
3561 if {$ch eq "\""} break
3563 append ret [string index $str $used]
3567 return [list $used $ret]
3570 proc shellsplit {str} {
3573 set str [string trimleft $str]
3574 if {$str eq {}} break
3575 set dq [shelldequote $str]
3576 set n [lindex $dq 0]
3577 set word [lindex $dq 1]
3578 set str [string range $str $n end]
3584 # Code to implement multiple views
3586 proc newview {ishighlight} {
3587 global nextviewnum newviewname newishighlight
3588 global revtreeargs viewargscmd newviewopts curview
3590 set newishighlight $ishighlight
3592 if {[winfo exists $top]} {
3596 set newviewname($nextviewnum) "[mc "View"] $nextviewnum"
3597 set newviewopts($nextviewnum,perm) 0
3598 set newviewopts($nextviewnum,cmd) $viewargscmd($curview)
3599 decode_view_opts $nextviewnum $revtreeargs
3600 vieweditor $top $nextviewnum [mc "Gitk view definition"]
3603 set known_view_options {
3604 {perm b . {} {mc "Remember this view"}}
3605 {args t50= + {} {mc "Commits to include (arguments to git log):"}}
3606 {all b * "--all" {mc "Use all refs"}}
3607 {dorder b . {"--date-order" "-d"} {mc "Strictly sort by date"}}
3608 {lright b . "--left-right" {mc "Mark branch sides"}}
3609 {since t15 + {"--since=*" "--after=*"} {mc "Since date:"}}
3610 {until t15 . {"--until=*" "--before=*"} {mc "Until date:"}}
3611 {limit t10 + "--max-count=*" {mc "Max count:"}}
3612 {skip t10 . "--skip=*" {mc "Skip:"}}
3613 {first b . "--first-parent" {mc "Limit to first parent"}}
3614 {cmd t50= + {} {mc "Command to generate more commits to include:"}}
3617 proc encode_view_opts {n} {
3618 global known_view_options newviewopts
3621 foreach opt $known_view_options {
3622 set patterns [lindex $opt 3]
3623 if {$patterns eq {}} continue
3624 set pattern [lindex $patterns 0]
3626 set val $newviewopts($n,[lindex $opt 0])
3628 if {[lindex $opt 1] eq "b"} {
3630 lappend rargs $pattern
3633 set val [string trim $val]
3635 set pfix [string range $pattern 0 end-1]
3636 lappend rargs $pfix$val
3640 return [concat $rargs [shellsplit $newviewopts($n,args)]]
3643 proc decode_view_opts {n view_args} {
3644 global known_view_options newviewopts
3646 foreach opt $known_view_options {
3647 if {[lindex $opt 1] eq "b"} {
3652 set newviewopts($n,[lindex $opt 0]) $val
3655 foreach arg $view_args {
3656 if {[regexp -- {^-([0-9]+)$} $arg arg cnt]
3657 && ![info exists found(limit)]} {
3658 set newviewopts($n,limit) $cnt
3663 foreach opt $known_view_options {
3664 set id [lindex $opt 0]
3665 if {[info exists found($id)]} continue
3666 foreach pattern [lindex $opt 3] {
3667 if {![string match $pattern $arg]} continue
3668 if {[lindex $opt 1] ne "b"} {
3669 set size [string length $pattern]
3670 set val [string range $arg [expr {$size-1}] end]
3674 set newviewopts($n,$id) $val
3678 if {[info exists val]} break
3680 if {[info exists val]} continue
3683 set newviewopts($n,args) [shellarglist $oargs]
3686 proc edit_or_newview {} {
3698 global viewname viewperm newviewname newviewopts
3699 global viewargs viewargscmd
3701 set top .gitkvedit-$curview
3702 if {[winfo exists $top]} {
3706 set newviewname($curview) $viewname($curview)
3707 set newviewopts($curview,perm) $viewperm($curview)
3708 set newviewopts($curview,cmd) $viewargscmd($curview)
3709 decode_view_opts $curview $viewargs($curview)
3710 vieweditor $top $curview "Gitk: edit view $viewname($curview)"
3713 proc vieweditor {top n title} {
3714 global newviewname newviewopts viewfiles bgcolor
3715 global known_view_options
3718 wm title $top $title
3719 make_transient $top .
3723 label $top.nl -text [mc "Name"]
3724 entry $top.name -width 20 -textvariable newviewname($n)
3725 pack $top.nfr -in $top -fill x -pady 5 -padx 3
3726 pack $top.nl -in $top.nfr -side left -padx {0 30}
3727 pack $top.name -in $top.nfr -side left
3733 foreach opt $known_view_options {
3734 set id [lindex $opt 0]
3735 set type [lindex $opt 1]
3736 set flags [lindex $opt 2]
3737 set title [eval [lindex $opt 4]]
3740 if {$flags eq "+" || $flags eq "*"} {
3741 set cframe $top.fr$cnt
3744 pack $cframe -in $top -fill x -pady 3 -padx 3
3745 set cexpand [expr {$flags eq "*"}]
3751 checkbutton $cframe.c_$id -text $title -variable newviewopts($n,$id)
3752 pack $cframe.c_$id -in $cframe -side left \
3753 -padx [list $lxpad 0] -expand $cexpand -anchor w
3754 } elseif {[regexp {^t(\d+)$} $type type sz]} {
3755 message $cframe.l_$id -aspect 1500 -text $title
3756 entry $cframe.e_$id -width $sz -background $bgcolor \
3757 -textvariable newviewopts($n,$id)
3758 pack $cframe.l_$id -in $cframe -side left -padx [list $lxpad 0]
3759 pack $cframe.e_$id -in $cframe -side left -expand 1 -fill x
3760 } elseif {[regexp {^t(\d+)=$} $type type sz]} {
3761 message $cframe.l_$id -aspect 1500 -text $title
3762 entry $cframe.e_$id -width $sz -background $bgcolor \
3763 -textvariable newviewopts($n,$id)
3764 pack $cframe.l_$id -in $cframe -side top -pady [list 3 0] -anchor w
3765 pack $cframe.e_$id -in $cframe -side top -fill x
3770 message $top.l -aspect 1500 \
3771 -text [mc "Enter files and directories to include, one per line:"]
3772 pack $top.l -in $top -side top -pady [list 7 0] -anchor w -padx 3
3773 text $top.t -width 40 -height 5 -background $bgcolor -font uifont
3774 if {[info exists viewfiles($n)]} {
3775 foreach f $viewfiles($n) {
3776 $top.t insert end $f
3777 $top.t insert end "\n"
3779 $top.t delete {end - 1c} end
3780 $top.t mark set insert 0.0
3782 pack $top.t -in $top -side top -pady [list 0 5] -fill both -expand 1 -padx 3
3784 button $top.buts.ok -text [mc "OK"] -command [list newviewok $top $n]
3785 button $top.buts.apply -text [mc "Apply (F5)"] -command [list newviewok $top $n 1]
3786 button $top.buts.can -text [mc "Cancel"] -command [list destroy $top]
3787 bind $top <Control-Return> [list newviewok $top $n]
3788 bind $top <F5> [list newviewok $top $n 1]
3789 bind $top <Escape> [list destroy $top]
3790 grid $top.buts.ok $top.buts.apply $top.buts.can
3791 grid columnconfigure $top.buts 0 -weight 1 -uniform a
3792 grid columnconfigure $top.buts 1 -weight 1 -uniform a
3793 grid columnconfigure $top.buts 2 -weight 1 -uniform a
3794 pack $top.buts -in $top -side top -fill x
3798 proc doviewmenu {m first cmd op argv} {
3799 set nmenu [$m index end]
3800 for {set i $first} {$i <= $nmenu} {incr i} {
3801 if {[$m entrycget $i -command] eq $cmd} {
3802 eval $m $op $i $argv
3808 proc allviewmenus {n op args} {
3811 doviewmenu .bar.view 5 [list showview $n] $op $args
3812 # doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
3815 proc newviewok {top n {apply 0}} {
3816 global nextviewnum newviewperm newviewname newishighlight
3817 global viewname viewfiles viewperm selectedview curview
3818 global viewargs viewargscmd newviewopts viewhlmenu
3821 set newargs [encode_view_opts $n]
3823 error_popup "[mc "Error in commit selection arguments:"] $err" $top
3827 foreach f [split [$top.t get 0.0 end] "\n"] {
3828 set ft [string trim $f]
3833 if {![info exists viewfiles($n)]} {
3834 # creating a new view
3836 set viewname($n) $newviewname($n)
3837 set viewperm($n) $newviewopts($n,perm)
3838 set viewfiles($n) $files
3839 set viewargs($n) $newargs
3840 set viewargscmd($n) $newviewopts($n,cmd)
3842 if {!$newishighlight} {
3845 run addvhighlight $n
3848 # editing an existing view
3849 set viewperm($n) $newviewopts($n,perm)
3850 if {$newviewname($n) ne $viewname($n)} {
3851 set viewname($n) $newviewname($n)
3852 doviewmenu .bar.view 5 [list showview $n] \
3853 entryconf [list -label $viewname($n)]
3854 # doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
3855 # entryconf [list -label $viewname($n) -value $viewname($n)]
3857 if {$files ne $viewfiles($n) || $newargs ne $viewargs($n) || \
3858 $newviewopts($n,cmd) ne $viewargscmd($n)} {
3859 set viewfiles($n) $files
3860 set viewargs($n) $newargs
3861 set viewargscmd($n) $newviewopts($n,cmd)
3862 if {$curview == $n} {
3868 catch {destroy $top}
3872 global curview viewperm hlview selectedhlview
3874 if {$curview == 0} return
3875 if {[info exists hlview] && $hlview == $curview} {
3876 set selectedhlview [mc "None"]
3879 allviewmenus $curview delete
3880 set viewperm($curview) 0
3884 proc addviewmenu {n} {
3885 global viewname viewhlmenu
3887 .bar.view add radiobutton -label $viewname($n) \
3888 -command [list showview $n] -variable selectedview -value $n
3889 #$viewhlmenu add radiobutton -label $viewname($n) \
3890 # -command [list addvhighlight $n] -variable selectedhlview
3894 global curview cached_commitrow ordertok
3895 global displayorder parentlist rowidlist rowisopt rowfinal
3896 global colormap rowtextx nextcolor canvxmax
3897 global numcommits viewcomplete
3898 global selectedline currentid canv canvy0
3900 global pending_select mainheadid
3903 global hlview selectedhlview commitinterest
3905 if {$n == $curview} return
3907 set ymax [lindex [$canv cget -scrollregion] 3]
3908 set span [$canv yview]
3909 set ytop [expr {[lindex $span 0] * $ymax}]
3910 set ybot [expr {[lindex $span 1] * $ymax}]
3911 set yscreen [expr {($ybot - $ytop) / 2}]
3912 if {$selectedline ne {}} {
3913 set selid $currentid
3914 set y [yc $selectedline]
3915 if {$ytop < $y && $y < $ybot} {
3916 set yscreen [expr {$y - $ytop}]
3918 } elseif {[info exists pending_select]} {
3919 set selid $pending_select
3920 unset pending_select
3924 catch {unset treediffs}
3926 if {[info exists hlview] && $hlview == $n} {
3928 set selectedhlview [mc "None"]
3930 catch {unset commitinterest}
3931 catch {unset cached_commitrow}
3932 catch {unset ordertok}
3936 .bar.view entryconf [mca "Edit view..."] -state [expr {$n == 0? "disabled": "normal"}]
3937 .bar.view entryconf [mca "Delete view"] -state [expr {$n == 0? "disabled": "normal"}]
3940 if {![info exists viewcomplete($n)]} {
3950 set numcommits $commitidx($n)
3952 catch {unset colormap}
3953 catch {unset rowtextx}
3955 set canvxmax [$canv cget -width]
3961 if {$selid ne {} && [commitinview $selid $n]} {
3962 set row [rowofcommit $selid]
3963 # try to get the selected row in the same position on the screen
3964 set ymax [lindex [$canv cget -scrollregion] 3]
3965 set ytop [expr {[yc $row] - $yscreen}]
3969 set yf [expr {$ytop * 1.0 / $ymax}]
3971 allcanvs yview moveto $yf
3975 } elseif {!$viewcomplete($n)} {
3976 reset_pending_select $selid
3978 reset_pending_select {}
3980 if {[commitinview $pending_select $curview]} {
3981 selectline [rowofcommit $pending_select] 1
3983 set row [first_real_row]
3984 if {$row < $numcommits} {
3989 if {!$viewcomplete($n)} {
3990 if {$numcommits == 0} {
3991 show_status [mc "Reading commits..."]
3993 } elseif {$numcommits == 0} {
3994 show_status [mc "No commits selected"]
3998 # Stuff relating to the highlighting facility
4000 proc ishighlighted {id} {
4001 global vhighlights fhighlights nhighlights rhighlights
4003 if {[info exists nhighlights($id)] && $nhighlights($id) > 0} {
4004 return $nhighlights($id)
4006 if {[info exists vhighlights($id)] && $vhighlights($id) > 0} {
4007 return $vhighlights($id)
4009 if {[info exists fhighlights($id)] && $fhighlights($id) > 0} {
4010 return $fhighlights($id)
4012 if {[info exists rhighlights($id)] && $rhighlights($id) > 0} {
4013 return $rhighlights($id)
4018 proc bolden {id font} {
4019 global canv linehtag currentid boldids need_redisplay
4021 # need_redisplay = 1 means the display is stale and about to be redrawn
4022 if {$need_redisplay} return
4024 $canv itemconf $linehtag($id) -font $font
4025 if {[info exists currentid] && $id eq $currentid} {
4027 set t [eval $canv create rect [$canv bbox $linehtag($id)] \
4028 -outline {{}} -tags secsel \
4029 -fill [$canv cget -selectbackground]]
4034 proc bolden_name {id font} {
4035 global canv2 linentag currentid boldnameids need_redisplay
4037 if {$need_redisplay} return
4038 lappend boldnameids $id
4039 $canv2 itemconf $linentag($id) -font $font
4040 if {[info exists currentid] && $id eq $currentid} {
4041 $canv2 delete secsel
4042 set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] \
4043 -outline {{}} -tags secsel \
4044 -fill [$canv2 cget -selectbackground]]
4053 foreach id $boldids {
4054 if {![ishighlighted $id]} {
4057 lappend stillbold $id
4060 set boldids $stillbold
4063 proc addvhighlight {n} {
4064 global hlview viewcomplete curview vhl_done commitidx
4066 if {[info exists hlview]} {
4070 if {$n != $curview && ![info exists viewcomplete($n)]} {
4073 set vhl_done $commitidx($hlview)
4074 if {$vhl_done > 0} {
4079 proc delvhighlight {} {
4080 global hlview vhighlights
4082 if {![info exists hlview]} return
4084 catch {unset vhighlights}
4088 proc vhighlightmore {} {
4089 global hlview vhl_done commitidx vhighlights curview
4091 set max $commitidx($hlview)
4092 set vr [visiblerows]
4093 set r0 [lindex $vr 0]
4094 set r1 [lindex $vr 1]
4095 for {set i $vhl_done} {$i < $max} {incr i} {
4096 set id [commitonrow $i $hlview]
4097 if {[commitinview $id $curview]} {
4098 set row [rowofcommit $id]
4099 if {$r0 <= $row && $row <= $r1} {
4100 if {![highlighted $row]} {
4101 bolden $id mainfontbold
4103 set vhighlights($id) 1
4111 proc askvhighlight {row id} {
4112 global hlview vhighlights iddrawn
4114 if {[commitinview $id $hlview]} {
4115 if {[info exists iddrawn($id)] && ![ishighlighted $id]} {
4116 bolden $id mainfontbold
4118 set vhighlights($id) 1
4120 set vhighlights($id) 0
4124 proc hfiles_change {} {
4125 global highlight_files filehighlight fhighlights fh_serial
4126 global highlight_paths
4128 if {[info exists filehighlight]} {
4129 # delete previous highlights
4130 catch {close $filehighlight}
4132 catch {unset fhighlights}
4134 unhighlight_filelist
4136 set highlight_paths {}
4137 after cancel do_file_hl $fh_serial
4139 if {$highlight_files ne {}} {
4140 after 300 do_file_hl $fh_serial
4144 proc gdttype_change {name ix op} {
4145 global gdttype highlight_files findstring findpattern
4148 if {$findstring ne {}} {
4149 if {$gdttype eq [mc "containing:"]} {
4150 if {$highlight_files ne {}} {
4151 set highlight_files {}
4156 if {$findpattern ne {}} {
4160 set highlight_files $findstring
4165 # enable/disable findtype/findloc menus too
4168 proc find_change {name ix op} {
4169 global gdttype findstring highlight_files
4172 if {$gdttype eq [mc "containing:"]} {
4175 if {$highlight_files ne $findstring} {
4176 set highlight_files $findstring
4183 proc findcom_change args {
4184 global nhighlights boldnameids
4185 global findpattern findtype findstring gdttype
4188 # delete previous highlights, if any
4189 foreach id $boldnameids {
4190 bolden_name $id mainfont
4193 catch {unset nhighlights}
4196 if {$gdttype ne [mc "containing:"] || $findstring eq {}} {
4198 } elseif {$findtype eq [mc "Regexp"]} {
4199 set findpattern $findstring
4201 set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
4203 set findpattern "*$e*"
4207 proc makepatterns {l} {
4210 set ee [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} $e]
4211 if {[string index $ee end] eq "/"} {
4221 proc do_file_hl {serial} {
4222 global highlight_files filehighlight highlight_paths gdttype fhl_list
4224 if {$gdttype eq [mc "touching paths:"]} {
4225 if {[catch {set paths [shellsplit $highlight_files]}]} return
4226 set highlight_paths [makepatterns $paths]
4228 set gdtargs [concat -- $paths]
4229 } elseif {$gdttype eq [mc "adding/removing string:"]} {
4230 set gdtargs [list "-S$highlight_files"]
4232 # must be "containing:", i.e. we're searching commit info
4235 set cmd [concat | git diff-tree -r -s --stdin $gdtargs]
4236 set filehighlight [open $cmd r+]
4237 fconfigure $filehighlight -blocking 0
4238 filerun $filehighlight readfhighlight
4244 proc flushhighlights {} {
4245 global filehighlight fhl_list
4247 if {[info exists filehighlight]} {
4249 puts $filehighlight ""
4250 flush $filehighlight
4254 proc askfilehighlight {row id} {
4255 global filehighlight fhighlights fhl_list
4257 lappend fhl_list $id
4258 set fhighlights($id) -1
4259 puts $filehighlight $id
4262 proc readfhighlight {} {
4263 global filehighlight fhighlights curview iddrawn
4264 global fhl_list find_dirn
4266 if {![info exists filehighlight]} {
4270 while {[incr nr] <= 100 && [gets $filehighlight line] >= 0} {
4271 set line [string trim $line]
4272 set i [lsearch -exact $fhl_list $line]
4273 if {$i < 0} continue
4274 for {set j 0} {$j < $i} {incr j} {
4275 set id [lindex $fhl_list $j]
4276 set fhighlights($id) 0
4278 set fhl_list [lrange $fhl_list [expr {$i+1}] end]
4279 if {$line eq {}} continue
4280 if {![commitinview $line $curview]} continue
4281 if {[info exists iddrawn($line)] && ![ishighlighted $line]} {
4282 bolden $line mainfontbold
4284 set fhighlights($line) 1
4286 if {[eof $filehighlight]} {
4288 puts "oops, git diff-tree died"
4289 catch {close $filehighlight}
4293 if {[info exists find_dirn]} {
4299 proc doesmatch {f} {
4300 global findtype findpattern
4302 if {$findtype eq [mc "Regexp"]} {
4303 return [regexp $findpattern $f]
4304 } elseif {$findtype eq [mc "IgnCase"]} {
4305 return [string match -nocase $findpattern $f]
4307 return [string match $findpattern $f]
4311 proc askfindhighlight {row id} {
4312 global nhighlights commitinfo iddrawn
4314 global markingmatches
4316 if {![info exists commitinfo($id)]} {
4319 set info $commitinfo($id)
4321 set fldtypes [list [mc Headline] [mc Author] [mc Date] [mc Committer] [mc CDate] [mc Comments]]
4322 foreach f $info ty $fldtypes {
4323 if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
4325 if {$ty eq [mc "Author"]} {
4332 if {$isbold && [info exists iddrawn($id)]} {
4333 if {![ishighlighted $id]} {
4334 bolden $id mainfontbold
4336 bolden_name $id mainfontbold
4339 if {$markingmatches} {
4340 markrowmatches $row $id
4343 set nhighlights($id) $isbold
4346 proc markrowmatches {row id} {
4347 global canv canv2 linehtag linentag commitinfo findloc
4349 set headline [lindex $commitinfo($id) 0]
4350 set author [lindex $commitinfo($id) 1]
4351 $canv delete match$row
4352 $canv2 delete match$row
4353 if {$findloc eq [mc "All fields"] || $findloc eq [mc "Headline"]} {
4354 set m [findmatches $headline]
4356 markmatches $canv $row $headline $linehtag($id) $m \
4357 [$canv itemcget $linehtag($id) -font] $row
4360 if {$findloc eq [mc "All fields"] || $findloc eq [mc "Author"]} {
4361 set m [findmatches $author]
4363 markmatches $canv2 $row $author $linentag($id) $m \
4364 [$canv2 itemcget $linentag($id) -font] $row
4369 proc vrel_change {name ix op} {
4370 global highlight_related
4373 if {$highlight_related ne [mc "None"]} {
4378 # prepare for testing whether commits are descendents or ancestors of a
4379 proc rhighlight_sel {a} {
4380 global descendent desc_todo ancestor anc_todo
4381 global highlight_related
4383 catch {unset descendent}
4384 set desc_todo [list $a]
4385 catch {unset ancestor}
4386 set anc_todo [list $a]
4387 if {$highlight_related ne [mc "None"]} {
4393 proc rhighlight_none {} {
4396 catch {unset rhighlights}
4400 proc is_descendent {a} {
4401 global curview children descendent desc_todo
4404 set la [rowofcommit $a]
4408 for {set i 0} {$i < [llength $todo]} {incr i} {
4409 set do [lindex $todo $i]
4410 if {[rowofcommit $do] < $la} {
4411 lappend leftover $do
4414 foreach nk $children($v,$do) {
4415 if {![info exists descendent($nk)]} {
4416 set descendent($nk) 1
4424 set desc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
4428 set descendent($a) 0
4429 set desc_todo $leftover
4432 proc is_ancestor {a} {
4433 global curview parents ancestor anc_todo
4436 set la [rowofcommit $a]
4440 for {set i 0} {$i < [llength $todo]} {incr i} {
4441 set do [lindex $todo $i]
4442 if {![commitinview $do $v] || [rowofcommit $do] > $la} {
4443 lappend leftover $do
4446 foreach np $parents($v,$do) {
4447 if {![info exists ancestor($np)]} {
4456 set anc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
4461 set anc_todo $leftover
4464 proc askrelhighlight {row id} {
4465 global descendent highlight_related iddrawn rhighlights
4466 global selectedline ancestor
4468 if {$selectedline eq {}} return
4470 if {$highlight_related eq [mc "Descendant"] ||
4471 $highlight_related eq [mc "Not descendant"]} {
4472 if {![info exists descendent($id)]} {
4475 if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} {
4478 } elseif {$highlight_related eq [mc "Ancestor"] ||
4479 $highlight_related eq [mc "Not ancestor"]} {
4480 if {![info exists ancestor($id)]} {
4483 if {$ancestor($id) == ($highlight_related eq [mc "Ancestor"])} {
4487 if {[info exists iddrawn($id)]} {
4488 if {$isbold && ![ishighlighted $id]} {
4489 bolden $id mainfontbold
4492 set rhighlights($id) $isbold
4495 # Graph layout functions
4497 proc shortids {ids} {
4500 if {[llength $id] > 1} {
4501 lappend res [shortids $id]
4502 } elseif {[regexp {^[0-9a-f]{40}$} $id]} {
4503 lappend res [string range $id 0 7]
4514 for {set mask 1} {$mask <= $n} {incr mask $mask} {
4515 if {($n & $mask) != 0} {
4516 set ret [concat $ret $o]
4518 set o [concat $o $o]
4523 proc ordertoken {id} {
4524 global ordertok curview varcid varcstart varctok curview parents children
4525 global nullid nullid2
4527 if {[info exists ordertok($id)]} {
4528 return $ordertok($id)
4533 if {[info exists varcid($curview,$id)]} {
4534 set a $varcid($curview,$id)
4535 set p [lindex $varcstart($curview) $a]
4537 set p [lindex $children($curview,$id) 0]
4539 if {[info exists ordertok($p)]} {
4540 set tok $ordertok($p)
4543 set id [first_real_child $curview,$p]
4546 set tok [lindex $varctok($curview) $varcid($curview,$p)]
4549 if {[llength $parents($curview,$id)] == 1} {
4550 lappend todo [list $p {}]
4552 set j [lsearch -exact $parents($curview,$id) $p]
4554 puts "oops didn't find [shortids $p] in parents of [shortids $id]"
4556 lappend todo [list $p [strrep $j]]
4559 for {set i [llength $todo]} {[incr i -1] >= 0} {} {
4560 set p [lindex $todo $i 0]
4561 append tok [lindex $todo $i 1]
4562 set ordertok($p) $tok
4564 set ordertok($origid) $tok
4568 # Work out where id should go in idlist so that order-token
4569 # values increase from left to right
4570 proc idcol {idlist id {i 0}} {
4571 set t [ordertoken $id]
4575 if {$i >= [llength $idlist] || $t < [ordertoken [lindex $idlist $i]]} {
4576 if {$i > [llength $idlist]} {
4577 set i [llength $idlist]
4579 while {[incr i -1] >= 0 && $t < [ordertoken [lindex $idlist $i]]} {}
4582 if {$t > [ordertoken [lindex $idlist $i]]} {
4583 while {[incr i] < [llength $idlist] &&
4584 $t >= [ordertoken [lindex $idlist $i]]} {}
4590 proc initlayout {} {
4591 global rowidlist rowisopt rowfinal displayorder parentlist
4592 global numcommits canvxmax canv
4594 global colormap rowtextx
4603 set canvxmax [$canv cget -width]
4604 catch {unset colormap}
4605 catch {unset rowtextx}
4609 proc setcanvscroll {} {
4610 global canv canv2 canv3 numcommits linespc canvxmax canvy0
4611 global lastscrollset lastscrollrows
4613 set ymax [expr {$canvy0 + ($numcommits - 0.5) * $linespc + 2}]
4614 $canv conf -scrollregion [list 0 0 $canvxmax $ymax]
4615 $canv2 conf -scrollregion [list 0 0 0 $ymax]
4616 $canv3 conf -scrollregion [list 0 0 0 $ymax]
4617 set lastscrollset [clock clicks -milliseconds]
4618 set lastscrollrows $numcommits
4621 proc visiblerows {} {
4622 global canv numcommits linespc
4624 set ymax [lindex [$canv cget -scrollregion] 3]
4625 if {$ymax eq {} || $ymax == 0} return
4627 set y0 [expr {int([lindex $f 0] * $ymax)}]
4628 set r0 [expr {int(($y0 - 3) / $linespc) - 1}]
4632 set y1 [expr {int([lindex $f 1] * $ymax)}]
4633 set r1 [expr {int(($y1 - 3) / $linespc) + 1}]
4634 if {$r1 >= $numcommits} {
4635 set r1 [expr {$numcommits - 1}]
4637 return [list $r0 $r1]
4640 proc layoutmore {} {
4641 global commitidx viewcomplete curview
4642 global numcommits pending_select curview
4643 global lastscrollset lastscrollrows
4645 if {$lastscrollrows < 100 || $viewcomplete($curview) ||
4646 [clock clicks -milliseconds] - $lastscrollset > 500} {
4649 if {[info exists pending_select] &&
4650 [commitinview $pending_select $curview]} {
4652 selectline [rowofcommit $pending_select] 1
4657 # With path limiting, we mightn't get the actual HEAD commit,
4658 # so ask git rev-list what is the first ancestor of HEAD that
4659 # touches a file in the path limit.
4660 proc get_viewmainhead {view} {
4661 global viewmainheadid vfilelimit viewinstances mainheadid
4664 set rfd [open [concat | git rev-list -1 $mainheadid \
4665 -- $vfilelimit($view)] r]
4666 set j [reg_instance $rfd]
4667 lappend viewinstances($view) $j
4668 fconfigure $rfd -blocking 0
4669 filerun $rfd [list getviewhead $rfd $j $view]
4670 set viewmainheadid($curview) {}
4674 # git rev-list should give us just 1 line to use as viewmainheadid($view)
4675 proc getviewhead {fd inst view} {
4676 global viewmainheadid commfd curview viewinstances showlocalchanges
4679 if {[gets $fd line] < 0} {
4683 } elseif {[string length $line] == 40 && [string is xdigit $line]} {
4686 set viewmainheadid($view) $id
4689 set i [lsearch -exact $viewinstances($view) $inst]
4691 set viewinstances($view) [lreplace $viewinstances($view) $i $i]
4693 if {$showlocalchanges && $id ne {} && $view == $curview} {
4699 proc doshowlocalchanges {} {
4700 global curview viewmainheadid
4702 if {$viewmainheadid($curview) eq {}} return
4703 if {[commitinview $viewmainheadid($curview) $curview]} {
4706 interestedin $viewmainheadid($curview) dodiffindex
4710 proc dohidelocalchanges {} {
4711 global nullid nullid2 lserial curview
4713 if {[commitinview $nullid $curview]} {
4714 removefakerow $nullid
4716 if {[commitinview $nullid2 $curview]} {
4717 removefakerow $nullid2
4722 # spawn off a process to do git diff-index --cached HEAD
4723 proc dodiffindex {} {
4724 global lserial showlocalchanges vfilelimit curview
4727 if {!$showlocalchanges || !$isworktree} return
4729 set cmd "|git diff-index --cached HEAD"
4730 if {$vfilelimit($curview) ne {}} {
4731 set cmd [concat $cmd -- $vfilelimit($curview)]
4733 set fd [open $cmd r]
4734 fconfigure $fd -blocking 0
4735 set i [reg_instance $fd]
4736 filerun $fd [list readdiffindex $fd $lserial $i]
4739 proc readdiffindex {fd serial inst} {
4740 global viewmainheadid nullid nullid2 curview commitinfo commitdata lserial
4744 if {[gets $fd line] < 0} {
4750 # we only need to see one line and we don't really care what it says...
4753 if {$serial != $lserial} {
4757 # now see if there are any local changes not checked in to the index
4758 set cmd "|git diff-files"
4759 if {$vfilelimit($curview) ne {}} {
4760 set cmd [concat $cmd -- $vfilelimit($curview)]
4762 set fd [open $cmd r]
4763 fconfigure $fd -blocking 0
4764 set i [reg_instance $fd]
4765 filerun $fd [list readdifffiles $fd $serial $i]
4767 if {$isdiff && ![commitinview $nullid2 $curview]} {
4768 # add the line for the changes in the index to the graph
4769 set hl [mc "Local changes checked in to index but not committed"]
4770 set commitinfo($nullid2) [list $hl {} {} {} {} " $hl\n"]
4771 set commitdata($nullid2) "\n $hl\n"
4772 if {[commitinview $nullid $curview]} {
4773 removefakerow $nullid
4775 insertfakerow $nullid2 $viewmainheadid($curview)
4776 } elseif {!$isdiff && [commitinview $nullid2 $curview]} {
4777 if {[commitinview $nullid $curview]} {
4778 removefakerow $nullid
4780 removefakerow $nullid2
4785 proc readdifffiles {fd serial inst} {
4786 global viewmainheadid nullid nullid2 curview
4787 global commitinfo commitdata lserial
4790 if {[gets $fd line] < 0} {
4796 # we only need to see one line and we don't really care what it says...
4799 if {$serial != $lserial} {
4803 if {$isdiff && ![commitinview $nullid $curview]} {
4804 # add the line for the local diff to the graph
4805 set hl [mc "Local uncommitted changes, not checked in to index"]
4806 set commitinfo($nullid) [list $hl {} {} {} {} " $hl\n"]
4807 set commitdata($nullid) "\n $hl\n"
4808 if {[commitinview $nullid2 $curview]} {
4811 set p $viewmainheadid($curview)
4813 insertfakerow $nullid $p
4814 } elseif {!$isdiff && [commitinview $nullid $curview]} {
4815 removefakerow $nullid
4820 proc nextuse {id row} {
4821 global curview children
4823 if {[info exists children($curview,$id)]} {
4824 foreach kid $children($curview,$id) {
4825 if {![commitinview $kid $curview]} {
4828 if {[rowofcommit $kid] > $row} {
4829 return [rowofcommit $kid]
4833 if {[commitinview $id $curview]} {
4834 return [rowofcommit $id]
4839 proc prevuse {id row} {
4840 global curview children
4843 if {[info exists children($curview,$id)]} {
4844 foreach kid $children($curview,$id) {
4845 if {![commitinview $kid $curview]} break
4846 if {[rowofcommit $kid] < $row} {
4847 set ret [rowofcommit $kid]
4854 proc make_idlist {row} {
4855 global displayorder parentlist uparrowlen downarrowlen mingaplen
4856 global commitidx curview children
4858 set r [expr {$row - $mingaplen - $downarrowlen - 1}]
4862 set ra [expr {$row - $downarrowlen}]
4866 set rb [expr {$row + $uparrowlen}]
4867 if {$rb > $commitidx($curview)} {
4868 set rb $commitidx($curview)
4870 make_disporder $r [expr {$rb + 1}]
4872 for {} {$r < $ra} {incr r} {
4873 set nextid [lindex $displayorder [expr {$r + 1}]]
4874 foreach p [lindex $parentlist $r] {
4875 if {$p eq $nextid} continue
4876 set rn [nextuse $p $r]
4878 $rn <= $r + $downarrowlen + $mingaplen + $uparrowlen} {
4879 lappend ids [list [ordertoken $p] $p]
4883 for {} {$r < $row} {incr r} {
4884 set nextid [lindex $displayorder [expr {$r + 1}]]
4885 foreach p [lindex $parentlist $r] {
4886 if {$p eq $nextid} continue
4887 set rn [nextuse $p $r]
4888 if {$rn < 0 || $rn >= $row} {
4889 lappend ids [list [ordertoken $p] $p]
4893 set id [lindex $displayorder $row]
4894 lappend ids [list [ordertoken $id] $id]
4896 foreach p [lindex $parentlist $r] {
4897 set firstkid [lindex $children($curview,$p) 0]
4898 if {[rowofcommit $firstkid] < $row} {
4899 lappend ids [list [ordertoken $p] $p]
4903 set id [lindex $displayorder $r]
4905 set firstkid [lindex $children($curview,$id) 0]
4906 if {$firstkid ne {} && [rowofcommit $firstkid] < $row} {
4907 lappend ids [list [ordertoken $id] $id]
4912 foreach idx [lsort -unique $ids] {
4913 lappend idlist [lindex $idx 1]
4918 proc rowsequal {a b} {
4919 while {[set i [lsearch -exact $a {}]] >= 0} {
4920 set a [lreplace $a $i $i]
4922 while {[set i [lsearch -exact $b {}]] >= 0} {
4923 set b [lreplace $b $i $i]
4925 return [expr {$a eq $b}]
4928 proc makeupline {id row rend col} {
4929 global rowidlist uparrowlen downarrowlen mingaplen
4931 for {set r $rend} {1} {set r $rstart} {
4932 set rstart [prevuse $id $r]
4933 if {$rstart < 0} return
4934 if {$rstart < $row} break
4936 if {$rstart + $uparrowlen + $mingaplen + $downarrowlen < $rend} {
4937 set rstart [expr {$rend - $uparrowlen - 1}]
4939 for {set r $rstart} {[incr r] <= $row} {} {
4940 set idlist [lindex $rowidlist $r]
4941 if {$idlist ne {} && [lsearch -exact $idlist $id] < 0} {
4942 set col [idcol $idlist $id $col]
4943 lset rowidlist $r [linsert $idlist $col $id]
4949 proc layoutrows {row endrow} {
4950 global rowidlist rowisopt rowfinal displayorder
4951 global uparrowlen downarrowlen maxwidth mingaplen
4952 global children parentlist
4953 global commitidx viewcomplete curview
4955 make_disporder [expr {$row - 1}] [expr {$endrow + $uparrowlen}]
4958 set rm1 [expr {$row - 1}]
4959 foreach id [lindex $rowidlist $rm1] {
4964 set final [lindex $rowfinal $rm1]
4966 for {} {$row < $endrow} {incr row} {
4967 set rm1 [expr {$row - 1}]
4968 if {$rm1 < 0 || $idlist eq {}} {
4969 set idlist [make_idlist $row]
4972 set id [lindex $displayorder $rm1]
4973 set col [lsearch -exact $idlist $id]
4974 set idlist [lreplace $idlist $col $col]
4975 foreach p [lindex $parentlist $rm1] {
4976 if {[lsearch -exact $idlist $p] < 0} {
4977 set col [idcol $idlist $p $col]
4978 set idlist [linsert $idlist $col $p]
4979 # if not the first child, we have to insert a line going up
4980 if {$id ne [lindex $children($curview,$p) 0]} {
4981 makeupline $p $rm1 $row $col
4985 set id [lindex $displayorder $row]
4986 if {$row > $downarrowlen} {
4987 set termrow [expr {$row - $downarrowlen - 1}]
4988 foreach p [lindex $parentlist $termrow] {
4989 set i [lsearch -exact $idlist $p]
4990 if {$i < 0} continue
4991 set nr [nextuse $p $termrow]
4992 if {$nr < 0 || $nr >= $row + $mingaplen + $uparrowlen} {
4993 set idlist [lreplace $idlist $i $i]
4997 set col [lsearch -exact $idlist $id]
4999 set col [idcol $idlist $id]
5000 set idlist [linsert $idlist $col $id]
5001 if {$children($curview,$id) ne {}} {
5002 makeupline $id $rm1 $row $col
5005 set r [expr {$row + $uparrowlen - 1}]
5006 if {$r < $commitidx($curview)} {
5008 foreach p [lindex $parentlist $r] {
5009 if {[lsearch -exact $idlist $p] >= 0} continue
5010 set fk [lindex $children($curview,$p) 0]
5011 if {[rowofcommit $fk] < $row} {
5012 set x [idcol $idlist $p $x]
5013 set idlist [linsert $idlist $x $p]
5016 if {[incr r] < $commitidx($curview)} {
5017 set p [lindex $displayorder $r]
5018 if {[lsearch -exact $idlist $p] < 0} {
5019 set fk [lindex $children($curview,$p) 0]
5020 if {$fk ne {} && [rowofcommit $fk] < $row} {
5021 set x [idcol $idlist $p $x]
5022 set idlist [linsert $idlist $x $p]
5028 if {$final && !$viewcomplete($curview) &&
5029 $row + $uparrowlen + $mingaplen + $downarrowlen
5030 >= $commitidx($curview)} {
5033 set l [llength $rowidlist]
5035 lappend rowidlist $idlist
5037 lappend rowfinal $final
5038 } elseif {$row < $l} {
5039 if {![rowsequal $idlist [lindex $rowidlist $row]]} {
5040 lset rowidlist $row $idlist
5043 lset rowfinal $row $final
5045 set pad [ntimes [expr {$row - $l}] {}]
5046 set rowidlist [concat $rowidlist $pad]
5047 lappend rowidlist $idlist
5048 set rowfinal [concat $rowfinal $pad]
5049 lappend rowfinal $final
5050 set rowisopt [concat $rowisopt [ntimes [expr {$row - $l + 1}] 0]]
5056 proc changedrow {row} {
5057 global displayorder iddrawn rowisopt need_redisplay
5059 set l [llength $rowisopt]
5061 lset rowisopt $row 0
5062 if {$row + 1 < $l} {
5063 lset rowisopt [expr {$row + 1}] 0
5064 if {$row + 2 < $l} {
5065 lset rowisopt [expr {$row + 2}] 0
5069 set id [lindex $displayorder $row]
5070 if {[info exists iddrawn($id)]} {
5071 set need_redisplay 1
5075 proc insert_pad {row col npad} {
5078 set pad [ntimes $npad {}]
5079 set idlist [lindex $rowidlist $row]
5080 set bef [lrange $idlist 0 [expr {$col - 1}]]
5081 set aft [lrange $idlist $col end]
5082 set i [lsearch -exact $aft {}]
5084 set aft [lreplace $aft $i $i]
5086 lset rowidlist $row [concat $bef $pad $aft]
5090 proc optimize_rows {row col endrow} {
5091 global rowidlist rowisopt displayorder curview children
5096 for {} {$row < $endrow} {incr row; set col 0} {
5097 if {[lindex $rowisopt $row]} continue
5099 set y0 [expr {$row - 1}]
5100 set ym [expr {$row - 2}]
5101 set idlist [lindex $rowidlist $row]
5102 set previdlist [lindex $rowidlist $y0]
5103 if {$idlist eq {} || $previdlist eq {}} continue
5105 set pprevidlist [lindex $rowidlist $ym]
5106 if {$pprevidlist eq {}} continue
5112 for {} {$col < [llength $idlist]} {incr col} {
5113 set id [lindex $idlist $col]
5114 if {[lindex $previdlist $col] eq $id} continue
5119 set x0 [lsearch -exact $previdlist $id]
5120 if {$x0 < 0} continue
5121 set z [expr {$x0 - $col}]
5125 set xm [lsearch -exact $pprevidlist $id]
5127 set z0 [expr {$xm - $x0}]
5131 # if row y0 is the first child of $id then it's not an arrow
5132 if {[lindex $children($curview,$id) 0] ne
5133 [lindex $displayorder $y0]} {
5137 if {!$isarrow && $id ne [lindex $displayorder $row] &&
5138 [lsearch -exact [lindex $rowidlist [expr {$row+1}]] $id] < 0} {
5141 # Looking at lines from this row to the previous row,
5142 # make them go straight up if they end in an arrow on
5143 # the previous row; otherwise make them go straight up
5145 if {$z < -1 || ($z < 0 && $isarrow)} {
5146 # Line currently goes left too much;
5147 # insert pads in the previous row, then optimize it
5148 set npad [expr {-1 - $z + $isarrow}]
5149 insert_pad $y0 $x0 $npad
5151 optimize_rows $y0 $x0 $row
5153 set previdlist [lindex $rowidlist $y0]
5154 set x0 [lsearch -exact $previdlist $id]
5155 set z [expr {$x0 - $col}]
5157 set pprevidlist [lindex $rowidlist $ym]
5158 set xm [lsearch -exact $pprevidlist $id]
5159 set z0 [expr {$xm - $x0}]
5161 } elseif {$z > 1 || ($z > 0 && $isarrow)} {
5162 # Line currently goes right too much;
5163 # insert pads in this line
5164 set npad [expr {$z - 1 + $isarrow}]
5165 insert_pad $row $col $npad
5166 set idlist [lindex $rowidlist $row]
5168 set z [expr {$x0 - $col}]
5171 if {$z0 eq {} && !$isarrow && $ym >= 0} {
5172 # this line links to its first child on row $row-2
5173 set id [lindex $displayorder $ym]
5174 set xc [lsearch -exact $pprevidlist $id]
5176 set z0 [expr {$xc - $x0}]
5179 # avoid lines jigging left then immediately right
5180 if {$z0 ne {} && $z < 0 && $z0 > 0} {
5181 insert_pad $y0 $x0 1
5183 optimize_rows $y0 $x0 $row
5184 set previdlist [lindex $rowidlist $y0]
5188 # Find the first column that doesn't have a line going right
5189 for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
5190 set id [lindex $idlist $col]
5191 if {$id eq {}} break
5192 set x0 [lsearch -exact $previdlist $id]
5194 # check if this is the link to the first child
5195 set kid [lindex $displayorder $y0]
5196 if {[lindex $children($curview,$id) 0] eq $kid} {
5197 # it is, work out offset to child
5198 set x0 [lsearch -exact $previdlist $kid]
5201 if {$x0 <= $col} break
5203 # Insert a pad at that column as long as it has a line and
5204 # isn't the last column
5205 if {$x0 >= 0 && [incr col] < [llength $idlist]} {
5206 set idlist [linsert $idlist $col {}]
5207 lset rowidlist $row $idlist
5215 global canvx0 linespc
5216 return [expr {$canvx0 + $col * $linespc}]
5220 global canvy0 linespc
5221 return [expr {$canvy0 + $row * $linespc}]
5224 proc linewidth {id} {
5225 global thickerline lthickness
5228 if {[info exists thickerline] && $id eq $thickerline} {
5229 set wid [expr {2 * $lthickness}]
5234 proc rowranges {id} {
5235 global curview children uparrowlen downarrowlen
5238 set kids $children($curview,$id)
5244 foreach child $kids {
5245 if {![commitinview $child $curview]} break
5246 set row [rowofcommit $child]
5247 if {![info exists prev]} {
5248 lappend ret [expr {$row + 1}]
5250 if {$row <= $prevrow} {
5251 puts "oops children of [shortids $id] out of order [shortids $child] $row <= [shortids $prev] $prevrow"
5253 # see if the line extends the whole way from prevrow to row
5254 if {$row > $prevrow + $uparrowlen + $downarrowlen &&
5255 [lsearch -exact [lindex $rowidlist \
5256 [expr {int(($row + $prevrow) / 2)}]] $id] < 0} {
5257 # it doesn't, see where it ends
5258 set r [expr {$prevrow + $downarrowlen}]
5259 if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {
5260 while {[incr r -1] > $prevrow &&
5261 [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}
5263 while {[incr r] <= $row &&
5264 [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}
5268 # see where it starts up again
5269 set r [expr {$row - $uparrowlen}]
5270 if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {
5271 while {[incr r] < $row &&
5272 [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}
5274 while {[incr r -1] >= $prevrow &&
5275 [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}
5281 if {$child eq $id} {
5290 proc drawlineseg {id row endrow arrowlow} {
5291 global rowidlist displayorder iddrawn linesegs
5292 global canv colormap linespc curview maxlinelen parentlist
5294 set cols [list [lsearch -exact [lindex $rowidlist $row] $id]]
5295 set le [expr {$row + 1}]
5298 set c [lsearch -exact [lindex $rowidlist $le] $id]
5304 set x [lindex $displayorder $le]
5309 if {[info exists iddrawn($x)] || $le == $endrow} {
5310 set c [lsearch -exact [lindex $rowidlist [expr {$le+1}]] $id]
5326 if {[info exists linesegs($id)]} {
5327 set lines $linesegs($id)
5329 set r0 [lindex $li 0]
5331 if {$r0 == $le && [lindex $li 1] - $row <= $maxlinelen} {
5341 set li [lindex $lines [expr {$i-1}]]
5342 set r1 [lindex $li 1]
5343 if {$r1 == $row && $le - [lindex $li 0] <= $maxlinelen} {
5348 set x [lindex $cols [expr {$le - $row}]]
5349 set xp [lindex $cols [expr {$le - 1 - $row}]]
5350 set dir [expr {$xp - $x}]
5352 set ith [lindex $lines $i 2]
5353 set coords [$canv coords $ith]
5354 set ah [$canv itemcget $ith -arrow]
5355 set arrowhigh [expr {$ah eq "first" || $ah eq "both"}]
5356 set x2 [lindex $cols [expr {$le + 1 - $row}]]
5357 if {$x2 ne {} && $x - $x2 == $dir} {
5358 set coords [lrange $coords 0 end-2]
5361 set coords [list [xc $le $x] [yc $le]]
5364 set itl [lindex $lines [expr {$i-1}] 2]
5365 set al [$canv itemcget $itl -arrow]
5366 set arrowlow [expr {$al eq "last" || $al eq "both"}]
5367 } elseif {$arrowlow} {
5368 if {[lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0 ||
5369 [lsearch -exact [lindex $parentlist [expr {$row-1}]] $id] >= 0} {
5373 set arrow [lindex {none first last both} [expr {$arrowhigh + 2*$arrowlow}]]
5374 for {set y $le} {[incr y -1] > $row} {} {
5376 set xp [lindex $cols [expr {$y - 1 - $row}]]
5377 set ndir [expr {$xp - $x}]
5378 if {$dir != $ndir || $xp < 0} {
5379 lappend coords [xc $y $x] [yc $y]
5385 # join parent line to first child
5386 set ch [lindex $displayorder $row]
5387 set xc [lsearch -exact [lindex $rowidlist $row] $ch]
5389 puts "oops: drawlineseg: child $ch not on row $row"
5390 } elseif {$xc != $x} {
5391 if {($arrowhigh && $le == $row + 1) || $dir == 0} {
5392 set d [expr {int(0.5 * $linespc)}]
5395 set x2 [expr {$x1 - $d}]
5397 set x2 [expr {$x1 + $d}]
5400 set y1 [expr {$y2 + $d}]
5401 lappend coords $x1 $y1 $x2 $y2
5402 } elseif {$xc < $x - 1} {
5403 lappend coords [xc $row [expr {$x-1}]] [yc $row]
5404 } elseif {$xc > $x + 1} {
5405 lappend coords [xc $row [expr {$x+1}]] [yc $row]
5409 lappend coords [xc $row $x] [yc $row]
5411 set xn [xc $row $xp]
5413 lappend coords $xn $yn
5417 set t [$canv create line $coords -width [linewidth $id] \
5418 -fill $colormap($id) -tags lines.$id -arrow $arrow]
5421 set lines [linsert $lines $i [list $row $le $t]]
5423 $canv coords $ith $coords
5424 if {$arrow ne $ah} {
5425 $canv itemconf $ith -arrow $arrow
5427 lset lines $i 0 $row
5430 set xo [lsearch -exact [lindex $rowidlist [expr {$row - 1}]] $id]
5431 set ndir [expr {$xo - $xp}]
5432 set clow [$canv coords $itl]
5433 if {$dir == $ndir} {
5434 set clow [lrange $clow 2 end]
5436 set coords [concat $coords $clow]
5438 lset lines [expr {$i-1}] 1 $le
5440 # coalesce two pieces
5442 set b [lindex $lines [expr {$i-1}] 0]
5443 set e [lindex $lines $i 1]
5444 set lines [lreplace $lines [expr {$i-1}] $i [list $b $e $itl]]
5446 $canv coords $itl $coords
5447 if {$arrow ne $al} {
5448 $canv itemconf $itl -arrow $arrow
5452 set linesegs($id) $lines
5456 proc drawparentlinks {id row} {
5457 global rowidlist canv colormap curview parentlist
5458 global idpos linespc
5460 set rowids [lindex $rowidlist $row]
5461 set col [lsearch -exact $rowids $id]
5462 if {$col < 0} return
5463 set olds [lindex $parentlist $row]
5464 set row2 [expr {$row + 1}]
5465 set x [xc $row $col]
5468 set d [expr {int(0.5 * $linespc)}]
5469 set ymid [expr {$y + $d}]
5470 set ids [lindex $rowidlist $row2]
5471 # rmx = right-most X coord used
5474 set i [lsearch -exact $ids $p]
5476 puts "oops, parent $p of $id not in list"
5479 set x2 [xc $row2 $i]
5483 set j [lsearch -exact $rowids $p]
5485 # drawlineseg will do this one for us
5489 # should handle duplicated parents here...
5490 set coords [list $x $y]
5492 # if attaching to a vertical segment, draw a smaller
5493 # slant for visual distinctness
5496 lappend coords [expr {$x2 + $d}] $y $x2 $ymid
5498 lappend coords [expr {$x2 - $d}] $y $x2 $ymid
5500 } elseif {$i < $col && $i < $j} {
5501 # segment slants towards us already
5502 lappend coords [xc $row $j] $y
5504 if {$i < $col - 1} {
5505 lappend coords [expr {$x2 + $linespc}] $y
5506 } elseif {$i > $col + 1} {
5507 lappend coords [expr {$x2 - $linespc}] $y
5509 lappend coords $x2 $y2
5512 lappend coords $x2 $y2
5514 set t [$canv create line $coords -width [linewidth $p] \
5515 -fill $colormap($p) -tags lines.$p]
5519 if {$rmx > [lindex $idpos($id) 1]} {
5520 lset idpos($id) 1 $rmx
5525 proc drawlines {id} {
5528 $canv itemconf lines.$id -width [linewidth $id]
5531 proc drawcmittext {id row col} {
5532 global linespc canv canv2 canv3 fgcolor curview
5533 global cmitlisted commitinfo rowidlist parentlist
5534 global rowtextx idpos idtags idheads idotherrefs
5535 global linehtag linentag linedtag selectedline
5536 global canvxmax boldids boldnameids fgcolor
5537 global mainheadid nullid nullid2 circleitem circlecolors ctxbut
5539 # listed is 0 for boundary, 1 for normal, 2 for negative, 3 for left, 4 for right
5540 set listed $cmitlisted($curview,$id)
5541 if {$id eq $nullid} {
5543 } elseif {$id eq $nullid2} {
5545 } elseif {$id eq $mainheadid} {
5548 set ofill [lindex $circlecolors $listed]
5550 set x [xc $row $col]
5552 set orad [expr {$linespc / 3}]
5554 set t [$canv create oval [expr {$x - $orad}] [expr {$y - $orad}] \
5555 [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
5556 -fill $ofill -outline $fgcolor -width 1 -tags circle]
5557 } elseif {$listed == 3} {
5558 # triangle pointing left for left-side commits
5559 set t [$canv create polygon \
5560 [expr {$x - $orad}] $y \
5561 [expr {$x + $orad - 1}] [expr {$y - $orad}] \
5562 [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
5563 -fill $ofill -outline $fgcolor -width 1 -tags circle]
5565 # triangle pointing right for right-side commits
5566 set t [$canv create polygon \
5567 [expr {$x + $orad - 1}] $y \
5568 [expr {$x - $orad}] [expr {$y - $orad}] \
5569 [expr {$x - $orad}] [expr {$y + $orad - 1}] \
5570 -fill $ofill -outline $fgcolor -width 1 -tags circle]
5572 set circleitem($row) $t
5574 $canv bind $t <1> {selcanvline {} %x %y}
5575 set rmx [llength [lindex $rowidlist $row]]
5576 set olds [lindex $parentlist $row]
5578 set nextids [lindex $rowidlist [expr {$row + 1}]]
5580 set i [lsearch -exact $nextids $p]
5586 set xt [xc $row $rmx]
5587 set rowtextx($row) $xt
5588 set idpos($id) [list $x $xt $y]
5589 if {[info exists idtags($id)] || [info exists idheads($id)]
5590 || [info exists idotherrefs($id)]} {
5591 set xt [drawtags $id $x $xt $y]
5593 set headline [lindex $commitinfo($id) 0]
5594 set name [lindex $commitinfo($id) 1]
5595 set date [lindex $commitinfo($id) 2]
5596 set date [formatdate $date]
5599 set isbold [ishighlighted $id]
5602 set font mainfontbold
5604 lappend boldnameids $id
5605 set nfont mainfontbold
5608 set linehtag($id) [$canv create text $xt $y -anchor w -fill $fgcolor \
5609 -text $headline -font $font -tags text]
5610 $canv bind $linehtag($id) $ctxbut "rowmenu %X %Y $id"
5611 set linentag($id) [$canv2 create text 3 $y -anchor w -fill $fgcolor \
5612 -text $name -font $nfont -tags text]
5613 set linedtag($id) [$canv3 create text 3 $y -anchor w -fill $fgcolor \
5614 -text $date -font mainfont -tags text]
5615 if {$selectedline == $row} {
5618 set xr [expr {$xt + [font measure $font $headline]}]
5619 if {$xr > $canvxmax} {
5625 proc drawcmitrow {row} {
5626 global displayorder rowidlist nrows_drawn
5627 global iddrawn markingmatches
5628 global commitinfo numcommits
5629 global filehighlight fhighlights findpattern nhighlights
5630 global hlview vhighlights
5631 global highlight_related rhighlights
5633 if {$row >= $numcommits} return
5635 set id [lindex $displayorder $row]
5636 if {[info exists hlview] && ![info exists vhighlights($id)]} {
5637 askvhighlight $row $id
5639 if {[info exists filehighlight] && ![info exists fhighlights($id)]} {
5640 askfilehighlight $row $id
5642 if {$findpattern ne {} && ![info exists nhighlights($id)]} {
5643 askfindhighlight $row $id
5645 if {$highlight_related ne [mc "None"] && ![info exists rhighlights($id)]} {
5646 askrelhighlight $row $id
5648 if {![info exists iddrawn($id)]} {
5649 set col [lsearch -exact [lindex $rowidlist $row] $id]
5651 puts "oops, row $row id $id not in list"
5654 if {![info exists commitinfo($id)]} {
5658 drawcmittext $id $row $col
5662 if {$markingmatches} {
5663 markrowmatches $row $id
5667 proc drawcommits {row {endrow {}}} {
5668 global numcommits iddrawn displayorder curview need_redisplay
5669 global parentlist rowidlist rowfinal uparrowlen downarrowlen nrows_drawn
5674 if {$endrow eq {}} {
5677 if {$endrow >= $numcommits} {
5678 set endrow [expr {$numcommits - 1}]
5681 set rl1 [expr {$row - $downarrowlen - 3}]
5685 set ro1 [expr {$row - 3}]
5689 set r2 [expr {$endrow + $uparrowlen + 3}]
5690 if {$r2 > $numcommits} {
5693 for {set r $rl1} {$r < $r2} {incr r} {
5694 if {[lindex $rowidlist $r] ne {} && [lindex $rowfinal $r]} {
5698 set rl1 [expr {$r + 1}]
5704 optimize_rows $ro1 0 $r2
5705 if {$need_redisplay || $nrows_drawn > 2000} {
5710 # make the lines join to already-drawn rows either side
5711 set r [expr {$row - 1}]
5712 if {$r < 0 || ![info exists iddrawn([lindex $displayorder $r])]} {
5715 set er [expr {$endrow + 1}]
5716 if {$er >= $numcommits ||
5717 ![info exists iddrawn([lindex $displayorder $er])]} {
5720 for {} {$r <= $er} {incr r} {
5721 set id [lindex $displayorder $r]
5722 set wasdrawn [info exists iddrawn($id)]
5724 if {$r == $er} break
5725 set nextid [lindex $displayorder [expr {$r + 1}]]
5726 if {$wasdrawn && [info exists iddrawn($nextid)]} continue
5727 drawparentlinks $id $r
5729 set rowids [lindex $rowidlist $r]
5730 foreach lid $rowids {
5731 if {$lid eq {}} continue
5732 if {[info exists lineend($lid)] && $lineend($lid) > $r} continue
5734 # see if this is the first child of any of its parents
5735 foreach p [lindex $parentlist $r] {
5736 if {[lsearch -exact $rowids $p] < 0} {
5737 # make this line extend up to the child
5738 set lineend($p) [drawlineseg $p $r $er 0]
5742 set lineend($lid) [drawlineseg $lid $r $er 1]
5748 proc undolayout {row} {
5749 global uparrowlen mingaplen downarrowlen
5750 global rowidlist rowisopt rowfinal need_redisplay
5752 set r [expr {$row - ($uparrowlen + $mingaplen + $downarrowlen)}]
5756 if {[llength $rowidlist] > $r} {
5758 set rowidlist [lrange $rowidlist 0 $r]
5759 set rowfinal [lrange $rowfinal 0 $r]
5760 set rowisopt [lrange $rowisopt 0 $r]
5761 set need_redisplay 1
5766 proc drawvisible {} {
5767 global canv linespc curview vrowmod selectedline targetrow targetid
5768 global need_redisplay cscroll numcommits
5770 set fs [$canv yview]
5771 set ymax [lindex [$canv cget -scrollregion] 3]
5772 if {$ymax eq {} || $ymax == 0 || $numcommits == 0} return
5773 set f0 [lindex $fs 0]
5774 set f1 [lindex $fs 1]
5775 set y0 [expr {int($f0 * $ymax)}]
5776 set y1 [expr {int($f1 * $ymax)}]
5778 if {[info exists targetid]} {
5779 if {[commitinview $targetid $curview]} {
5780 set r [rowofcommit $targetid]
5781 if {$r != $targetrow} {
5782 # Fix up the scrollregion and change the scrolling position
5783 # now that our target row has moved.
5784 set diff [expr {($r - $targetrow) * $linespc}]
5787 set ymax [lindex [$canv cget -scrollregion] 3]
5790 set f0 [expr {$y0 / $ymax}]
5791 set f1 [expr {$y1 / $ymax}]
5792 allcanvs yview moveto $f0
5793 $cscroll set $f0 $f1
5794 set need_redisplay 1
5801 set row [expr {int(($y0 - 3) / $linespc) - 1}]
5802 set endrow [expr {int(($y1 - 3) / $linespc) + 1}]
5803 if {$endrow >= $vrowmod($curview)} {
5804 update_arcrows $curview
5806 if {$selectedline ne {} &&
5807 $row <= $selectedline && $selectedline <= $endrow} {
5808 set targetrow $selectedline
5809 } elseif {[info exists targetid]} {
5810 set targetrow [expr {int(($row + $endrow) / 2)}]
5812 if {[info exists targetrow]} {
5813 if {$targetrow >= $numcommits} {
5814 set targetrow [expr {$numcommits - 1}]
5816 set targetid [commitonrow $targetrow]
5818 drawcommits $row $endrow
5821 proc clear_display {} {
5822 global iddrawn linesegs need_redisplay nrows_drawn
5823 global vhighlights fhighlights nhighlights rhighlights
5824 global linehtag linentag linedtag boldids boldnameids
5827 catch {unset iddrawn}
5828 catch {unset linesegs}
5829 catch {unset linehtag}
5830 catch {unset linentag}
5831 catch {unset linedtag}
5834 catch {unset vhighlights}
5835 catch {unset fhighlights}
5836 catch {unset nhighlights}
5837 catch {unset rhighlights}
5838 set need_redisplay 0
5842 proc findcrossings {id} {
5843 global rowidlist parentlist numcommits displayorder
5847 foreach {s e} [rowranges $id] {
5848 if {$e >= $numcommits} {
5849 set e [expr {$numcommits - 1}]
5851 if {$e <= $s} continue
5852 for {set row $e} {[incr row -1] >= $s} {} {
5853 set x [lsearch -exact [lindex $rowidlist $row] $id]
5855 set olds [lindex $parentlist $row]
5856 set kid [lindex $displayorder $row]
5857 set kidx [lsearch -exact [lindex $rowidlist $row] $kid]
5858 if {$kidx < 0} continue
5859 set nextrow [lindex $rowidlist [expr {$row + 1}]]
5861 set px [lsearch -exact $nextrow $p]
5862 if {$px < 0} continue
5863 if {($kidx < $x && $x < $px) || ($px < $x && $x < $kidx)} {
5864 if {[lsearch -exact $ccross $p] >= 0} continue
5865 if {$x == $px + ($kidx < $px? -1: 1)} {
5867 } elseif {[lsearch -exact $cross $p] < 0} {
5874 return [concat $ccross {{}} $cross]
5877 proc assigncolor {id} {
5878 global colormap colors nextcolor
5879 global parents children children curview
5881 if {[info exists colormap($id)]} return
5882 set ncolors [llength $colors]
5883 if {[info exists children($curview,$id)]} {
5884 set kids $children($curview,$id)
5888 if {[llength $kids] == 1} {
5889 set child [lindex $kids 0]
5890 if {[info exists colormap($child)]
5891 && [llength $parents($curview,$child)] == 1} {
5892 set colormap($id) $colormap($child)
5898 foreach x [findcrossings $id] {
5900 # delimiter between corner crossings and other crossings
5901 if {[llength $badcolors] >= $ncolors - 1} break
5902 set origbad $badcolors
5904 if {[info exists colormap($x)]
5905 && [lsearch -exact $badcolors $colormap($x)] < 0} {
5906 lappend badcolors $colormap($x)
5909 if {[llength $badcolors] >= $ncolors} {
5910 set badcolors $origbad
5912 set origbad $badcolors
5913 if {[llength $badcolors] < $ncolors - 1} {
5914 foreach child $kids {
5915 if {[info exists colormap($child)]
5916 && [lsearch -exact $badcolors $colormap($child)] < 0} {
5917 lappend badcolors $colormap($child)
5919 foreach p $parents($curview,$child) {
5920 if {[info exists colormap($p)]
5921 && [lsearch -exact $badcolors $colormap($p)] < 0} {
5922 lappend badcolors $colormap($p)
5926 if {[llength $badcolors] >= $ncolors} {
5927 set badcolors $origbad
5930 for {set i 0} {$i <= $ncolors} {incr i} {
5931 set c [lindex $colors $nextcolor]
5932 if {[incr nextcolor] >= $ncolors} {
5935 if {[lsearch -exact $badcolors $c]} break
5937 set colormap($id) $c
5940 proc bindline {t id} {
5943 $canv bind $t <Enter> "lineenter %x %y $id"
5944 $canv bind $t <Motion> "linemotion %x %y $id"
5945 $canv bind $t <Leave> "lineleave $id"
5946 $canv bind $t <Button-1> "lineclick %x %y $id 1"
5949 proc drawtags {id x xt y1} {
5950 global idtags idheads idotherrefs mainhead
5951 global linespc lthickness
5952 global canv rowtextx curview fgcolor bgcolor ctxbut
5957 if {[info exists idtags($id)]} {
5958 set marks $idtags($id)
5959 set ntags [llength $marks]
5961 if {[info exists idheads($id)]} {
5962 set marks [concat $marks $idheads($id)]
5963 set nheads [llength $idheads($id)]
5965 if {[info exists idotherrefs($id)]} {
5966 set marks [concat $marks $idotherrefs($id)]
5972 set delta [expr {int(0.5 * ($linespc - $lthickness))}]
5973 set yt [expr {$y1 - 0.5 * $linespc}]
5974 set yb [expr {$yt + $linespc - 1}]
5978 foreach tag $marks {
5980 if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} {
5981 set wid [font measure mainfontbold $tag]
5983 set wid [font measure mainfont $tag]
5987 set xt [expr {$xt + $delta + $wid + $lthickness + $linespc}]
5989 set t [$canv create line $x $y1 [lindex $xvals end] $y1 \
5990 -width $lthickness -fill black -tags tag.$id]
5992 foreach tag $marks x $xvals wid $wvals {
5993 set xl [expr {$x + $delta}]
5994 set xr [expr {$x + $delta + $wid + $lthickness}]
5996 if {[incr ntags -1] >= 0} {
5998 set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
5999 $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
6000 -width 1 -outline black -fill yellow -tags tag.$id]
6001 $canv bind $t <1> [list showtag $tag 1]
6002 set rowtextx([rowofcommit $id]) [expr {$xr + $linespc}]
6004 # draw a head or other ref
6005 if {[incr nheads -1] >= 0} {
6007 if {$tag eq $mainhead} {
6008 set font mainfontbold
6013 set xl [expr {$xl - $delta/2}]
6014 $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
6015 -width 1 -outline black -fill $col -tags tag.$id
6016 if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
6017 set rwid [font measure mainfont $remoteprefix]
6018 set xi [expr {$x + 1}]
6019 set yti [expr {$yt + 1}]
6020 set xri [expr {$x + $rwid}]
6021 $canv create polygon $xi $yti $xri $yti $xri $yb $xi $yb \
6022 -width 0 -fill "#ffddaa" -tags tag.$id
6025 set t [$canv create text $xl $y1 -anchor w -text $tag -fill $fgcolor \
6026 -font $font -tags [list tag.$id text]]
6028 $canv bind $t <1> [list showtag $tag 1]
6029 } elseif {$nheads >= 0} {
6030 $canv bind $t $ctxbut [list headmenu %X %Y $id $tag]
6036 proc xcoord {i level ln} {
6037 global canvx0 xspc1 xspc2
6039 set x [expr {$canvx0 + $i * $xspc1($ln)}]
6040 if {$i > 0 && $i == $level} {
6041 set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}]
6042 } elseif {$i > $level} {
6043 set x [expr {$x + $xspc2 - $xspc1($ln)}]
6048 proc show_status {msg} {
6052 $canv create text 3 3 -anchor nw -text $msg -font mainfont \
6053 -tags text -fill $fgcolor
6056 # Don't change the text pane cursor if it is currently the hand cursor,
6057 # showing that we are over a sha1 ID link.
6058 proc settextcursor {c} {
6059 global ctext curtextcursor
6061 if {[$ctext cget -cursor] == $curtextcursor} {
6062 $ctext config -cursor $c
6064 set curtextcursor $c
6067 proc nowbusy {what {name {}}} {
6068 global isbusy busyname statusw
6070 if {[array names isbusy] eq {}} {
6071 . config -cursor watch
6075 set busyname($what) $name
6077 $statusw conf -text $name
6081 proc notbusy {what} {
6082 global isbusy maincursor textcursor busyname statusw
6086 if {$busyname($what) ne {} &&
6087 [$statusw cget -text] eq $busyname($what)} {
6088 $statusw conf -text {}
6091 if {[array names isbusy] eq {}} {
6092 . config -cursor $maincursor
6093 settextcursor $textcursor
6097 proc findmatches {f} {
6098 global findtype findstring
6099 if {$findtype == [mc "Regexp"]} {
6100 set matches [regexp -indices -all -inline $findstring $f]
6103 if {$findtype == [mc "IgnCase"]} {
6104 set f [string tolower $f]
6105 set fs [string tolower $fs]
6109 set l [string length $fs]
6110 while {[set j [string first $fs $f $i]] >= 0} {
6111 lappend matches [list $j [expr {$j+$l-1}]]
6112 set i [expr {$j + $l}]
6118 proc dofind {{dirn 1} {wrap 1}} {
6119 global findstring findstartline findcurline selectedline numcommits
6120 global gdttype filehighlight fh_serial find_dirn findallowwrap
6122 if {[info exists find_dirn]} {
6123 if {$find_dirn == $dirn} return
6127 if {$findstring eq {} || $numcommits == 0} return
6128 if {$selectedline eq {}} {
6129 set findstartline [lindex [visiblerows] [expr {$dirn < 0}]]
6131 set findstartline $selectedline
6133 set findcurline $findstartline
6134 nowbusy finding [mc "Searching"]
6135 if {$gdttype ne [mc "containing:"] && ![info exists filehighlight]} {
6136 after cancel do_file_hl $fh_serial
6137 do_file_hl $fh_serial
6140 set findallowwrap $wrap
6144 proc stopfinding {} {
6145 global find_dirn findcurline fprogcoord
6147 if {[info exists find_dirn]} {
6158 global commitdata commitinfo numcommits findpattern findloc
6159 global findstartline findcurline findallowwrap
6160 global find_dirn gdttype fhighlights fprogcoord
6161 global curview varcorder vrownum varccommits vrowmod
6163 if {![info exists find_dirn]} {
6166 set fldtypes [list [mc "Headline"] [mc "Author"] [mc "Date"] [mc "Committer"] [mc "CDate"] [mc "Comments"]]
6169 if {$find_dirn > 0} {
6171 if {$l >= $numcommits} {
6174 if {$l <= $findstartline} {
6175 set lim [expr {$findstartline + 1}]
6178 set moretodo $findallowwrap
6185 if {$l >= $findstartline} {
6186 set lim [expr {$findstartline - 1}]
6189 set moretodo $findallowwrap
6192 set n [expr {($lim - $l) * $find_dirn}]
6197 if {$l + ($find_dirn > 0? $n: 1) > $vrowmod($curview)} {
6198 update_arcrows $curview
6202 set ai [bsearch $vrownum($curview) $l]
6203 set a [lindex $varcorder($curview) $ai]
6204 set arow [lindex $vrownum($curview) $ai]
6205 set ids [lindex $varccommits($curview,$a)]
6206 set arowend [expr {$arow + [llength $ids]}]
6207 if {$gdttype eq [mc "containing:"]} {
6208 for {} {$n > 0} {incr n -1; incr l $find_dirn} {
6209 if {$l < $arow || $l >= $arowend} {
6211 set a [lindex $varcorder($curview) $ai]
6212 set arow [lindex $vrownum($curview) $ai]
6213 set ids [lindex $varccommits($curview,$a)]
6214 set arowend [expr {$arow + [llength $ids]}]
6216 set id [lindex $ids [expr {$l - $arow}]]
6217 # shouldn't happen unless git log doesn't give all the commits...
6218 if {![info exists commitdata($id)] ||
6219 ![doesmatch $commitdata($id)]} {
6222 if {![info exists commitinfo($id)]} {
6225 set info $commitinfo($id)
6226 foreach f $info ty $fldtypes {
6227 if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
6236 for {} {$n > 0} {incr n -1; incr l $find_dirn} {
6237 if {$l < $arow || $l >= $arowend} {
6239 set a [lindex $varcorder($curview) $ai]
6240 set arow [lindex $vrownum($curview) $ai]
6241 set ids [lindex $varccommits($curview,$a)]
6242 set arowend [expr {$arow + [llength $ids]}]
6244 set id [lindex $ids [expr {$l - $arow}]]
6245 if {![info exists fhighlights($id)]} {
6246 # this sets fhighlights($id) to -1
6247 askfilehighlight $l $id
6249 if {$fhighlights($id) > 0} {
6253 if {$fhighlights($id) < 0} {
6256 set findcurline [expr {$l - $find_dirn}]
6261 if {$found || ($domore && !$moretodo)} {
6277 set findcurline [expr {$l - $find_dirn}]
6279 set n [expr {($findcurline - $findstartline) * $find_dirn - 1}]
6283 set fprogcoord [expr {$n * 1.0 / $numcommits}]
6288 proc findselectline {l} {
6289 global findloc commentend ctext findcurline markingmatches gdttype
6291 set markingmatches [expr {$gdttype eq [mc "containing:"]}]
6294 if {$markingmatches &&
6295 ($findloc eq [mc "All fields"] || $findloc eq [mc "Comments"])} {
6296 # highlight the matches in the comments
6297 set f [$ctext get 1.0 $commentend]
6298 set matches [findmatches $f]
6299 foreach match $matches {
6300 set start [lindex $match 0]
6301 set end [expr {[lindex $match 1] + 1}]
6302 $ctext tag add found "1.0 + $start c" "1.0 + $end c"
6308 # mark the bits of a headline or author that match a find string
6309 proc markmatches {canv l str tag matches font row} {
6312 set bbox [$canv bbox $tag]
6313 set x0 [lindex $bbox 0]
6314 set y0 [lindex $bbox 1]
6315 set y1 [lindex $bbox 3]
6316 foreach match $matches {
6317 set start [lindex $match 0]
6318 set end [lindex $match 1]
6319 if {$start > $end} continue
6320 set xoff [font measure $font [string range $str 0 [expr {$start-1}]]]
6321 set xlen [font measure $font [string range $str 0 [expr {$end}]]]
6322 set t [$canv create rect [expr {$x0+$xoff}] $y0 \
6323 [expr {$x0+$xlen+2}] $y1 \
6324 -outline {} -tags [list match$l matches] -fill yellow]
6326 if {$row == $selectedline} {
6327 $canv raise $t secsel
6332 proc unmarkmatches {} {
6333 global markingmatches
6335 allcanvs delete matches
6336 set markingmatches 0
6340 proc selcanvline {w x y} {
6341 global canv canvy0 ctext linespc
6343 set ymax [lindex [$canv cget -scrollregion] 3]
6344 if {$ymax == {}} return
6345 set yfrac [lindex [$canv yview] 0]
6346 set y [expr {$y + $yfrac * $ymax}]
6347 set l [expr {int(($y - $canvy0) / $linespc + 0.5)}]
6352 set xmax [lindex [$canv cget -scrollregion] 2]
6353 set xleft [expr {[lindex [$canv xview] 0] * $xmax}]
6354 if {![info exists rowtextx($l)] || $xleft + $x < $rowtextx($l)} return
6360 proc commit_descriptor {p} {
6362 if {![info exists commitinfo($p)]} {
6366 if {[llength $commitinfo($p)] > 1} {
6367 set l [lindex $commitinfo($p) 0]
6372 # append some text to the ctext widget, and make any SHA1 ID
6373 # that we know about be a clickable link.
6374 proc appendwithlinks {text tags} {
6375 global ctext linknum curview
6377 set start [$ctext index "end - 1c"]
6378 $ctext insert end $text $tags
6379 set links [regexp -indices -all -inline {\m[0-9a-f]{6,40}\M} $text]
6383 set linkid [string range $text $s $e]
6385 $ctext tag delete link$linknum
6386 $ctext tag add link$linknum "$start + $s c" "$start + $e c"
6387 setlink $linkid link$linknum
6392 proc setlink {id lk} {
6393 global curview ctext pendinglinks
6396 if {[string length $id] < 40} {
6397 set matches [longid $id]
6398 if {[llength $matches] > 0} {
6399 if {[llength $matches] > 1} return
6401 set id [lindex $matches 0]
6404 set known [commitinview $id $curview]
6407 $ctext tag conf $lk -foreground blue -underline 1
6408 $ctext tag bind $lk <1> [list selbyid $id]
6409 $ctext tag bind $lk <Enter> {linkcursor %W 1}
6410 $ctext tag bind $lk <Leave> {linkcursor %W -1}
6412 lappend pendinglinks($id) $lk
6413 interestedin $id {makelink %P}
6417 proc makelink {id} {
6420 if {![info exists pendinglinks($id)]} return
6421 foreach lk $pendinglinks($id) {
6424 unset pendinglinks($id)
6427 proc linkcursor {w inc} {
6428 global linkentercount curtextcursor
6430 if {[incr linkentercount $inc] > 0} {
6431 $w configure -cursor hand2
6433 $w configure -cursor $curtextcursor
6434 if {$linkentercount < 0} {
6435 set linkentercount 0
6440 proc viewnextline {dir} {
6444 set ymax [lindex [$canv cget -scrollregion] 3]
6445 set wnow [$canv yview]
6446 set wtop [expr {[lindex $wnow 0] * $ymax}]
6447 set newtop [expr {$wtop + $dir * $linespc}]
6450 } elseif {$newtop > $ymax} {
6453 allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
6456 # add a list of tag or branch names at position pos
6457 # returns the number of names inserted
6458 proc appendrefs {pos ids var} {
6459 global ctext linknum curview $var maxrefs
6461 if {[catch {$ctext index $pos}]} {
6464 $ctext conf -state normal
6465 $ctext delete $pos "$pos lineend"
6468 foreach tag [set $var\($id\)] {
6469 lappend tags [list $tag $id]
6472 if {[llength $tags] > $maxrefs} {
6473 $ctext insert $pos "many ([llength $tags])"
6475 set tags [lsort -index 0 -decreasing $tags]
6478 set id [lindex $ti 1]
6481 $ctext tag delete $lk
6482 $ctext insert $pos $sep
6483 $ctext insert $pos [lindex $ti 0] $lk
6488 $ctext conf -state disabled
6489 return [llength $tags]
6492 # called when we have finished computing the nearby tags
6493 proc dispneartags {delay} {
6494 global selectedline currentid showneartags tagphase
6496 if {$selectedline eq {} || !$showneartags} return
6497 after cancel dispnexttag
6499 after 200 dispnexttag
6502 after idle dispnexttag
6507 proc dispnexttag {} {
6508 global selectedline currentid showneartags tagphase ctext
6510 if {$selectedline eq {} || !$showneartags} return
6511 switch -- $tagphase {
6513 set dtags [desctags $currentid]
6515 appendrefs precedes $dtags idtags
6519 set atags [anctags $currentid]
6521 appendrefs follows $atags idtags
6525 set dheads [descheads $currentid]
6526 if {$dheads ne {}} {
6527 if {[appendrefs branch $dheads idheads] > 1
6528 && [$ctext get "branch -3c"] eq "h"} {
6529 # turn "Branch" into "Branches"
6530 $ctext conf -state normal
6531 $ctext insert "branch -2c" "es"
6532 $ctext conf -state disabled
6537 if {[incr tagphase] <= 2} {
6538 after idle dispnexttag
6542 proc make_secsel {id} {
6543 global linehtag linentag linedtag canv canv2 canv3
6545 if {![info exists linehtag($id)]} return
6547 set t [eval $canv create rect [$canv bbox $linehtag($id)] -outline {{}} \
6548 -tags secsel -fill [$canv cget -selectbackground]]
6550 $canv2 delete secsel
6551 set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] -outline {{}} \
6552 -tags secsel -fill [$canv2 cget -selectbackground]]
6554 $canv3 delete secsel
6555 set t [eval $canv3 create rect [$canv3 bbox $linedtag($id)] -outline {{}} \
6556 -tags secsel -fill [$canv3 cget -selectbackground]]
6560 proc selectline {l isnew {desired_loc {}}} {
6561 global canv ctext commitinfo selectedline
6562 global canvy0 linespc parents children curview
6563 global currentid sha1entry
6564 global commentend idtags linknum
6565 global mergemax numcommits pending_select
6566 global cmitmode showneartags allcommits
6567 global targetrow targetid lastscrollrows
6568 global autoselect jump_to_here
6570 catch {unset pending_select}
6575 if {$l < 0 || $l >= $numcommits} return
6576 set id [commitonrow $l]
6581 if {$lastscrollrows < $numcommits} {
6585 set y [expr {$canvy0 + $l * $linespc}]
6586 set ymax [lindex [$canv cget -scrollregion] 3]
6587 set ytop [expr {$y - $linespc - 1}]
6588 set ybot [expr {$y + $linespc + 1}]
6589 set wnow [$canv yview]
6590 set wtop [expr {[lindex $wnow 0] * $ymax}]
6591 set wbot [expr {[lindex $wnow 1] * $ymax}]
6592 set wh [expr {$wbot - $wtop}]
6594 if {$ytop < $wtop} {
6595 if {$ybot < $wtop} {
6596 set newtop [expr {$y - $wh / 2.0}]
6599 if {$newtop > $wtop - $linespc} {
6600 set newtop [expr {$wtop - $linespc}]
6603 } elseif {$ybot > $wbot} {
6604 if {$ytop > $wbot} {
6605 set newtop [expr {$y - $wh / 2.0}]
6607 set newtop [expr {$ybot - $wh}]
6608 if {$newtop < $wtop + $linespc} {
6609 set newtop [expr {$wtop + $linespc}]
6613 if {$newtop != $wtop} {
6617 allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
6624 addtohistory [list selbyid $id]
6627 $sha1entry delete 0 end
6628 $sha1entry insert 0 $id
6630 $sha1entry selection from 0
6631 $sha1entry selection to end
6635 $ctext conf -state normal
6638 if {![info exists commitinfo($id)]} {
6641 set info $commitinfo($id)
6642 set date [formatdate [lindex $info 2]]
6643 $ctext insert end "[mc "Author"]: [lindex $info 1] $date\n"
6644 set date [formatdate [lindex $info 4]]
6645 $ctext insert end "[mc "Committer"]: [lindex $info 3] $date\n"
6646 if {[info exists idtags($id)]} {
6647 $ctext insert end [mc "Tags:"]
6648 foreach tag $idtags($id) {
6649 $ctext insert end " $tag"
6651 $ctext insert end "\n"
6655 set olds $parents($curview,$id)
6656 if {[llength $olds] > 1} {
6659 if {$np >= $mergemax} {
6664 $ctext insert end "[mc "Parent"]: " $tag
6665 appendwithlinks [commit_descriptor $p] {}
6670 append headers "[mc "Parent"]: [commit_descriptor $p]"
6674 foreach c $children($curview,$id) {
6675 append headers "[mc "Child"]: [commit_descriptor $c]"
6678 # make anything that looks like a SHA1 ID be a clickable link
6679 appendwithlinks $headers {}
6680 if {$showneartags} {
6681 if {![info exists allcommits]} {
6684 $ctext insert end "[mc "Branch"]: "
6685 $ctext mark set branch "end -1c"
6686 $ctext mark gravity branch left
6687 $ctext insert end "\n[mc "Follows"]: "
6688 $ctext mark set follows "end -1c"
6689 $ctext mark gravity follows left
6690 $ctext insert end "\n[mc "Precedes"]: "
6691 $ctext mark set precedes "end -1c"
6692 $ctext mark gravity precedes left
6693 $ctext insert end "\n"
6696 $ctext insert end "\n"
6697 set comment [lindex $info 5]
6698 if {[string first "\r" $comment] >= 0} {
6699 set comment [string map {"\r" "\n "} $comment]
6701 appendwithlinks $comment {comment}
6703 $ctext tag remove found 1.0 end
6704 $ctext conf -state disabled
6705 set commentend [$ctext index "end - 1c"]
6707 set jump_to_here $desired_loc
6708 init_flist [mc "Comments"]
6709 if {$cmitmode eq "tree"} {
6711 } elseif {[llength $olds] <= 1} {
6718 proc selfirstline {} {
6723 proc sellastline {} {
6726 set l [expr {$numcommits - 1}]
6730 proc selnextline {dir} {
6733 if {$selectedline eq {}} return
6734 set l [expr {$selectedline + $dir}]
6739 proc selnextpage {dir} {
6740 global canv linespc selectedline numcommits
6742 set lpp [expr {([winfo height $canv] - 2) / $linespc}]
6746 allcanvs yview scroll [expr {$dir * $lpp}] units
6748 if {$selectedline eq {}} return
6749 set l [expr {$selectedline + $dir * $lpp}]
6752 } elseif {$l >= $numcommits} {
6753 set l [expr $numcommits - 1]
6759 proc unselectline {} {
6760 global selectedline currentid
6763 catch {unset currentid}
6764 allcanvs delete secsel
6768 proc reselectline {} {
6771 if {$selectedline ne {}} {
6772 selectline $selectedline 0
6776 proc addtohistory {cmd} {
6777 global history historyindex curview
6779 set elt [list $curview $cmd]
6780 if {$historyindex > 0
6781 && [lindex $history [expr {$historyindex - 1}]] == $elt} {
6785 if {$historyindex < [llength $history]} {
6786 set history [lreplace $history $historyindex end $elt]
6788 lappend history $elt
6791 if {$historyindex > 1} {
6792 .tf.bar.leftbut conf -state normal
6794 .tf.bar.leftbut conf -state disabled
6796 .tf.bar.rightbut conf -state disabled
6802 set view [lindex $elt 0]
6803 set cmd [lindex $elt 1]
6804 if {$curview != $view} {
6811 global history historyindex
6814 if {$historyindex > 1} {
6815 incr historyindex -1
6816 godo [lindex $history [expr {$historyindex - 1}]]
6817 .tf.bar.rightbut conf -state normal
6819 if {$historyindex <= 1} {
6820 .tf.bar.leftbut conf -state disabled
6825 global history historyindex
6828 if {$historyindex < [llength $history]} {
6829 set cmd [lindex $history $historyindex]
6832 .tf.bar.leftbut conf -state normal
6834 if {$historyindex >= [llength $history]} {
6835 .tf.bar.rightbut conf -state disabled
6840 global treefilelist treeidlist diffids diffmergeid treepending
6841 global nullid nullid2
6844 catch {unset diffmergeid}
6845 if {![info exists treefilelist($id)]} {
6846 if {![info exists treepending]} {
6847 if {$id eq $nullid} {
6848 set cmd [list | git ls-files]
6849 } elseif {$id eq $nullid2} {
6850 set cmd [list | git ls-files --stage -t]
6852 set cmd [list | git ls-tree -r $id]
6854 if {[catch {set gtf [open $cmd r]}]} {
6858 set treefilelist($id) {}
6859 set treeidlist($id) {}
6860 fconfigure $gtf -blocking 0 -encoding binary
6861 filerun $gtf [list gettreeline $gtf $id]
6868 proc gettreeline {gtf id} {
6869 global treefilelist treeidlist treepending cmitmode diffids nullid nullid2
6872 while {[incr nl] <= 1000 && [gets $gtf line] >= 0} {
6873 if {$diffids eq $nullid} {
6876 set i [string first "\t" $line]
6877 if {$i < 0} continue
6878 set fname [string range $line [expr {$i+1}] end]
6879 set line [string range $line 0 [expr {$i-1}]]
6880 if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue
6881 set sha1 [lindex $line 2]
6882 lappend treeidlist($id) $sha1
6884 if {[string index $fname 0] eq "\""} {
6885 set fname [lindex $fname 0]
6887 set fname [encoding convertfrom $fname]
6888 lappend treefilelist($id) $fname
6891 return [expr {$nl >= 1000? 2: 1}]
6895 if {$cmitmode ne "tree"} {
6896 if {![info exists diffmergeid]} {
6897 gettreediffs $diffids
6899 } elseif {$id ne $diffids} {
6908 global treefilelist treeidlist diffids nullid nullid2
6909 global ctext_file_names ctext_file_lines
6910 global ctext commentend
6912 set i [lsearch -exact $treefilelist($diffids) $f]
6914 puts "oops, $f not in list for id $diffids"
6917 if {$diffids eq $nullid} {
6918 if {[catch {set bf [open $f r]} err]} {
6919 puts "oops, can't read $f: $err"
6923 set blob [lindex $treeidlist($diffids) $i]
6924 if {[catch {set bf [open [concat | git cat-file blob $blob] r]} err]} {
6925 puts "oops, error reading blob $blob: $err"
6929 fconfigure $bf -blocking 0 -encoding [get_path_encoding $f]
6930 filerun $bf [list getblobline $bf $diffids]
6931 $ctext config -state normal
6932 clear_ctext $commentend
6933 lappend ctext_file_names $f
6934 lappend ctext_file_lines [lindex [split $commentend "."] 0]
6935 $ctext insert end "\n"
6936 $ctext insert end "$f\n" filesep
6937 $ctext config -state disabled
6938 $ctext yview $commentend
6942 proc getblobline {bf id} {
6943 global diffids cmitmode ctext
6945 if {$id ne $diffids || $cmitmode ne "tree"} {
6949 $ctext config -state normal
6951 while {[incr nl] <= 1000 && [gets $bf line] >= 0} {
6952 $ctext insert end "$line\n"
6955 global jump_to_here ctext_file_names commentend
6957 # delete last newline
6958 $ctext delete "end - 2c" "end - 1c"
6960 if {$jump_to_here ne {} &&
6961 [lindex $jump_to_here 0] eq [lindex $ctext_file_names 0]} {
6962 set lnum [expr {[lindex $jump_to_here 1] +
6963 [lindex [split $commentend .] 0]}]
6964 mark_ctext_line $lnum
6968 $ctext config -state disabled
6969 return [expr {$nl >= 1000? 2: 1}]
6972 proc mark_ctext_line {lnum} {
6973 global ctext markbgcolor
6975 $ctext tag delete omark
6976 $ctext tag add omark $lnum.0 "$lnum.0 + 1 line"
6977 $ctext tag conf omark -background $markbgcolor
6981 proc mergediff {id} {
6983 global diffids treediffs
6984 global parents curview
6988 set treediffs($id) {}
6989 set np [llength $parents($curview,$id)]
6994 proc startdiff {ids} {
6995 global treediffs diffids treepending diffmergeid nullid nullid2
6999 catch {unset diffmergeid}
7000 if {![info exists treediffs($ids)] ||
7001 [lsearch -exact $ids $nullid] >= 0 ||
7002 [lsearch -exact $ids $nullid2] >= 0} {
7003 if {![info exists treepending]} {
7011 proc path_filter {filter name} {
7013 set l [string length $p]
7014 if {[string index $p end] eq "/"} {
7015 if {[string compare -length $l $p $name] == 0} {
7019 if {[string compare -length $l $p $name] == 0 &&
7020 ([string length $name] == $l ||
7021 [string index $name $l] eq "/")} {
7029 proc addtocflist {ids} {
7032 add_flist $treediffs($ids)
7036 proc diffcmd {ids flags} {
7037 global nullid nullid2
7039 set i [lsearch -exact $ids $nullid]
7040 set j [lsearch -exact $ids $nullid2]
7042 if {[llength $ids] > 1 && $j < 0} {
7043 # comparing working directory with some specific revision
7044 set cmd [concat | git diff-index $flags]
7046 lappend cmd -R [lindex $ids 1]
7048 lappend cmd [lindex $ids 0]
7051 # comparing working directory with index
7052 set cmd [concat | git diff-files $flags]
7057 } elseif {$j >= 0} {
7058 set cmd [concat | git diff-index --cached $flags]
7059 if {[llength $ids] > 1} {
7060 # comparing index with specific revision
7062 lappend cmd -R [lindex $ids 1]
7064 lappend cmd [lindex $ids 0]
7067 # comparing index with HEAD
7071 set cmd [concat | git diff-tree -r $flags $ids]
7076 proc gettreediffs {ids} {
7077 global treediff treepending
7079 if {[catch {set gdtf [open [diffcmd $ids {--no-commit-id}] r]}]} return
7081 set treepending $ids
7083 fconfigure $gdtf -blocking 0 -encoding binary
7084 filerun $gdtf [list gettreediffline $gdtf $ids]
7087 proc gettreediffline {gdtf ids} {
7088 global treediff treediffs treepending diffids diffmergeid
7089 global cmitmode vfilelimit curview limitdiffs perfile_attrs
7094 if {$perfile_attrs} {
7095 # cache_gitattr is slow, and even slower on win32 where we
7096 # have to invoke it for only about 30 paths at a time
7098 if {[tk windowingsystem] == "win32"} {
7102 while {[incr nr] <= $max && [gets $gdtf line] >= 0} {
7103 set i [string first "\t" $line]
7105 set file [string range $line [expr {$i+1}] end]
7106 if {[string index $file 0] eq "\""} {
7107 set file [lindex $file 0]
7109 set file [encoding convertfrom $file]
7110 if {$file ne [lindex $treediff end]} {
7111 lappend treediff $file
7112 lappend sublist $file
7116 if {$perfile_attrs} {
7117 cache_gitattr encoding $sublist
7120 return [expr {$nr >= $max? 2: 1}]
7123 if {$limitdiffs && $vfilelimit($curview) ne {}} {
7125 foreach f $treediff {
7126 if {[path_filter $vfilelimit($curview) $f]} {
7130 set treediffs($ids) $flist
7132 set treediffs($ids) $treediff
7135 if {$cmitmode eq "tree" && [llength $diffids] == 1} {
7137 } elseif {$ids != $diffids} {
7138 if {![info exists diffmergeid]} {
7139 gettreediffs $diffids
7147 # empty string or positive integer
7148 proc diffcontextvalidate {v} {
7149 return [regexp {^(|[1-9][0-9]*)$} $v]
7152 proc diffcontextchange {n1 n2 op} {
7153 global diffcontextstring diffcontext
7155 if {[string is integer -strict $diffcontextstring]} {
7156 if {$diffcontextstring > 0} {
7157 set diffcontext $diffcontextstring
7163 proc changeignorespace {} {
7167 proc getblobdiffs {ids} {
7168 global blobdifffd diffids env
7169 global diffinhdr treediffs
7172 global limitdiffs vfilelimit curview
7173 global diffencoding targetline diffnparents
7175 set cmd [diffcmd $ids "-p -C --cc --no-commit-id -U$diffcontext"]
7179 if {$limitdiffs && $vfilelimit($curview) ne {}} {
7180 set cmd [concat $cmd -- $vfilelimit($curview)]
7182 if {[catch {set bdf [open $cmd r]} err]} {
7183 error_popup [mc "Error getting diffs: %s" $err]
7189 set diffencoding [get_path_encoding {}]
7190 fconfigure $bdf -blocking 0 -encoding binary
7191 set blobdifffd($ids) $bdf
7192 filerun $bdf [list getblobdiffline $bdf $diffids]
7195 proc setinlist {var i val} {
7198 while {[llength [set $var]] < $i} {
7201 if {[llength [set $var]] == $i} {
7208 proc makediffhdr {fname ids} {
7209 global ctext curdiffstart treediffs diffencoding
7210 global ctext_file_names jump_to_here targetline diffline
7212 set fname [encoding convertfrom $fname]
7213 set diffencoding [get_path_encoding $fname]
7214 set i [lsearch -exact $treediffs($ids) $fname]
7216 setinlist difffilestart $i $curdiffstart
7218 lset ctext_file_names end $fname
7219 set l [expr {(78 - [string length $fname]) / 2}]
7220 set pad [string range "----------------------------------------" 1 $l]
7221 $ctext insert $curdiffstart "$pad $fname $pad" filesep
7223 if {$jump_to_here ne {} && [lindex $jump_to_here 0] eq $fname} {
7224 set targetline [lindex $jump_to_here 1]
7229 proc getblobdiffline {bdf ids} {
7230 global diffids blobdifffd ctext curdiffstart
7231 global diffnexthead diffnextnote difffilestart
7232 global ctext_file_names ctext_file_lines
7233 global diffinhdr treediffs mergemax diffnparents
7234 global diffencoding jump_to_here targetline diffline
7237 $ctext conf -state normal
7238 while {[incr nr] <= 1000 && [gets $bdf line] >= 0} {
7239 if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
7243 if {![string compare -length 5 "diff " $line]} {
7244 if {![regexp {^diff (--cc|--git) } $line m type]} {
7245 set line [encoding convertfrom $line]
7246 $ctext insert end "$line\n" hunksep
7249 # start of a new file
7251 $ctext insert end "\n"
7252 set curdiffstart [$ctext index "end - 1c"]
7253 lappend ctext_file_names ""
7254 lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
7255 $ctext insert end "\n" filesep
7257 if {$type eq "--cc"} {
7258 # start of a new file in a merge diff
7259 set fname [string range $line 10 end]
7260 if {[lsearch -exact $treediffs($ids) $fname] < 0} {
7261 lappend treediffs($ids) $fname
7262 add_flist [list $fname]
7266 set line [string range $line 11 end]
7267 # If the name hasn't changed the length will be odd,
7268 # the middle char will be a space, and the two bits either
7269 # side will be a/name and b/name, or "a/name" and "b/name".
7270 # If the name has changed we'll get "rename from" and
7271 # "rename to" or "copy from" and "copy to" lines following
7272 # this, and we'll use them to get the filenames.
7273 # This complexity is necessary because spaces in the
7274 # filename(s) don't get escaped.
7275 set l [string length $line]
7276 set i [expr {$l / 2}]
7277 if {!(($l & 1) && [string index $line $i] eq " " &&
7278 [string range $line 2 [expr {$i - 1}]] eq \
7279 [string range $line [expr {$i + 3}] end])} {
7282 # unescape if quoted and chop off the a/ from the front
7283 if {[string index $line 0] eq "\""} {
7284 set fname [string range [lindex $line 0] 2 end]
7286 set fname [string range $line 2 [expr {$i - 1}]]
7289 makediffhdr $fname $ids
7291 } elseif {![string compare -length 16 "* Unmerged path " $line]} {
7292 set fname [encoding convertfrom [string range $line 16 end]]
7293 $ctext insert end "\n"
7294 set curdiffstart [$ctext index "end - 1c"]
7295 lappend ctext_file_names $fname
7296 lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
7297 $ctext insert end "$line\n" filesep
7298 set i [lsearch -exact $treediffs($ids) $fname]
7300 setinlist difffilestart $i $curdiffstart
7303 } elseif {![string compare -length 2 "@@" $line]} {
7304 regexp {^@@+} $line ats
7305 set line [encoding convertfrom $diffencoding $line]
7306 $ctext insert end "$line\n" hunksep
7307 if {[regexp { \+(\d+),\d+ @@} $line m nl]} {
7310 set diffnparents [expr {[string length $ats] - 1}]
7313 } elseif {$diffinhdr} {
7314 if {![string compare -length 12 "rename from " $line]} {
7315 set fname [string range $line [expr 6 + [string first " from " $line] ] end]
7316 if {[string index $fname 0] eq "\""} {
7317 set fname [lindex $fname 0]
7319 set fname [encoding convertfrom $fname]
7320 set i [lsearch -exact $treediffs($ids) $fname]
7322 setinlist difffilestart $i $curdiffstart
7324 } elseif {![string compare -length 10 $line "rename to "] ||
7325 ![string compare -length 8 $line "copy to "]} {
7326 set fname [string range $line [expr 4 + [string first " to " $line] ] end]
7327 if {[string index $fname 0] eq "\""} {
7328 set fname [lindex $fname 0]
7330 makediffhdr $fname $ids
7331 } elseif {[string compare -length 3 $line "---"] == 0} {
7334 } elseif {[string compare -length 3 $line "+++"] == 0} {
7338 $ctext insert end "$line\n" filesep
7341 set line [encoding convertfrom $diffencoding $line]
7342 # parse the prefix - one ' ', '-' or '+' for each parent
7343 set prefix [string range $line 0 [expr {$diffnparents - 1}]]
7344 set tag [expr {$diffnparents > 1? "m": "d"}]
7345 if {[string trim $prefix " -+"] eq {}} {
7346 # prefix only has " ", "-" and "+" in it: normal diff line
7347 set num [string first "-" $prefix]
7349 # removed line, first parent with line is $num
7350 if {$num >= $mergemax} {
7353 $ctext insert end "$line\n" $tag$num
7356 if {[string first "+" $prefix] >= 0} {
7358 lappend tags ${tag}result
7359 if {$diffnparents > 1} {
7360 set num [string first " " $prefix]
7362 if {$num >= $mergemax} {
7369 if {$targetline ne {}} {
7370 if {$diffline == $targetline} {
7371 set seehere [$ctext index "end - 1 chars"]
7377 $ctext insert end "$line\n" $tags
7380 # "\ No newline at end of file",
7381 # or something else we don't recognize
7382 $ctext insert end "$line\n" hunksep
7386 if {[info exists seehere]} {
7387 mark_ctext_line [lindex [split $seehere .] 0]
7389 $ctext conf -state disabled
7394 return [expr {$nr >= 1000? 2: 1}]
7397 proc changediffdisp {} {
7398 global ctext diffelide
7400 $ctext tag conf d0 -elide [lindex $diffelide 0]
7401 $ctext tag conf dresult -elide [lindex $diffelide 1]
7404 proc highlightfile {loc cline} {
7405 global ctext cflist cflist_top
7408 $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
7409 $cflist tag add highlight $cline.0 "$cline.0 lineend"
7410 $cflist see $cline.0
7411 set cflist_top $cline
7415 global difffilestart ctext cmitmode
7417 if {$cmitmode eq "tree"} return
7420 set here [$ctext index @0,0]
7421 foreach loc $difffilestart {
7422 if {[$ctext compare $loc >= $here]} {
7423 highlightfile $prev $prevline
7429 highlightfile $prev $prevline
7433 global difffilestart ctext cmitmode
7435 if {$cmitmode eq "tree"} return
7436 set here [$ctext index @0,0]
7438 foreach loc $difffilestart {
7440 if {[$ctext compare $loc > $here]} {
7441 highlightfile $loc $line
7447 proc clear_ctext {{first 1.0}} {
7448 global ctext smarktop smarkbot
7449 global ctext_file_names ctext_file_lines
7452 set l [lindex [split $first .] 0]
7453 if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} {
7456 if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} {
7459 $ctext delete $first end
7460 if {$first eq "1.0"} {
7461 catch {unset pendinglinks}
7463 set ctext_file_names {}
7464 set ctext_file_lines {}
7467 proc settabs {{firstab {}}} {
7468 global firsttabstop tabstop ctext have_tk85
7470 if {$firstab ne {} && $have_tk85} {
7471 set firsttabstop $firstab
7473 set w [font measure textfont "0"]
7474 if {$firsttabstop != 0} {
7475 $ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \
7476 [expr {($firsttabstop + 2 * $tabstop) * $w}]]
7477 } elseif {$have_tk85 || $tabstop != 8} {
7478 $ctext conf -tabs [expr {$tabstop * $w}]
7480 $ctext conf -tabs {}
7484 proc incrsearch {name ix op} {
7485 global ctext searchstring searchdirn
7487 $ctext tag remove found 1.0 end
7488 if {[catch {$ctext index anchor}]} {
7489 # no anchor set, use start of selection, or of visible area
7490 set sel [$ctext tag ranges sel]
7492 $ctext mark set anchor [lindex $sel 0]
7493 } elseif {$searchdirn eq "-forwards"} {
7494 $ctext mark set anchor @0,0
7496 $ctext mark set anchor @0,[winfo height $ctext]
7499 if {$searchstring ne {}} {
7500 set here [$ctext search $searchdirn -- $searchstring anchor]
7509 global sstring ctext searchstring searchdirn
7512 $sstring icursor end
7513 set searchdirn -forwards
7514 if {$searchstring ne {}} {
7515 set sel [$ctext tag ranges sel]
7517 set start "[lindex $sel 0] + 1c"
7518 } elseif {[catch {set start [$ctext index anchor]}]} {
7521 set match [$ctext search -count mlen -- $searchstring $start]
7522 $ctext tag remove sel 1.0 end
7528 set mend "$match + $mlen c"
7529 $ctext tag add sel $match $mend
7530 $ctext mark unset anchor
7534 proc dosearchback {} {
7535 global sstring ctext searchstring searchdirn
7538 $sstring icursor end
7539 set searchdirn -backwards
7540 if {$searchstring ne {}} {
7541 set sel [$ctext tag ranges sel]
7543 set start [lindex $sel 0]
7544 } elseif {[catch {set start [$ctext index anchor]}]} {
7545 set start @0,[winfo height $ctext]
7547 set match [$ctext search -backwards -count ml -- $searchstring $start]
7548 $ctext tag remove sel 1.0 end
7554 set mend "$match + $ml c"
7555 $ctext tag add sel $match $mend
7556 $ctext mark unset anchor
7560 proc searchmark {first last} {
7561 global ctext searchstring
7565 set match [$ctext search -count mlen -- $searchstring $mend $last.end]
7566 if {$match eq {}} break
7567 set mend "$match + $mlen c"
7568 $ctext tag add found $match $mend
7572 proc searchmarkvisible {doall} {
7573 global ctext smarktop smarkbot
7575 set topline [lindex [split [$ctext index @0,0] .] 0]
7576 set botline [lindex [split [$ctext index @0,[winfo height $ctext]] .] 0]
7577 if {$doall || $botline < $smarktop || $topline > $smarkbot} {
7578 # no overlap with previous
7579 searchmark $topline $botline
7580 set smarktop $topline
7581 set smarkbot $botline
7583 if {$topline < $smarktop} {
7584 searchmark $topline [expr {$smarktop-1}]
7585 set smarktop $topline
7587 if {$botline > $smarkbot} {
7588 searchmark [expr {$smarkbot+1}] $botline
7589 set smarkbot $botline
7594 proc scrolltext {f0 f1} {
7597 .bleft.bottom.sb set $f0 $f1
7598 if {$searchstring ne {}} {
7604 global linespc charspc canvx0 canvy0
7605 global xspc1 xspc2 lthickness
7607 set linespc [font metrics mainfont -linespace]
7608 set charspc [font measure mainfont "m"]
7609 set canvy0 [expr {int(3 + 0.5 * $linespc)}]
7610 set canvx0 [expr {int(3 + 0.5 * $linespc)}]
7611 set lthickness [expr {int($linespc / 9) + 1}]
7612 set xspc1(0) $linespc
7620 set ymax [lindex [$canv cget -scrollregion] 3]
7621 if {$ymax eq {} || $ymax == 0} return
7622 set span [$canv yview]
7625 allcanvs yview moveto [lindex $span 0]
7627 if {$selectedline ne {}} {
7628 selectline $selectedline 0
7629 allcanvs yview moveto [lindex $span 0]
7633 proc parsefont {f n} {
7636 set fontattr($f,family) [lindex $n 0]
7638 if {$s eq {} || $s == 0} {
7641 set s [expr {int(-$s / [winfo fpixels . 1p] + 0.5)}]
7643 set fontattr($f,size) $s
7644 set fontattr($f,weight) normal
7645 set fontattr($f,slant) roman
7646 foreach style [lrange $n 2 end] {
7649 "bold" {set fontattr($f,weight) $style}
7651 "italic" {set fontattr($f,slant) $style}
7656 proc fontflags {f {isbold 0}} {
7659 return [list -family $fontattr($f,family) -size $fontattr($f,size) \
7660 -weight [expr {$isbold? "bold": $fontattr($f,weight)}] \
7661 -slant $fontattr($f,slant)]
7667 set n [list $fontattr($f,family) $fontattr($f,size)]
7668 if {$fontattr($f,weight) eq "bold"} {
7671 if {$fontattr($f,slant) eq "italic"} {
7677 proc incrfont {inc} {
7678 global mainfont textfont ctext canv cflist showrefstop
7679 global stopped entries fontattr
7682 set s $fontattr(mainfont,size)
7687 set fontattr(mainfont,size) $s
7688 font config mainfont -size $s
7689 font config mainfontbold -size $s
7690 set mainfont [fontname mainfont]
7691 set s $fontattr(textfont,size)
7696 set fontattr(textfont,size) $s
7697 font config textfont -size $s
7698 font config textfontbold -size $s
7699 set textfont [fontname textfont]
7706 global sha1entry sha1string
7707 if {[string length $sha1string] == 40} {
7708 $sha1entry delete 0 end
7712 proc sha1change {n1 n2 op} {
7713 global sha1string currentid sha1but
7714 if {$sha1string == {}
7715 || ([info exists currentid] && $sha1string == $currentid)} {
7720 if {[$sha1but cget -state] == $state} return
7721 if {$state == "normal"} {
7722 $sha1but conf -state normal -relief raised -text "[mc "Goto:"] "
7724 $sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] "
7728 proc gotocommit {} {
7729 global sha1string tagids headids curview varcid
7731 if {$sha1string == {}
7732 || ([info exists currentid] && $sha1string == $currentid)} return
7733 if {[info exists tagids($sha1string)]} {
7734 set id $tagids($sha1string)
7735 } elseif {[info exists headids($sha1string)]} {
7736 set id $headids($sha1string)
7738 set id [string tolower $sha1string]
7739 if {[regexp {^[0-9a-f]{4,39}$} $id]} {
7740 set matches [longid $id]
7741 if {$matches ne {}} {
7742 if {[llength $matches] > 1} {
7743 error_popup [mc "Short SHA1 id %s is ambiguous" $id]
7746 set id [lindex $matches 0]
7750 if {[commitinview $id $curview]} {
7751 selectline [rowofcommit $id] 1
7754 if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
7755 set msg [mc "SHA1 id %s is not known" $sha1string]
7757 set msg [mc "Tag/Head %s is not known" $sha1string]
7762 proc lineenter {x y id} {
7763 global hoverx hovery hoverid hovertimer
7764 global commitinfo canv
7766 if {![info exists commitinfo($id)] && ![getcommit $id]} return
7770 if {[info exists hovertimer]} {
7771 after cancel $hovertimer
7773 set hovertimer [after 500 linehover]
7777 proc linemotion {x y id} {
7778 global hoverx hovery hoverid hovertimer
7780 if {[info exists hoverid] && $id == $hoverid} {
7783 if {[info exists hovertimer]} {
7784 after cancel $hovertimer
7786 set hovertimer [after 500 linehover]
7790 proc lineleave {id} {
7791 global hoverid hovertimer canv
7793 if {[info exists hoverid] && $id == $hoverid} {
7795 if {[info exists hovertimer]} {
7796 after cancel $hovertimer
7804 global hoverx hovery hoverid hovertimer
7805 global canv linespc lthickness
7808 set text [lindex $commitinfo($hoverid) 0]
7809 set ymax [lindex [$canv cget -scrollregion] 3]
7810 if {$ymax == {}} return
7811 set yfrac [lindex [$canv yview] 0]
7812 set x [expr {$hoverx + 2 * $linespc}]
7813 set y [expr {$hovery + $yfrac * $ymax - $linespc / 2}]
7814 set x0 [expr {$x - 2 * $lthickness}]
7815 set y0 [expr {$y - 2 * $lthickness}]
7816 set x1 [expr {$x + [font measure mainfont $text] + 2 * $lthickness}]
7817 set y1 [expr {$y + $linespc + 2 * $lthickness}]
7818 set t [$canv create rectangle $x0 $y0 $x1 $y1 \
7819 -fill \#ffff80 -outline black -width 1 -tags hover]
7821 set t [$canv create text $x $y -anchor nw -text $text -tags hover \
7826 proc clickisonarrow {id y} {
7829 set ranges [rowranges $id]
7830 set thresh [expr {2 * $lthickness + 6}]
7831 set n [expr {[llength $ranges] - 1}]
7832 for {set i 1} {$i < $n} {incr i} {
7833 set row [lindex $ranges $i]
7834 if {abs([yc $row] - $y) < $thresh} {
7841 proc arrowjump {id n y} {
7844 # 1 <-> 2, 3 <-> 4, etc...
7845 set n [expr {(($n - 1) ^ 1) + 1}]
7846 set row [lindex [rowranges $id] $n]
7848 set ymax [lindex [$canv cget -scrollregion] 3]
7849 if {$ymax eq {} || $ymax <= 0} return
7850 set view [$canv yview]
7851 set yspan [expr {[lindex $view 1] - [lindex $view 0]}]
7852 set yfrac [expr {$yt / $ymax - $yspan / 2}]
7856 allcanvs yview moveto $yfrac
7859 proc lineclick {x y id isnew} {
7860 global ctext commitinfo children canv thickerline curview
7862 if {![info exists commitinfo($id)] && ![getcommit $id]} return
7867 # draw this line thicker than normal
7871 set ymax [lindex [$canv cget -scrollregion] 3]
7872 if {$ymax eq {}} return
7873 set yfrac [lindex [$canv yview] 0]
7874 set y [expr {$y + $yfrac * $ymax}]
7876 set dirn [clickisonarrow $id $y]
7878 arrowjump $id $dirn $y
7883 addtohistory [list lineclick $x $y $id 0]
7885 # fill the details pane with info about this line
7886 $ctext conf -state normal
7889 $ctext insert end "[mc "Parent"]:\t"
7890 $ctext insert end $id link0
7892 set info $commitinfo($id)
7893 $ctext insert end "\n\t[lindex $info 0]\n"
7894 $ctext insert end "\t[mc "Author"]:\t[lindex $info 1]\n"
7895 set date [formatdate [lindex $info 2]]
7896 $ctext insert end "\t[mc "Date"]:\t$date\n"
7897 set kids $children($curview,$id)
7899 $ctext insert end "\n[mc "Children"]:"
7901 foreach child $kids {
7903 if {![info exists commitinfo($child)] && ![getcommit $child]} continue
7904 set info $commitinfo($child)
7905 $ctext insert end "\n\t"
7906 $ctext insert end $child link$i
7907 setlink $child link$i
7908 $ctext insert end "\n\t[lindex $info 0]"
7909 $ctext insert end "\n\t[mc "Author"]:\t[lindex $info 1]"
7910 set date [formatdate [lindex $info 2]]
7911 $ctext insert end "\n\t[mc "Date"]:\t$date\n"
7914 $ctext conf -state disabled
7918 proc normalline {} {
7920 if {[info exists thickerline]} {
7929 if {[commitinview $id $curview]} {
7930 selectline [rowofcommit $id] 1
7936 if {![info exists startmstime]} {
7937 set startmstime [clock clicks -milliseconds]
7939 return [format "%.3f" [expr {([clock click -milliseconds] - $startmstime) / 1000.0}]]
7942 proc rowmenu {x y id} {
7943 global rowctxmenu selectedline rowmenuid curview
7944 global nullid nullid2 fakerowmenu mainhead
7948 if {$selectedline eq {} || [rowofcommit $id] eq $selectedline} {
7953 if {$id ne $nullid && $id ne $nullid2} {
7954 set menu $rowctxmenu
7955 if {$mainhead ne {}} {
7956 $menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead]
7958 $menu entryconfigure 7 -label [mc "Detached head: can't reset" $mainhead] -state disabled
7961 set menu $fakerowmenu
7963 $menu entryconfigure [mca "Diff this -> selected"] -state $state
7964 $menu entryconfigure [mca "Diff selected -> this"] -state $state
7965 $menu entryconfigure [mca "Make patch"] -state $state
7966 tk_popup $menu $x $y
7969 proc diffvssel {dirn} {
7970 global rowmenuid selectedline
7972 if {$selectedline eq {}} return
7974 set oldid [commitonrow $selectedline]
7975 set newid $rowmenuid
7977 set oldid $rowmenuid
7978 set newid [commitonrow $selectedline]
7980 addtohistory [list doseldiff $oldid $newid]
7981 doseldiff $oldid $newid
7984 proc doseldiff {oldid newid} {
7988 $ctext conf -state normal
7990 init_flist [mc "Top"]
7991 $ctext insert end "[mc "From"] "
7992 $ctext insert end $oldid link0
7993 setlink $oldid link0
7994 $ctext insert end "\n "
7995 $ctext insert end [lindex $commitinfo($oldid) 0]
7996 $ctext insert end "\n\n[mc "To"] "
7997 $ctext insert end $newid link1
7998 setlink $newid link1
7999 $ctext insert end "\n "
8000 $ctext insert end [lindex $commitinfo($newid) 0]
8001 $ctext insert end "\n"
8002 $ctext conf -state disabled
8003 $ctext tag remove found 1.0 end
8004 startdiff [list $oldid $newid]
8008 global rowmenuid currentid commitinfo patchtop patchnum
8010 if {![info exists currentid]} return
8011 set oldid $currentid
8012 set oldhead [lindex $commitinfo($oldid) 0]
8013 set newid $rowmenuid
8014 set newhead [lindex $commitinfo($newid) 0]
8017 catch {destroy $top}
8019 make_transient $top .
8020 label $top.title -text [mc "Generate patch"]
8021 grid $top.title - -pady 10
8022 label $top.from -text [mc "From:"]
8023 entry $top.fromsha1 -width 40 -relief flat
8024 $top.fromsha1 insert 0 $oldid
8025 $top.fromsha1 conf -state readonly
8026 grid $top.from $top.fromsha1 -sticky w
8027 entry $top.fromhead -width 60 -relief flat
8028 $top.fromhead insert 0 $oldhead
8029 $top.fromhead conf -state readonly
8030 grid x $top.fromhead -sticky w
8031 label $top.to -text [mc "To:"]
8032 entry $top.tosha1 -width 40 -relief flat
8033 $top.tosha1 insert 0 $newid
8034 $top.tosha1 conf -state readonly
8035 grid $top.to $top.tosha1 -sticky w
8036 entry $top.tohead -width 60 -relief flat
8037 $top.tohead insert 0 $newhead
8038 $top.tohead conf -state readonly
8039 grid x $top.tohead -sticky w
8040 button $top.rev -text [mc "Reverse"] -command mkpatchrev -padx 5
8041 grid $top.rev x -pady 10
8042 label $top.flab -text [mc "Output file:"]
8043 entry $top.fname -width 60
8044 $top.fname insert 0 [file normalize "patch$patchnum.patch"]
8046 grid $top.flab $top.fname -sticky w
8048 button $top.buts.gen -text [mc "Generate"] -command mkpatchgo
8049 button $top.buts.can -text [mc "Cancel"] -command mkpatchcan
8050 bind $top <Key-Return> mkpatchgo
8051 bind $top <Key-Escape> mkpatchcan
8052 grid $top.buts.gen $top.buts.can
8053 grid columnconfigure $top.buts 0 -weight 1 -uniform a
8054 grid columnconfigure $top.buts 1 -weight 1 -uniform a
8055 grid $top.buts - -pady 10 -sticky ew
8059 proc mkpatchrev {} {
8062 set oldid [$patchtop.fromsha1 get]
8063 set oldhead [$patchtop.fromhead get]
8064 set newid [$patchtop.tosha1 get]
8065 set newhead [$patchtop.tohead get]
8066 foreach e [list fromsha1 fromhead tosha1 tohead] \
8067 v [list $newid $newhead $oldid $oldhead] {
8068 $patchtop.$e conf -state normal
8069 $patchtop.$e delete 0 end
8070 $patchtop.$e insert 0 $v
8071 $patchtop.$e conf -state readonly
8076 global patchtop nullid nullid2
8078 set oldid [$patchtop.fromsha1 get]
8079 set newid [$patchtop.tosha1 get]
8080 set fname [$patchtop.fname get]
8081 set cmd [diffcmd [list $oldid $newid] -p]
8082 # trim off the initial "|"
8083 set cmd [lrange $cmd 1 end]
8084 lappend cmd >$fname &
8085 if {[catch {eval exec $cmd} err]} {
8086 error_popup "[mc "Error creating patch:"] $err" $patchtop
8088 catch {destroy $patchtop}
8092 proc mkpatchcan {} {
8095 catch {destroy $patchtop}
8100 global rowmenuid mktagtop commitinfo
8104 catch {destroy $top}
8106 make_transient $top .
8107 label $top.title -text [mc "Create tag"]
8108 grid $top.title - -pady 10
8109 label $top.id -text [mc "ID:"]
8110 entry $top.sha1 -width 40 -relief flat
8111 $top.sha1 insert 0 $rowmenuid
8112 $top.sha1 conf -state readonly
8113 grid $top.id $top.sha1 -sticky w
8114 entry $top.head -width 60 -relief flat
8115 $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
8116 $top.head conf -state readonly
8117 grid x $top.head -sticky w
8118 label $top.tlab -text [mc "Tag name:"]
8119 entry $top.tag -width 60
8120 grid $top.tlab $top.tag -sticky w
8122 button $top.buts.gen -text [mc "Create"] -command mktaggo
8123 button $top.buts.can -text [mc "Cancel"] -command mktagcan
8124 bind $top <Key-Return> mktaggo
8125 bind $top <Key-Escape> mktagcan
8126 grid $top.buts.gen $top.buts.can
8127 grid columnconfigure $top.buts 0 -weight 1 -uniform a
8128 grid columnconfigure $top.buts 1 -weight 1 -uniform a
8129 grid $top.buts - -pady 10 -sticky ew
8134 global mktagtop env tagids idtags
8136 set id [$mktagtop.sha1 get]
8137 set tag [$mktagtop.tag get]
8139 error_popup [mc "No tag name specified"] $mktagtop
8142 if {[info exists tagids($tag)]} {
8143 error_popup [mc "Tag \"%s\" already exists" $tag] $mktagtop
8147 exec git tag $tag $id
8149 error_popup "[mc "Error creating tag:"] $err" $mktagtop
8153 set tagids($tag) $id
8154 lappend idtags($id) $tag
8162 proc redrawtags {id} {
8163 global canv linehtag idpos currentid curview cmitlisted
8164 global canvxmax iddrawn circleitem mainheadid circlecolors
8166 if {![commitinview $id $curview]} return
8167 if {![info exists iddrawn($id)]} return
8168 set row [rowofcommit $id]
8169 if {$id eq $mainheadid} {
8172 set ofill [lindex $circlecolors $cmitlisted($curview,$id)]
8174 $canv itemconf $circleitem($row) -fill $ofill
8175 $canv delete tag.$id
8176 set xt [eval drawtags $id $idpos($id)]
8177 $canv coords $linehtag($id) $xt [lindex $idpos($id) 2]
8178 set text [$canv itemcget $linehtag($id) -text]
8179 set font [$canv itemcget $linehtag($id) -font]
8180 set xr [expr {$xt + [font measure $font $text]}]
8181 if {$xr > $canvxmax} {
8185 if {[info exists currentid] && $currentid == $id} {
8193 catch {destroy $mktagtop}
8198 if {![domktag]} return
8202 proc writecommit {} {
8203 global rowmenuid wrcomtop commitinfo wrcomcmd
8205 set top .writecommit
8207 catch {destroy $top}
8209 make_transient $top .
8210 label $top.title -text [mc "Write commit to file"]
8211 grid $top.title - -pady 10
8212 label $top.id -text [mc "ID:"]
8213 entry $top.sha1 -width 40 -relief flat
8214 $top.sha1 insert 0 $rowmenuid
8215 $top.sha1 conf -state readonly
8216 grid $top.id $top.sha1 -sticky w
8217 entry $top.head -width 60 -relief flat
8218 $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
8219 $top.head conf -state readonly
8220 grid x $top.head -sticky w
8221 label $top.clab -text [mc "Command:"]
8222 entry $top.cmd -width 60 -textvariable wrcomcmd
8223 grid $top.clab $top.cmd -sticky w -pady 10
8224 label $top.flab -text [mc "Output file:"]
8225 entry $top.fname -width 60
8226 $top.fname insert 0 [file normalize "commit-[string range $rowmenuid 0 6]"]
8227 grid $top.flab $top.fname -sticky w
8229 button $top.buts.gen -text [mc "Write"] -command wrcomgo
8230 button $top.buts.can -text [mc "Cancel"] -command wrcomcan
8231 bind $top <Key-Return> wrcomgo
8232 bind $top <Key-Escape> wrcomcan
8233 grid $top.buts.gen $top.buts.can
8234 grid columnconfigure $top.buts 0 -weight 1 -uniform a
8235 grid columnconfigure $top.buts 1 -weight 1 -uniform a
8236 grid $top.buts - -pady 10 -sticky ew
8243 set id [$wrcomtop.sha1 get]
8244 set cmd "echo $id | [$wrcomtop.cmd get]"
8245 set fname [$wrcomtop.fname get]
8246 if {[catch {exec sh -c $cmd >$fname &} err]} {
8247 error_popup "[mc "Error writing commit:"] $err" $wrcomtop
8249 catch {destroy $wrcomtop}
8256 catch {destroy $wrcomtop}
8261 global rowmenuid mkbrtop
8264 catch {destroy $top}
8266 make_transient $top .
8267 label $top.title -text [mc "Create new branch"]
8268 grid $top.title - -pady 10
8269 label $top.id -text [mc "ID:"]
8270 entry $top.sha1 -width 40 -relief flat
8271 $top.sha1 insert 0 $rowmenuid
8272 $top.sha1 conf -state readonly
8273 grid $top.id $top.sha1 -sticky w
8274 label $top.nlab -text [mc "Name:"]
8275 entry $top.name -width 40
8276 grid $top.nlab $top.name -sticky w
8278 button $top.buts.go -text [mc "Create"] -command [list mkbrgo $top]
8279 button $top.buts.can -text [mc "Cancel"] -command "catch {destroy $top}"
8280 bind $top <Key-Return> [list mkbrgo $top]
8281 bind $top <Key-Escape> "catch {destroy $top}"
8282 grid $top.buts.go $top.buts.can
8283 grid columnconfigure $top.buts 0 -weight 1 -uniform a
8284 grid columnconfigure $top.buts 1 -weight 1 -uniform a
8285 grid $top.buts - -pady 10 -sticky ew
8290 global headids idheads
8292 set name [$top.name get]
8293 set id [$top.sha1 get]
8297 error_popup [mc "Please specify a name for the new branch"] $top
8300 if {[info exists headids($name)]} {
8301 if {![confirm_popup [mc \
8302 "Branch '%s' already exists. Overwrite?" $name] $top]} {
8305 set old_id $headids($name)
8308 catch {destroy $top}
8309 lappend cmdargs $name $id
8313 eval exec git branch $cmdargs
8319 if {$old_id ne {}} {
8325 set headids($name) $id
8326 lappend idheads($id) $name
8335 proc exec_citool {tool_args {baseid {}}} {
8336 global commitinfo env
8338 set save_env [array get env GIT_AUTHOR_*]
8340 if {$baseid ne {}} {
8341 if {![info exists commitinfo($baseid)]} {
8344 set author [lindex $commitinfo($baseid) 1]
8345 set date [lindex $commitinfo($baseid) 2]
8346 if {[regexp {^\s*(\S.*\S|\S)\s*<(.*)>\s*$} \
8347 $author author name email]
8349 set env(GIT_AUTHOR_NAME) $name
8350 set env(GIT_AUTHOR_EMAIL) $email
8351 set env(GIT_AUTHOR_DATE) $date
8355 eval exec git citool $tool_args &
8357 array unset env GIT_AUTHOR_*
8358 array set env $save_env
8361 proc cherrypick {} {
8362 global rowmenuid curview
8363 global mainhead mainheadid
8365 set oldhead [exec git rev-parse HEAD]
8366 set dheads [descheads $rowmenuid]
8367 if {$dheads ne {} && [lsearch -exact $dheads $oldhead] >= 0} {
8368 set ok [confirm_popup [mc "Commit %s is already\
8369 included in branch %s -- really re-apply it?" \
8370 [string range $rowmenuid 0 7] $mainhead]]
8373 nowbusy cherrypick [mc "Cherry-picking"]
8375 # Unfortunately git-cherry-pick writes stuff to stderr even when
8376 # no error occurs, and exec takes that as an indication of error...
8377 if {[catch {exec sh -c "git cherry-pick -r $rowmenuid 2>&1"} err]} {
8380 {Entry '(.*)' (would be overwritten by merge|not uptodate)} \
8382 error_popup [mc "Cherry-pick failed because of local changes\
8383 to file '%s'.\nPlease commit, reset or stash\
8384 your changes and try again." $fname]
8385 } elseif {[regexp -line \
8386 {^(CONFLICT \(.*\):|Automatic cherry-pick failed)} \
8388 if {[confirm_popup [mc "Cherry-pick failed because of merge\
8389 conflict.\nDo you wish to run git citool to\
8391 # Force citool to read MERGE_MSG
8392 file delete [file join [gitdir] "GITGUI_MSG"]
8393 exec_citool {} $rowmenuid
8401 set newhead [exec git rev-parse HEAD]
8402 if {$newhead eq $oldhead} {
8404 error_popup [mc "No changes committed"]
8407 addnewchild $newhead $oldhead
8408 if {[commitinview $oldhead $curview]} {
8409 # XXX this isn't right if we have a path limit...
8410 insertrow $newhead $oldhead $curview
8411 if {$mainhead ne {}} {
8412 movehead $newhead $mainhead
8413 movedhead $newhead $mainhead
8415 set mainheadid $newhead
8424 global mainhead rowmenuid confirm_ok resettype
8427 set w ".confirmreset"
8430 wm title $w [mc "Confirm reset"]
8431 message $w.m -text \
8432 [mc "Reset branch %s to %s?" $mainhead [string range $rowmenuid 0 7]] \
8433 -justify center -aspect 1000
8434 pack $w.m -side top -fill x -padx 20 -pady 20
8435 frame $w.f -relief sunken -border 2
8436 message $w.f.rt -text [mc "Reset type:"] -aspect 1000
8437 grid $w.f.rt -sticky w
8439 radiobutton $w.f.soft -value soft -variable resettype -justify left \
8440 -text [mc "Soft: Leave working tree and index untouched"]
8441 grid $w.f.soft -sticky w
8442 radiobutton $w.f.mixed -value mixed -variable resettype -justify left \
8443 -text [mc "Mixed: Leave working tree untouched, reset index"]
8444 grid $w.f.mixed -sticky w
8445 radiobutton $w.f.hard -value hard -variable resettype -justify left \
8446 -text [mc "Hard: Reset working tree and index\n(discard ALL local changes)"]
8447 grid $w.f.hard -sticky w
8448 pack $w.f -side top -fill x
8449 button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w"
8450 pack $w.ok -side left -fill x -padx 20 -pady 20
8451 button $w.cancel -text [mc Cancel] -command "destroy $w"
8452 bind $w <Key-Escape> [list destroy $w]
8453 pack $w.cancel -side right -fill x -padx 20 -pady 20
8454 bind $w <Visibility> "grab $w; focus $w"
8456 if {!$confirm_ok} return
8457 if {[catch {set fd [open \
8458 [list | git reset --$resettype $rowmenuid 2>@1] r]} err]} {
8462 filerun $fd [list readresetstat $fd]
8463 nowbusy reset [mc "Resetting"]
8468 proc readresetstat {fd} {
8469 global mainhead mainheadid showlocalchanges rprogcoord
8471 if {[gets $fd line] >= 0} {
8472 if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
8473 set rprogcoord [expr {1.0 * $m / $n}]
8481 if {[catch {close $fd} err]} {
8484 set oldhead $mainheadid
8485 set newhead [exec git rev-parse HEAD]
8486 if {$newhead ne $oldhead} {
8487 movehead $newhead $mainhead
8488 movedhead $newhead $mainhead
8489 set mainheadid $newhead
8493 if {$showlocalchanges} {
8499 # context menu for a head
8500 proc headmenu {x y id head} {
8501 global headmenuid headmenuhead headctxmenu mainhead
8505 set headmenuhead $head
8507 if {$head eq $mainhead} {
8510 $headctxmenu entryconfigure 0 -state $state
8511 $headctxmenu entryconfigure 1 -state $state
8512 tk_popup $headctxmenu $x $y
8516 global headmenuid headmenuhead headids
8517 global showlocalchanges
8519 # check the tree is clean first??
8520 nowbusy checkout [mc "Checking out"]
8524 set fd [open [list | git checkout $headmenuhead 2>@1] r]
8528 if {$showlocalchanges} {
8532 filerun $fd [list readcheckoutstat $fd $headmenuhead $headmenuid]
8536 proc readcheckoutstat {fd newhead newheadid} {
8537 global mainhead mainheadid headids showlocalchanges progresscoords
8538 global viewmainheadid curview
8540 if {[gets $fd line] >= 0} {
8541 if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
8542 set progresscoords [list 0 [expr {1.0 * $m / $n}]]
8547 set progresscoords {0 0}
8550 if {[catch {close $fd} err]} {
8553 set oldmainid $mainheadid
8554 set mainhead $newhead
8555 set mainheadid $newheadid
8556 set viewmainheadid($curview) $newheadid
8557 redrawtags $oldmainid
8558 redrawtags $newheadid
8560 if {$showlocalchanges} {
8566 global headmenuid headmenuhead mainhead
8569 set head $headmenuhead
8571 # this check shouldn't be needed any more...
8572 if {$head eq $mainhead} {
8573 error_popup [mc "Cannot delete the currently checked-out branch"]
8576 set dheads [descheads $id]
8577 if {[llength $dheads] == 1 && $idheads($dheads) eq $head} {
8578 # the stuff on this branch isn't on any other branch
8579 if {![confirm_popup [mc "The commits on branch %s aren't on any other\
8580 branch.\nReally delete branch %s?" $head $head]]} return
8584 if {[catch {exec git branch -D $head} err]} {
8589 removehead $id $head
8590 removedhead $id $head
8597 # Display a list of tags and heads
8599 global showrefstop bgcolor fgcolor selectbgcolor
8600 global bglist fglist reflistfilter reflist maincursor
8603 set showrefstop $top
8604 if {[winfo exists $top]} {
8610 wm title $top [mc "Tags and heads: %s" [file tail [pwd]]]
8611 make_transient $top .
8612 text $top.list -background $bgcolor -foreground $fgcolor \
8613 -selectbackground $selectbgcolor -font mainfont \
8614 -xscrollcommand "$top.xsb set" -yscrollcommand "$top.ysb set" \
8615 -width 30 -height 20 -cursor $maincursor \
8616 -spacing1 1 -spacing3 1 -state disabled
8617 $top.list tag configure highlight -background $selectbgcolor
8618 lappend bglist $top.list
8619 lappend fglist $top.list
8620 scrollbar $top.ysb -command "$top.list yview" -orient vertical
8621 scrollbar $top.xsb -command "$top.list xview" -orient horizontal
8622 grid $top.list $top.ysb -sticky nsew
8623 grid $top.xsb x -sticky ew
8625 label $top.f.l -text "[mc "Filter"]: "
8626 entry $top.f.e -width 20 -textvariable reflistfilter
8627 set reflistfilter "*"
8628 trace add variable reflistfilter write reflistfilter_change
8629 pack $top.f.e -side right -fill x -expand 1
8630 pack $top.f.l -side left
8631 grid $top.f - -sticky ew -pady 2
8632 button $top.close -command [list destroy $top] -text [mc "Close"]
8633 bind $top <Key-Escape> [list destroy $top]
8635 grid columnconfigure $top 0 -weight 1
8636 grid rowconfigure $top 0 -weight 1
8637 bind $top.list <1> {break}
8638 bind $top.list <B1-Motion> {break}
8639 bind $top.list <ButtonRelease-1> {sel_reflist %W %x %y; break}
8644 proc sel_reflist {w x y} {
8645 global showrefstop reflist headids tagids otherrefids
8647 if {![winfo exists $showrefstop]} return
8648 set l [lindex [split [$w index "@$x,$y"] "."] 0]
8649 set ref [lindex $reflist [expr {$l-1}]]
8650 set n [lindex $ref 0]
8651 switch -- [lindex $ref 1] {
8652 "H" {selbyid $headids($n)}
8653 "T" {selbyid $tagids($n)}
8654 "o" {selbyid $otherrefids($n)}
8656 $showrefstop.list tag add highlight $l.0 "$l.0 lineend"
8659 proc unsel_reflist {} {
8662 if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
8663 $showrefstop.list tag remove highlight 0.0 end
8666 proc reflistfilter_change {n1 n2 op} {
8667 global reflistfilter
8669 after cancel refill_reflist
8670 after 200 refill_reflist
8673 proc refill_reflist {} {
8674 global reflist reflistfilter showrefstop headids tagids otherrefids
8677 if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
8679 foreach n [array names headids] {
8680 if {[string match $reflistfilter $n]} {
8681 if {[commitinview $headids($n) $curview]} {
8682 lappend refs [list $n H]
8684 interestedin $headids($n) {run refill_reflist}
8688 foreach n [array names tagids] {
8689 if {[string match $reflistfilter $n]} {
8690 if {[commitinview $tagids($n) $curview]} {
8691 lappend refs [list $n T]
8693 interestedin $tagids($n) {run refill_reflist}
8697 foreach n [array names otherrefids] {
8698 if {[string match $reflistfilter $n]} {
8699 if {[commitinview $otherrefids($n) $curview]} {
8700 lappend refs [list $n o]
8702 interestedin $otherrefids($n) {run refill_reflist}
8706 set refs [lsort -index 0 $refs]
8707 if {$refs eq $reflist} return
8709 # Update the contents of $showrefstop.list according to the
8710 # differences between $reflist (old) and $refs (new)
8711 $showrefstop.list conf -state normal
8712 $showrefstop.list insert end "\n"
8715 while {$i < [llength $reflist] || $j < [llength $refs]} {
8716 if {$i < [llength $reflist]} {
8717 if {$j < [llength $refs]} {
8718 set cmp [string compare [lindex $reflist $i 0] \
8719 [lindex $refs $j 0]]
8721 set cmp [string compare [lindex $reflist $i 1] \
8722 [lindex $refs $j 1]]
8732 $showrefstop.list delete "[expr {$j+1}].0" "[expr {$j+2}].0"
8740 set l [expr {$j + 1}]
8741 $showrefstop.list image create $l.0 -align baseline \
8742 -image reficon-[lindex $refs $j 1] -padx 2
8743 $showrefstop.list insert $l.1 "[lindex $refs $j 0]\n"
8749 # delete last newline
8750 $showrefstop.list delete end-2c end-1c
8751 $showrefstop.list conf -state disabled
8754 # Stuff for finding nearby tags
8755 proc getallcommits {} {
8756 global allcommits nextarc seeds allccache allcwait cachedarcs allcupdate
8757 global idheads idtags idotherrefs allparents tagobjid
8759 if {![info exists allcommits]} {
8765 set allccache [file join [gitdir] "gitk.cache"]
8767 set f [open $allccache r]
8776 set cmd [list | git rev-list --parents]
8777 set allcupdate [expr {$seeds ne {}}]
8781 set refs [concat [array names idheads] [array names idtags] \
8782 [array names idotherrefs]]
8785 foreach name [array names tagobjid] {
8786 lappend tagobjs $tagobjid($name)
8788 foreach id [lsort -unique $refs] {
8789 if {![info exists allparents($id)] &&
8790 [lsearch -exact $tagobjs $id] < 0} {
8801 set fd [open [concat $cmd $ids] r]
8802 fconfigure $fd -blocking 0
8805 filerun $fd [list getallclines $fd]
8811 # Since most commits have 1 parent and 1 child, we group strings of
8812 # such commits into "arcs" joining branch/merge points (BMPs), which
8813 # are commits that either don't have 1 parent or don't have 1 child.
8815 # arcnos(id) - incoming arcs for BMP, arc we're on for other nodes
8816 # arcout(id) - outgoing arcs for BMP
8817 # arcids(a) - list of IDs on arc including end but not start
8818 # arcstart(a) - BMP ID at start of arc
8819 # arcend(a) - BMP ID at end of arc
8820 # growing(a) - arc a is still growing
8821 # arctags(a) - IDs out of arcids (excluding end) that have tags
8822 # archeads(a) - IDs out of arcids (excluding end) that have heads
8823 # The start of an arc is at the descendent end, so "incoming" means
8824 # coming from descendents, and "outgoing" means going towards ancestors.
8826 proc getallclines {fd} {
8827 global allparents allchildren idtags idheads nextarc
8828 global arcnos arcids arctags arcout arcend arcstart archeads growing
8829 global seeds allcommits cachedarcs allcupdate
8832 while {[incr nid] <= 1000 && [gets $fd line] >= 0} {
8833 set id [lindex $line 0]
8834 if {[info exists allparents($id)]} {
8839 set olds [lrange $line 1 end]
8840 set allparents($id) $olds
8841 if {![info exists allchildren($id)]} {
8842 set allchildren($id) {}
8847 if {[llength $olds] == 1 && [llength $a] == 1} {
8848 lappend arcids($a) $id
8849 if {[info exists idtags($id)]} {
8850 lappend arctags($a) $id
8852 if {[info exists idheads($id)]} {
8853 lappend archeads($a) $id
8855 if {[info exists allparents($olds)]} {
8856 # seen parent already
8857 if {![info exists arcout($olds)]} {
8860 lappend arcids($a) $olds
8861 set arcend($a) $olds
8864 lappend allchildren($olds) $id
8865 lappend arcnos($olds) $a
8869 foreach a $arcnos($id) {
8870 lappend arcids($a) $id
8877 lappend allchildren($p) $id
8878 set a [incr nextarc]
8879 set arcstart($a) $id
8886 if {[info exists allparents($p)]} {
8887 # seen it already, may need to make a new branch
8888 if {![info exists arcout($p)]} {
8891 lappend arcids($a) $p
8895 lappend arcnos($p) $a
8900 global cached_dheads cached_dtags cached_atags
8901 catch {unset cached_dheads}
8902 catch {unset cached_dtags}
8903 catch {unset cached_atags}
8906 return [expr {$nid >= 1000? 2: 1}]
8910 fconfigure $fd -blocking 1
8913 # got an error reading the list of commits
8914 # if we were updating, try rereading the whole thing again
8920 error_popup "[mc "Error reading commit topology information;\
8921 branch and preceding/following tag information\
8922 will be incomplete."]\n($err)"
8925 if {[incr allcommits -1] == 0} {
8935 proc recalcarc {a} {
8936 global arctags archeads arcids idtags idheads
8940 foreach id [lrange $arcids($a) 0 end-1] {
8941 if {[info exists idtags($id)]} {
8944 if {[info exists idheads($id)]} {
8949 set archeads($a) $ah
8953 global arcnos arcids nextarc arctags archeads idtags idheads
8954 global arcstart arcend arcout allparents growing
8957 if {[llength $a] != 1} {
8958 puts "oops splitarc called but [llength $a] arcs already"
8962 set i [lsearch -exact $arcids($a) $p]
8964 puts "oops splitarc $p not in arc $a"
8967 set na [incr nextarc]
8968 if {[info exists arcend($a)]} {
8969 set arcend($na) $arcend($a)
8971 set l [lindex $allparents([lindex $arcids($a) end]) 0]
8972 set j [lsearch -exact $arcnos($l) $a]
8973 set arcnos($l) [lreplace $arcnos($l) $j $j $na]
8975 set tail [lrange $arcids($a) [expr {$i+1}] end]
8976 set arcids($a) [lrange $arcids($a) 0 $i]
8978 set arcstart($na) $p
8980 set arcids($na) $tail
8981 if {[info exists growing($a)]} {
8987 if {[llength $arcnos($id)] == 1} {
8990 set j [lsearch -exact $arcnos($id) $a]
8991 set arcnos($id) [lreplace $arcnos($id) $j $j $na]
8995 # reconstruct tags and heads lists
8996 if {$arctags($a) ne {} || $archeads($a) ne {}} {
9001 set archeads($na) {}
9005 # Update things for a new commit added that is a child of one
9006 # existing commit. Used when cherry-picking.
9007 proc addnewchild {id p} {
9008 global allparents allchildren idtags nextarc
9009 global arcnos arcids arctags arcout arcend arcstart archeads growing
9010 global seeds allcommits
9012 if {![info exists allcommits] || ![info exists arcnos($p)]} return
9013 set allparents($id) [list $p]
9014 set allchildren($id) {}
9017 lappend allchildren($p) $id
9018 set a [incr nextarc]
9019 set arcstart($a) $id
9022 set arcids($a) [list $p]
9024 if {![info exists arcout($p)]} {
9027 lappend arcnos($p) $a
9028 set arcout($id) [list $a]
9031 # This implements a cache for the topology information.
9032 # The cache saves, for each arc, the start and end of the arc,
9033 # the ids on the arc, and the outgoing arcs from the end.
9034 proc readcache {f} {
9035 global arcnos arcids arcout arcstart arcend arctags archeads nextarc
9036 global idtags idheads allparents cachedarcs possible_seeds seeds growing
9041 if {$lim - $a > 500} {
9042 set lim [expr {$a + 500}]
9046 # finish reading the cache and setting up arctags, etc.
9048 if {$line ne "1"} {error "bad final version"}
9050 foreach id [array names idtags] {
9051 if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 &&
9052 [llength $allparents($id)] == 1} {
9053 set a [lindex $arcnos($id) 0]
9054 if {$arctags($a) eq {}} {
9059 foreach id [array names idheads] {
9060 if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 &&
9061 [llength $allparents($id)] == 1} {
9062 set a [lindex $arcnos($id) 0]
9063 if {$archeads($a) eq {}} {
9068 foreach id [lsort -unique $possible_seeds] {
9069 if {$arcnos($id) eq {}} {
9075 while {[incr a] <= $lim} {
9077 if {[llength $line] != 3} {error "bad line"}
9078 set s [lindex $line 0]
9080 lappend arcout($s) $a
9081 if {![info exists arcnos($s)]} {
9082 lappend possible_seeds $s
9085 set e [lindex $line 1]
9090 if {![info exists arcout($e)]} {
9094 set arcids($a) [lindex $line 2]
9095 foreach id $arcids($a) {
9096 lappend allparents($s) $id
9098 lappend arcnos($id) $a
9100 if {![info exists allparents($s)]} {
9101 set allparents($s) {}
9106 set nextarc [expr {$a - 1}]
9119 global nextarc cachedarcs possible_seeds
9123 if {[llength $line] != 2 || [lindex $line 0] ne "1"} {error "bad version"}
9124 # make sure it's an integer
9125 set cachedarcs [expr {int([lindex $line 1])}]
9126 if {$cachedarcs < 0} {error "bad number of arcs"}
9128 set possible_seeds {}
9136 proc dropcache {err} {
9137 global allcwait nextarc cachedarcs seeds
9139 #puts "dropping cache ($err)"
9140 foreach v {arcnos arcout arcids arcstart arcend growing \
9141 arctags archeads allparents allchildren} {
9152 proc writecache {f} {
9153 global cachearc cachedarcs allccache
9154 global arcstart arcend arcnos arcids arcout
9158 if {$lim - $a > 1000} {
9159 set lim [expr {$a + 1000}]
9162 while {[incr a] <= $lim} {
9163 if {[info exists arcend($a)]} {
9164 puts $f [list $arcstart($a) $arcend($a) $arcids($a)]
9166 puts $f [list $arcstart($a) {} $arcids($a)]
9171 catch {file delete $allccache}
9172 #puts "writing cache failed ($err)"
9175 set cachearc [expr {$a - 1}]
9176 if {$a > $cachedarcs} {
9185 global nextarc cachedarcs cachearc allccache
9187 if {$nextarc == $cachedarcs} return
9189 set cachedarcs $nextarc
9191 set f [open $allccache w]
9192 puts $f [list 1 $cachedarcs]
9197 # Returns 1 if a is an ancestor of b, -1 if b is an ancestor of a,
9198 # or 0 if neither is true.
9199 proc anc_or_desc {a b} {
9200 global arcout arcstart arcend arcnos cached_isanc
9202 if {$arcnos($a) eq $arcnos($b)} {
9203 # Both are on the same arc(s); either both are the same BMP,
9204 # or if one is not a BMP, the other is also not a BMP or is
9205 # the BMP at end of the arc (and it only has 1 incoming arc).
9206 # Or both can be BMPs with no incoming arcs.
9207 if {$a eq $b || $arcnos($a) eq {}} {
9210 # assert {[llength $arcnos($a)] == 1}
9211 set arc [lindex $arcnos($a) 0]
9212 set i [lsearch -exact $arcids($arc) $a]
9213 set j [lsearch -exact $arcids($arc) $b]
9214 if {$i < 0 || $i > $j} {
9221 if {![info exists arcout($a)]} {
9222 set arc [lindex $arcnos($a) 0]
9223 if {[info exists arcend($arc)]} {
9224 set aend $arcend($arc)
9228 set a $arcstart($arc)
9232 if {![info exists arcout($b)]} {
9233 set arc [lindex $arcnos($b) 0]
9234 if {[info exists arcend($arc)]} {
9235 set bend $arcend($arc)
9239 set b $arcstart($arc)
9249 if {[info exists cached_isanc($a,$bend)]} {
9250 if {$cached_isanc($a,$bend)} {
9254 if {[info exists cached_isanc($b,$aend)]} {
9255 if {$cached_isanc($b,$aend)} {
9258 if {[info exists cached_isanc($a,$bend)]} {
9263 set todo [list $a $b]
9266 for {set i 0} {$i < [llength $todo]} {incr i} {
9267 set x [lindex $todo $i]
9268 if {$anc($x) eq {}} {
9271 foreach arc $arcnos($x) {
9272 set xd $arcstart($arc)
9274 set cached_isanc($a,$bend) 1
9275 set cached_isanc($b,$aend) 0
9277 } elseif {$xd eq $aend} {
9278 set cached_isanc($b,$aend) 1
9279 set cached_isanc($a,$bend) 0
9282 if {![info exists anc($xd)]} {
9283 set anc($xd) $anc($x)
9285 } elseif {$anc($xd) ne $anc($x)} {
9290 set cached_isanc($a,$bend) 0
9291 set cached_isanc($b,$aend) 0
9295 # This identifies whether $desc has an ancestor that is
9296 # a growing tip of the graph and which is not an ancestor of $anc
9297 # and returns 0 if so and 1 if not.
9298 # If we subsequently discover a tag on such a growing tip, and that
9299 # turns out to be a descendent of $anc (which it could, since we
9300 # don't necessarily see children before parents), then $desc
9301 # isn't a good choice to display as a descendent tag of
9302 # $anc (since it is the descendent of another tag which is
9303 # a descendent of $anc). Similarly, $anc isn't a good choice to
9304 # display as a ancestor tag of $desc.
9306 proc is_certain {desc anc} {
9307 global arcnos arcout arcstart arcend growing problems
9310 if {[llength $arcnos($anc)] == 1} {
9311 # tags on the same arc are certain
9312 if {$arcnos($desc) eq $arcnos($anc)} {
9315 if {![info exists arcout($anc)]} {
9316 # if $anc is partway along an arc, use the start of the arc instead
9317 set a [lindex $arcnos($anc) 0]
9318 set anc $arcstart($a)
9321 if {[llength $arcnos($desc)] > 1 || [info exists arcout($desc)]} {
9324 set a [lindex $arcnos($desc) 0]
9330 set anclist [list $x]
9334 for {set i 0} {$i < [llength $anclist] && ($nnh > 0 || $ngrowanc > 0)} {incr i} {
9335 set x [lindex $anclist $i]
9340 foreach a $arcout($x) {
9341 if {[info exists growing($a)]} {
9342 if {![info exists growanc($x)] && $dl($x)} {
9348 if {[info exists dl($y)]} {
9352 if {![info exists done($y)]} {
9355 if {[info exists growanc($x)]} {
9359 for {set k 0} {$k < [llength $xl]} {incr k} {
9360 set z [lindex $xl $k]
9361 foreach c $arcout($z) {
9362 if {[info exists arcend($c)]} {
9364 if {[info exists dl($v)] && $dl($v)} {
9366 if {![info exists done($v)]} {
9369 if {[info exists growanc($v)]} {
9379 } elseif {$y eq $anc || !$dl($x)} {
9390 foreach x [array names growanc] {
9399 proc validate_arctags {a} {
9400 global arctags idtags
9404 foreach id $arctags($a) {
9406 if {![info exists idtags($id)]} {
9407 set na [lreplace $na $i $i]
9414 proc validate_archeads {a} {
9415 global archeads idheads
9418 set na $archeads($a)
9419 foreach id $archeads($a) {
9421 if {![info exists idheads($id)]} {
9422 set na [lreplace $na $i $i]
9426 set archeads($a) $na
9429 # Return the list of IDs that have tags that are descendents of id,
9430 # ignoring IDs that are descendents of IDs already reported.
9431 proc desctags {id} {
9432 global arcnos arcstart arcids arctags idtags allparents
9433 global growing cached_dtags
9435 if {![info exists allparents($id)]} {
9438 set t1 [clock clicks -milliseconds]
9440 if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
9441 # part-way along an arc; check that arc first
9442 set a [lindex $arcnos($id) 0]
9443 if {$arctags($a) ne {}} {
9445 set i [lsearch -exact $arcids($a) $id]
9447 foreach t $arctags($a) {
9448 set j [lsearch -exact $arcids($a) $t]
9456 set id $arcstart($a)
9457 if {[info exists idtags($id)]} {
9461 if {[info exists cached_dtags($id)]} {
9462 return $cached_dtags($id)
9469 for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} {
9470 set id [lindex $todo $i]
9472 set ta [info exists hastaggedancestor($id)]
9476 # ignore tags on starting node
9477 if {!$ta && $i > 0} {
9478 if {[info exists idtags($id)]} {
9481 } elseif {[info exists cached_dtags($id)]} {
9482 set tagloc($id) $cached_dtags($id)
9486 foreach a $arcnos($id) {
9488 if {!$ta && $arctags($a) ne {}} {
9490 if {$arctags($a) ne {}} {
9491 lappend tagloc($id) [lindex $arctags($a) end]
9494 if {$ta || $arctags($a) ne {}} {
9495 set tomark [list $d]
9496 for {set j 0} {$j < [llength $tomark]} {incr j} {
9497 set dd [lindex $tomark $j]
9498 if {![info exists hastaggedancestor($dd)]} {
9499 if {[info exists done($dd)]} {
9500 foreach b $arcnos($dd) {
9501 lappend tomark $arcstart($b)
9503 if {[info exists tagloc($dd)]} {
9506 } elseif {[info exists queued($dd)]} {
9509 set hastaggedancestor($dd) 1
9513 if {![info exists queued($d)]} {
9516 if {![info exists hastaggedancestor($d)]} {
9523 foreach id [array names tagloc] {
9524 if {![info exists hastaggedancestor($id)]} {
9525 foreach t $tagloc($id) {
9526 if {[lsearch -exact $tags $t] < 0} {
9532 set t2 [clock clicks -milliseconds]
9535 # remove tags that are descendents of other tags
9536 for {set i 0} {$i < [llength $tags]} {incr i} {
9537 set a [lindex $tags $i]
9538 for {set j 0} {$j < $i} {incr j} {
9539 set b [lindex $tags $j]
9540 set r [anc_or_desc $a $b]
9542 set tags [lreplace $tags $j $j]
9545 } elseif {$r == -1} {
9546 set tags [lreplace $tags $i $i]
9553 if {[array names growing] ne {}} {
9554 # graph isn't finished, need to check if any tag could get
9555 # eclipsed by another tag coming later. Simply ignore any
9556 # tags that could later get eclipsed.
9559 if {[is_certain $t $origid]} {
9563 if {$tags eq $ctags} {
9564 set cached_dtags($origid) $tags
9569 set cached_dtags($origid) $tags
9571 set t3 [clock clicks -milliseconds]
9572 if {0 && $t3 - $t1 >= 100} {
9573 puts "iterating descendents ($loopix/[llength $todo] nodes) took\
9574 [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left"
9580 global arcnos arcids arcout arcend arctags idtags allparents
9581 global growing cached_atags
9583 if {![info exists allparents($id)]} {
9586 set t1 [clock clicks -milliseconds]
9588 if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
9589 # part-way along an arc; check that arc first
9590 set a [lindex $arcnos($id) 0]
9591 if {$arctags($a) ne {}} {
9593 set i [lsearch -exact $arcids($a) $id]
9594 foreach t $arctags($a) {
9595 set j [lsearch -exact $arcids($a) $t]
9601 if {![info exists arcend($a)]} {
9605 if {[info exists idtags($id)]} {
9609 if {[info exists cached_atags($id)]} {
9610 return $cached_atags($id)
9618 for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} {
9619 set id [lindex $todo $i]
9621 set td [info exists hastaggeddescendent($id)]
9625 # ignore tags on starting node
9626 if {!$td && $i > 0} {
9627 if {[info exists idtags($id)]} {
9630 } elseif {[info exists cached_atags($id)]} {
9631 set tagloc($id) $cached_atags($id)
9635 foreach a $arcout($id) {
9636 if {!$td && $arctags($a) ne {}} {
9638 if {$arctags($a) ne {}} {
9639 lappend tagloc($id) [lindex $arctags($a) 0]
9642 if {![info exists arcend($a)]} continue
9644 if {$td || $arctags($a) ne {}} {
9645 set tomark [list $d]
9646 for {set j 0} {$j < [llength $tomark]} {incr j} {
9647 set dd [lindex $tomark $j]
9648 if {![info exists hastaggeddescendent($dd)]} {
9649 if {[info exists done($dd)]} {
9650 foreach b $arcout($dd) {
9651 if {[info exists arcend($b)]} {
9652 lappend tomark $arcend($b)
9655 if {[info exists tagloc($dd)]} {
9658 } elseif {[info exists queued($dd)]} {
9661 set hastaggeddescendent($dd) 1
9665 if {![info exists queued($d)]} {
9668 if {![info exists hastaggeddescendent($d)]} {
9674 set t2 [clock clicks -milliseconds]
9677 foreach id [array names tagloc] {
9678 if {![info exists hastaggeddescendent($id)]} {
9679 foreach t $tagloc($id) {
9680 if {[lsearch -exact $tags $t] < 0} {
9687 # remove tags that are ancestors of other tags
9688 for {set i 0} {$i < [llength $tags]} {incr i} {
9689 set a [lindex $tags $i]
9690 for {set j 0} {$j < $i} {incr j} {
9691 set b [lindex $tags $j]
9692 set r [anc_or_desc $a $b]
9694 set tags [lreplace $tags $j $j]
9697 } elseif {$r == 1} {
9698 set tags [lreplace $tags $i $i]
9705 if {[array names growing] ne {}} {
9706 # graph isn't finished, need to check if any tag could get
9707 # eclipsed by another tag coming later. Simply ignore any
9708 # tags that could later get eclipsed.
9711 if {[is_certain $origid $t]} {
9715 if {$tags eq $ctags} {
9716 set cached_atags($origid) $tags
9721 set cached_atags($origid) $tags
9723 set t3 [clock clicks -milliseconds]
9724 if {0 && $t3 - $t1 >= 100} {
9725 puts "iterating ancestors ($loopix/[llength $todo] nodes) took\
9726 [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left"
9731 # Return the list of IDs that have heads that are descendents of id,
9732 # including id itself if it has a head.
9733 proc descheads {id} {
9734 global arcnos arcstart arcids archeads idheads cached_dheads
9737 if {![info exists allparents($id)]} {
9741 if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
9742 # part-way along an arc; check it first
9743 set a [lindex $arcnos($id) 0]
9744 if {$archeads($a) ne {}} {
9745 validate_archeads $a
9746 set i [lsearch -exact $arcids($a) $id]
9747 foreach t $archeads($a) {
9748 set j [lsearch -exact $arcids($a) $t]
9753 set id $arcstart($a)
9759 for {set i 0} {$i < [llength $todo]} {incr i} {
9760 set id [lindex $todo $i]
9761 if {[info exists cached_dheads($id)]} {
9762 set ret [concat $ret $cached_dheads($id)]
9764 if {[info exists idheads($id)]} {
9767 foreach a $arcnos($id) {
9768 if {$archeads($a) ne {}} {
9769 validate_archeads $a
9770 if {$archeads($a) ne {}} {
9771 set ret [concat $ret $archeads($a)]
9775 if {![info exists seen($d)]} {
9782 set ret [lsort -unique $ret]
9783 set cached_dheads($origid) $ret
9784 return [concat $ret $aret]
9787 proc addedtag {id} {
9788 global arcnos arcout cached_dtags cached_atags
9790 if {![info exists arcnos($id)]} return
9791 if {![info exists arcout($id)]} {
9792 recalcarc [lindex $arcnos($id) 0]
9794 catch {unset cached_dtags}
9795 catch {unset cached_atags}
9798 proc addedhead {hid head} {
9799 global arcnos arcout cached_dheads
9801 if {![info exists arcnos($hid)]} return
9802 if {![info exists arcout($hid)]} {
9803 recalcarc [lindex $arcnos($hid) 0]
9805 catch {unset cached_dheads}
9808 proc removedhead {hid head} {
9809 global cached_dheads
9811 catch {unset cached_dheads}
9814 proc movedhead {hid head} {
9815 global arcnos arcout cached_dheads
9817 if {![info exists arcnos($hid)]} return
9818 if {![info exists arcout($hid)]} {
9819 recalcarc [lindex $arcnos($hid) 0]
9821 catch {unset cached_dheads}
9824 proc changedrefs {} {
9825 global cached_dheads cached_dtags cached_atags
9826 global arctags archeads arcnos arcout idheads idtags
9828 foreach id [concat [array names idheads] [array names idtags]] {
9829 if {[info exists arcnos($id)] && ![info exists arcout($id)]} {
9830 set a [lindex $arcnos($id) 0]
9831 if {![info exists donearc($a)]} {
9837 catch {unset cached_dtags}
9838 catch {unset cached_atags}
9839 catch {unset cached_dheads}
9842 proc rereadrefs {} {
9843 global idtags idheads idotherrefs mainheadid
9845 set refids [concat [array names idtags] \
9846 [array names idheads] [array names idotherrefs]]
9847 foreach id $refids {
9848 if {![info exists ref($id)]} {
9849 set ref($id) [listrefs $id]
9852 set oldmainhead $mainheadid
9855 set refids [lsort -unique [concat $refids [array names idtags] \
9856 [array names idheads] [array names idotherrefs]]]
9857 foreach id $refids {
9858 set v [listrefs $id]
9859 if {![info exists ref($id)] || $ref($id) != $v} {
9863 if {$oldmainhead ne $mainheadid} {
9864 redrawtags $oldmainhead
9865 redrawtags $mainheadid
9870 proc listrefs {id} {
9871 global idtags idheads idotherrefs
9874 if {[info exists idtags($id)]} {
9878 if {[info exists idheads($id)]} {
9882 if {[info exists idotherrefs($id)]} {
9883 set z $idotherrefs($id)
9885 return [list $x $y $z]
9888 proc showtag {tag isnew} {
9889 global ctext tagcontents tagids linknum tagobjid
9892 addtohistory [list showtag $tag 0]
9894 $ctext conf -state normal
9898 if {![info exists tagcontents($tag)]} {
9900 set tagcontents($tag) [exec git cat-file tag $tagobjid($tag)]
9903 if {[info exists tagcontents($tag)]} {
9904 set text $tagcontents($tag)
9906 set text "[mc "Tag"]: $tag\n[mc "Id"]: $tagids($tag)"
9908 appendwithlinks $text {}
9909 $ctext conf -state disabled
9921 if {[info exists gitktmpdir]} {
9922 catch {file delete -force $gitktmpdir}
9926 proc mkfontdisp {font top which} {
9927 global fontattr fontpref $font
9929 set fontpref($font) [set $font]
9930 button $top.${font}but -text $which -font optionfont \
9931 -command [list choosefont $font $which]
9932 label $top.$font -relief flat -font $font \
9933 -text $fontattr($font,family) -justify left
9934 grid x $top.${font}but $top.$font -sticky w
9937 proc choosefont {font which} {
9938 global fontparam fontlist fonttop fontattr
9941 set fontparam(which) $which
9942 set fontparam(font) $font
9943 set fontparam(family) [font actual $font -family]
9944 set fontparam(size) $fontattr($font,size)
9945 set fontparam(weight) $fontattr($font,weight)
9946 set fontparam(slant) $fontattr($font,slant)
9949 if {![winfo exists $top]} {
9951 eval font config sample [font actual $font]
9953 make_transient $top $prefstop
9954 wm title $top [mc "Gitk font chooser"]
9955 label $top.l -textvariable fontparam(which)
9956 pack $top.l -side top
9957 set fontlist [lsort [font families]]
9959 listbox $top.f.fam -listvariable fontlist \
9960 -yscrollcommand [list $top.f.sb set]
9961 bind $top.f.fam <<ListboxSelect>> selfontfam
9962 scrollbar $top.f.sb -command [list $top.f.fam yview]
9963 pack $top.f.sb -side right -fill y
9964 pack $top.f.fam -side left -fill both -expand 1
9965 pack $top.f -side top -fill both -expand 1
9967 spinbox $top.g.size -from 4 -to 40 -width 4 \
9968 -textvariable fontparam(size) \
9969 -validatecommand {string is integer -strict %s}
9970 checkbutton $top.g.bold -padx 5 \
9971 -font {{Times New Roman} 12 bold} -text [mc "B"] -indicatoron 0 \
9972 -variable fontparam(weight) -onvalue bold -offvalue normal
9973 checkbutton $top.g.ital -padx 5 \
9974 -font {{Times New Roman} 12 italic} -text [mc "I"] -indicatoron 0 \
9975 -variable fontparam(slant) -onvalue italic -offvalue roman
9976 pack $top.g.size $top.g.bold $top.g.ital -side left
9977 pack $top.g -side top
9978 canvas $top.c -width 150 -height 50 -border 2 -relief sunk \
9980 $top.c create text 100 25 -anchor center -text $which -font sample \
9981 -fill black -tags text
9982 bind $top.c <Configure> [list centertext $top.c]
9983 pack $top.c -side top -fill x
9985 button $top.buts.ok -text [mc "OK"] -command fontok -default active
9986 button $top.buts.can -text [mc "Cancel"] -command fontcan -default normal
9987 bind $top <Key-Return> fontok
9988 bind $top <Key-Escape> fontcan
9989 grid $top.buts.ok $top.buts.can
9990 grid columnconfigure $top.buts 0 -weight 1 -uniform a
9991 grid columnconfigure $top.buts 1 -weight 1 -uniform a
9992 pack $top.buts -side bottom -fill x
9993 trace add variable fontparam write chg_fontparam
9996 $top.c itemconf text -text $which
9998 set i [lsearch -exact $fontlist $fontparam(family)]
10000 $top.f.fam selection set $i
10005 proc centertext {w} {
10006 $w coords text [expr {[winfo width $w] / 2}] [expr {[winfo height $w] / 2}]
10010 global fontparam fontpref prefstop
10012 set f $fontparam(font)
10013 set fontpref($f) [list $fontparam(family) $fontparam(size)]
10014 if {$fontparam(weight) eq "bold"} {
10015 lappend fontpref($f) "bold"
10017 if {$fontparam(slant) eq "italic"} {
10018 lappend fontpref($f) "italic"
10021 $w conf -text $fontparam(family) -font $fontpref($f)
10027 global fonttop fontparam
10029 if {[info exists fonttop]} {
10030 catch {destroy $fonttop}
10031 catch {font delete sample}
10037 proc selfontfam {} {
10038 global fonttop fontparam
10040 set i [$fonttop.f.fam curselection]
10042 set fontparam(family) [$fonttop.f.fam get $i]
10046 proc chg_fontparam {v sub op} {
10049 font config sample -$sub $fontparam($sub)
10053 global maxwidth maxgraphpct
10054 global oldprefs prefstop showneartags showlocalchanges
10055 global bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
10056 global tabstop limitdiffs autoselect extdifftool perfile_attrs
10060 if {[winfo exists $top]} {
10064 foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
10065 limitdiffs tabstop perfile_attrs} {
10066 set oldprefs($v) [set $v]
10069 wm title $top [mc "Gitk preferences"]
10070 make_transient $top .
10071 label $top.ldisp -text [mc "Commit list display options"]
10072 grid $top.ldisp - -sticky w -pady 10
10073 label $top.spacer -text " "
10074 label $top.maxwidthl -text [mc "Maximum graph width (lines)"] \
10076 spinbox $top.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
10077 grid $top.spacer $top.maxwidthl $top.maxwidth -sticky w
10078 label $top.maxpctl -text [mc "Maximum graph width (% of pane)"] \
10080 spinbox $top.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
10081 grid x $top.maxpctl $top.maxpct -sticky w
10082 frame $top.showlocal
10083 label $top.showlocal.l -text [mc "Show local changes"] -font optionfont
10084 checkbutton $top.showlocal.b -variable showlocalchanges
10085 pack $top.showlocal.b $top.showlocal.l -side left
10086 grid x $top.showlocal -sticky w
10087 frame $top.autoselect
10088 label $top.autoselect.l -text [mc "Auto-select SHA1"] -font optionfont
10089 checkbutton $top.autoselect.b -variable autoselect
10090 pack $top.autoselect.b $top.autoselect.l -side left
10091 grid x $top.autoselect -sticky w
10093 label $top.ddisp -text [mc "Diff display options"]
10094 grid $top.ddisp - -sticky w -pady 10
10095 label $top.tabstopl -text [mc "Tab spacing"] -font optionfont
10096 spinbox $top.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
10097 grid x $top.tabstopl $top.tabstop -sticky w
10099 label $top.ntag.l -text [mc "Display nearby tags"] -font optionfont
10100 checkbutton $top.ntag.b -variable showneartags
10101 pack $top.ntag.b $top.ntag.l -side left
10102 grid x $top.ntag -sticky w
10104 label $top.ldiff.l -text [mc "Limit diffs to listed paths"] -font optionfont
10105 checkbutton $top.ldiff.b -variable limitdiffs
10106 pack $top.ldiff.b $top.ldiff.l -side left
10107 grid x $top.ldiff -sticky w
10109 label $top.lattr.l -text [mc "Support per-file encodings"] -font optionfont
10110 checkbutton $top.lattr.b -variable perfile_attrs
10111 pack $top.lattr.b $top.lattr.l -side left
10112 grid x $top.lattr -sticky w
10114 entry $top.extdifft -textvariable extdifftool
10115 frame $top.extdifff
10116 label $top.extdifff.l -text [mc "External diff tool" ] -font optionfont \
10118 button $top.extdifff.b -text [mc "Choose..."] -font optionfont \
10119 -command choose_extdiff
10120 pack $top.extdifff.l $top.extdifff.b -side left
10121 grid x $top.extdifff $top.extdifft -sticky w
10123 label $top.cdisp -text [mc "Colors: press to choose"]
10124 grid $top.cdisp - -sticky w -pady 10
10125 label $top.bg -padx 40 -relief sunk -background $bgcolor
10126 button $top.bgbut -text [mc "Background"] -font optionfont \
10127 -command [list choosecolor bgcolor {} $top.bg background setbg]
10128 grid x $top.bgbut $top.bg -sticky w
10129 label $top.fg -padx 40 -relief sunk -background $fgcolor
10130 button $top.fgbut -text [mc "Foreground"] -font optionfont \
10131 -command [list choosecolor fgcolor {} $top.fg foreground setfg]
10132 grid x $top.fgbut $top.fg -sticky w
10133 label $top.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]
10134 button $top.diffoldbut -text [mc "Diff: old lines"] -font optionfont \
10135 -command [list choosecolor diffcolors 0 $top.diffold "diff old lines" \
10136 [list $ctext tag conf d0 -foreground]]
10137 grid x $top.diffoldbut $top.diffold -sticky w
10138 label $top.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1]
10139 button $top.diffnewbut -text [mc "Diff: new lines"] -font optionfont \
10140 -command [list choosecolor diffcolors 1 $top.diffnew "diff new lines" \
10141 [list $ctext tag conf dresult -foreground]]
10142 grid x $top.diffnewbut $top.diffnew -sticky w
10143 label $top.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2]
10144 button $top.hunksepbut -text [mc "Diff: hunk header"] -font optionfont \
10145 -command [list choosecolor diffcolors 2 $top.hunksep \
10146 "diff hunk header" \
10147 [list $ctext tag conf hunksep -foreground]]
10148 grid x $top.hunksepbut $top.hunksep -sticky w
10149 label $top.markbgsep -padx 40 -relief sunk -background $markbgcolor
10150 button $top.markbgbut -text [mc "Marked line bg"] -font optionfont \
10151 -command [list choosecolor markbgcolor {} $top.markbgsep \
10152 [mc "marked line background"] \
10153 [list $ctext tag conf omark -background]]
10154 grid x $top.markbgbut $top.markbgsep -sticky w
10155 label $top.selbgsep -padx 40 -relief sunk -background $selectbgcolor
10156 button $top.selbgbut -text [mc "Select bg"] -font optionfont \
10157 -command [list choosecolor selectbgcolor {} $top.selbgsep background setselbg]
10158 grid x $top.selbgbut $top.selbgsep -sticky w
10160 label $top.cfont -text [mc "Fonts: press to choose"]
10161 grid $top.cfont - -sticky w -pady 10
10162 mkfontdisp mainfont $top [mc "Main font"]
10163 mkfontdisp textfont $top [mc "Diff display font"]
10164 mkfontdisp uifont $top [mc "User interface font"]
10167 button $top.buts.ok -text [mc "OK"] -command prefsok -default active
10168 button $top.buts.can -text [mc "Cancel"] -command prefscan -default normal
10169 bind $top <Key-Return> prefsok
10170 bind $top <Key-Escape> prefscan
10171 grid $top.buts.ok $top.buts.can
10172 grid columnconfigure $top.buts 0 -weight 1 -uniform a
10173 grid columnconfigure $top.buts 1 -weight 1 -uniform a
10174 grid $top.buts - - -pady 10 -sticky ew
10175 bind $top <Visibility> "focus $top.buts.ok"
10178 proc choose_extdiff {} {
10181 set prog [tk_getOpenFile -title "External diff tool" -multiple false]
10183 set extdifftool $prog
10187 proc choosecolor {v vi w x cmd} {
10190 set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \
10191 -title [mc "Gitk: choose color for %s" $x]]
10192 if {$c eq {}} return
10193 $w conf -background $c
10198 proc setselbg {c} {
10199 global bglist cflist
10200 foreach w $bglist {
10201 $w configure -selectbackground $c
10203 $cflist tag configure highlight \
10204 -background [$cflist cget -selectbackground]
10205 allcanvs itemconf secsel -fill $c
10211 foreach w $bglist {
10212 $w conf -background $c
10219 foreach w $fglist {
10220 $w conf -foreground $c
10222 allcanvs itemconf text -fill $c
10223 $canv itemconf circle -outline $c
10227 global oldprefs prefstop
10229 foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
10230 limitdiffs tabstop perfile_attrs} {
10232 set $v $oldprefs($v)
10234 catch {destroy $prefstop}
10240 global maxwidth maxgraphpct
10241 global oldprefs prefstop showneartags showlocalchanges
10242 global fontpref mainfont textfont uifont
10243 global limitdiffs treediffs perfile_attrs
10245 catch {destroy $prefstop}
10249 if {$mainfont ne $fontpref(mainfont)} {
10250 set mainfont $fontpref(mainfont)
10251 parsefont mainfont $mainfont
10252 eval font configure mainfont [fontflags mainfont]
10253 eval font configure mainfontbold [fontflags mainfont 1]
10257 if {$textfont ne $fontpref(textfont)} {
10258 set textfont $fontpref(textfont)
10259 parsefont textfont $textfont
10260 eval font configure textfont [fontflags textfont]
10261 eval font configure textfontbold [fontflags textfont 1]
10263 if {$uifont ne $fontpref(uifont)} {
10264 set uifont $fontpref(uifont)
10265 parsefont uifont $uifont
10266 eval font configure uifont [fontflags uifont]
10269 if {$showlocalchanges != $oldprefs(showlocalchanges)} {
10270 if {$showlocalchanges} {
10276 if {$limitdiffs != $oldprefs(limitdiffs) ||
10277 ($perfile_attrs && !$oldprefs(perfile_attrs))} {
10278 # treediffs elements are limited by path;
10279 # won't have encodings cached if perfile_attrs was just turned on
10280 catch {unset treediffs}
10282 if {$fontchanged || $maxwidth != $oldprefs(maxwidth)
10283 || $maxgraphpct != $oldprefs(maxgraphpct)} {
10285 } elseif {$showneartags != $oldprefs(showneartags) ||
10286 $limitdiffs != $oldprefs(limitdiffs)} {
10291 proc formatdate {d} {
10292 global datetimeformat
10294 set d [clock format $d -format $datetimeformat]
10299 # This list of encoding names and aliases is distilled from
10300 # http://www.iana.org/assignments/character-sets.
10301 # Not all of them are supported by Tcl.
10302 set encoding_aliases {
10303 { ANSI_X3.4-1968 iso-ir-6 ANSI_X3.4-1986 ISO_646.irv:1991 ASCII
10304 ISO646-US US-ASCII us IBM367 cp367 csASCII }
10305 { ISO-10646-UTF-1 csISO10646UTF1 }
10306 { ISO_646.basic:1983 ref csISO646basic1983 }
10307 { INVARIANT csINVARIANT }
10308 { ISO_646.irv:1983 iso-ir-2 irv csISO2IntlRefVersion }
10309 { BS_4730 iso-ir-4 ISO646-GB gb uk csISO4UnitedKingdom }
10310 { NATS-SEFI iso-ir-8-1 csNATSSEFI }
10311 { NATS-SEFI-ADD iso-ir-8-2 csNATSSEFIADD }
10312 { NATS-DANO iso-ir-9-1 csNATSDANO }
10313 { NATS-DANO-ADD iso-ir-9-2 csNATSDANOADD }
10314 { SEN_850200_B iso-ir-10 FI ISO646-FI ISO646-SE se csISO10Swedish }
10315 { SEN_850200_C iso-ir-11 ISO646-SE2 se2 csISO11SwedishForNames }
10316 { KS_C_5601-1987 iso-ir-149 KS_C_5601-1989 KSC_5601 korean csKSC56011987 }
10317 { ISO-2022-KR csISO2022KR }
10319 { ISO-2022-JP csISO2022JP }
10320 { ISO-2022-JP-2 csISO2022JP2 }
10321 { JIS_C6220-1969-jp JIS_C6220-1969 iso-ir-13 katakana x0201-7
10322 csISO13JISC6220jp }
10323 { JIS_C6220-1969-ro iso-ir-14 jp ISO646-JP csISO14JISC6220ro }
10324 { IT iso-ir-15 ISO646-IT csISO15Italian }
10325 { PT iso-ir-16 ISO646-PT csISO16Portuguese }
10326 { ES iso-ir-17 ISO646-ES csISO17Spanish }
10327 { greek7-old iso-ir-18 csISO18Greek7Old }
10328 { latin-greek iso-ir-19 csISO19LatinGreek }
10329 { DIN_66003 iso-ir-21 de ISO646-DE csISO21German }
10330 { NF_Z_62-010_(1973) iso-ir-25 ISO646-FR1 csISO25French }
10331 { Latin-greek-1 iso-ir-27 csISO27LatinGreek1 }
10332 { ISO_5427 iso-ir-37 csISO5427Cyrillic }
10333 { JIS_C6226-1978 iso-ir-42 csISO42JISC62261978 }
10334 { BS_viewdata iso-ir-47 csISO47BSViewdata }
10335 { INIS iso-ir-49 csISO49INIS }
10336 { INIS-8 iso-ir-50 csISO50INIS8 }
10337 { INIS-cyrillic iso-ir-51 csISO51INISCyrillic }
10338 { ISO_5427:1981 iso-ir-54 ISO5427Cyrillic1981 }
10339 { ISO_5428:1980 iso-ir-55 csISO5428Greek }
10340 { GB_1988-80 iso-ir-57 cn ISO646-CN csISO57GB1988 }
10341 { GB_2312-80 iso-ir-58 chinese csISO58GB231280 }
10342 { NS_4551-1 iso-ir-60 ISO646-NO no csISO60DanishNorwegian
10343 csISO60Norwegian1 }
10344 { NS_4551-2 ISO646-NO2 iso-ir-61 no2 csISO61Norwegian2 }
10345 { NF_Z_62-010 iso-ir-69 ISO646-FR fr csISO69French }
10346 { videotex-suppl iso-ir-70 csISO70VideotexSupp1 }
10347 { PT2 iso-ir-84 ISO646-PT2 csISO84Portuguese2 }
10348 { ES2 iso-ir-85 ISO646-ES2 csISO85Spanish2 }
10349 { MSZ_7795.3 iso-ir-86 ISO646-HU hu csISO86Hungarian }
10350 { JIS_C6226-1983 iso-ir-87 x0208 JIS_X0208-1983 csISO87JISX0208 }
10351 { greek7 iso-ir-88 csISO88Greek7 }
10352 { ASMO_449 ISO_9036 arabic7 iso-ir-89 csISO89ASMO449 }
10353 { iso-ir-90 csISO90 }
10354 { JIS_C6229-1984-a iso-ir-91 jp-ocr-a csISO91JISC62291984a }
10355 { JIS_C6229-1984-b iso-ir-92 ISO646-JP-OCR-B jp-ocr-b
10356 csISO92JISC62991984b }
10357 { JIS_C6229-1984-b-add iso-ir-93 jp-ocr-b-add csISO93JIS62291984badd }
10358 { JIS_C6229-1984-hand iso-ir-94 jp-ocr-hand csISO94JIS62291984hand }
10359 { JIS_C6229-1984-hand-add iso-ir-95 jp-ocr-hand-add
10360 csISO95JIS62291984handadd }
10361 { JIS_C6229-1984-kana iso-ir-96 csISO96JISC62291984kana }
10362 { ISO_2033-1983 iso-ir-98 e13b csISO2033 }
10363 { ANSI_X3.110-1983 iso-ir-99 CSA_T500-1983 NAPLPS csISO99NAPLPS }
10364 { ISO_8859-1:1987 iso-ir-100 ISO_8859-1 ISO-8859-1 latin1 l1 IBM819
10365 CP819 csISOLatin1 }
10366 { ISO_8859-2:1987 iso-ir-101 ISO_8859-2 ISO-8859-2 latin2 l2 csISOLatin2 }
10367 { T.61-7bit iso-ir-102 csISO102T617bit }
10368 { T.61-8bit T.61 iso-ir-103 csISO103T618bit }
10369 { ISO_8859-3:1988 iso-ir-109 ISO_8859-3 ISO-8859-3 latin3 l3 csISOLatin3 }
10370 { ISO_8859-4:1988 iso-ir-110 ISO_8859-4 ISO-8859-4 latin4 l4 csISOLatin4 }
10371 { ECMA-cyrillic iso-ir-111 KOI8-E csISO111ECMACyrillic }
10372 { CSA_Z243.4-1985-1 iso-ir-121 ISO646-CA csa7-1 ca csISO121Canadian1 }
10373 { CSA_Z243.4-1985-2 iso-ir-122 ISO646-CA2 csa7-2 csISO122Canadian2 }
10374 { CSA_Z243.4-1985-gr iso-ir-123 csISO123CSAZ24341985gr }
10375 { ISO_8859-6:1987 iso-ir-127 ISO_8859-6 ISO-8859-6 ECMA-114 ASMO-708
10376 arabic csISOLatinArabic }
10377 { ISO_8859-6-E csISO88596E ISO-8859-6-E }
10378 { ISO_8859-6-I csISO88596I ISO-8859-6-I }
10379 { ISO_8859-7:1987 iso-ir-126 ISO_8859-7 ISO-8859-7 ELOT_928 ECMA-118
10380 greek greek8 csISOLatinGreek }
10381 { T.101-G2 iso-ir-128 csISO128T101G2 }
10382 { ISO_8859-8:1988 iso-ir-138 ISO_8859-8 ISO-8859-8 hebrew
10384 { ISO_8859-8-E csISO88598E ISO-8859-8-E }
10385 { ISO_8859-8-I csISO88598I ISO-8859-8-I }
10386 { CSN_369103 iso-ir-139 csISO139CSN369103 }
10387 { JUS_I.B1.002 iso-ir-141 ISO646-YU js yu csISO141JUSIB1002 }
10388 { ISO_6937-2-add iso-ir-142 csISOTextComm }
10389 { IEC_P27-1 iso-ir-143 csISO143IECP271 }
10390 { ISO_8859-5:1988 iso-ir-144 ISO_8859-5 ISO-8859-5 cyrillic
10391 csISOLatinCyrillic }
10392 { JUS_I.B1.003-serb iso-ir-146 serbian csISO146Serbian }
10393 { JUS_I.B1.003-mac macedonian iso-ir-147 csISO147Macedonian }
10394 { ISO_8859-9:1989 iso-ir-148 ISO_8859-9 ISO-8859-9 latin5 l5 csISOLatin5 }
10395 { greek-ccitt iso-ir-150 csISO150 csISO150GreekCCITT }
10396 { NC_NC00-10:81 cuba iso-ir-151 ISO646-CU csISO151Cuba }
10397 { ISO_6937-2-25 iso-ir-152 csISO6937Add }
10398 { GOST_19768-74 ST_SEV_358-88 iso-ir-153 csISO153GOST1976874 }
10399 { ISO_8859-supp iso-ir-154 latin1-2-5 csISO8859Supp }
10400 { ISO_10367-box iso-ir-155 csISO10367Box }
10401 { ISO-8859-10 iso-ir-157 l6 ISO_8859-10:1992 csISOLatin6 latin6 }
10402 { latin-lap lap iso-ir-158 csISO158Lap }
10403 { JIS_X0212-1990 x0212 iso-ir-159 csISO159JISX02121990 }
10404 { DS_2089 DS2089 ISO646-DK dk csISO646Danish }
10407 { JIS_X0201 X0201 csHalfWidthKatakana }
10408 { KSC5636 ISO646-KR csKSC5636 }
10409 { ISO-10646-UCS-2 csUnicode }
10410 { ISO-10646-UCS-4 csUCS4 }
10411 { DEC-MCS dec csDECMCS }
10412 { hp-roman8 roman8 r8 csHPRoman8 }
10413 { macintosh mac csMacintosh }
10414 { IBM037 cp037 ebcdic-cp-us ebcdic-cp-ca ebcdic-cp-wt ebcdic-cp-nl
10416 { IBM038 EBCDIC-INT cp038 csIBM038 }
10417 { IBM273 CP273 csIBM273 }
10418 { IBM274 EBCDIC-BE CP274 csIBM274 }
10419 { IBM275 EBCDIC-BR cp275 csIBM275 }
10420 { IBM277 EBCDIC-CP-DK EBCDIC-CP-NO csIBM277 }
10421 { IBM278 CP278 ebcdic-cp-fi ebcdic-cp-se csIBM278 }
10422 { IBM280 CP280 ebcdic-cp-it csIBM280 }
10423 { IBM281 EBCDIC-JP-E cp281 csIBM281 }
10424 { IBM284 CP284 ebcdic-cp-es csIBM284 }
10425 { IBM285 CP285 ebcdic-cp-gb csIBM285 }
10426 { IBM290 cp290 EBCDIC-JP-kana csIBM290 }
10427 { IBM297 cp297 ebcdic-cp-fr csIBM297 }
10428 { IBM420 cp420 ebcdic-cp-ar1 csIBM420 }
10429 { IBM423 cp423 ebcdic-cp-gr csIBM423 }
10430 { IBM424 cp424 ebcdic-cp-he csIBM424 }
10431 { IBM437 cp437 437 csPC8CodePage437 }
10432 { IBM500 CP500 ebcdic-cp-be ebcdic-cp-ch csIBM500 }
10433 { IBM775 cp775 csPC775Baltic }
10434 { IBM850 cp850 850 csPC850Multilingual }
10435 { IBM851 cp851 851 csIBM851 }
10436 { IBM852 cp852 852 csPCp852 }
10437 { IBM855 cp855 855 csIBM855 }
10438 { IBM857 cp857 857 csIBM857 }
10439 { IBM860 cp860 860 csIBM860 }
10440 { IBM861 cp861 861 cp-is csIBM861 }
10441 { IBM862 cp862 862 csPC862LatinHebrew }
10442 { IBM863 cp863 863 csIBM863 }
10443 { IBM864 cp864 csIBM864 }
10444 { IBM865 cp865 865 csIBM865 }
10445 { IBM866 cp866 866 csIBM866 }
10446 { IBM868 CP868 cp-ar csIBM868 }
10447 { IBM869 cp869 869 cp-gr csIBM869 }
10448 { IBM870 CP870 ebcdic-cp-roece ebcdic-cp-yu csIBM870 }
10449 { IBM871 CP871 ebcdic-cp-is csIBM871 }
10450 { IBM880 cp880 EBCDIC-Cyrillic csIBM880 }
10451 { IBM891 cp891 csIBM891 }
10452 { IBM903 cp903 csIBM903 }
10453 { IBM904 cp904 904 csIBBM904 }
10454 { IBM905 CP905 ebcdic-cp-tr csIBM905 }
10455 { IBM918 CP918 ebcdic-cp-ar2 csIBM918 }
10456 { IBM1026 CP1026 csIBM1026 }
10457 { EBCDIC-AT-DE csIBMEBCDICATDE }
10458 { EBCDIC-AT-DE-A csEBCDICATDEA }
10459 { EBCDIC-CA-FR csEBCDICCAFR }
10460 { EBCDIC-DK-NO csEBCDICDKNO }
10461 { EBCDIC-DK-NO-A csEBCDICDKNOA }
10462 { EBCDIC-FI-SE csEBCDICFISE }
10463 { EBCDIC-FI-SE-A csEBCDICFISEA }
10464 { EBCDIC-FR csEBCDICFR }
10465 { EBCDIC-IT csEBCDICIT }
10466 { EBCDIC-PT csEBCDICPT }
10467 { EBCDIC-ES csEBCDICES }
10468 { EBCDIC-ES-A csEBCDICESA }
10469 { EBCDIC-ES-S csEBCDICESS }
10470 { EBCDIC-UK csEBCDICUK }
10471 { EBCDIC-US csEBCDICUS }
10472 { UNKNOWN-8BIT csUnknown8BiT }
10473 { MNEMONIC csMnemonic }
10475 { VISCII csVISCII }
10478 { IBM00858 CCSID00858 CP00858 PC-Multilingual-850+euro }
10479 { IBM00924 CCSID00924 CP00924 ebcdic-Latin9--euro }
10480 { IBM01140 CCSID01140 CP01140 ebcdic-us-37+euro }
10481 { IBM01141 CCSID01141 CP01141 ebcdic-de-273+euro }
10482 { IBM01142 CCSID01142 CP01142 ebcdic-dk-277+euro ebcdic-no-277+euro }
10483 { IBM01143 CCSID01143 CP01143 ebcdic-fi-278+euro ebcdic-se-278+euro }
10484 { IBM01144 CCSID01144 CP01144 ebcdic-it-280+euro }
10485 { IBM01145 CCSID01145 CP01145 ebcdic-es-284+euro }
10486 { IBM01146 CCSID01146 CP01146 ebcdic-gb-285+euro }
10487 { IBM01147 CCSID01147 CP01147 ebcdic-fr-297+euro }
10488 { IBM01148 CCSID01148 CP01148 ebcdic-international-500+euro }
10489 { IBM01149 CCSID01149 CP01149 ebcdic-is-871+euro }
10490 { IBM1047 IBM-1047 }
10491 { PTCP154 csPTCP154 PT154 CP154 Cyrillic-Asian }
10492 { Amiga-1251 Ami1251 Amiga1251 Ami-1251 }
10493 { UNICODE-1-1 csUnicode11 }
10494 { CESU-8 csCESU-8 }
10495 { BOCU-1 csBOCU-1 }
10496 { UNICODE-1-1-UTF-7 csUnicode11UTF7 }
10497 { ISO-8859-14 iso-ir-199 ISO_8859-14:1998 ISO_8859-14 latin8 iso-celtic
10499 { ISO-8859-15 ISO_8859-15 Latin-9 }
10500 { ISO-8859-16 iso-ir-226 ISO_8859-16:2001 ISO_8859-16 latin10 l10 }
10501 { GBK CP936 MS936 windows-936 }
10502 { JIS_Encoding csJISEncoding }
10503 { Shift_JIS MS_Kanji csShiftJIS ShiftJIS Shift-JIS }
10504 { Extended_UNIX_Code_Packed_Format_for_Japanese csEUCPkdFmtJapanese
10506 { Extended_UNIX_Code_Fixed_Width_for_Japanese csEUCFixWidJapanese }
10507 { ISO-10646-UCS-Basic csUnicodeASCII }
10508 { ISO-10646-Unicode-Latin1 csUnicodeLatin1 ISO-10646 }
10509 { ISO-Unicode-IBM-1261 csUnicodeIBM1261 }
10510 { ISO-Unicode-IBM-1268 csUnicodeIBM1268 }
10511 { ISO-Unicode-IBM-1276 csUnicodeIBM1276 }
10512 { ISO-Unicode-IBM-1264 csUnicodeIBM1264 }
10513 { ISO-Unicode-IBM-1265 csUnicodeIBM1265 }
10514 { ISO-8859-1-Windows-3.0-Latin-1 csWindows30Latin1 }
10515 { ISO-8859-1-Windows-3.1-Latin-1 csWindows31Latin1 }
10516 { ISO-8859-2-Windows-Latin-2 csWindows31Latin2 }
10517 { ISO-8859-9-Windows-Latin-5 csWindows31Latin5 }
10518 { Adobe-Standard-Encoding csAdobeStandardEncoding }
10519 { Ventura-US csVenturaUS }
10520 { Ventura-International csVenturaInternational }
10521 { PC8-Danish-Norwegian csPC8DanishNorwegian }
10522 { PC8-Turkish csPC8Turkish }
10523 { IBM-Symbols csIBMSymbols }
10524 { IBM-Thai csIBMThai }
10525 { HP-Legal csHPLegal }
10526 { HP-Pi-font csHPPiFont }
10527 { HP-Math8 csHPMath8 }
10528 { Adobe-Symbol-Encoding csHPPSMath }
10529 { HP-DeskTop csHPDesktop }
10530 { Ventura-Math csVenturaMath }
10531 { Microsoft-Publishing csMicrosoftPublishing }
10532 { Windows-31J csWindows31J }
10533 { GB2312 csGB2312 }
10537 proc tcl_encoding {enc} {
10538 global encoding_aliases tcl_encoding_cache
10539 if {[info exists tcl_encoding_cache($enc)]} {
10540 return $tcl_encoding_cache($enc)
10542 set names [encoding names]
10543 set lcnames [string tolower $names]
10544 set enc [string tolower $enc]
10545 set i [lsearch -exact $lcnames $enc]
10547 # look for "isonnn" instead of "iso-nnn" or "iso_nnn"
10548 if {[regsub {^(iso|cp|ibm|jis)[-_]} $enc {\1} encx]} {
10549 set i [lsearch -exact $lcnames $encx]
10553 foreach l $encoding_aliases {
10554 set ll [string tolower $l]
10555 if {[lsearch -exact $ll $enc] < 0} continue
10556 # look through the aliases for one that tcl knows about
10558 set i [lsearch -exact $lcnames $e]
10560 if {[regsub {^(iso|cp|ibm|jis)[-_]} $e {\1} ex]} {
10561 set i [lsearch -exact $lcnames $ex]
10571 set tclenc [lindex $names $i]
10573 set tcl_encoding_cache($enc) $tclenc
10577 proc gitattr {path attr default} {
10578 global path_attr_cache
10579 if {[info exists path_attr_cache($attr,$path)]} {
10580 set r $path_attr_cache($attr,$path)
10582 set r "unspecified"
10583 if {![catch {set line [exec git check-attr $attr -- $path]}]} {
10584 regexp "(.*): encoding: (.*)" $line m f r
10586 set path_attr_cache($attr,$path) $r
10588 if {$r eq "unspecified"} {
10594 proc cache_gitattr {attr pathlist} {
10595 global path_attr_cache
10597 foreach path $pathlist {
10598 if {![info exists path_attr_cache($attr,$path)]} {
10599 lappend newlist $path
10603 if {[tk windowingsystem] == "win32"} {
10604 # windows has a 32k limit on the arguments to a command...
10607 while {$newlist ne {}} {
10608 set head [lrange $newlist 0 [expr {$lim - 1}]]
10609 set newlist [lrange $newlist $lim end]
10610 if {![catch {set rlist [eval exec git check-attr $attr -- $head]}]} {
10611 foreach row [split $rlist "\n"] {
10612 if {[regexp "(.*): encoding: (.*)" $row m path value]} {
10613 if {[string index $path 0] eq "\""} {
10614 set path [encoding convertfrom [lindex $path 0]]
10616 set path_attr_cache($attr,$path) $value
10623 proc get_path_encoding {path} {
10624 global gui_encoding perfile_attrs
10625 set tcl_enc $gui_encoding
10626 if {$path ne {} && $perfile_attrs} {
10627 set enc2 [tcl_encoding [gitattr $path encoding $tcl_enc]]
10635 # First check that Tcl/Tk is recent enough
10636 if {[catch {package require Tk 8.4} err]} {
10637 show_error {} . [mc "Sorry, gitk cannot run with this version of Tcl/Tk.\n\
10638 Gitk requires at least Tcl/Tk 8.4."]
10643 set wrcomcmd "git diff-tree --stdin -p --pretty"
10647 set gitencoding [exec git config --get i18n.commitencoding]
10650 set gitencoding [exec git config --get i18n.logoutputencoding]
10652 if {$gitencoding == ""} {
10653 set gitencoding "utf-8"
10655 set tclencoding [tcl_encoding $gitencoding]
10656 if {$tclencoding == {}} {
10657 puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
10660 set gui_encoding [encoding system]
10662 set enc [exec git config --get gui.encoding]
10664 set tclenc [tcl_encoding $enc]
10665 if {$tclenc ne {}} {
10666 set gui_encoding $tclenc
10668 puts stderr "Warning: encoding $enc is not supported by Tcl/Tk"
10673 set mainfont {Helvetica 9}
10674 set textfont {Courier 9}
10675 set uifont {Helvetica 9 bold}
10677 set findmergefiles 0
10685 set cmitmode "patch"
10686 set wrapcomment "none"
10690 set showlocalchanges 1
10692 set datetimeformat "%Y-%m-%d %H:%M:%S"
10694 set perfile_attrs 0
10696 set extdifftool "meld"
10698 set colors {green red blue magenta darkgrey brown orange}
10701 set diffcolors {red "#00a000" blue}
10704 set selectbgcolor gray85
10705 set markbgcolor "#e0e0ff"
10707 set circlecolors {white blue gray blue blue}
10709 # button for popping up context menus
10710 if {[tk windowingsystem] eq "aqua"} {
10711 set ctxbut <Button-2>
10713 set ctxbut <Button-3>
10716 ## For msgcat loading, first locate the installation location.
10717 if { [info exists ::env(GITK_MSGSDIR)] } {
10718 ## Msgsdir was manually set in the environment.
10719 set gitk_msgsdir $::env(GITK_MSGSDIR)
10721 ## Let's guess the prefix from argv0.
10722 set gitk_prefix [file dirname [file dirname [file normalize $argv0]]]
10723 set gitk_libdir [file join $gitk_prefix share gitk lib]
10724 set gitk_msgsdir [file join $gitk_libdir msgs]
10728 ## Internationalization (i18n) through msgcat and gettext. See
10729 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
10730 package require msgcat
10731 namespace import ::msgcat::mc
10732 ## And eventually load the actual message catalog
10733 ::msgcat::mcload $gitk_msgsdir
10735 catch {source ~/.gitk}
10737 font create optionfont -family sans-serif -size -12
10739 parsefont mainfont $mainfont
10740 eval font create mainfont [fontflags mainfont]
10741 eval font create mainfontbold [fontflags mainfont 1]
10743 parsefont textfont $textfont
10744 eval font create textfont [fontflags textfont]
10745 eval font create textfontbold [fontflags textfont 1]
10747 parsefont uifont $uifont
10748 eval font create uifont [fontflags uifont]
10752 # check that we can find a .git directory somewhere...
10753 if {[catch {set gitdir [gitdir]}]} {
10754 show_error {} . [mc "Cannot find a git repository here."]
10757 if {![file isdirectory $gitdir]} {
10758 show_error {} . [mc "Cannot find the git directory \"%s\"." $gitdir]
10763 set selectheadid {}
10766 set cmdline_files {}
10768 set revtreeargscmd {}
10769 foreach arg $argv {
10770 switch -glob -- $arg {
10773 set cmdline_files [lrange $argv [expr {$i + 1}] end]
10776 "--select-commit=*" {
10777 set selecthead [string range $arg 16 end]
10780 set revtreeargscmd [string range $arg 10 end]
10783 lappend revtreeargs $arg
10789 if {$selecthead eq "HEAD"} {
10793 if {$i >= [llength $argv] && $revtreeargs ne {}} {
10794 # no -- on command line, but some arguments (other than --argscmd)
10796 set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs]
10797 set cmdline_files [split $f "\n"]
10798 set n [llength $cmdline_files]
10799 set revtreeargs [lrange $revtreeargs 0 end-$n]
10800 # Unfortunately git rev-parse doesn't produce an error when
10801 # something is both a revision and a filename. To be consistent
10802 # with git log and git rev-list, check revtreeargs for filenames.
10803 foreach arg $revtreeargs {
10804 if {[file exists $arg]} {
10805 show_error {} . [mc "Ambiguous argument '%s': both revision\
10806 and filename" $arg]
10811 # unfortunately we get both stdout and stderr in $err,
10812 # so look for "fatal:".
10813 set i [string first "fatal:" $err]
10815 set err [string range $err [expr {$i + 6}] end]
10817 show_error {} . "[mc "Bad arguments to gitk:"]\n$err"
10822 set nullid "0000000000000000000000000000000000000000"
10823 set nullid2 "0000000000000000000000000000000000000001"
10824 set nullfile "/dev/null"
10826 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
10833 set highlight_paths {}
10835 set searchdirn -forwards
10838 set diffelide {0 0}
10839 set markingmatches 0
10840 set linkentercount 0
10841 set need_redisplay 0
10848 set selectedhlview [mc "None"]
10849 set highlight_related [mc "None"]
10850 set highlight_files {}
10851 set viewfiles(0) {}
10854 set viewargscmd(0) {}
10856 set selectedline {}
10864 set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}]
10867 # wait for the window to become visible
10868 tkwait visibility .
10869 wm title . "[file tail $argv0]: [file tail [pwd]]"
10872 if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} {
10873 # create a view for the files/dirs specified on the command line
10877 set viewname(1) [mc "Command line"]
10878 set viewfiles(1) $cmdline_files
10879 set viewargs(1) $revtreeargs
10880 set viewargscmd(1) $revtreeargscmd
10884 .bar.view entryconf [mca "Edit view..."] -state normal
10885 .bar.view entryconf [mca "Delete view"] -state normal
10888 if {[info exists permviews]} {
10889 foreach v $permviews {
10892 set viewname($n) [lindex $v 0]
10893 set viewfiles($n) [lindex $v 1]
10894 set viewargs($n) [lindex $v 2]
10895 set viewargscmd($n) [lindex $v 3]