2 # Tcl ignores the next line -*- tcl -*- \
5 # Copyright © 2005-2014 Paul Mackerras. All rights reserved.
6 # This program is free software; it may be used, copied, modified
7 # and distributed under the terms of the GNU General Public Licence,
8 # either version 2, or (at your option) any later version.
13 return [expr {[exec git rev-parse
--is-bare-repository] == "false" &&
14 [exec git rev-parse
--is-inside-git-dir] == "false"}]
19 set n
[file normalize
$gitdir]
20 if {[string match
"*/.git" $n]} {
21 set n
[string range
$n 0 end-5
]
28 if {[info exists _gitworktree
]} {
31 # v1.7.0 introduced --show-toplevel to return the canonical work-tree
32 if {[catch
{set _gitworktree
[exec git rev-parse
--show-toplevel]}]} {
33 # try to set work tree from environment, core.worktree or use
34 # cdup to obtain a relative path to the top of the worktree. If
35 # run from the top, the ./ prefix ensures normalize expands pwd.
36 if {[catch
{ set _gitworktree
$env(GIT_WORK_TREE
) }]} {
37 catch
{set _gitworktree
[exec git config
--get core.worktree
]}
38 if {$_gitworktree eq
""} {
39 set _gitworktree
[file normalize .
/[exec git rev-parse
--show-cdup]]
46 # A simple scheduler for compute-intensive stuff.
47 # The aim is to make sure that event handlers for GUI actions can
48 # run at least every 50-100 ms. Unfortunately fileevent handlers are
49 # run before X event handlers, so reading from a fast source can
50 # make the GUI completely unresponsive.
52 global isonrunq runq currunq
55 if {[info exists isonrunq
($script)]} return
56 if {$runq eq
{} && ![info exists currunq
]} {
59 lappend runq
[list
{} $script]
60 set isonrunq
($script) 1
63 proc filerun
{fd
script} {
64 fileevent
$fd readable
[list filereadable
$fd $script]
67 proc filereadable
{fd
script} {
70 fileevent
$fd readable
{}
71 if {$runq eq
{} && ![info exists currunq
]} {
74 lappend runq
[list
$fd $script]
80 for {set i
0} {$i < [llength
$runq]} {} {
81 if {[lindex
$runq $i 0] eq
$fd} {
82 set runq
[lreplace
$runq $i $i]
90 global isonrunq runq currunq
92 set tstart
[clock clicks
-milliseconds]
94 while {[llength
$runq] > 0} {
95 set fd
[lindex
$runq 0 0]
96 set script [lindex
$runq 0 1]
97 set currunq
[lindex
$runq 0]
98 set runq
[lrange
$runq 1 end
]
99 set repeat
[eval $script]
101 set t1
[clock clicks
-milliseconds]
102 set t
[expr {$t1 - $t0}]
103 if {$repeat ne
{} && $repeat} {
104 if {$fd eq
{} ||
$repeat == 2} {
105 # script returns 1 if it wants to be readded
106 # file readers return 2 if they could do more straight away
107 lappend runq
[list
$fd $script]
109 fileevent
$fd readable
[list filereadable
$fd $script]
111 } elseif
{$fd eq
{}} {
112 unset isonrunq
($script)
115 if {$t1 - $tstart >= 80} break
122 proc reg_instance
{fd
} {
123 global commfd leftover loginstance
125 set i
[incr loginstance
]
131 proc unmerged_files
{files
} {
134 # find the list of unmerged files
138 set fd
[open
"| git ls-files -u" r
]
140 show_error
{} .
"[mc "Couldn
't get list of unmerged files:"] $err"
143 while {[gets $fd line] >= 0} {
144 set i [string first "\t" $line]
146 set fname [string range $line [expr {$i+1}] end]
147 if {[lsearch -exact $mlist $fname] >= 0} continue
149 if {$files eq {} || [path_filter $files $fname]} {
157 proc parseviewargs {n arglist} {
158 global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs env
160 global worddiff git_version
164 set vinlinediff($n) 0
169 set origargs $arglist
173 foreach arg $arglist {
180 switch -glob -- $arg {
184 # remove from origargs in case we hit an unknown option
185 set origargs [lreplace $origargs $i $i]
189 "--no-renames" - "--full-index" - "--binary" - "--abbrev=*" -
190 "--find-copies-harder" - "-l*" - "--ext-diff" - "--no-ext-diff" -
191 "--src-prefix=*" - "--dst-prefix=*" - "--no-prefix" -
192 "-O*" - "--text" - "--full-diff" - "--ignore-space-at-eol" -
193 "--ignore-space-change" - "-U*" - "--unified=*" {
194 # These request or affect diff output, which we don't want.
195 # Some could be used to set our defaults for diff display.
196 lappend diffargs
$arg
198 "--raw" - "--patch-with-raw" - "--patch-with-stat" -
199 "--name-only" - "--name-status" - "--color" -
200 "--log-size" - "--pretty=*" - "--decorate" - "--abbrev-commit" -
201 "--cc" - "-z" - "--header" - "--parents" - "--boundary" -
202 "--no-color" - "-g" - "--walk-reflogs" - "--no-walk" -
203 "--timestamp" - "relative-date" - "--date=*" - "--stdin" -
204 "--objects" - "--objects-edge" - "--reverse" {
205 # These cause our parsing of git log's output to fail, or else
206 # they're options we want to set ourselves, so ignore them.
208 "--color-words*" - "--word-diff=color" {
209 # These trigger a word diff in the console interface,
210 # so help the user by enabling our own support
211 if {[package vcompare
$git_version "1.7.2"] >= 0} {
212 set worddiff
[mc
"Color words"]
216 if {[package vcompare
$git_version "1.7.2"] >= 0} {
217 set worddiff
[mc
"Markup words"]
220 "--stat=*" - "--numstat" - "--shortstat" - "--summary" -
221 "--check" - "--exit-code" - "--quiet" - "--topo-order" -
222 "--full-history" - "--dense" - "--sparse" -
223 "--follow" - "--left-right" - "--encoding=*" {
224 # These are harmless, and some are even useful
227 "--diff-filter=*" - "--no-merges" - "--unpacked" -
228 "--max-count=*" - "--skip=*" - "--since=*" - "--after=*" -
229 "--until=*" - "--before=*" - "--max-age=*" - "--min-age=*" -
230 "--author=*" - "--committer=*" - "--grep=*" - "-[iE]" -
231 "--remove-empty" - "--first-parent" - "--cherry-pick" -
232 "-S*" - "-G*" - "--pickaxe-all" - "--pickaxe-regex" -
233 "--simplify-by-decoration" {
234 # These mean that we get a subset of the commits
239 # Line-log with 'stuck' argument (unstuck form is
242 set vinlinediff
($n) 1
247 # This appears to be the only one that has a value as a
248 # separate word following it
258 # git rev-parse doesn't understand --merge
259 lappend revargs
--gitk-symmetric-diff-marker MERGE_HEAD...HEAD
261 "--no-replace-objects" {
262 set env
(GIT_NO_REPLACE_OBJECTS
) "1"
265 # Other flag arguments including -<n>
266 if {[string is digit
-strict [string range
$arg 1 end
]]} {
269 # a flag argument that we don't recognize;
270 # that means we can't optimize
276 # Non-flag arguments specify commits or ranges of commits
277 if {[string match
"*...*" $arg]} {
278 lappend revargs
--gitk-symmetric-diff-marker
284 set vdflags
($n) $diffargs
285 set vflags
($n) $glflags
286 set vrevs
($n) $revargs
287 set vfiltered
($n) $filtered
288 set vorigargs
($n) $origargs
292 proc parseviewrevs
{view revs
} {
293 global vposids vnegids
298 if {[catch
{set ids
[eval exec git rev-parse
$revs]} err
]} {
299 # we get stdout followed by stderr in $err
300 # for an unknown rev, git rev-parse echoes it and then errors out
301 set errlines
[split $err "\n"]
303 for {set l
0} {$l < [llength
$errlines]} {incr l
} {
304 set line
[lindex
$errlines $l]
305 if {!([string length
$line] == 40 && [string is xdigit
$line])} {
306 if {[string match
"fatal:*" $line]} {
307 if {[string match
"fatal: ambiguous argument*" $line]
309 if {[llength
$badrev] == 1} {
310 set err
"unknown revision $badrev"
312 set err
"unknown revisions: [join $badrev ", "]"
315 set err
[join [lrange
$errlines $l end
] "\n"]
322 error_popup
"[mc "Error parsing revisions
:"] $err"
329 foreach id
[split $ids "\n"] {
330 if {$id eq
"--gitk-symmetric-diff-marker"} {
332 } elseif
{[string match
"^*" $id]} {
339 lappend neg
[string range
$id 1 end
]
344 lset ret end
$id...
[lindex
$ret end
]
350 set vposids
($view) $pos
351 set vnegids
($view) $neg
355 # Start off a git log process and arrange to read its output
356 proc start_rev_list
{view
} {
357 global startmsecs commitidx viewcomplete curview
359 global viewargs viewargscmd viewfiles vfilelimit
360 global showlocalchanges
361 global viewactive viewinstances vmergeonly
362 global mainheadid viewmainheadid viewmainheadid_orig
363 global vcanopt vflags vrevs vorigargs
366 set startmsecs
[clock clicks
-milliseconds]
367 set commitidx
($view) 0
368 # these are set this way for the error exits
369 set viewcomplete
($view) 1
370 set viewactive
($view) 0
373 set args
$viewargs($view)
374 if {$viewargscmd($view) ne
{}} {
376 set str
[exec sh
-c $viewargscmd($view)]
378 error_popup
"[mc "Error executing
--argscmd command:"] $err"
381 set args
[concat
$args [split $str "\n"]]
383 set vcanopt
($view) [parseviewargs
$view $args]
385 set files
$viewfiles($view)
386 if {$vmergeonly($view)} {
387 set files
[unmerged_files
$files]
390 if {$nr_unmerged == 0} {
391 error_popup
[mc
"No files selected: --merge specified but\
392 no files are unmerged."]
394 error_popup
[mc
"No files selected: --merge specified but\
395 no unmerged files are within file limit."]
400 set vfilelimit
($view) $files
402 if {$vcanopt($view)} {
403 set revs
[parseviewrevs
$view $vrevs($view)]
407 set args
[concat
$vflags($view) $revs]
409 set args
$vorigargs($view)
413 set fd
[open
[concat | git log
--no-color -z --pretty=raw
$show_notes \
414 --parents --boundary $args "--" $files] r
]
416 error_popup
"[mc "Error executing git log
:"] $err"
419 set i
[reg_instance
$fd]
420 set viewinstances
($view) [list
$i]
421 set viewmainheadid
($view) $mainheadid
422 set viewmainheadid_orig
($view) $mainheadid
423 if {$files ne
{} && $mainheadid ne
{}} {
424 get_viewmainhead
$view
426 if {$showlocalchanges && $viewmainheadid($view) ne
{}} {
427 interestedin
$viewmainheadid($view) dodiffindex
429 fconfigure
$fd -blocking 0 -translation lf
-eofchar {}
430 if {$tclencoding != {}} {
431 fconfigure
$fd -encoding $tclencoding
433 filerun
$fd [list getcommitlines
$fd $i $view 0]
434 nowbusy
$view [mc
"Reading"]
435 set viewcomplete
($view) 0
436 set viewactive
($view) 1
440 proc stop_instance
{inst
} {
441 global commfd leftover
443 set fd
$commfd($inst)
447 if {$
::tcl_platform
(platform
) eq
{windows
}} {
456 unset leftover
($inst)
459 proc stop_backends
{} {
462 foreach inst
[array names commfd
] {
467 proc stop_rev_list
{view
} {
470 foreach inst
$viewinstances($view) {
473 set viewinstances
($view) {}
476 proc reset_pending_select
{selid
} {
477 global pending_select mainheadid selectheadid
480 set pending_select
$selid
481 } elseif
{$selectheadid ne
{}} {
482 set pending_select
$selectheadid
484 set pending_select
$mainheadid
488 proc getcommits
{selid
} {
489 global canv curview need_redisplay viewactive
492 if {[start_rev_list
$curview]} {
493 reset_pending_select
$selid
494 show_status
[mc
"Reading commits..."]
497 show_status
[mc
"No commits selected"]
501 proc updatecommits
{} {
502 global curview vcanopt vorigargs vfilelimit viewinstances
503 global viewactive viewcomplete tclencoding
504 global startmsecs showneartags showlocalchanges
505 global mainheadid viewmainheadid viewmainheadid_orig pending_select
507 global varcid vposids vnegids vflags vrevs
510 set hasworktree
[hasworktree
]
513 if {$mainheadid ne
$viewmainheadid_orig($view)} {
514 if {$showlocalchanges} {
517 set viewmainheadid
($view) $mainheadid
518 set viewmainheadid_orig
($view) $mainheadid
519 if {$vfilelimit($view) ne
{}} {
520 get_viewmainhead
$view
523 if {$showlocalchanges} {
526 if {$vcanopt($view)} {
527 set oldpos
$vposids($view)
528 set oldneg
$vnegids($view)
529 set revs
[parseviewrevs
$view $vrevs($view)]
533 # note: getting the delta when negative refs change is hard,
534 # and could require multiple git log invocations, so in that
535 # case we ask git log for all the commits (not just the delta)
536 if {$oldneg eq
$vnegids($view)} {
539 # take out positive refs that we asked for before or
540 # that we have already seen
542 if {[string length
$rev] == 40} {
543 if {[lsearch
-exact $oldpos $rev] < 0
544 && ![info exists varcid
($view,$rev)]} {
549 lappend
$newrevs $rev
552 if {$npos == 0} return
554 set vposids
($view) [lsort
-unique [concat
$oldpos $vposids($view)]]
556 set args
[concat
$vflags($view) $revs --not $oldpos]
558 set args
$vorigargs($view)
561 set fd
[open
[concat | git log
--no-color -z --pretty=raw
$show_notes \
562 --parents --boundary $args "--" $vfilelimit($view)] r
]
564 error_popup
"[mc "Error executing git log
:"] $err"
567 if {$viewactive($view) == 0} {
568 set startmsecs
[clock clicks
-milliseconds]
570 set i
[reg_instance
$fd]
571 lappend viewinstances
($view) $i
572 fconfigure
$fd -blocking 0 -translation lf
-eofchar {}
573 if {$tclencoding != {}} {
574 fconfigure
$fd -encoding $tclencoding
576 filerun
$fd [list getcommitlines
$fd $i $view 1]
577 incr viewactive
($view)
578 set viewcomplete
($view) 0
579 reset_pending_select
{}
580 nowbusy
$view [mc
"Reading"]
586 proc reloadcommits
{} {
587 global curview viewcomplete selectedline currentid thickerline
588 global showneartags treediffs commitinterest cached_commitrow
592 if {$selectedline ne
{}} {
596 if {!$viewcomplete($curview)} {
597 stop_rev_list
$curview
601 catch
{unset currentid
}
602 catch
{unset thickerline
}
603 catch
{unset treediffs
}
610 catch
{unset commitinterest
}
611 catch
{unset cached_commitrow
}
612 catch
{unset targetid
}
618 # This makes a string representation of a positive integer which
619 # sorts as a string in numerical order
622 return [format
"%x" $n]
623 } elseif
{$n < 256} {
624 return [format
"x%.2x" $n]
625 } elseif
{$n < 65536} {
626 return [format
"y%.4x" $n]
628 return [format
"z%.8x" $n]
631 # Procedures used in reordering commits from git log (without
632 # --topo-order) into the order for display.
634 proc varcinit
{view
} {
635 global varcstart vupptr vdownptr vleftptr vbackptr varctok varcrow
636 global vtokmod varcmod vrowmod varcix vlastins
638 set varcstart
($view) {{}}
639 set vupptr
($view) {0}
640 set vdownptr
($view) {0}
641 set vleftptr
($view) {0}
642 set vbackptr
($view) {0}
643 set varctok
($view) {{}}
644 set varcrow
($view) {{}}
645 set vtokmod
($view) {}
648 set varcix
($view) {{}}
649 set vlastins
($view) {0}
652 proc resetvarcs
{view
} {
653 global varcid varccommits parents children vseedcount ordertok
656 foreach vid
[array names varcid
$view,*] {
661 foreach vid
[array names vshortids
$view,*] {
662 unset vshortids
($vid)
664 # some commits might have children but haven't been seen yet
665 foreach vid
[array names children
$view,*] {
668 foreach va
[array names varccommits
$view,*] {
669 unset varccommits
($va)
671 foreach vd
[array names vseedcount
$view,*] {
672 unset vseedcount
($vd)
674 catch
{unset ordertok
}
677 # returns a list of the commits with no children
679 global vdownptr vleftptr varcstart
682 set a
[lindex
$vdownptr($v) 0]
684 lappend ret
[lindex
$varcstart($v) $a]
685 set a
[lindex
$vleftptr($v) $a]
690 proc newvarc
{view id
} {
691 global varcid varctok parents children vdatemode
692 global vupptr vdownptr vleftptr vbackptr varcrow varcix varcstart
693 global commitdata commitinfo vseedcount varccommits vlastins
695 set a
[llength
$varctok($view)]
697 if {[llength
$children($vid)] == 0 ||
$vdatemode($view)} {
698 if {![info exists commitinfo
($id)]} {
699 parsecommit
$id $commitdata($id) 1
701 set cdate
[lindex
[lindex
$commitinfo($id) 4] 0]
702 if {![string is integer
-strict $cdate]} {
705 if {![info exists vseedcount
($view,$cdate)]} {
706 set vseedcount
($view,$cdate) -1
708 set c
[incr vseedcount
($view,$cdate)]
709 set cdate
[expr {$cdate ^
0xffffffff}]
710 set tok
"s[strrep $cdate][strrep $c]"
715 if {[llength
$children($vid)] > 0} {
716 set kid
[lindex
$children($vid) end
]
717 set k
$varcid($view,$kid)
718 if {[string compare
[lindex
$varctok($view) $k] $tok] > 0} {
721 set tok
[lindex
$varctok($view) $k]
725 set i
[lsearch
-exact $parents($view,$ki) $id]
726 set j
[expr {[llength
$parents($view,$ki)] - 1 - $i}]
727 append tok
[strrep
$j]
729 set c
[lindex
$vlastins($view) $ka]
730 if {$c == 0 ||
[string compare
$tok [lindex
$varctok($view) $c]] < 0} {
732 set b
[lindex
$vdownptr($view) $ka]
734 set b
[lindex
$vleftptr($view) $c]
736 while {$b != 0 && [string compare
$tok [lindex
$varctok($view) $b]] >= 0} {
738 set b
[lindex
$vleftptr($view) $c]
741 lset vdownptr
($view) $ka $a
742 lappend vbackptr
($view) 0
744 lset vleftptr
($view) $c $a
745 lappend vbackptr
($view) $c
747 lset vlastins
($view) $ka $a
748 lappend vupptr
($view) $ka
749 lappend vleftptr
($view) $b
751 lset vbackptr
($view) $b $a
753 lappend varctok
($view) $tok
754 lappend varcstart
($view) $id
755 lappend vdownptr
($view) 0
756 lappend varcrow
($view) {}
757 lappend varcix
($view) {}
758 set varccommits
($view,$a) {}
759 lappend vlastins
($view) 0
763 proc splitvarc
{p v
} {
764 global varcid varcstart varccommits varctok vtokmod
765 global vupptr vdownptr vleftptr vbackptr varcix varcrow vlastins
767 set oa
$varcid($v,$p)
768 set otok
[lindex
$varctok($v) $oa]
769 set ac
$varccommits($v,$oa)
770 set i
[lsearch
-exact $varccommits($v,$oa) $p]
772 set na
[llength
$varctok($v)]
773 # "%" sorts before "0"...
774 set tok
"$otok%[strrep $i]"
775 lappend varctok
($v) $tok
776 lappend varcrow
($v) {}
777 lappend varcix
($v) {}
778 set varccommits
($v,$oa) [lrange
$ac 0 [expr {$i - 1}]]
779 set varccommits
($v,$na) [lrange
$ac $i end
]
780 lappend varcstart
($v) $p
781 foreach id
$varccommits($v,$na) {
782 set varcid
($v,$id) $na
784 lappend vdownptr
($v) [lindex
$vdownptr($v) $oa]
785 lappend vlastins
($v) [lindex
$vlastins($v) $oa]
786 lset vdownptr
($v) $oa $na
787 lset vlastins
($v) $oa 0
788 lappend vupptr
($v) $oa
789 lappend vleftptr
($v) 0
790 lappend vbackptr
($v) 0
791 for {set b
[lindex
$vdownptr($v) $na]} {$b != 0} {set b
[lindex
$vleftptr($v) $b]} {
792 lset vupptr
($v) $b $na
794 if {[string compare
$otok $vtokmod($v)] <= 0} {
799 proc renumbervarc
{a v
} {
800 global parents children varctok varcstart varccommits
801 global vupptr vdownptr vleftptr vbackptr vlastins varcid vtokmod vdatemode
803 set t1
[clock clicks
-milliseconds]
809 if {[info exists isrelated
($a)]} {
811 set id
[lindex
$varccommits($v,$a) end
]
812 foreach p
$parents($v,$id) {
813 if {[info exists varcid
($v,$p)]} {
814 set isrelated
($varcid($v,$p)) 1
819 set b
[lindex
$vdownptr($v) $a]
822 set b
[lindex
$vleftptr($v) $a]
824 set a
[lindex
$vupptr($v) $a]
830 if {![info exists kidchanged
($a)]} continue
831 set id
[lindex
$varcstart($v) $a]
832 if {[llength
$children($v,$id)] > 1} {
833 set children
($v,$id) [lsort
-command [list vtokcmp
$v] \
836 set oldtok
[lindex
$varctok($v) $a]
837 if {!$vdatemode($v)} {
843 set kid
[last_real_child
$v,$id]
845 set k
$varcid($v,$kid)
846 if {[string compare
[lindex
$varctok($v) $k] $tok] > 0} {
849 set tok
[lindex
$varctok($v) $k]
853 set i
[lsearch
-exact $parents($v,$ki) $id]
854 set j
[expr {[llength
$parents($v,$ki)] - 1 - $i}]
855 append tok
[strrep
$j]
857 if {$tok eq
$oldtok} {
860 set id
[lindex
$varccommits($v,$a) end
]
861 foreach p
$parents($v,$id) {
862 if {[info exists varcid
($v,$p)]} {
863 set kidchanged
($varcid($v,$p)) 1
868 lset varctok
($v) $a $tok
869 set b
[lindex
$vupptr($v) $a]
871 if {[string compare
[lindex
$varctok($v) $ka] $vtokmod($v)] < 0} {
874 if {[string compare
[lindex
$varctok($v) $b] $vtokmod($v)] < 0} {
877 set c
[lindex
$vbackptr($v) $a]
878 set d
[lindex
$vleftptr($v) $a]
880 lset vdownptr
($v) $b $d
882 lset vleftptr
($v) $c $d
885 lset vbackptr
($v) $d $c
887 if {[lindex
$vlastins($v) $b] == $a} {
888 lset vlastins
($v) $b $c
890 lset vupptr
($v) $a $ka
891 set c
[lindex
$vlastins($v) $ka]
893 [string compare
$tok [lindex
$varctok($v) $c]] < 0} {
895 set b
[lindex
$vdownptr($v) $ka]
897 set b
[lindex
$vleftptr($v) $c]
900 [string compare
$tok [lindex
$varctok($v) $b]] >= 0} {
902 set b
[lindex
$vleftptr($v) $c]
905 lset vdownptr
($v) $ka $a
906 lset vbackptr
($v) $a 0
908 lset vleftptr
($v) $c $a
909 lset vbackptr
($v) $a $c
911 lset vleftptr
($v) $a $b
913 lset vbackptr
($v) $b $a
915 lset vlastins
($v) $ka $a
918 foreach id
[array names sortkids
] {
919 if {[llength
$children($v,$id)] > 1} {
920 set children
($v,$id) [lsort
-command [list vtokcmp
$v] \
924 set t2
[clock clicks
-milliseconds]
925 #puts "renumbervarc did [llength $todo] of $ntot arcs in [expr {$t2-$t1}]ms"
928 # Fix up the graph after we have found out that in view $v,
929 # $p (a commit that we have already seen) is actually the parent
930 # of the last commit in arc $a.
931 proc fix_reversal
{p a v
} {
932 global varcid varcstart varctok vupptr
934 set pa
$varcid($v,$p)
935 if {$p ne
[lindex
$varcstart($v) $pa]} {
937 set pa
$varcid($v,$p)
939 # seeds always need to be renumbered
940 if {[lindex
$vupptr($v) $pa] == 0 ||
941 [string compare
[lindex
$varctok($v) $a] \
942 [lindex
$varctok($v) $pa]] > 0} {
947 proc insertrow
{id p v
} {
948 global cmitlisted children parents varcid varctok vtokmod
949 global varccommits ordertok commitidx numcommits curview
950 global targetid targetrow vshortids
954 set cmitlisted
($vid) 1
955 set children
($vid) {}
956 set parents
($vid) [list
$p]
957 set a
[newvarc
$v $id]
959 lappend vshortids
($v,[string range
$id 0 3]) $id
960 if {[string compare
[lindex
$varctok($v) $a] $vtokmod($v)] < 0} {
963 lappend varccommits
($v,$a) $id
965 if {[llength
[lappend children
($vp) $id]] > 1} {
966 set children
($vp) [lsort
-command [list vtokcmp
$v] $children($vp)]
967 catch
{unset ordertok
}
969 fix_reversal
$p $a $v
971 if {$v == $curview} {
972 set numcommits
$commitidx($v)
974 if {[info exists targetid
]} {
975 if {![comes_before
$targetid $p]} {
982 proc insertfakerow
{id p
} {
983 global varcid varccommits parents children cmitlisted
984 global commitidx varctok vtokmod targetid targetrow curview numcommits
988 set i
[lsearch
-exact $varccommits($v,$a) $p]
990 puts
"oops: insertfakerow can't find [shortids $p] on arc $a"
993 set children
($v,$id) {}
994 set parents
($v,$id) [list
$p]
995 set varcid
($v,$id) $a
996 lappend children
($v,$p) $id
997 set cmitlisted
($v,$id) 1
998 set numcommits
[incr commitidx
($v)]
999 # note we deliberately don't update varcstart($v) even if $i == 0
1000 set varccommits
($v,$a) [linsert
$varccommits($v,$a) $i $id]
1002 if {[info exists targetid
]} {
1003 if {![comes_before
$targetid $p]} {
1011 proc removefakerow
{id
} {
1012 global varcid varccommits parents children commitidx
1013 global varctok vtokmod cmitlisted currentid selectedline
1014 global targetid curview numcommits
1017 if {[llength
$parents($v,$id)] != 1} {
1018 puts
"oops: removefakerow [shortids $id] has [llength $parents($v,$id)] parents"
1021 set p
[lindex
$parents($v,$id) 0]
1022 set a
$varcid($v,$id)
1023 set i
[lsearch
-exact $varccommits($v,$a) $id]
1025 puts
"oops: removefakerow can't find [shortids $id] on arc $a"
1028 unset varcid
($v,$id)
1029 set varccommits
($v,$a) [lreplace
$varccommits($v,$a) $i $i]
1030 unset parents
($v,$id)
1031 unset children
($v,$id)
1032 unset cmitlisted
($v,$id)
1033 set numcommits
[incr commitidx
($v) -1]
1034 set j
[lsearch
-exact $children($v,$p) $id]
1036 set children
($v,$p) [lreplace
$children($v,$p) $j $j]
1039 if {[info exist currentid
] && $id eq
$currentid} {
1043 if {[info exists targetid
] && $targetid eq
$id} {
1050 proc real_children
{vp
} {
1051 global children nullid nullid2
1054 foreach id
$children($vp) {
1055 if {$id ne
$nullid && $id ne
$nullid2} {
1062 proc first_real_child
{vp
} {
1063 global children nullid nullid2
1065 foreach id
$children($vp) {
1066 if {$id ne
$nullid && $id ne
$nullid2} {
1073 proc last_real_child
{vp
} {
1074 global children nullid nullid2
1076 set kids
$children($vp)
1077 for {set i
[llength
$kids]} {[incr i
-1] >= 0} {} {
1078 set id
[lindex
$kids $i]
1079 if {$id ne
$nullid && $id ne
$nullid2} {
1086 proc vtokcmp
{v a b
} {
1087 global varctok varcid
1089 return [string compare
[lindex
$varctok($v) $varcid($v,$a)] \
1090 [lindex
$varctok($v) $varcid($v,$b)]]
1093 # This assumes that if lim is not given, the caller has checked that
1094 # arc a's token is less than $vtokmod($v)
1095 proc modify_arc
{v a
{lim
{}}} {
1096 global varctok vtokmod varcmod varcrow vupptr curview vrowmod varccommits
1099 set c
[string compare
[lindex
$varctok($v) $a] $vtokmod($v)]
1102 set r
[lindex
$varcrow($v) $a]
1103 if {$r ne
{} && $vrowmod($v) <= $r + $lim} return
1106 set vtokmod
($v) [lindex
$varctok($v) $a]
1108 if {$v == $curview} {
1109 while {$a != 0 && [lindex
$varcrow($v) $a] eq
{}} {
1110 set a
[lindex
$vupptr($v) $a]
1116 set lim
[llength
$varccommits($v,$a)]
1118 set r
[expr {[lindex
$varcrow($v) $a] + $lim}]
1125 proc update_arcrows
{v
} {
1126 global vtokmod varcmod vrowmod varcrow commitidx currentid selectedline
1127 global varcid vrownum varcorder varcix varccommits
1128 global vupptr vdownptr vleftptr varctok
1129 global displayorder parentlist curview cached_commitrow
1131 if {$vrowmod($v) == $commitidx($v)} return
1132 if {$v == $curview} {
1133 if {[llength
$displayorder] > $vrowmod($v)} {
1134 set displayorder
[lrange
$displayorder 0 [expr {$vrowmod($v) - 1}]]
1135 set parentlist
[lrange
$parentlist 0 [expr {$vrowmod($v) - 1}]]
1137 catch
{unset cached_commitrow
}
1139 set narctot
[expr {[llength
$varctok($v)] - 1}]
1141 while {$a != 0 && [lindex
$varcix($v) $a] eq
{}} {
1142 # go up the tree until we find something that has a row number,
1143 # or we get to a seed
1144 set a
[lindex
$vupptr($v) $a]
1147 set a
[lindex
$vdownptr($v) 0]
1150 set varcorder
($v) [list
$a]
1151 lset varcix
($v) $a 0
1152 lset varcrow
($v) $a 0
1156 set arcn
[lindex
$varcix($v) $a]
1157 if {[llength
$vrownum($v)] > $arcn + 1} {
1158 set vrownum
($v) [lrange
$vrownum($v) 0 $arcn]
1159 set varcorder
($v) [lrange
$varcorder($v) 0 $arcn]
1161 set row
[lindex
$varcrow($v) $a]
1165 incr row
[llength
$varccommits($v,$a)]
1166 # go down if possible
1167 set b
[lindex
$vdownptr($v) $a]
1169 # if not, go left, or go up until we can go left
1171 set b
[lindex
$vleftptr($v) $a]
1173 set a
[lindex
$vupptr($v) $a]
1179 lappend vrownum
($v) $row
1180 lappend varcorder
($v) $a
1181 lset varcix
($v) $a $arcn
1182 lset varcrow
($v) $a $row
1184 set vtokmod
($v) [lindex
$varctok($v) $p]
1186 set vrowmod
($v) $row
1187 if {[info exists currentid
]} {
1188 set selectedline
[rowofcommit
$currentid]
1192 # Test whether view $v contains commit $id
1193 proc commitinview
{id v
} {
1196 return [info exists varcid
($v,$id)]
1199 # Return the row number for commit $id in the current view
1200 proc rowofcommit
{id
} {
1201 global varcid varccommits varcrow curview cached_commitrow
1202 global varctok vtokmod
1205 if {![info exists varcid
($v,$id)]} {
1206 puts
"oops rowofcommit no arc for [shortids $id]"
1209 set a
$varcid($v,$id)
1210 if {[string compare
[lindex
$varctok($v) $a] $vtokmod($v)] >= 0} {
1213 if {[info exists cached_commitrow
($id)]} {
1214 return $cached_commitrow($id)
1216 set i
[lsearch
-exact $varccommits($v,$a) $id]
1218 puts
"oops didn't find commit [shortids $id] in arc $a"
1221 incr i
[lindex
$varcrow($v) $a]
1222 set cached_commitrow
($id) $i
1226 # Returns 1 if a is on an earlier row than b, otherwise 0
1227 proc comes_before
{a b
} {
1228 global varcid varctok curview
1231 if {$a eq
$b ||
![info exists varcid
($v,$a)] || \
1232 ![info exists varcid
($v,$b)]} {
1235 if {$varcid($v,$a) != $varcid($v,$b)} {
1236 return [expr {[string compare
[lindex
$varctok($v) $varcid($v,$a)] \
1237 [lindex
$varctok($v) $varcid($v,$b)]] < 0}]
1239 return [expr {[rowofcommit
$a] < [rowofcommit
$b]}]
1242 proc bsearch
{l elt
} {
1243 if {[llength
$l] == 0 ||
$elt <= [lindex
$l 0]} {
1248 while {$hi - $lo > 1} {
1249 set mid
[expr {int
(($lo + $hi) / 2)}]
1250 set t
[lindex
$l $mid]
1253 } elseif
{$elt > $t} {
1262 # Make sure rows $start..$end-1 are valid in displayorder and parentlist
1263 proc make_disporder
{start end
} {
1264 global vrownum curview commitidx displayorder parentlist
1265 global varccommits varcorder parents vrowmod varcrow
1266 global d_valid_start d_valid_end
1268 if {$end > $vrowmod($curview)} {
1269 update_arcrows
$curview
1271 set ai
[bsearch
$vrownum($curview) $start]
1272 set start
[lindex
$vrownum($curview) $ai]
1273 set narc
[llength
$vrownum($curview)]
1274 for {set r
$start} {$ai < $narc && $r < $end} {incr ai
} {
1275 set a
[lindex
$varcorder($curview) $ai]
1276 set l
[llength
$displayorder]
1277 set al
[llength
$varccommits($curview,$a)]
1278 if {$l < $r + $al} {
1280 set pad
[ntimes
[expr {$r - $l}] {}]
1281 set displayorder
[concat
$displayorder $pad]
1282 set parentlist
[concat
$parentlist $pad]
1283 } elseif
{$l > $r} {
1284 set displayorder
[lrange
$displayorder 0 [expr {$r - 1}]]
1285 set parentlist
[lrange
$parentlist 0 [expr {$r - 1}]]
1287 foreach id
$varccommits($curview,$a) {
1288 lappend displayorder
$id
1289 lappend parentlist
$parents($curview,$id)
1291 } elseif
{[lindex
$displayorder [expr {$r + $al - 1}]] eq
{}} {
1293 foreach id
$varccommits($curview,$a) {
1294 lset displayorder
$i $id
1295 lset parentlist
$i $parents($curview,$id)
1303 proc commitonrow
{row
} {
1306 set id
[lindex
$displayorder $row]
1308 make_disporder
$row [expr {$row + 1}]
1309 set id
[lindex
$displayorder $row]
1314 proc closevarcs
{v
} {
1315 global varctok varccommits varcid parents children
1316 global cmitlisted commitidx vtokmod
1318 set missing_parents
0
1320 set narcs
[llength
$varctok($v)]
1321 for {set a
1} {$a < $narcs} {incr a
} {
1322 set id
[lindex
$varccommits($v,$a) end
]
1323 foreach p
$parents($v,$id) {
1324 if {[info exists varcid
($v,$p)]} continue
1325 # add p as a new commit
1326 incr missing_parents
1327 set cmitlisted
($v,$p) 0
1328 set parents
($v,$p) {}
1329 if {[llength
$children($v,$p)] == 1 &&
1330 [llength
$parents($v,$id)] == 1} {
1333 set b
[newvarc
$v $p]
1335 set varcid
($v,$p) $b
1336 if {[string compare
[lindex
$varctok($v) $b] $vtokmod($v)] < 0} {
1339 lappend varccommits
($v,$b) $p
1341 set scripts
[check_interest
$p $scripts]
1344 if {$missing_parents > 0} {
1345 foreach s
$scripts {
1351 # Use $rwid as a substitute for $id, i.e. reparent $id's children to $rwid
1352 # Assumes we already have an arc for $rwid.
1353 proc rewrite_commit
{v id rwid
} {
1354 global children parents varcid varctok vtokmod varccommits
1356 foreach ch
$children($v,$id) {
1357 # make $rwid be $ch's parent in place of $id
1358 set i
[lsearch
-exact $parents($v,$ch) $id]
1360 puts
"oops rewrite_commit didn't find $id in parent list for $ch"
1362 set parents
($v,$ch) [lreplace
$parents($v,$ch) $i $i $rwid]
1363 # add $ch to $rwid's children and sort the list if necessary
1364 if {[llength
[lappend children
($v,$rwid) $ch]] > 1} {
1365 set children
($v,$rwid) [lsort
-command [list vtokcmp
$v] \
1366 $children($v,$rwid)]
1368 # fix the graph after joining $id to $rwid
1369 set a
$varcid($v,$ch)
1370 fix_reversal
$rwid $a $v
1371 # parentlist is wrong for the last element of arc $a
1372 # even if displayorder is right, hence the 3rd arg here
1373 modify_arc
$v $a [expr {[llength
$varccommits($v,$a)] - 1}]
1377 # Mechanism for registering a command to be executed when we come
1378 # across a particular commit. To handle the case when only the
1379 # prefix of the commit is known, the commitinterest array is now
1380 # indexed by the first 4 characters of the ID. Each element is a
1381 # list of id, cmd pairs.
1382 proc interestedin
{id cmd
} {
1383 global commitinterest
1385 lappend commitinterest
([string range
$id 0 3]) $id $cmd
1388 proc check_interest
{id scripts
} {
1389 global commitinterest
1391 set prefix
[string range
$id 0 3]
1392 if {[info exists commitinterest
($prefix)]} {
1394 foreach
{i
script} $commitinterest($prefix) {
1395 if {[string match
"$i*" $id]} {
1396 lappend scripts
[string map
[list
"%I" $id "%P" $i] $script]
1398 lappend newlist
$i $script
1401 if {$newlist ne
{}} {
1402 set commitinterest
($prefix) $newlist
1404 unset commitinterest
($prefix)
1410 proc getcommitlines
{fd inst view updating
} {
1411 global cmitlisted leftover
1412 global commitidx commitdata vdatemode
1413 global parents children curview hlview
1414 global idpending ordertok
1415 global varccommits varcid varctok vtokmod vfilelimit vshortids
1417 set stuff
[read $fd 500000]
1418 # git log doesn't terminate the last commit with a null...
1419 if {$stuff == {} && $leftover($inst) ne
{} && [eof
$fd]} {
1426 global commfd viewcomplete viewactive viewname
1427 global viewinstances
1429 set i
[lsearch
-exact $viewinstances($view) $inst]
1431 set viewinstances
($view) [lreplace
$viewinstances($view) $i $i]
1433 # set it blocking so we wait for the process to terminate
1434 fconfigure
$fd -blocking 1
1435 if {[catch
{close
$fd} err
]} {
1437 if {$view != $curview} {
1438 set fv
" for the \"$viewname($view)\" view"
1440 if {[string range
$err 0 4] == "usage"} {
1441 set err
"Gitk: error reading commits$fv:\
1442 bad arguments to git log."
1443 if {$viewname($view) eq
"Command line"} {
1445 " (Note: arguments to gitk are passed to git log\
1446 to allow selection of commits to be displayed.)"
1449 set err
"Error reading commits$fv: $err"
1453 if {[incr viewactive
($view) -1] <= 0} {
1454 set viewcomplete
($view) 1
1455 # Check if we have seen any ids listed as parents that haven't
1456 # appeared in the list
1460 if {$view == $curview} {
1469 set i
[string first
"\0" $stuff $start]
1471 append leftover
($inst) [string range
$stuff $start end
]
1475 set cmit
$leftover($inst)
1476 append cmit
[string range
$stuff 0 [expr {$i - 1}]]
1477 set leftover
($inst) {}
1479 set cmit
[string range
$stuff $start [expr {$i - 1}]]
1481 set start
[expr {$i + 1}]
1482 set j
[string first
"\n" $cmit]
1485 if {$j >= 0 && [string match
"commit *" $cmit]} {
1486 set ids
[string range
$cmit 7 [expr {$j - 1}]]
1487 if {[string match
{[-^
<>]*} $ids]} {
1488 switch
-- [string index
$ids 0] {
1494 set ids
[string range
$ids 1 end
]
1498 if {[string length
$id] != 40} {
1506 if {[string length
$shortcmit] > 80} {
1507 set shortcmit
"[string range $shortcmit 0 80]..."
1509 error_popup
"[mc "Can
't parse git log output:"] {$shortcmit}"
1512 set id [lindex $ids 0]
1515 lappend vshortids($view,[string range $id 0 3]) $id
1517 if {!$listed && $updating && ![info exists varcid($vid)] &&
1518 $vfilelimit($view) ne {}} {
1519 # git log doesn't rewrite parents
for unlisted commits
1520 # when doing path limiting, so work around that here
1521 # by working out the rewritten parent with git rev-list
1522 # and if we already know about it, using the rewritten
1523 # parent as a substitute parent for $id's children.
1525 set rwid
[exec git rev-list
--first-parent --max-count=1 \
1526 $id -- $vfilelimit($view)]
1528 if {$rwid ne
{} && [info exists varcid
($view,$rwid)]} {
1529 # use $rwid in place of $id
1530 rewrite_commit
$view $id $rwid
1537 if {[info exists varcid
($vid)]} {
1538 if {$cmitlisted($vid) ||
!$listed} continue
1542 set olds
[lrange
$ids 1 end
]
1546 set commitdata
($id) [string range
$cmit [expr {$j + 1}] end
]
1547 set cmitlisted
($vid) $listed
1548 set parents
($vid) $olds
1549 if {![info exists children
($vid)]} {
1550 set children
($vid) {}
1551 } elseif
{$a == 0 && [llength
$children($vid)] == 1} {
1552 set k
[lindex
$children($vid) 0]
1553 if {[llength
$parents($view,$k)] == 1 &&
1554 (!$vdatemode($view) ||
1555 $varcid($view,$k) == [llength
$varctok($view)] - 1)} {
1556 set a
$varcid($view,$k)
1561 set a
[newvarc
$view $id]
1563 if {[string compare
[lindex
$varctok($view) $a] $vtokmod($view)] < 0} {
1566 if {![info exists varcid
($vid)]} {
1568 lappend varccommits
($view,$a) $id
1569 incr commitidx
($view)
1574 if {$i == 0 ||
[lsearch
-exact $olds $p] >= $i} {
1576 if {[llength
[lappend children
($vp) $id]] > 1 &&
1577 [vtokcmp
$view [lindex
$children($vp) end-1
] $id] > 0} {
1578 set children
($vp) [lsort
-command [list vtokcmp
$view] \
1580 catch
{unset ordertok
}
1582 if {[info exists varcid
($view,$p)]} {
1583 fix_reversal
$p $a $view
1589 set scripts
[check_interest
$id $scripts]
1593 global numcommits hlview
1595 if {$view == $curview} {
1596 set numcommits
$commitidx($view)
1599 if {[info exists hlview
] && $view == $hlview} {
1600 # we never actually get here...
1603 foreach s
$scripts {
1610 proc chewcommits
{} {
1611 global curview hlview viewcomplete
1612 global pending_select
1615 if {$viewcomplete($curview)} {
1616 global commitidx varctok
1617 global numcommits startmsecs
1619 if {[info exists pending_select
]} {
1621 reset_pending_select
{}
1623 if {[commitinview
$pending_select $curview]} {
1624 selectline
[rowofcommit
$pending_select] 1
1626 set row
[first_real_row
]
1630 if {$commitidx($curview) > 0} {
1631 #set ms [expr {[clock clicks -milliseconds] - $startmsecs}]
1632 #puts "overall $ms ms for $numcommits commits"
1633 #puts "[llength $varctok($view)] arcs, $commitidx($view) commits"
1635 show_status
[mc
"No commits selected"]
1642 proc do_readcommit
{id
} {
1645 # Invoke git-log to handle automatic encoding conversion
1646 set fd
[open
[concat | git log
--no-color --pretty=raw
-1 $id] r
]
1647 # Read the results using i18n.logoutputencoding
1648 fconfigure
$fd -translation lf
-eofchar {}
1649 if {$tclencoding != {}} {
1650 fconfigure
$fd -encoding $tclencoding
1652 set contents
[read $fd]
1654 # Remove the heading line
1655 regsub
{^commit
[0-9a-f]+\n} $contents {} contents
1660 proc readcommit
{id
} {
1661 if {[catch
{set contents
[do_readcommit
$id]}]} return
1662 parsecommit
$id $contents 1
1665 proc parsecommit
{id contents listed
} {
1675 set hdrend
[string first
"\n\n" $contents]
1677 # should never happen...
1678 set hdrend
[string length
$contents]
1680 set header
[string range
$contents 0 [expr {$hdrend - 1}]]
1681 set comment
[string range
$contents [expr {$hdrend + 2}] end
]
1682 foreach line
[split $header "\n"] {
1683 set line
[split $line " "]
1684 set tag
[lindex
$line 0]
1685 if {$tag == "author"} {
1686 set audate
[lrange
$line end-1 end
]
1687 set auname
[join [lrange
$line 1 end-2
] " "]
1688 } elseif
{$tag == "committer"} {
1689 set comdate
[lrange
$line end-1 end
]
1690 set comname
[join [lrange
$line 1 end-2
] " "]
1694 # take the first non-blank line of the comment as the headline
1695 set headline
[string trimleft
$comment]
1696 set i
[string first
"\n" $headline]
1698 set headline
[string range
$headline 0 $i]
1700 set headline
[string trimright
$headline]
1701 set i
[string first
"\r" $headline]
1703 set headline
[string trimright
[string range
$headline 0 $i]]
1706 # git log indents the comment by 4 spaces;
1707 # if we got this via git cat-file, add the indentation
1709 foreach line
[split $comment "\n"] {
1710 append newcomment
" "
1711 append newcomment
$line
1712 append newcomment
"\n"
1714 set comment
$newcomment
1716 set hasnote
[string first
"\nNotes:\n" $contents]
1718 # If there is diff output shown in the git-log stream, split it
1719 # out. But get rid of the empty line that always precedes the
1721 set i
[string first
"\n\ndiff" $comment]
1723 set diff [string range
$comment $i+1 end
]
1724 set comment
[string range
$comment 0 $i-1]
1726 set commitinfo
($id) [list
$headline $auname $audate \
1727 $comname $comdate $comment $hasnote $diff]
1730 proc getcommit
{id
} {
1731 global commitdata commitinfo
1733 if {[info exists commitdata
($id)]} {
1734 parsecommit
$id $commitdata($id) 1
1737 if {![info exists commitinfo
($id)]} {
1738 set commitinfo
($id) [list
[mc
"No commit information available"]]
1744 # Expand an abbreviated commit ID to a list of full 40-char IDs that match
1745 # and are present in the current view.
1746 # This is fairly slow...
1747 proc longid
{prefix
} {
1748 global varcid curview vshortids
1751 if {[string length
$prefix] >= 4} {
1752 set vshortid
$curview,[string range
$prefix 0 3]
1753 if {[info exists vshortids
($vshortid)]} {
1754 foreach id
$vshortids($vshortid) {
1755 if {[string match
"$prefix*" $id]} {
1756 if {[lsearch
-exact $ids $id] < 0} {
1758 if {[llength
$ids] >= 2} break
1764 foreach match
[array names varcid
"$curview,$prefix*"] {
1765 lappend ids
[lindex
[split $match ","] 1]
1766 if {[llength
$ids] >= 2} break
1773 global tagids idtags headids idheads tagobjid
1774 global otherrefids idotherrefs mainhead mainheadid
1775 global selecthead selectheadid
1778 foreach v
{tagids idtags headids idheads otherrefids idotherrefs
} {
1781 set refd
[open
[list | git show-ref
-d] r
]
1782 while {[gets
$refd line
] >= 0} {
1783 if {[string index
$line 40] ne
" "} continue
1784 set id
[string range
$line 0 39]
1785 set ref
[string range
$line 41 end
]
1786 if {![string match
"refs/*" $ref]} continue
1787 set name
[string range
$ref 5 end
]
1788 if {[string match
"remotes/*" $name]} {
1789 if {![string match
"*/HEAD" $name] && !$hideremotes} {
1790 set headids
($name) $id
1791 lappend idheads
($id) $name
1793 } elseif
{[string match
"heads/*" $name]} {
1794 set name
[string range
$name 6 end
]
1795 set headids
($name) $id
1796 lappend idheads
($id) $name
1797 } elseif
{[string match
"tags/*" $name]} {
1798 # this lets refs/tags/foo^{} overwrite refs/tags/foo,
1799 # which is what we want since the former is the commit ID
1800 set name
[string range
$name 5 end
]
1801 if {[string match
"*^{}" $name]} {
1802 set name
[string range
$name 0 end-3
]
1804 set tagobjid
($name) $id
1806 set tagids
($name) $id
1807 lappend idtags
($id) $name
1809 set otherrefids
($name) $id
1810 lappend idotherrefs
($id) $name
1817 set mainheadid
[exec git rev-parse HEAD
]
1818 set thehead
[exec git symbolic-ref HEAD
]
1819 if {[string match
"refs/heads/*" $thehead]} {
1820 set mainhead
[string range
$thehead 11 end
]
1824 if {$selecthead ne
{}} {
1826 set selectheadid
[exec git rev-parse
--verify $selecthead]
1831 # skip over fake commits
1832 proc first_real_row
{} {
1833 global nullid nullid2 numcommits
1835 for {set row
0} {$row < $numcommits} {incr row
} {
1836 set id
[commitonrow
$row]
1837 if {$id ne
$nullid && $id ne
$nullid2} {
1844 # update things for a head moved to a child of its previous location
1845 proc movehead
{id name
} {
1846 global headids idheads
1848 removehead
$headids($name) $name
1849 set headids
($name) $id
1850 lappend idheads
($id) $name
1853 # update things when a head has been removed
1854 proc removehead
{id name
} {
1855 global headids idheads
1857 if {$idheads($id) eq
$name} {
1860 set i
[lsearch
-exact $idheads($id) $name]
1862 set idheads
($id) [lreplace
$idheads($id) $i $i]
1865 unset headids
($name)
1868 proc ttk_toplevel
{w args
} {
1870 eval [linsert
$args 0 ::toplevel
$w]
1872 place
[ttk
::frame
$w._toplevel_background
] -x 0 -y 0 -relwidth 1 -relheight 1
1877 proc make_transient
{window origin
} {
1880 # In MacOS Tk 8.4 transient appears to work by setting
1881 # overrideredirect, which is utterly useless, since the
1882 # windows get no border, and are not even kept above
1884 if {!$have_tk85 && [tk windowingsystem
] eq
{aqua
}} return
1886 wm transient
$window $origin
1888 # Windows fails to place transient windows normally, so
1889 # schedule a callback to center them on the parent.
1890 if {[tk windowingsystem
] eq
{win32
}} {
1891 after idle
[list tk
::PlaceWindow
$window widget
$origin]
1895 proc show_error
{w top msg
{mc mc
}} {
1897 if {![info exists NS
]} {set NS
""}
1898 if {[wm state
$top] eq
"withdrawn"} { wm deiconify
$top }
1899 message
$w.m
-text $msg -justify center
-aspect 400
1900 pack
$w.m
-side top
-fill x
-padx 20 -pady 20
1901 ${NS}::button
$w.ok
-default active
-text [$mc OK
] -command "destroy $top"
1902 pack
$w.ok
-side bottom
-fill x
1903 bind $top <Visibility
> "grab $top; focus $top"
1904 bind $top <Key-Return
> "destroy $top"
1905 bind $top <Key-space
> "destroy $top"
1906 bind $top <Key-Escape
> "destroy $top"
1910 proc error_popup
{msg
{owner .
}} {
1911 if {[tk windowingsystem
] eq
"win32"} {
1912 tk_messageBox
-icon error
-type ok
-title [wm title .
] \
1913 -parent $owner -message $msg
1917 make_transient
$w $owner
1918 show_error
$w $w $msg
1922 proc confirm_popup
{msg
{owner .
}} {
1923 global confirm_ok NS
1927 make_transient
$w $owner
1928 message
$w.m
-text $msg -justify center
-aspect 400
1929 pack
$w.m
-side top
-fill x
-padx 20 -pady 20
1930 ${NS}::button
$w.ok
-text [mc OK
] -command "set confirm_ok 1; destroy $w"
1931 pack
$w.ok
-side left
-fill x
1932 ${NS}::button
$w.cancel
-text [mc Cancel
] -command "destroy $w"
1933 pack
$w.cancel
-side right
-fill x
1934 bind $w <Visibility
> "grab $w; focus $w"
1935 bind $w <Key-Return
> "set confirm_ok 1; destroy $w"
1936 bind $w <Key-space
> "set confirm_ok 1; destroy $w"
1937 bind $w <Key-Escape
> "destroy $w"
1938 tk
::PlaceWindow
$w widget
$owner
1943 proc setoptions
{} {
1944 if {[tk windowingsystem
] ne
"win32"} {
1945 option add
*Panedwindow.showHandle
1 startupFile
1946 option add
*Panedwindow.sashRelief raised startupFile
1947 if {[tk windowingsystem
] ne
"aqua"} {
1948 option add
*Menu.font uifont startupFile
1951 option add
*Menu.TearOff
0 startupFile
1953 option add
*Button.font uifont startupFile
1954 option add
*Checkbutton.font uifont startupFile
1955 option add
*Radiobutton.font uifont startupFile
1956 option add
*Menubutton.font uifont startupFile
1957 option add
*Label.font uifont startupFile
1958 option add
*Message.font uifont startupFile
1959 option add
*Entry.font textfont startupFile
1960 option add
*Text.font textfont startupFile
1961 option add
*Labelframe.font uifont startupFile
1962 option add
*Spinbox.font textfont startupFile
1963 option add
*Listbox.font mainfont startupFile
1966 # Make a menu and submenus.
1967 # m is the window name for the menu, items is the list of menu items to add.
1968 # Each item is a list {mc label type description options...}
1969 # mc is ignored; it's so we can put mc there to alert xgettext
1970 # label is the string that appears in the menu
1971 # type is cascade, command or radiobutton (should add checkbutton)
1972 # description depends on type; it's the sublist for cascade, the
1973 # command to invoke for command, or {variable value} for radiobutton
1974 proc makemenu
{m items
} {
1976 if {[tk windowingsystem
] eq
{aqua
}} {
1982 set name
[mc
[lindex
$i 1]]
1983 set type [lindex
$i 2]
1984 set thing
[lindex
$i 3]
1985 set params
[list
$type]
1987 set u
[string first
"&" [string map
{&& x
} $name]]
1988 lappend params
-label [string map
{&& & & {}} $name]
1990 lappend params
-underline $u
1995 set submenu
[string tolower
[string map
{& ""} [lindex
$i 1]]]
1996 lappend params
-menu $m.
$submenu
1999 lappend params
-command $thing
2002 lappend params
-variable [lindex
$thing 0] \
2003 -value [lindex
$thing 1]
2006 set tail [lrange
$i 4 end
]
2007 regsub
-all {\yMeta1\y
} $tail $Meta1 tail
2008 eval $m add
$params $tail
2009 if {$type eq
"cascade"} {
2010 makemenu
$m.
$submenu $thing
2015 # translate string and remove ampersands
2017 return [string map
{&& & & {}} [mc
$str]]
2020 proc cleardropsel
{w
} {
2023 proc makedroplist
{w varname args
} {
2027 foreach label
$args {
2028 set cx
[string length
$label]
2029 if {$cx > $width} {set width
$cx}
2031 set gm
[ttk
::combobox
$w -width $width -state readonly\
2032 -textvariable $varname -values $args \
2033 -exportselection false
]
2034 bind $gm <<ComboboxSelected>> [list $gm selection clear]
2036 set gm [eval [linsert $args 0 tk_optionMenu $w $varname]]
2041 proc makewindow {} {
2042 global canv canv2 canv3 linespc charspc ctext cflist cscroll
2044 global findtype findtypemenu findloc findstring fstring geometry
2045 global entries sha1entry sha1string sha1but
2046 global diffcontextstring diffcontext
2048 global maincursor textcursor curtextcursor
2049 global rowctxmenu fakerowmenu mergemax wrapcomment
2050 global highlight_files gdttype
2051 global searchstring sstring
2052 global bgcolor fgcolor bglist fglist diffcolors selectbgcolor
2053 global uifgcolor uifgdisabledcolor
2054 global filesepbgcolor filesepfgcolor
2055 global mergecolors foundbgcolor currentsearchhitbgcolor
2056 global headctxmenu progresscanv progressitem progresscoords statusw
2057 global fprogitem fprogcoord lastprogupdate progupdatepending
2058 global rprogitem rprogcoord rownumsel numcommits
2059 global have_tk85 use_ttk NS
2063 # The "mc" arguments here are purely so that xgettext
2064 # sees the following string as needing to be translated
2067 {mc "Update" command updatecommits -accelerator F5}
2068 {mc "Reload" command reloadcommits -accelerator Shift-F5}
2069 {mc "Reread references" command rereadrefs}
2070 {mc "List references" command showrefs -accelerator F2}
2072 {mc "Start git gui" command {exec git gui &}}
2074 {mc "Quit" command doquit -accelerator Meta1-Q}
2078 {mc "Preferences" command doprefs}
2082 {mc "New view..." command {newview 0} -accelerator Shift-F4}
2083 {mc "Edit view..." command editview -state disabled -accelerator F4}
2084 {mc "Delete view" command delview -state disabled}
2086 {mc "All files" radiobutton {selectedview 0} -command {showview 0}}
2088 if {[tk windowingsystem] ne "aqua"} {
2091 {mc "About gitk" command about}
2092 {mc "Key bindings" command keys}
2094 set bar [list $file $edit $view $help]
2096 proc ::tk::mac::ShowPreferences {} {doprefs}
2097 proc ::tk::mac::Quit {} {doquit}
2098 lset file end [lreplace [lindex $file end] end-1 end]
2100 xx "Apple" cascade {
2101 {mc "About gitk" command about}
2106 {mc "Key bindings" command keys}
2108 set bar [list $apple $file $view $help]
2111 . configure -menu .bar
2114 # cover the non-themed toplevel with a themed frame.
2115 place [ttk::frame ._main_background] -x 0 -y 0 -relwidth 1 -relheight 1
2118 # the gui has upper and lower half, parts of a paned window.
2119 ${NS}::panedwindow .ctop -orient vertical
2121 # possibly use assumed geometry
2122 if {![info exists geometry(pwsash0)]} {
2123 set geometry(topheight) [expr {15 * $linespc}]
2124 set geometry(topwidth) [expr {80 * $charspc}]
2125 set geometry(botheight) [expr {15 * $linespc}]
2126 set geometry(botwidth) [expr {50 * $charspc}]
2127 set geometry(pwsash0) [list [expr {40 * $charspc}] 2]
2128 set geometry(pwsash1) [list [expr {60 * $charspc}] 2]
2131 # the upper half will have a paned window, a scroll bar to the right, and some stuff below
2132 ${NS}::frame .tf -height $geometry(topheight) -width $geometry(topwidth)
2133 ${NS}::frame .tf.histframe
2134 ${NS}::panedwindow .tf.histframe.pwclist -orient horizontal
2136 .tf.histframe.pwclist configure -sashpad 0 -handlesize 4
2139 # create three canvases
2140 set cscroll .tf.histframe.csb
2141 set canv .tf.histframe.pwclist.canv
2143 -selectbackground $selectbgcolor \
2144 -background $bgcolor -bd 0 \
2145 -yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
2146 .tf.histframe.pwclist add $canv
2147 set canv2 .tf.histframe.pwclist.canv2
2149 -selectbackground $selectbgcolor \
2150 -background $bgcolor -bd 0 -yscrollincr $linespc
2151 .tf.histframe.pwclist add $canv2
2152 set canv3 .tf.histframe.pwclist.canv3
2154 -selectbackground $selectbgcolor \
2155 -background $bgcolor -bd 0 -yscrollincr $linespc
2156 .tf.histframe.pwclist add $canv3
2158 bind .tf.histframe.pwclist <Map> {
2160 .tf.histframe.pwclist sashpos 1 [lindex $::geometry(pwsash1) 0]
2161 .tf.histframe.pwclist sashpos 0 [lindex $::geometry(pwsash0) 0]
2164 eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0)
2165 eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1)
2168 # a scroll bar to rule them
2169 ${NS}::scrollbar $cscroll -command {allcanvs yview}
2170 if {!$use_ttk} {$cscroll configure -highlightthickness 0}
2171 pack $cscroll -side right -fill y
2172 bind .tf.histframe.pwclist <Configure> {resizeclistpanes %W %w}
2173 lappend bglist $canv $canv2 $canv3
2174 pack .tf.histframe.pwclist -fill both -expand 1 -side left
2176 # we have two button bars at bottom of top frame. Bar 1
2177 ${NS}::frame .tf.bar
2178 ${NS}::frame .tf.lbar -height 15
2180 set sha1entry .tf.bar.sha1
2181 set entries $sha1entry
2182 set sha1but .tf.bar.sha1label
2183 button $sha1but -text "[mc "SHA1 ID:"] " -state disabled -relief flat \
2184 -command gotocommit -width 8
2185 $sha1but conf -disabledforeground [$sha1but cget -foreground]
2186 pack .tf.bar.sha1label -side left
2187 ${NS}::entry $sha1entry -width 40 -font textfont -textvariable sha1string
2188 trace add variable sha1string write sha1change
2189 pack $sha1entry -side left -pady 2
2192 #define left_width 16
2193 #define left_height 16
2194 static unsigned char left_bits[] = {
2195 0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
2196 0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00,
2197 0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01};
2200 #define right_width 16
2201 #define right_height 16
2202 static unsigned char right_bits[] = {
2203 0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c,
2204 0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c,
2205 0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01};
2207 image create bitmap bm-left -data $bm_left_data -foreground $uifgcolor
2208 image create bitmap bm-left-gray -data $bm_left_data -foreground $uifgdisabledcolor
2209 image create bitmap bm-right -data $bm_right_data -foreground $uifgcolor
2210 image create bitmap bm-right-gray -data $bm_right_data -foreground $uifgdisabledcolor
2212 ${NS}::button .tf.bar.leftbut -command goback -state disabled -width 26
2214 .tf.bar.leftbut configure -image [list bm-left disabled bm-left-gray]
2216 .tf.bar.leftbut configure -image bm-left
2218 pack .tf.bar.leftbut -side left -fill y
2219 ${NS}::button .tf.bar.rightbut -command goforw -state disabled -width 26
2221 .tf.bar.rightbut configure -image [list bm-right disabled bm-right-gray]
2223 .tf.bar.rightbut configure -image bm-right
2225 pack .tf.bar.rightbut -side left -fill y
2227 ${NS}::label .tf.bar.rowlabel -text [mc "Row"]
2229 ${NS}::label .tf.bar.rownum -width 7 -textvariable rownumsel \
2230 -relief sunken -anchor e
2231 ${NS}::label .tf.bar.rowlabel2 -text "/"
2232 ${NS}::label .tf.bar.numcommits -width 7 -textvariable numcommits \
2233 -relief sunken -anchor e
2234 pack .tf.bar.rowlabel .tf.bar.rownum .tf.bar.rowlabel2 .tf.bar.numcommits \
2237 foreach w {rownum numcommits} {.tf.bar.$w configure -font textfont}
2240 trace add variable selectedline write selectedline_change
2242 # Status label and progress bar
2243 set statusw .tf.bar.status
2244 ${NS}::label $statusw -width 15 -relief sunken
2245 pack $statusw -side left -padx 5
2247 set progresscanv [ttk::progressbar .tf.bar.progress]
2249 set h [expr {[font metrics uifont -linespace] + 2}]
2250 set progresscanv .tf.bar.progress
2251 canvas $progresscanv -relief sunken -height $h -borderwidth 2
2252 set progressitem [$progresscanv create rect -1 0 0 $h -fill green]
2253 set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow]
2254 set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
2256 pack $progresscanv -side right -expand 1 -fill x -padx {0 2}
2257 set progresscoords {0 0}
2260 bind $progresscanv <Configure> adjustprogress
2261 set lastprogupdate [clock clicks -milliseconds]
2262 set progupdatepending 0
2264 # build up the bottom bar of upper window
2265 ${NS}::label .tf.lbar.flabel -text "[mc "Find"] "
2268 #define down_width 16
2269 #define down_height 16
2270 static unsigned char down_bits[] = {
2271 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,
2272 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,
2273 0x87, 0xe1, 0x8e, 0x71, 0x9c, 0x39, 0xb8, 0x1d,
2274 0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0x80, 0x01};
2276 image create bitmap bm-down -data $bm_down_data -foreground $uifgcolor
2277 ${NS}::button .tf.lbar.fnext -width 26 -command {dofind 1 1}
2278 .tf.lbar.fnext configure -image bm-down
2282 #define up_height 16
2283 static unsigned char up_bits[] = {
2284 0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f,
2285 0xb8, 0x1d, 0x9c, 0x39, 0x8e, 0x71, 0x87, 0xe1,
2286 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,
2287 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01};
2289 image create bitmap bm-up -data $bm_up_data -foreground $uifgcolor
2290 ${NS}::button .tf.lbar.fprev -width 26 -command {dofind -1 1}
2291 .tf.lbar.fprev configure -image bm-up
2293 ${NS}::label .tf.lbar.flab2 -text " [mc "commit"] "
2295 pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \
2297 set gdttype [mc "containing:"]
2298 set gm [makedroplist .tf.lbar.gdttype gdttype \
2299 [mc "containing:"] \
2300 [mc "touching paths:"] \
2301 [mc "adding/removing string:"] \
2302 [mc "changing lines matching:"]]
2303 trace add variable gdttype write gdttype_change
2304 pack .tf.lbar.gdttype -side left -fill y
2307 set fstring .tf.lbar.findstring
2308 lappend entries $fstring
2309 ${NS}::entry $fstring -width 30 -textvariable findstring
2310 trace add variable findstring write find_change
2311 set findtype [mc "Exact"]
2312 set findtypemenu [makedroplist .tf.lbar.findtype \
2313 findtype [mc "Exact"] [mc "IgnCase"] [mc "Regexp"]]
2314 trace add variable findtype write findcom_change
2315 set findloc [mc "All fields"]
2316 makedroplist .tf.lbar.findloc findloc [mc "All fields"] [mc "Headline"] \
2317 [mc "Comments"] [mc "Author"] [mc "Committer"]
2318 trace add variable findloc write find_change
2319 pack .tf.lbar.findloc -side right
2320 pack .tf.lbar.findtype -side right
2321 pack $fstring -side left -expand 1 -fill x
2323 # Finish putting the upper half of the viewer together
2324 pack .tf.lbar -in .tf -side bottom -fill x
2325 pack .tf.bar -in .tf -side bottom -fill x
2326 pack .tf.histframe -fill both -side top -expand 1
2329 .ctop paneconfigure .tf -height $geometry(topheight)
2330 .ctop paneconfigure .tf -width $geometry(topwidth)
2333 # now build up the bottom
2334 ${NS}::panedwindow .pwbottom -orient horizontal
2336 # lower left, a text box over search bar, scroll bar to the right
2337 # if we know window height, then that will set the lower text height, otherwise
2338 # we set lower text height which will drive window height
2339 if {[info exists geometry(main)]} {
2340 ${NS}::frame .bleft -width $geometry(botwidth)
2342 ${NS}::frame .bleft -width $geometry(botwidth) -height $geometry(botheight)
2344 ${NS}::frame .bleft.top
2345 ${NS}::frame .bleft.mid
2346 ${NS}::frame .bleft.bottom
2348 ${NS}::button .bleft.top.search -text [mc "Search"] -command dosearch
2349 pack .bleft.top.search -side left -padx 5
2350 set sstring .bleft.top.sstring
2352 ${NS}::entry $sstring -width 20 -textvariable searchstring
2353 lappend entries $sstring
2354 trace add variable searchstring write incrsearch
2355 pack $sstring -side left -expand 1 -fill x
2356 ${NS}::radiobutton .bleft.mid.diff -text [mc "Diff"] \
2357 -command changediffdisp -variable diffelide -value {0 0}
2358 ${NS}::radiobutton .bleft.mid.old -text [mc "Old version"] \
2359 -command changediffdisp -variable diffelide -value {0 1}
2360 ${NS}::radiobutton .bleft.mid.new -text [mc "New version"] \
2361 -command changediffdisp -variable diffelide -value {1 0}
2362 ${NS}::label .bleft.mid.labeldiffcontext -text " [mc "Lines of context"]: "
2363 pack .bleft.mid.diff .bleft.mid.old .bleft.mid.new -side left
2364 spinbox .bleft.mid.diffcontext -width 5 \
2365 -from 0 -increment 1 -to 10000000 \
2366 -validate all -validatecommand "diffcontextvalidate %P" \
2367 -textvariable diffcontextstring
2368 .bleft.mid.diffcontext set $diffcontext
2369 trace add variable diffcontextstring write diffcontextchange
2370 lappend entries .bleft.mid.diffcontext
2371 pack .bleft.mid.labeldiffcontext .bleft.mid.diffcontext -side left
2372 ${NS}::checkbutton .bleft.mid.ignspace -text [mc "Ignore space change"] \
2373 -command changeignorespace -variable ignorespace
2374 pack .bleft.mid.ignspace -side left -padx 5
2376 set worddiff [mc "Line diff"]
2377 if {[package vcompare $git_version "1.7.2"] >= 0} {
2378 makedroplist .bleft.mid.worddiff worddiff [mc "Line diff"] \
2379 [mc "Markup words"] [mc "Color words"]
2380 trace add variable worddiff write changeworddiff
2381 pack .bleft.mid.worddiff -side left -padx 5
2384 set ctext .bleft.bottom.ctext
2385 text $ctext -background $bgcolor -foreground $fgcolor \
2386 -state disabled -font textfont \
2387 -yscrollcommand scrolltext -wrap none \
2388 -xscrollcommand ".bleft.bottom.sbhorizontal set"
2390 $ctext conf -tabstyle wordprocessor
2392 ${NS}::scrollbar .bleft.bottom.sb -command "$ctext yview"
2393 ${NS}::scrollbar .bleft.bottom.sbhorizontal -command "$ctext xview" -orient h
2394 pack .bleft.top -side top -fill x
2395 pack .bleft.mid -side top -fill x
2396 grid $ctext .bleft.bottom.sb -sticky nsew
2397 grid .bleft.bottom.sbhorizontal -sticky ew
2398 grid columnconfigure .bleft.bottom 0 -weight 1
2399 grid rowconfigure .bleft.bottom 0 -weight 1
2400 grid rowconfigure .bleft.bottom 1 -weight 0
2401 pack .bleft.bottom -side top -fill both -expand 1
2402 lappend bglist $ctext
2403 lappend fglist $ctext
2405 $ctext tag conf comment -wrap $wrapcomment
2406 $ctext tag conf filesep -font textfontbold -fore $filesepfgcolor -back $filesepbgcolor
2407 $ctext tag conf hunksep -fore [lindex $diffcolors 2]
2408 $ctext tag conf d0 -fore [lindex $diffcolors 0]
2409 $ctext tag conf dresult -fore [lindex $diffcolors 1]
2410 $ctext tag conf m0 -fore [lindex $mergecolors 0]
2411 $ctext tag conf m1 -fore [lindex $mergecolors 1]
2412 $ctext tag conf m2 -fore [lindex $mergecolors 2]
2413 $ctext tag conf m3 -fore [lindex $mergecolors 3]
2414 $ctext tag conf m4 -fore [lindex $mergecolors 4]
2415 $ctext tag conf m5 -fore [lindex $mergecolors 5]
2416 $ctext tag conf m6 -fore [lindex $mergecolors 6]
2417 $ctext tag conf m7 -fore [lindex $mergecolors 7]
2418 $ctext tag conf m8 -fore [lindex $mergecolors 8]
2419 $ctext tag conf m9 -fore [lindex $mergecolors 9]
2420 $ctext tag conf m10 -fore [lindex $mergecolors 10]
2421 $ctext tag conf m11 -fore [lindex $mergecolors 11]
2422 $ctext tag conf m12 -fore [lindex $mergecolors 12]
2423 $ctext tag conf m13 -fore [lindex $mergecolors 13]
2424 $ctext tag conf m14 -fore [lindex $mergecolors 14]
2425 $ctext tag conf m15 -fore [lindex $mergecolors 15]
2426 $ctext tag conf mmax -fore darkgrey
2428 $ctext tag conf mresult -font textfontbold
2429 $ctext tag conf msep -font textfontbold
2430 $ctext tag conf found -back $foundbgcolor
2431 $ctext tag conf currentsearchhit -back $currentsearchhitbgcolor
2432 $ctext tag conf wwrap -wrap word -lmargin2 1c
2433 $ctext tag conf bold -font textfontbold
2435 .pwbottom add .bleft
2437 .pwbottom paneconfigure .bleft -width $geometry(botwidth)
2441 ${NS}::frame .bright
2442 ${NS}::frame .bright.mode
2443 ${NS}::radiobutton .bright.mode.patch -text [mc "Patch"] \
2444 -command reselectline -variable cmitmode -value "patch"
2445 ${NS}::radiobutton .bright.mode.tree -text [mc "Tree"] \
2446 -command reselectline -variable cmitmode -value "tree"
2447 grid .bright.mode.patch .bright.mode.tree -sticky ew
2448 pack .bright.mode -side top -fill x
2449 set cflist .bright.cfiles
2450 set indent [font measure mainfont "nn"]
2452 -selectbackground $selectbgcolor \
2453 -background $bgcolor -foreground $fgcolor \
2455 -tabs [list $indent [expr {2 * $indent}]] \
2456 -yscrollcommand ".bright.sb set" \
2457 -cursor [. cget -cursor] \
2458 -spacing1 1 -spacing3 1
2459 lappend bglist $cflist
2460 lappend fglist $cflist
2461 ${NS}::scrollbar .bright.sb -command "$cflist yview"
2462 pack .bright.sb -side right -fill y
2463 pack $cflist -side left -fill both -expand 1
2464 $cflist tag configure highlight \
2465 -background [$cflist cget -selectbackground]
2466 $cflist tag configure bold -font mainfontbold
2468 .pwbottom add .bright
2471 # restore window width & height if known
2472 if {[info exists geometry(main)]} {
2473 if {[scan $geometry(main) "%dx%d" w h] >= 2} {
2474 if {$w > [winfo screenwidth .]} {
2475 set w [winfo screenwidth .]
2477 if {$h > [winfo screenheight .]} {
2478 set h [winfo screenheight .]
2480 wm geometry . "${w}x$h"
2484 if {[info exists geometry(state)] && $geometry(state) eq "zoomed"} {
2485 wm state . $geometry(state)
2488 if {[tk windowingsystem] eq {aqua}} {
2499 %W sashpos 0 $::geometry(topheight)
2501 bind .pwbottom <Map> {
2503 %W sashpos 0 $::geometry(botwidth)
2507 bind .pwbottom <Configure> {resizecdetpanes %W %w}
2508 pack .ctop -fill both -expand 1
2509 bindall <1> {selcanvline %W %x %y}
2510 #bindall <B1-Motion> {selcanvline %W %x %y}
2511 if {[tk windowingsystem] == "win32"} {
2512 bind . <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D }
2513 bind $ctext <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D ; break }
2515 bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
2516 bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
2517 if {[tk windowingsystem] eq "aqua"} {
2518 bindall <MouseWheel> {
2519 set delta [expr {- (%D)}]
2520 allcanvs yview scroll $delta units
2522 bindall <Shift-MouseWheel> {
2523 set delta [expr {- (%D)}]
2524 $canv xview scroll $delta units
2528 bindall <$::BM> "canvscan mark %W %x %y"
2529 bindall <B$::BM-Motion> "canvscan dragto %W %x %y"
2530 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2531 bind . <$M1B-Key-w> doquit
2532 bindkey <Home> selfirstline
2533 bindkey <End> sellastline
2534 bind . <Key-Up> "selnextline -1"
2535 bind . <Key-Down> "selnextline 1"
2536 bind . <Shift-Key-Up> "dofind -1 0"
2537 bind . <Shift-Key-Down> "dofind 1 0"
2538 bindkey <Key-Right> "goforw"
2539 bindkey <Key-Left> "goback"
2540 bind . <Key-Prior> "selnextpage -1"
2541 bind . <Key-Next> "selnextpage 1"
2542 bind . <$M1B-Home> "allcanvs yview moveto 0.0"
2543 bind . <$M1B-End> "allcanvs yview moveto 1.0"
2544 bind . <$M1B-Key-Up> "allcanvs yview scroll -1 units"
2545 bind . <$M1B-Key-Down> "allcanvs yview scroll 1 units"
2546 bind . <$M1B-Key-Prior> "allcanvs yview scroll -1 pages"
2547 bind . <$M1B-Key-Next> "allcanvs yview scroll 1 pages"
2548 bindkey <Key-Delete> "$ctext yview scroll -1 pages"
2549 bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
2550 bindkey <Key-space> "$ctext yview scroll 1 pages"
2551 bindkey p "selnextline -1"
2552 bindkey n "selnextline 1"
2555 bindkey k "selnextline -1"
2556 bindkey j "selnextline 1"
2560 bindkey d "$ctext yview scroll 18 units"
2561 bindkey u "$ctext yview scroll -18 units"
2562 bindkey / {focus $fstring}
2563 bindkey <Key-KP_Divide> {focus $fstring}
2564 bindkey <Key-Return> {dofind 1 1}
2565 bindkey ? {dofind -1 1}
2567 bind . <F5> updatecommits
2568 bindmodfunctionkey Shift 5 reloadcommits
2569 bind . <F2> showrefs
2570 bindmodfunctionkey Shift 4 {newview 0}
2571 bind . <F4> edit_or_newview
2572 bind . <$M1B-q> doquit
2573 bind . <$M1B-f> {dofind 1 1}
2574 bind . <$M1B-g> {dofind 1 0}
2575 bind . <$M1B-r> dosearchback
2576 bind . <$M1B-s> dosearch
2577 bind . <$M1B-equal> {incrfont 1}
2578 bind . <$M1B-plus> {incrfont 1}
2579 bind . <$M1B-KP_Add> {incrfont 1}
2580 bind . <$M1B-minus> {incrfont -1}
2581 bind . <$M1B-KP_Subtract> {incrfont -1}
2582 wm protocol . WM_DELETE_WINDOW doquit
2583 bind . <Destroy> {stop_backends}
2584 bind . <Button-1> "click %W"
2585 bind $fstring <Key-Return> {dofind 1 1}
2586 bind $sha1entry <Key-Return> {gotocommit; break}
2587 bind $sha1entry <<PasteSelection>> clearsha1
2588 bind $sha1entry <<Paste>> clearsha1
2589 bind $cflist <1> {sel_flist %W %x %y; break}
2590 bind $cflist <B1-Motion> {sel_flist %W %x %y; break}
2591 bind $cflist <ButtonRelease-1> {treeclick %W %x %y}
2593 bind $cflist $ctxbut {pop_flist_menu %W %X %Y %x %y}
2594 bind $ctext $ctxbut {pop_diff_menu %W %X %Y %x %y}
2595 bind $ctext <Button-1> {focus %W}
2596 bind $ctext <<Selection>> rehighlight_search_results
2598 set maincursor [. cget -cursor]
2599 set textcursor [$ctext cget -cursor]
2600 set curtextcursor $textcursor
2602 set rowctxmenu .rowctxmenu
2603 makemenu $rowctxmenu {
2604 {mc "Diff this -> selected" command {diffvssel 0}}
2605 {mc "Diff selected -> this" command {diffvssel 1}}
2606 {mc "Make patch" command mkpatch}
2607 {mc "Create tag" command mktag}
2608 {mc "Write commit to file" command writecommit}
2609 {mc "Create new branch" command mkbranch}
2610 {mc "Cherry-pick this commit" command cherrypick}
2611 {mc "Reset HEAD branch to here" command resethead}
2612 {mc "Mark this commit" command markhere}
2613 {mc "Return to mark" command gotomark}
2614 {mc "Find descendant of this and mark" command find_common_desc}
2615 {mc "Compare with marked commit" command compare_commits}
2616 {mc "Diff this -> marked commit" command {diffvsmark 0}}
2617 {mc "Diff marked commit -> this" command {diffvsmark 1}}
2618 {mc "Revert this commit" command revert}
2620 $rowctxmenu configure -tearoff 0
2622 set fakerowmenu .fakerowmenu
2623 makemenu $fakerowmenu {
2624 {mc "Diff this -> selected" command {diffvssel 0}}
2625 {mc "Diff selected -> this" command {diffvssel 1}}
2626 {mc "Make patch" command mkpatch}
2627 {mc "Diff this -> marked commit" command {diffvsmark 0}}
2628 {mc "Diff marked commit -> this" command {diffvsmark 1}}
2630 $fakerowmenu configure -tearoff 0
2632 set headctxmenu .headctxmenu
2633 makemenu $headctxmenu {
2634 {mc "Check out this branch" command cobranch}
2635 {mc "Remove this branch" command rmbranch}
2637 $headctxmenu configure -tearoff 0
2640 set flist_menu .flistctxmenu
2641 makemenu $flist_menu {
2642 {mc "Highlight this too" command {flist_hl 0}}
2643 {mc "Highlight this only" command {flist_hl 1}}
2644 {mc "External diff" command {external_diff}}
2645 {mc "Blame parent commit" command {external_blame 1}}
2647 $flist_menu configure -tearoff 0
2650 set diff_menu .diffctxmenu
2651 makemenu $diff_menu {
2652 {mc "Show origin of this line" command show_line_source}
2653 {mc "Run git gui blame on this line" command {external_blame_diff}}
2655 $diff_menu configure -tearoff 0
2658 # Windows sends all mouse wheel events to the current focused window, not
2659 # the one where the mouse hovers, so bind those events here and redirect
2660 # to the correct window
2661 proc windows_mousewheel_redirector {W X Y D} {
2662 global canv canv2 canv3
2663 set w [winfo containing -displayof $W $X $Y]
2665 set u [expr {$D < 0 ? 5 : -5}]
2666 if {$w == $canv || $w == $canv2 || $w == $canv3} {
2667 allcanvs yview scroll $u units
2670 $w yview scroll $u units
2676 # Update row number label when selectedline changes
2677 proc selectedline_change {n1 n2 op} {
2678 global selectedline rownumsel
2680 if {$selectedline eq {}} {
2683 set rownumsel [expr {$selectedline + 1}]
2687 # mouse-2 makes all windows scan vertically, but only the one
2688 # the cursor is in scans horizontally
2689 proc canvscan {op w x y} {
2690 global canv canv2 canv3
2691 foreach c [list $canv $canv2 $canv3] {
2700 proc scrollcanv {cscroll f0 f1} {
2701 $cscroll set $f0 $f1
2706 # when we make a key binding for the toplevel, make sure
2707 # it doesn't get triggered when that key is pressed in the
2708 # find string entry widget.
2709 proc bindkey {ev script} {
2712 set escript [bind Entry $ev]
2713 if {$escript == {}} {
2714 set escript [bind Entry <Key>]
2716 foreach e $entries {
2717 bind $e $ev "$escript; break"
2721 proc bindmodfunctionkey {mod n script} {
2722 bind . <$mod-F$n> $script
2723 catch { bind . <$mod-XF86_Switch_VT_$n> $script }
2726 # set the focus back to the toplevel for any click outside
2729 global ctext entries
2730 foreach e [concat $entries $ctext] {
2731 if {$w == $e} return
2736 # Adjust the progress bar for a change in requested extent or canvas size
2737 proc adjustprogress {} {
2738 global progresscanv progressitem progresscoords
2739 global fprogitem fprogcoord lastprogupdate progupdatepending
2740 global rprogitem rprogcoord use_ttk
2743 $progresscanv configure -value [expr {int($fprogcoord * 100)}]
2747 set w [expr {[winfo width $progresscanv] - 4}]
2748 set x0 [expr {$w * [lindex $progresscoords 0]}]
2749 set x1 [expr {$w * [lindex $progresscoords 1]}]
2750 set h [winfo height $progresscanv]
2751 $progresscanv coords $progressitem $x0 0 $x1 $h
2752 $progresscanv coords $fprogitem 0 0 [expr {$w * $fprogcoord}] $h
2753 $progresscanv coords $rprogitem 0 0 [expr {$w * $rprogcoord}] $h
2754 set now [clock clicks -milliseconds]
2755 if {$now >= $lastprogupdate + 100} {
2756 set progupdatepending 0
2758 } elseif {!$progupdatepending} {
2759 set progupdatepending 1
2760 after [expr {$lastprogupdate + 100 - $now}] doprogupdate
2764 proc doprogupdate {} {
2765 global lastprogupdate progupdatepending
2767 if {$progupdatepending} {
2768 set progupdatepending 0
2769 set lastprogupdate [clock clicks -milliseconds]
2774 proc savestuff {w} {
2775 global canv canv2 canv3 mainfont textfont uifont tabstop
2776 global stuffsaved findmergefiles maxgraphpct
2777 global maxwidth showneartags showlocalchanges
2778 global viewname viewfiles viewargs viewargscmd viewperm nextviewnum
2779 global cmitmode wrapcomment datetimeformat limitdiffs
2780 global colors uicolor bgcolor fgcolor diffcolors diffcontext selectbgcolor
2781 global uifgcolor uifgdisabledcolor
2782 global headbgcolor headfgcolor headoutlinecolor remotebgcolor
2783 global tagbgcolor tagfgcolor tagoutlinecolor
2784 global reflinecolor filesepbgcolor filesepfgcolor
2785 global mergecolors foundbgcolor currentsearchhitbgcolor
2786 global linehoverbgcolor linehoverfgcolor linehoveroutlinecolor circlecolors
2787 global mainheadcirclecolor workingfilescirclecolor indexcirclecolor
2788 global linkfgcolor circleoutlinecolor
2789 global autoselect autosellen extdifftool perfile_attrs markbgcolor use_ttk
2790 global hideremotes want_ttk maxrefs
2791 global config_file config_file_tmp
2793 if {$stuffsaved} return
2794 if {![winfo viewable .]} return
2796 if {[file exists $config_file_tmp]} {
2797 file delete -force $config_file_tmp
2799 set f [open $config_file_tmp w]
2800 if {$::tcl_platform(platform) eq {windows}} {
2801 file attributes $config_file_tmp -hidden true
2803 puts $f [list set mainfont $mainfont]
2804 puts $f [list set textfont $textfont]
2805 puts $f [list set uifont $uifont]
2806 puts $f [list set tabstop $tabstop]
2807 puts $f [list set findmergefiles $findmergefiles]
2808 puts $f [list set maxgraphpct $maxgraphpct]
2809 puts $f [list set maxwidth $maxwidth]
2810 puts $f [list set cmitmode $cmitmode]
2811 puts $f [list set wrapcomment $wrapcomment]
2812 puts $f [list set autoselect $autoselect]
2813 puts $f [list set autosellen $autosellen]
2814 puts $f [list set showneartags $showneartags]
2815 puts $f [list set maxrefs $maxrefs]
2816 puts $f [list set hideremotes $hideremotes]
2817 puts $f [list set showlocalchanges $showlocalchanges]
2818 puts $f [list set datetimeformat $datetimeformat]
2819 puts $f [list set limitdiffs $limitdiffs]
2820 puts $f [list set uicolor $uicolor]
2821 puts $f [list set want_ttk $want_ttk]
2822 puts $f [list set bgcolor $bgcolor]
2823 puts $f [list set fgcolor $fgcolor]
2824 puts $f [list set uifgcolor $uifgcolor]
2825 puts $f [list set uifgdisabledcolor $uifgdisabledcolor]
2826 puts $f [list set colors $colors]
2827 puts $f [list set diffcolors $diffcolors]
2828 puts $f [list set mergecolors $mergecolors]
2829 puts $f [list set markbgcolor $markbgcolor]
2830 puts $f [list set diffcontext $diffcontext]
2831 puts $f [list set selectbgcolor $selectbgcolor]
2832 puts $f [list set foundbgcolor $foundbgcolor]
2833 puts $f [list set currentsearchhitbgcolor $currentsearchhitbgcolor]
2834 puts $f [list set extdifftool $extdifftool]
2835 puts $f [list set perfile_attrs $perfile_attrs]
2836 puts $f [list set headbgcolor $headbgcolor]
2837 puts $f [list set headfgcolor $headfgcolor]
2838 puts $f [list set headoutlinecolor $headoutlinecolor]
2839 puts $f [list set remotebgcolor $remotebgcolor]
2840 puts $f [list set tagbgcolor $tagbgcolor]
2841 puts $f [list set tagfgcolor $tagfgcolor]
2842 puts $f [list set tagoutlinecolor $tagoutlinecolor]
2843 puts $f [list set reflinecolor $reflinecolor]
2844 puts $f [list set filesepbgcolor $filesepbgcolor]
2845 puts $f [list set filesepfgcolor $filesepfgcolor]
2846 puts $f [list set linehoverbgcolor $linehoverbgcolor]
2847 puts $f [list set linehoverfgcolor $linehoverfgcolor]
2848 puts $f [list set linehoveroutlinecolor $linehoveroutlinecolor]
2849 puts $f [list set mainheadcirclecolor $mainheadcirclecolor]
2850 puts $f [list set workingfilescirclecolor $workingfilescirclecolor]
2851 puts $f [list set indexcirclecolor $indexcirclecolor]
2852 puts $f [list set circlecolors $circlecolors]
2853 puts $f [list set linkfgcolor $linkfgcolor]
2854 puts $f [list set circleoutlinecolor $circleoutlinecolor]
2856 puts $f "set geometry(main) [wm geometry .]"
2857 puts $f "set geometry(state) [wm state .]"
2858 puts $f "set geometry(topwidth) [winfo width .tf]"
2859 puts $f "set geometry(topheight) [winfo height .tf]"
2861 puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sashpos 0] 1\""
2862 puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sashpos 1] 1\""
2864 puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\""
2865 puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\""
2867 puts $f "set geometry(botwidth) [winfo width .bleft]"
2868 puts $f "set geometry(botheight) [winfo height .bleft]"
2870 puts -nonewline $f "set permviews {"
2871 for {set v 0} {$v < $nextviewnum} {incr v} {
2872 if {$viewperm($v)} {
2873 puts $f "{[list $viewname($v) $viewfiles($v) $viewargs($v) $viewargscmd($v)]}"
2878 file rename -force $config_file_tmp $config_file
2883 proc resizeclistpanes {win w} {
2884 global oldwidth use_ttk
2885 if {[info exists oldwidth($win)]} {
2887 set s0 [$win sashpos 0]
2888 set s1 [$win sashpos 1]
2890 set s0 [$win sash coord 0]
2891 set s1 [$win sash coord 1]
2894 set sash0 [expr {int($w/2 - 2)}]
2895 set sash1 [expr {int($w*5/6 - 2)}]
2897 set factor [expr {1.0 * $w / $oldwidth($win)}]
2898 set sash0 [expr {int($factor * [lindex $s0 0])}]
2899 set sash1 [expr {int($factor * [lindex $s1 0])}]
2903 if {$sash1 < $sash0 + 20} {
2904 set sash1 [expr {$sash0 + 20}]
2906 if {$sash1 > $w - 10} {
2907 set sash1 [expr {$w - 10}]
2908 if {$sash0 > $sash1 - 20} {
2909 set sash0 [expr {$sash1 - 20}]
2914 $win sashpos 0 $sash0
2915 $win sashpos 1 $sash1
2917 $win sash place 0 $sash0 [lindex $s0 1]
2918 $win sash place 1 $sash1 [lindex $s1 1]
2921 set oldwidth($win) $w
2924 proc resizecdetpanes {win w} {
2925 global oldwidth use_ttk
2926 if {[info exists oldwidth($win)]} {
2928 set s0 [$win sashpos 0]
2930 set s0 [$win sash coord 0]
2933 set sash0 [expr {int($w*3/4 - 2)}]
2935 set factor [expr {1.0 * $w / $oldwidth($win)}]
2936 set sash0 [expr {int($factor * [lindex $s0 0])}]
2940 if {$sash0 > $w - 15} {
2941 set sash0 [expr {$w - 15}]
2945 $win sashpos 0 $sash0
2947 $win sash place 0 $sash0 [lindex $s0 1]
2950 set oldwidth($win) $w
2953 proc allcanvs args {
2954 global canv canv2 canv3
2960 proc bindall {event action} {
2961 global canv canv2 canv3
2962 bind $canv $event $action
2963 bind $canv2 $event $action
2964 bind $canv3 $event $action
2970 if {[winfo exists $w]} {
2975 wm title $w [mc "About gitk"]
2977 message $w.m -text [mc "
2978 Gitk - a commit viewer for git
2980 Copyright \u00a9 2005-2014 Paul Mackerras
2982 Use and redistribute under the terms of the GNU General Public License"] \
2983 -justify center -aspect 400 -border 2 -bg white -relief groove
2984 pack $w.m -side top -fill x -padx 2 -pady 2
2985 ${NS}::button $w.ok -text [mc "Close"] -command "destroy $w" -default active
2986 pack $w.ok -side bottom
2987 bind $w <Visibility> "focus $w.ok"
2988 bind $w <Key-Escape> "destroy $w"
2989 bind $w <Key-Return> "destroy $w"
2990 tk::PlaceWindow $w widget .
2996 if {[winfo exists $w]} {
3000 if {[tk windowingsystem] eq {aqua}} {
3006 wm title $w [mc "Gitk key bindings"]
3008 message $w.m -text "
3009 [mc "Gitk key bindings:"]
3011 [mc "<%s-Q> Quit" $M1T]
3012 [mc "<%s-W> Close window" $M1T]
3013 [mc "<Home> Move to first commit"]
3014 [mc "<End> Move to last commit"]
3015 [mc "<Up>, p, k Move up one commit"]
3016 [mc "<Down>, n, j Move down one commit"]
3017 [mc "<Left>, z, h Go back in history list"]
3018 [mc "<Right>, x, l Go forward in history list"]
3019 [mc "<PageUp> Move up one page in commit list"]
3020 [mc "<PageDown> Move down one page in commit list"]
3021 [mc "<%s-Home> Scroll to top of commit list" $M1T]
3022 [mc "<%s-End> Scroll to bottom of commit list" $M1T]
3023 [mc "<%s-Up> Scroll commit list up one line" $M1T]
3024 [mc "<%s-Down> Scroll commit list down one line" $M1T]
3025 [mc "<%s-PageUp> Scroll commit list up one page" $M1T]
3026 [mc "<%s-PageDown> Scroll commit list down one page" $M1T]
3027 [mc "<Shift-Up> Find backwards (upwards, later commits)"]
3028 [mc "<Shift-Down> Find forwards (downwards, earlier commits)"]
3029 [mc "<Delete>, b Scroll diff view up one page"]
3030 [mc "<Backspace> Scroll diff view up one page"]
3031 [mc "<Space> Scroll diff view down one page"]
3032 [mc "u Scroll diff view up 18 lines"]
3033 [mc "d Scroll diff view down 18 lines"]
3034 [mc "<%s-F> Find" $M1T]
3035 [mc "<%s-G> Move to next find hit" $M1T]
3036 [mc "<Return> Move to next find hit"]
3037 [mc "/ Focus the search box"]
3038 [mc "? Move to previous find hit"]
3039 [mc "f Scroll diff view to next file"]
3040 [mc "<%s-S> Search for next hit in diff view" $M1T]
3041 [mc "<%s-R> Search for previous hit in diff view" $M1T]
3042 [mc "<%s-KP+> Increase font size" $M1T]
3043 [mc "<%s-plus> Increase font size" $M1T]
3044 [mc "<%s-KP-> Decrease font size" $M1T]
3045 [mc "<%s-minus> Decrease font size" $M1T]
3048 -justify left -bg white -border 2 -relief groove
3049 pack $w.m -side top -fill both -padx 2 -pady 2
3050 ${NS}::button $w.ok -text [mc "Close"] -command "destroy $w" -default active
3051 bind $w <Key-Escape> [list destroy $w]
3052 pack $w.ok -side bottom
3053 bind $w <Visibility> "focus $w.ok"
3054 bind $w <Key-Escape> "destroy $w"
3055 bind $w <Key-Return> "destroy $w"
3058 # Procedures for manipulating the file list window at the
3059 # bottom right of the overall window.
3061 proc treeview {w l openlevs} {
3062 global treecontents treediropen treeheight treeparent treeindex
3072 set treecontents() {}
3073 $w conf -state normal
3075 while {[string range $f 0 $prefixend] ne $prefix} {
3076 if {$lev <= $openlevs} {
3077 $w mark set e:$treeindex($prefix) "end -1c"
3078 $w mark gravity e:$treeindex($prefix) left
3080 set treeheight($prefix) $ht
3081 incr ht [lindex $htstack end]
3082 set htstack [lreplace $htstack end end]
3083 set prefixend [lindex $prefendstack end]
3084 set prefendstack [lreplace $prefendstack end end]
3085 set prefix [string range $prefix 0 $prefixend]
3088 set tail [string range $f [expr {$prefixend+1}] end]
3089 while {[set slash [string first "/" $tail]] >= 0} {
3092 lappend prefendstack $prefixend
3093 incr prefixend [expr {$slash + 1}]
3094 set d [string range $tail 0 $slash]
3095 lappend treecontents($prefix) $d
3096 set oldprefix $prefix
3098 set treecontents($prefix) {}
3099 set treeindex($prefix) [incr ix]
3100 set treeparent($prefix) $oldprefix
3101 set tail [string range $tail [expr {$slash+1}] end]
3102 if {$lev <= $openlevs} {
3104 set treediropen($prefix) [expr {$lev < $openlevs}]
3105 set bm [expr {$lev == $openlevs? "tri-rt": "tri-dn"}]
3106 $w mark set d:$ix "end -1c"
3107 $w mark gravity d:$ix left
3109 for {set i 0} {$i < $lev} {incr i} {append str "\t"}
3111 $w image create end -align center -image $bm -padx 1 \
3113 $w insert end $d [highlight_tag $prefix]
3114 $w mark set s:$ix "end -1c"
3115 $w mark gravity s:$ix left
3120 if {$lev <= $openlevs} {
3123 for {set i 0} {$i < $lev} {incr i} {append str "\t"}
3125 $w insert end $tail [highlight_tag $f]
3127 lappend treecontents($prefix) $tail
3130 while {$htstack ne {}} {
3131 set treeheight($prefix) $ht
3132 incr ht [lindex $htstack end]
3133 set htstack [lreplace $htstack end end]
3134 set prefixend [lindex $prefendstack end]
3135 set prefendstack [lreplace $prefendstack end end]
3136 set prefix [string range $prefix 0 $prefixend]
3138 $w conf -state disabled
3141 proc linetoelt {l} {
3142 global treeheight treecontents
3147 foreach e $treecontents($prefix) {
3152 if {[string index $e end] eq "/"} {
3153 set n $treeheight($prefix$e)
3165 proc highlight_tree {y prefix} {
3166 global treeheight treecontents cflist
3168 foreach e $treecontents($prefix) {
3170 if {[highlight_tag $path] ne {}} {
3171 $cflist tag add bold $y.0 "$y.0 lineend"
3174 if {[string index $e end] eq "/" && $treeheight($path) > 1} {
3175 set y [highlight_tree $y $path]
3181 proc treeclosedir {w dir} {
3182 global treediropen treeheight treeparent treeindex
3184 set ix $treeindex($dir)
3185 $w conf -state normal
3186 $w delete s:$ix e:$ix
3187 set treediropen($dir) 0
3188 $w image configure a:$ix -image tri-rt
3189 $w conf -state disabled
3190 set n [expr {1 - $treeheight($dir)}]
3191 while {$dir ne {}} {
3192 incr treeheight($dir) $n
3193 set dir $treeparent($dir)
3197 proc treeopendir {w dir} {
3198 global treediropen treeheight treeparent treecontents treeindex
3200 set ix $treeindex($dir)
3201 $w conf -state normal
3202 $w image configure a:$ix -image tri-dn
3203 $w mark set e:$ix s:$ix
3204 $w mark gravity e:$ix right
3207 set n [llength $treecontents($dir)]
3208 for {set x $dir} {$x ne {}} {set x $treeparent($x)} {
3211 incr treeheight($x) $n
3213 foreach e $treecontents($dir) {
3215 if {[string index $e end] eq "/"} {
3216 set iy $treeindex($de)
3217 $w mark set d:$iy e:$ix
3218 $w mark gravity d:$iy left
3219 $w insert e:$ix $str
3220 set treediropen($de) 0
3221 $w image create e:$ix -align center -image tri-rt -padx 1 \
3223 $w insert e:$ix $e [highlight_tag $de]
3224 $w mark set s:$iy e:$ix
3225 $w mark gravity s:$iy left
3226 set treeheight($de) 1
3228 $w insert e:$ix $str
3229 $w insert e:$ix $e [highlight_tag $de]
3232 $w mark gravity e:$ix right
3233 $w conf -state disabled
3234 set treediropen($dir) 1
3235 set top [lindex [split [$w index @0,0] .] 0]
3236 set ht [$w cget -height]
3237 set l [lindex [split [$w index s:$ix] .] 0]
3240 } elseif {$l + $n + 1 > $top + $ht} {
3241 set top [expr {$l + $n + 2 - $ht}]
3249 proc treeclick {w x y} {
3250 global treediropen cmitmode ctext cflist cflist_top
3252 if {$cmitmode ne "tree"} return
3253 if {![info exists cflist_top]} return
3254 set l [lindex [split [$w index "@$x,$y"] "."] 0]
3255 $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
3256 $cflist tag add highlight $l.0 "$l.0 lineend"
3262 set e [linetoelt $l]
3263 if {[string index $e end] ne "/"} {
3265 } elseif {$treediropen($e)} {
3272 proc setfilelist {id} {
3273 global treefilelist cflist jump_to_here
3275 treeview $cflist $treefilelist($id) 0
3276 if {$jump_to_here ne {}} {
3277 set f [lindex $jump_to_here 0]
3278 if {[lsearch -exact $treefilelist($id) $f] >= 0} {
3284 image create bitmap tri-rt -background black -foreground blue -data {
3285 #define tri-rt_width 13
3286 #define tri-rt_height 13
3287 static unsigned char tri-rt_bits[] = {
3288 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x00, 0x70, 0x00, 0xf0, 0x00,
3289 0xf0, 0x01, 0xf0, 0x00, 0x70, 0x00, 0x30, 0x00, 0x10, 0x00, 0x00, 0x00,
3292 #define tri-rt-mask_width 13
3293 #define tri-rt-mask_height 13
3294 static unsigned char tri-rt-mask_bits[] = {
3295 0x08, 0x00, 0x18, 0x00, 0x38, 0x00, 0x78, 0x00, 0xf8, 0x00, 0xf8, 0x01,
3296 0xf8, 0x03, 0xf8, 0x01, 0xf8, 0x00, 0x78, 0x00, 0x38, 0x00, 0x18, 0x00,
3299 image create bitmap tri-dn -background black -foreground blue -data {
3300 #define tri-dn_width 13
3301 #define tri-dn_height 13
3302 static unsigned char tri-dn_bits[] = {
3303 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x07, 0xf8, 0x03,
3304 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
3307 #define tri-dn-mask_width 13
3308 #define tri-dn-mask_height 13
3309 static unsigned char tri-dn-mask_bits[] = {
3310 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0xfe, 0x0f, 0xfc, 0x07,
3311 0xf8, 0x03, 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
3315 image create bitmap reficon-T -background black -foreground yellow -data {
3316 #define tagicon_width 13
3317 #define tagicon_height 9
3318 static unsigned char tagicon_bits[] = {
3319 0x00, 0x00, 0x00, 0x00, 0xf0, 0x07, 0xf8, 0x07,
3320 0xfc, 0x07, 0xf8, 0x07, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00};
3322 #define tagicon-mask_width 13
3323 #define tagicon-mask_height 9
3324 static unsigned char tagicon-mask_bits[] = {
3325 0x00, 0x00, 0xf0, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
3326 0xfe, 0x0f, 0xfc, 0x0f, 0xf8, 0x0f, 0xf0, 0x0f, 0x00, 0x00};
3329 #define headicon_width 13
3330 #define headicon_height 9
3331 static unsigned char headicon_bits[] = {
3332 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xf8, 0x07,
3333 0xf8, 0x07, 0xf8, 0x07, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00};
3336 #define headicon-mask_width 13
3337 #define headicon-mask_height 9
3338 static unsigned char headicon-mask_bits[] = {
3339 0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
3340 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00};
3342 image create bitmap reficon-H -background black -foreground green \
3343 -data $rectdata -maskdata $rectmask
3344 image create bitmap reficon-o -background black -foreground "#ddddff" \
3345 -data $rectdata -maskdata $rectmask
3347 proc init_flist {first} {
3348 global cflist cflist_top difffilestart
3350 $cflist conf -state normal
3351 $cflist delete 0.0 end
3353 $cflist insert end $first
3355 $cflist tag add highlight 1.0 "1.0 lineend"
3357 catch {unset cflist_top}
3359 $cflist conf -state disabled
3360 set difffilestart {}
3363 proc highlight_tag {f} {
3364 global highlight_paths
3366 foreach p $highlight_paths {
3367 if {[string match $p $f]} {
3374 proc highlight_filelist {} {
3375 global cmitmode cflist
3377 $cflist conf -state normal
3378 if {$cmitmode ne "tree"} {
3379 set end [lindex [split [$cflist index end] .] 0]
3380 for {set l 2} {$l < $end} {incr l} {
3381 set line [$cflist get $l.0 "$l.0 lineend"]
3382 if {[highlight_tag $line] ne {}} {
3383 $cflist tag add bold $l.0 "$l.0 lineend"
3389 $cflist conf -state disabled
3392 proc unhighlight_filelist {} {
3395 $cflist conf -state normal
3396 $cflist tag remove bold 1.0 end
3397 $cflist conf -state disabled
3400 proc add_flist {fl} {
3403 $cflist conf -state normal
3405 $cflist insert end "\n"
3406 $cflist insert end $f [highlight_tag $f]
3408 $cflist conf -state disabled
3411 proc sel_flist {w x y} {
3412 global ctext difffilestart cflist cflist_top cmitmode
3414 if {$cmitmode eq "tree"} return
3415 if {![info exists cflist_top]} return
3416 set l [lindex [split [$w index "@$x,$y"] "."] 0]
3417 $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
3418 $cflist tag add highlight $l.0 "$l.0 lineend"
3423 catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
3425 suppress_highlighting_file_for_current_scrollpos
3428 proc pop_flist_menu {w X Y x y} {
3429 global ctext cflist cmitmode flist_menu flist_menu_file
3430 global treediffs diffids
3433 set l [lindex [split [$w index "@$x,$y"] "."] 0]
3435 if {$cmitmode eq "tree"} {
3436 set e [linetoelt $l]
3437 if {[string index $e end] eq "/"} return
3439 set e [lindex $treediffs($diffids) [expr {$l-2}]]
3441 set flist_menu_file $e
3442 set xdiffstate "normal"
3443 if {$cmitmode eq "tree"} {
3444 set xdiffstate "disabled"
3446 # Disable "External diff" item in tree mode
3447 $flist_menu entryconf 2 -state $xdiffstate
3448 tk_popup $flist_menu $X $Y
3451 proc find_ctext_fileinfo {line} {
3452 global ctext_file_names ctext_file_lines
3454 set ok [bsearch $ctext_file_lines $line]
3455 set tline [lindex $ctext_file_lines $ok]
3457 if {$ok >= [llength $ctext_file_lines] || $line < $tline} {
3460 return [list [lindex $ctext_file_names $ok] $tline]
3464 proc pop_diff_menu {w X Y x y} {
3465 global ctext diff_menu flist_menu_file
3466 global diff_menu_txtpos diff_menu_line
3467 global diff_menu_filebase
3469 set diff_menu_txtpos [split [$w index "@$x,$y"] "."]
3470 set diff_menu_line [lindex $diff_menu_txtpos 0]
3471 # don't pop up the menu on hunk-separator or file-separator lines
3472 if {[lsearch -glob [$ctext tag names $diff_menu_line.0] "*sep"] >= 0} {
3476 set f [find_ctext_fileinfo $diff_menu_line]
3477 if {$f eq {}} return
3478 set flist_menu_file [lindex $f 0]
3479 set diff_menu_filebase [lindex $f 1]
3480 tk_popup $diff_menu $X $Y
3483 proc flist_hl {only} {
3484 global flist_menu_file findstring gdttype
3486 set x [shellquote $flist_menu_file]
3487 if {$only || $findstring eq {} || $gdttype ne [mc "touching paths:"]} {
3490 append findstring " " $x
3492 set gdttype [mc "touching paths:"]
3495 proc gitknewtmpdir {} {
3496 global diffnum gitktmpdir gitdir
3498 if {![info exists gitktmpdir]} {
3499 set gitktmpdir [file join $gitdir [format ".gitk-tmp.%s" [pid]]]
3500 if {[catch {file mkdir $gitktmpdir} err]} {
3501 error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err"
3508 set diffdir [file join $gitktmpdir $diffnum]
3509 if {[catch {file mkdir $diffdir} err]} {
3510 error_popup "[mc "Error creating temporary directory %s:" $diffdir] $err"
3516 proc save_file_from_commit {filename output what} {
3519 if {[catch {exec git show $filename -- > $output} err]} {
3520 if {[string match "fatal: bad revision *" $err]} {
3523 error_popup "[mc "Error getting \"%s\" from %s:" $filename $what] $err"
3529 proc external_diff_get_one_file {diffid filename diffdir} {
3530 global nullid nullid2 nullfile
3533 if {$diffid == $nullid} {
3534 set difffile [file join $worktree $filename]
3535 if {[file exists $difffile]} {
3540 if {$diffid == $nullid2} {
3541 set difffile [file join $diffdir "\[index\] [file tail $filename]"]
3542 return [save_file_from_commit :$filename $difffile index]
3544 set difffile [file join $diffdir "\[$diffid\] [file tail $filename]"]
3545 return [save_file_from_commit $diffid:$filename $difffile \
3549 proc external_diff {} {
3550 global nullid nullid2
3551 global flist_menu_file
3555 if {[llength $diffids] == 1} {
3556 # no reference commit given
3557 set diffidto [lindex $diffids 0]
3558 if {$diffidto eq $nullid} {
3559 # diffing working copy with index
3560 set diffidfrom $nullid2
3561 } elseif {$diffidto eq $nullid2} {
3562 # diffing index with HEAD
3563 set diffidfrom "HEAD"
3565 # use first parent commit
3566 global parentlist selectedline
3567 set diffidfrom [lindex $parentlist $selectedline 0]
3570 set diffidfrom [lindex $diffids 0]
3571 set diffidto [lindex $diffids 1]
3574 # make sure that several diffs wont collide
3575 set diffdir [gitknewtmpdir]
3576 if {$diffdir eq {}} return
3578 # gather files to diff
3579 set difffromfile [external_diff_get_one_file $diffidfrom $flist_menu_file $diffdir]
3580 set difftofile [external_diff_get_one_file $diffidto $flist_menu_file $diffdir]
3582 if {$difffromfile ne {} && $difftofile ne {}} {
3583 set cmd [list [shellsplit $extdifftool] $difffromfile $difftofile]
3584 if {[catch {set fl [open |$cmd r]} err]} {
3585 file delete -force $diffdir
3586 error_popup "$extdifftool: [mc "command failed:"] $err"
3588 fconfigure $fl -blocking 0
3589 filerun $fl [list delete_at_eof $fl $diffdir]
3594 proc find_hunk_blamespec {base line} {
3597 # Find and parse the hunk header
3598 set s_lix [$ctext search -backwards -regexp ^@@ "$line.0 lineend" $base.0]
3599 if {$s_lix eq {}} return
3601 set s_line [$ctext get $s_lix "$s_lix + 1 lines"]
3602 if {![regexp {^@@@*(( -\d+(,\d+)?)+) \+(\d+)(,\d+)? @@} $s_line \
3603 s_line old_specs osz osz1 new_line nsz]} {
3607 # base lines for the parents
3608 set base_lines [list $new_line]
3609 foreach old_spec [lrange [split $old_specs " "] 1 end] {
3610 if {![regexp -- {-(\d+)(,\d+)?} $old_spec \
3611 old_spec old_line osz]} {
3614 lappend base_lines $old_line
3617 # Now scan the lines to determine offset within the hunk
3618 set max_parent [expr {[llength $base_lines]-2}]
3620 set s_lno [lindex [split $s_lix "."] 0]
3622 # Determine if the line is removed
3623 set chunk [$ctext get $line.0 "$line.1 + $max_parent chars"]
3624 if {[string match {[-+ ]*} $chunk]} {
3625 set removed_idx [string first "-" $chunk]
3626 # Choose a parent index
3627 if {$removed_idx >= 0} {
3628 set parent $removed_idx
3630 set unchanged_idx [string first " " $chunk]
3631 if {$unchanged_idx >= 0} {
3632 set parent $unchanged_idx
3634 # blame the current commit
3638 # then count other lines that belong to it
3639 for {set i $line} {[incr i -1] > $s_lno} {} {
3640 set chunk [$ctext get $i.0 "$i.1 + $max_parent chars"]
3641 # Determine if the line is removed
3642 set removed_idx [string first "-" $chunk]
3644 set code [string index $chunk $parent]
3645 if {$code eq "-" || ($removed_idx < 0 && $code ne "+")} {
3649 if {$removed_idx < 0} {
3659 incr dline [lindex $base_lines $parent]
3660 return [list $parent $dline]
3663 proc external_blame_diff {} {
3664 global currentid cmitmode
3665 global diff_menu_txtpos diff_menu_line
3666 global diff_menu_filebase flist_menu_file
3668 if {$cmitmode eq "tree"} {
3670 set line [expr {$diff_menu_line - $diff_menu_filebase}]
3672 set hinfo [find_hunk_blamespec $diff_menu_filebase $diff_menu_line]
3674 set parent_idx [lindex $hinfo 0]
3675 set line [lindex $hinfo 1]
3682 external_blame $parent_idx $line
3685 # Find the SHA1 ID of the blob for file $fname in the index
3687 proc index_sha1 {fname} {
3688 set f [open [list | git ls-files -s $fname] r]
3689 while {[gets $f line] >= 0} {
3690 set info [lindex [split $line "\t"] 0]
3691 set stage [lindex $info 2]
3692 if {$stage eq "0" || $stage eq "2"} {
3694 return [lindex $info 1]
3701 # Turn an absolute path into one relative to the current directory
3702 proc make_relative {f} {
3703 if {[file pathtype $f] eq "relative"} {
3706 set elts [file split $f]
3707 set here [file split [pwd]]
3712 if {$ei < $hi || $ei >= [llength $elts] || [lindex $elts $ei] ne $d} {
3719 set elts [concat $res [lrange $elts $ei end]]
3720 return [eval file join $elts]
3723 proc external_blame {parent_idx {line {}}} {
3724 global flist_menu_file cdup
3725 global nullid nullid2
3726 global parentlist selectedline currentid
3728 if {$parent_idx > 0} {
3729 set base_commit [lindex $parentlist $selectedline [expr {$parent_idx-1}]]
3731 set base_commit $currentid
3734 if {$base_commit eq {} || $base_commit eq $nullid || $base_commit eq $nullid2} {
3735 error_popup [mc "No such commit"]
3739 set cmdline [list git gui blame]
3740 if {$line ne {} && $line > 1} {
3741 lappend cmdline "--line=$line"
3743 set f [file join $cdup $flist_menu_file]
3744 # Unfortunately it seems git gui blame doesn't like
3745 # being given an absolute path...
3746 set f [make_relative $f]
3747 lappend cmdline $base_commit $f
3748 if {[catch {eval exec $cmdline &} err]} {
3749 error_popup "[mc "git gui blame: command failed:"] $err"
3753 proc show_line_source {} {
3754 global cmitmode currentid parents curview blamestuff blameinst
3755 global diff_menu_line diff_menu_filebase flist_menu_file
3756 global nullid nullid2 gitdir cdup
3759 if {$cmitmode eq "tree"} {
3761 set line [expr {$diff_menu_line - $diff_menu_filebase}]
3763 set h [find_hunk_blamespec $diff_menu_filebase $diff_menu_line]
3764 if {$h eq {}} return
3765 set pi [lindex $h 0]
3767 mark_ctext_line $diff_menu_line
3771 if {$currentid eq $nullid} {
3773 # must be a merge in progress...
3775 # get the last line from .git/MERGE_HEAD
3776 set f [open [file join $gitdir MERGE_HEAD] r]
3777 set id [lindex [split [read $f] "\n"] end-1]
3780 error_popup [mc "Couldn't read merge head: %s" $err]
3783 } elseif {$parents($curview,$currentid) eq $nullid2} {
3784 # need to do the blame from the index
3786 set from_index [index_sha1 $flist_menu_file]
3788 error_popup [mc "Error reading index: %s" $err]
3792 set id $parents($curview,$currentid)
3795 set id [lindex $parents($curview,$currentid) $pi]
3797 set line [lindex $h 1]
3800 if {$from_index ne {}} {
3801 lappend blameargs | git cat-file blob $from_index
3803 lappend blameargs | git blame -p -L$line,+1
3804 if {$from_index ne {}} {
3805 lappend blameargs --contents -
3807 lappend blameargs $id
3809 lappend blameargs -- [file join $cdup $flist_menu_file]
3811 set f [open $blameargs r]
3813 error_popup [mc "Couldn't start git blame: %s" $err]
3816 nowbusy blaming [mc "Searching"]
3817 fconfigure $f -blocking 0
3818 set i [reg_instance $f]
3819 set blamestuff($i) {}
3821 filerun $f [list read_line_source $f $i]
3824 proc stopblaming {} {
3827 if {[info exists blameinst]} {
3828 stop_instance $blameinst
3834 proc read_line_source {fd inst} {
3835 global blamestuff curview commfd blameinst nullid nullid2
3837 while {[gets $fd line] >= 0} {
3838 lappend blamestuff($inst) $line
3846 fconfigure $fd -blocking 1
3847 if {[catch {close $fd} err]} {
3848 error_popup [mc "Error running git blame: %s" $err]
3853 set line [split [lindex $blamestuff($inst) 0] " "]
3854 set id [lindex $line 0]
3855 set lnum [lindex $line 1]
3856 if {[string length $id] == 40 && [string is xdigit $id] &&
3857 [string is digit -strict $lnum]} {
3858 # look for "filename" line
3859 foreach l $blamestuff($inst) {
3860 if {[string match "filename *" $l]} {
3861 set fname [string range $l 9 end]
3867 # all looks good, select it
3868 if {$id eq $nullid} {
3869 # blame uses all-zeroes to mean not committed,
3870 # which would mean a change in the index
3873 if {[commitinview $id $curview]} {
3874 selectline [rowofcommit $id] 1 [list $fname $lnum] 1
3876 error_popup [mc "That line comes from commit %s, \
3877 which is not in this view" [shortids $id]]
3880 puts "oops couldn't parse git blame output"
3885 # delete $dir when we see eof on $f (presumably because the child has exited)
3886 proc delete_at_eof {f dir} {
3887 while {[gets $f line] >= 0} {}
3889 if {[catch {close $f} err]} {
3890 error_popup "[mc "External diff viewer failed:"] $err"
3892 file delete -force $dir
3898 # Functions for adding and removing shell-type quoting
3900 proc shellquote {str} {
3901 if {![string match "*\['\"\\ \t]*" $str]} {
3904 if {![string match "*\['\"\\]*" $str]} {
3907 if {![string match "*'*" $str]} {
3910 return "\"[string map {\" \\\" \\ \\\\} $str]\""
3913 proc shellarglist {l} {
3919 append str [shellquote $a]
3924 proc shelldequote {str} {
3929 if {![regexp -start $used -indices "\['\"\\\\ \t]" $str first]} {
3930 append ret [string range $str $used end]
3931 set used [string length $str]
3934 set first [lindex $first 0]
3935 set ch [string index $str $first]
3936 if {$first > $used} {
3937 append ret [string range $str $used [expr {$first - 1}]]
3940 if {$ch eq " " || $ch eq "\t"} break
3943 set first [string first "'" $str $used]
3945 error "unmatched single-quote"
3947 append ret [string range $str $used [expr {$first - 1}]]
3952 if {$used >= [string length $str]} {
3953 error "trailing backslash"
3955 append ret [string index $str $used]
3960 if {![regexp -start $used -indices "\[\"\\\\]" $str first]} {
3961 error "unmatched double-quote"
3963 set first [lindex $first 0]
3964 set ch [string index $str $first]
3965 if {$first > $used} {
3966 append ret [string range $str $used [expr {$first - 1}]]
3969 if {$ch eq "\""} break
3971 append ret [string index $str $used]
3975 return [list $used $ret]
3978 proc shellsplit {str} {
3981 set str [string trimleft $str]
3982 if {$str eq {}} break
3983 set dq [shelldequote $str]
3984 set n [lindex $dq 0]
3985 set word [lindex $dq 1]
3986 set str [string range $str $n end]
3992 # Code to implement multiple views
3994 proc newview {ishighlight} {
3995 global nextviewnum newviewname newishighlight
3996 global revtreeargs viewargscmd newviewopts curview
3998 set newishighlight $ishighlight
4000 if {[winfo exists $top]} {
4004 decode_view_opts $nextviewnum $revtreeargs
4005 set newviewname($nextviewnum) "[mc "View"] $nextviewnum"
4006 set newviewopts($nextviewnum,perm) 0
4007 set newviewopts($nextviewnum,cmd) $viewargscmd($curview)
4008 vieweditor $top $nextviewnum [mc "Gitk view definition"]
4011 set known_view_options {
4012 {perm b . {} {mc "Remember this view"}}
4013 {reflabel l + {} {mc "References (space separated list):"}}
4014 {refs t15 .. {} {mc "Branches & tags:"}}
4015 {allrefs b *. "--all" {mc "All refs"}}
4016 {branches b . "--branches" {mc "All (local) branches"}}
4017 {tags b . "--tags" {mc "All tags"}}
4018 {remotes b . "--remotes" {mc "All remote-tracking branches"}}
4019 {commitlbl l + {} {mc "Commit Info (regular expressions):"}}
4020 {author t15 .. "--author=*" {mc "Author:"}}
4021 {committer t15 . "--committer=*" {mc "Committer:"}}
4022 {loginfo t15 .. "--grep=*" {mc "Commit Message:"}}
4023 {allmatch b .. "--all-match" {mc "Matches all Commit Info criteria"}}
4024 {changes_l l + {} {mc "Changes to Files:"}}
4025 {pickaxe_s r0 . {} {mc "Fixed String"}}
4026 {pickaxe_t r1 . "--pickaxe-regex" {mc "Regular Expression"}}
4027 {pickaxe t15 .. "-S*" {mc "Search string:"}}
4028 {datelabel l + {} {mc "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 15:27:38\"):"}}
4029 {since t15 .. {"--since=*" "--after=*"} {mc "Since:"}}
4030 {until t15 . {"--until=*" "--before=*"} {mc "Until:"}}
4031 {limit_lbl l + {} {mc "Limit and/or skip a number of revisions (positive integer):"}}
4032 {limit t10 *. "--max-count=*" {mc "Number to show:"}}
4033 {skip t10 . "--skip=*" {mc "Number to skip:"}}
4034 {misc_lbl l + {} {mc "Miscellaneous options:"}}
4035 {dorder b *. {"--date-order" "-d"} {mc "Strictly sort by date"}}
4036 {lright b . "--left-right" {mc "Mark branch sides"}}
4037 {first b . "--first-parent" {mc "Limit to first parent"}}
4038 {smplhst b . "--simplify-by-decoration" {mc "Simple history"}}
4039 {args t50 *. {} {mc "Additional arguments to git log:"}}
4040 {allpaths path + {} {mc "Enter files and directories to include, one per line:"}}
4041 {cmd t50= + {} {mc "Command to generate more commits to include:"}}
4044 # Convert $newviewopts($n, ...) into args for git log.
4045 proc encode_view_opts {n} {
4046 global known_view_options newviewopts
4049 foreach opt $known_view_options {
4050 set patterns [lindex $opt 3]
4051 if {$patterns eq {}} continue
4052 set pattern [lindex $patterns 0]
4054 if {[lindex $opt 1] eq "b"} {
4055 set val $newviewopts($n,[lindex $opt 0])
4057 lappend rargs $pattern
4059 } elseif {[regexp {^r(\d+)$} [lindex $opt 1] type value]} {
4060 regexp {^(.*_)} [lindex $opt 0] uselessvar button_id
4061 set val $newviewopts($n,$button_id)
4062 if {$val eq $value} {
4063 lappend rargs $pattern
4066 set val $newviewopts($n,[lindex $opt 0])
4067 set val [string trim $val]
4069 set pfix [string range $pattern 0 end-1]
4070 lappend rargs $pfix$val
4074 set rargs [concat $rargs [shellsplit $newviewopts($n,refs)]]
4075 return [concat $rargs [shellsplit $newviewopts($n,args)]]
4078 # Fill $newviewopts($n, ...) based on args for git log.
4079 proc decode_view_opts {n view_args} {
4080 global known_view_options newviewopts
4082 foreach opt $known_view_options {
4083 set id [lindex $opt 0]
4084 if {[lindex $opt 1] eq "b"} {
4087 } elseif {[regexp {^r(\d+)$} [lindex $opt 1]]} {
4089 regexp {^(.*_)} $id uselessvar id
4095 set newviewopts($n,$id) $val
4099 foreach arg $view_args {
4100 if {[regexp -- {^-([0-9]+)$} $arg arg cnt]
4101 && ![info exists found(limit)]} {
4102 set newviewopts($n,limit) $cnt
4107 foreach opt $known_view_options {
4108 set id [lindex $opt 0]
4109 if {[info exists found($id)]} continue
4110 foreach pattern [lindex $opt 3] {
4111 if {![string match $pattern $arg]} continue
4112 if {[lindex $opt 1] eq "b"} {
4115 } elseif {[regexp {^r(\d+)$} [lindex $opt 1] match num]} {
4117 regexp {^(.*_)} $id uselessvar id
4121 set size [string length $pattern]
4122 set val [string range $arg [expr {$size-1}] end]
4124 set newviewopts($n,$id) $val
4128 if {[info exists val]} break
4130 if {[info exists val]} continue
4131 if {[regexp {^-} $arg]} {
4134 lappend refargs $arg
4137 set newviewopts($n,refs) [shellarglist $refargs]
4138 set newviewopts($n,args) [shellarglist $oargs]
4141 proc edit_or_newview {} {
4153 global viewname viewperm newviewname newviewopts
4154 global viewargs viewargscmd
4156 set top .gitkvedit-$curview
4157 if {[winfo exists $top]} {
4161 decode_view_opts $curview $viewargs($curview)
4162 set newviewname($curview) $viewname($curview)
4163 set newviewopts($curview,perm) $viewperm($curview)
4164 set newviewopts($curview,cmd) $viewargscmd($curview)
4165 vieweditor $top $curview "[mc "Gitk: edit view"] $viewname($curview)"
4168 proc vieweditor {top n title} {
4169 global newviewname newviewopts viewfiles bgcolor
4170 global known_view_options NS
4173 wm title $top [concat $title [mc "-- criteria for selecting revisions"]]
4174 make_transient $top .
4177 ${NS}::frame $top.nfr
4178 ${NS}::label $top.nl -text [mc "View Name"]
4179 ${NS}::entry $top.name -width 20 -textvariable newviewname($n)
4180 pack $top.nfr -in $top -fill x -pady 5 -padx 3
4181 pack $top.nl -in $top.nfr -side left -padx {0 5}
4182 pack $top.name -in $top.nfr -side left -padx {0 25}
4188 foreach opt $known_view_options {
4189 set id [lindex $opt 0]
4190 set type [lindex $opt 1]
4191 set flags [lindex $opt 2]
4192 set title [eval [lindex $opt 4]]
4195 if {$flags eq "+" || $flags eq "*"} {
4196 set cframe $top.fr$cnt
4198 ${NS}::frame $cframe
4199 pack $cframe -in $top -fill x -pady 3 -padx 3
4200 set cexpand [expr {$flags eq "*"}]
4201 } elseif {$flags eq ".." || $flags eq "*."} {
4202 set cframe $top.fr$cnt
4204 ${NS}::frame $cframe
4205 pack $cframe -in $top -fill x -pady 3 -padx [list 15 3]
4206 set cexpand [expr {$flags eq "*."}]
4212 ${NS}::label $cframe.l_$id -text $title
4213 pack $cframe.l_$id -in $cframe -side left -pady [list 3 0] -anchor w
4214 } elseif {$type eq "b"} {
4215 ${NS}::checkbutton $cframe.c_$id -text $title -variable newviewopts($n,$id)
4216 pack $cframe.c_$id -in $cframe -side left \
4217 -padx [list $lxpad 0] -expand $cexpand -anchor w
4218 } elseif {[regexp {^r(\d+)$} $type type sz]} {
4219 regexp {^(.*_)} $id uselessvar button_id
4220 ${NS}::radiobutton $cframe.c_$id -text $title -variable newviewopts($n,$button_id) -value $sz
4221 pack $cframe.c_$id -in $cframe -side left \
4222 -padx [list $lxpad 0] -expand $cexpand -anchor w
4223 } elseif {[regexp {^t(\d+)$} $type type sz]} {
4224 ${NS}::label $cframe.l_$id -text $title
4225 ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \
4226 -textvariable newviewopts($n,$id)
4227 pack $cframe.l_$id -in $cframe -side left -padx [list $lxpad 0]
4228 pack $cframe.e_$id -in $cframe -side left -expand 1 -fill x
4229 } elseif {[regexp {^t(\d+)=$} $type type sz]} {
4230 ${NS}::label $cframe.l_$id -text $title
4231 ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \
4232 -textvariable newviewopts($n,$id)
4233 pack $cframe.l_$id -in $cframe -side top -pady [list 3 0] -anchor w
4234 pack $cframe.e_$id -in $cframe -side top -fill x
4235 } elseif {$type eq "path"} {
4236 ${NS}::label $top.l -text $title
4237 pack $top.l -in $top -side top -pady [list 3 0] -anchor w -padx 3
4238 text $top.t -width 40 -height 5 -background $bgcolor
4239 if {[info exists viewfiles($n)]} {
4240 foreach f $viewfiles($n) {
4241 $top.t insert end $f
4242 $top.t insert end "\n"
4244 $top.t delete {end - 1c} end
4245 $top.t mark set insert 0.0
4247 pack $top.t -in $top -side top -pady [list 0 5] -fill both -expand 1 -padx 3
4251 ${NS}::frame $top.buts
4252 ${NS}::button $top.buts.ok -text [mc "OK"] -command [list newviewok $top $n]
4253 ${NS}::button $top.buts.apply -text [mc "Apply (F5)"] -command [list newviewok $top $n 1]
4254 ${NS}::button $top.buts.can -text [mc "Cancel"] -command [list destroy $top]
4255 bind $top <Control-Return> [list newviewok $top $n]
4256 bind $top <F5> [list newviewok $top $n 1]
4257 bind $top <Escape> [list destroy $top]
4258 grid $top.buts.ok $top.buts.apply $top.buts.can
4259 grid columnconfigure $top.buts 0 -weight 1 -uniform a
4260 grid columnconfigure $top.buts 1 -weight 1 -uniform a
4261 grid columnconfigure $top.buts 2 -weight 1 -uniform a
4262 pack $top.buts -in $top -side top -fill x
4266 proc doviewmenu {m first cmd op argv} {
4267 set nmenu [$m index end]
4268 for {set i $first} {$i <= $nmenu} {incr i} {
4269 if {[$m entrycget $i -command] eq $cmd} {
4270 eval $m $op $i $argv
4276 proc allviewmenus {n op args} {
4279 doviewmenu .bar.view 5 [list showview $n] $op $args
4280 # doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
4283 proc newviewok {top n {apply 0}} {
4284 global nextviewnum newviewperm newviewname newishighlight
4285 global viewname viewfiles viewperm selectedview curview
4286 global viewargs viewargscmd newviewopts viewhlmenu
4289 set newargs [encode_view_opts $n]
4291 error_popup "[mc "Error in commit selection arguments:"] $err" $top
4295 foreach f [split [$top.t get 0.0 end] "\n"] {
4296 set ft [string trim $f]
4301 if {![info exists viewfiles($n)]} {
4302 # creating a new view
4304 set viewname($n) $newviewname($n)
4305 set viewperm($n) $newviewopts($n,perm)
4306 set viewfiles($n) $files
4307 set viewargs($n) $newargs
4308 set viewargscmd($n) $newviewopts($n,cmd)
4310 if {!$newishighlight} {
4313 run addvhighlight $n
4316 # editing an existing view
4317 set viewperm($n) $newviewopts($n,perm)
4318 if {$newviewname($n) ne $viewname($n)} {
4319 set viewname($n) $newviewname($n)
4320 doviewmenu .bar.view 5 [list showview $n] \
4321 entryconf [list -label $viewname($n)]
4322 # doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
4323 # entryconf [list -label $viewname($n) -value $viewname($n)]
4325 if {$files ne $viewfiles($n) || $newargs ne $viewargs($n) || \
4326 $newviewopts($n,cmd) ne $viewargscmd($n)} {
4327 set viewfiles($n) $files
4328 set viewargs($n) $newargs
4329 set viewargscmd($n) $newviewopts($n,cmd)
4330 if {$curview == $n} {
4336 catch {destroy $top}
4340 global curview viewperm hlview selectedhlview
4342 if {$curview == 0} return
4343 if {[info exists hlview] && $hlview == $curview} {
4344 set selectedhlview [mc "None"]
4347 allviewmenus $curview delete
4348 set viewperm($curview) 0
4352 proc addviewmenu {n} {
4353 global viewname viewhlmenu
4355 .bar.view add radiobutton -label $viewname($n) \
4356 -command [list showview $n] -variable selectedview -value $n
4357 #$viewhlmenu add radiobutton -label $viewname($n) \
4358 # -command [list addvhighlight $n] -variable selectedhlview
4362 global curview cached_commitrow ordertok
4363 global displayorder parentlist rowidlist rowisopt rowfinal
4364 global colormap rowtextx nextcolor canvxmax
4365 global numcommits viewcomplete
4366 global selectedline currentid canv canvy0
4368 global pending_select mainheadid
4371 global hlview selectedhlview commitinterest
4373 if {$n == $curview} return
4375 set ymax [lindex [$canv cget -scrollregion] 3]
4376 set span [$canv yview]
4377 set ytop [expr {[lindex $span 0] * $ymax}]
4378 set ybot [expr {[lindex $span 1] * $ymax}]
4379 set yscreen [expr {($ybot - $ytop) / 2}]
4380 if {$selectedline ne {}} {
4381 set selid $currentid
4382 set y [yc $selectedline]
4383 if {$ytop < $y && $y < $ybot} {
4384 set yscreen [expr {$y - $ytop}]
4386 } elseif {[info exists pending_select]} {
4387 set selid $pending_select
4388 unset pending_select
4392 catch {unset treediffs}
4394 if {[info exists hlview] && $hlview == $n} {
4396 set selectedhlview [mc "None"]
4398 catch {unset commitinterest}
4399 catch {unset cached_commitrow}
4400 catch {unset ordertok}
4404 .bar.view entryconf [mca "Edit view..."] -state [expr {$n == 0? "disabled": "normal"}]
4405 .bar.view entryconf [mca "Delete view"] -state [expr {$n == 0? "disabled": "normal"}]
4408 if {![info exists viewcomplete($n)]} {
4418 set numcommits $commitidx($n)
4420 catch {unset colormap}
4421 catch {unset rowtextx}
4423 set canvxmax [$canv cget -width]
4429 if {$selid ne {} && [commitinview $selid $n]} {
4430 set row [rowofcommit $selid]
4431 # try to get the selected row in the same position on the screen
4432 set ymax [lindex [$canv cget -scrollregion] 3]
4433 set ytop [expr {[yc $row] - $yscreen}]
4437 set yf [expr {$ytop * 1.0 / $ymax}]
4439 allcanvs yview moveto $yf
4443 } elseif {!$viewcomplete($n)} {
4444 reset_pending_select $selid
4446 reset_pending_select {}
4448 if {[commitinview $pending_select $curview]} {
4449 selectline [rowofcommit $pending_select] 1
4451 set row [first_real_row]
4452 if {$row < $numcommits} {
4457 if {!$viewcomplete($n)} {
4458 if {$numcommits == 0} {
4459 show_status [mc "Reading commits..."]
4461 } elseif {$numcommits == 0} {
4462 show_status [mc "No commits selected"]
4466 # Stuff relating to the highlighting facility
4468 proc ishighlighted {id} {
4469 global vhighlights fhighlights nhighlights rhighlights
4471 if {[info exists nhighlights($id)] && $nhighlights($id) > 0} {
4472 return $nhighlights($id)
4474 if {[info exists vhighlights($id)] && $vhighlights($id) > 0} {
4475 return $vhighlights($id)
4477 if {[info exists fhighlights($id)] && $fhighlights($id) > 0} {
4478 return $fhighlights($id)
4480 if {[info exists rhighlights($id)] && $rhighlights($id) > 0} {
4481 return $rhighlights($id)
4486 proc bolden {id font} {
4487 global canv linehtag currentid boldids need_redisplay markedid
4489 # need_redisplay = 1 means the display is stale and about to be redrawn
4490 if {$need_redisplay} return
4492 $canv itemconf $linehtag($id) -font $font
4493 if {[info exists currentid] && $id eq $currentid} {
4495 set t [eval $canv create rect [$canv bbox $linehtag($id)] \
4496 -outline {{}} -tags secsel \
4497 -fill [$canv cget -selectbackground]]
4500 if {[info exists markedid] && $id eq $markedid} {
4505 proc bolden_name {id font} {
4506 global canv2 linentag currentid boldnameids need_redisplay
4508 if {$need_redisplay} return
4509 lappend boldnameids $id
4510 $canv2 itemconf $linentag($id) -font $font
4511 if {[info exists currentid] && $id eq $currentid} {
4512 $canv2 delete secsel
4513 set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] \
4514 -outline {{}} -tags secsel \
4515 -fill [$canv2 cget -selectbackground]]
4524 foreach id $boldids {
4525 if {![ishighlighted $id]} {
4528 lappend stillbold $id
4531 set boldids $stillbold
4534 proc addvhighlight {n} {
4535 global hlview viewcomplete curview vhl_done commitidx
4537 if {[info exists hlview]} {
4541 if {$n != $curview && ![info exists viewcomplete($n)]} {
4544 set vhl_done $commitidx($hlview)
4545 if {$vhl_done > 0} {
4550 proc delvhighlight {} {
4551 global hlview vhighlights
4553 if {![info exists hlview]} return
4555 catch {unset vhighlights}
4559 proc vhighlightmore {} {
4560 global hlview vhl_done commitidx vhighlights curview
4562 set max $commitidx($hlview)
4563 set vr [visiblerows]
4564 set r0 [lindex $vr 0]
4565 set r1 [lindex $vr 1]
4566 for {set i $vhl_done} {$i < $max} {incr i} {
4567 set id [commitonrow $i $hlview]
4568 if {[commitinview $id $curview]} {
4569 set row [rowofcommit $id]
4570 if {$r0 <= $row && $row <= $r1} {
4571 if {![highlighted $row]} {
4572 bolden $id mainfontbold
4574 set vhighlights($id) 1
4582 proc askvhighlight {row id} {
4583 global hlview vhighlights iddrawn
4585 if {[commitinview $id $hlview]} {
4586 if {[info exists iddrawn($id)] && ![ishighlighted $id]} {
4587 bolden $id mainfontbold
4589 set vhighlights($id) 1
4591 set vhighlights($id) 0
4595 proc hfiles_change {} {
4596 global highlight_files filehighlight fhighlights fh_serial
4597 global highlight_paths
4599 if {[info exists filehighlight]} {
4600 # delete previous highlights
4601 catch {close $filehighlight}
4603 catch {unset fhighlights}
4605 unhighlight_filelist
4607 set highlight_paths {}
4608 after cancel do_file_hl $fh_serial
4610 if {$highlight_files ne {}} {
4611 after 300 do_file_hl $fh_serial
4615 proc gdttype_change {name ix op} {
4616 global gdttype highlight_files findstring findpattern
4619 if {$findstring ne {}} {
4620 if {$gdttype eq [mc "containing:"]} {
4621 if {$highlight_files ne {}} {
4622 set highlight_files {}
4627 if {$findpattern ne {}} {
4631 set highlight_files $findstring
4636 # enable/disable findtype/findloc menus too
4639 proc find_change {name ix op} {
4640 global gdttype findstring highlight_files
4643 if {$gdttype eq [mc "containing:"]} {
4646 if {$highlight_files ne $findstring} {
4647 set highlight_files $findstring
4654 proc findcom_change args {
4655 global nhighlights boldnameids
4656 global findpattern findtype findstring gdttype
4659 # delete previous highlights, if any
4660 foreach id $boldnameids {
4661 bolden_name $id mainfont
4664 catch {unset nhighlights}
4667 if {$gdttype ne [mc "containing:"] || $findstring eq {}} {
4669 } elseif {$findtype eq [mc "Regexp"]} {
4670 set findpattern $findstring
4672 set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
4674 set findpattern "*$e*"
4678 proc makepatterns {l} {
4681 set ee [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} $e]
4682 if {[string index $ee end] eq "/"} {
4692 proc do_file_hl {serial} {
4693 global highlight_files filehighlight highlight_paths gdttype fhl_list
4694 global cdup findtype
4696 if {$gdttype eq [mc "touching paths:"]} {
4697 # If "exact" match then convert backslashes to forward slashes.
4698 # Most useful to support Windows-flavoured file paths.
4699 if {$findtype eq [mc "Exact"]} {
4700 set highlight_files [string map {"\\" "/"} $highlight_files]
4702 if {[catch {set paths [shellsplit $highlight_files]}]} return
4703 set highlight_paths [makepatterns $paths]
4705 set relative_paths {}
4706 foreach path $paths {
4707 lappend relative_paths [file join $cdup $path]
4709 set gdtargs [concat -- $relative_paths]
4710 } elseif {$gdttype eq [mc "adding/removing string:"]} {
4711 set gdtargs [list "-S$highlight_files"]
4712 } elseif {$gdttype eq [mc "changing lines matching:"]} {
4713 set gdtargs [list "-G$highlight_files"]
4715 # must be "containing:", i.e. we're searching commit info
4718 set cmd [concat | git diff-tree -r -s --stdin $gdtargs]
4719 set filehighlight [open $cmd r+]
4720 fconfigure $filehighlight -blocking 0
4721 filerun $filehighlight readfhighlight
4727 proc flushhighlights {} {
4728 global filehighlight fhl_list
4730 if {[info exists filehighlight]} {
4732 puts $filehighlight ""
4733 flush $filehighlight
4737 proc askfilehighlight {row id} {
4738 global filehighlight fhighlights fhl_list
4740 lappend fhl_list $id
4741 set fhighlights($id) -1
4742 puts $filehighlight $id
4745 proc readfhighlight {} {
4746 global filehighlight fhighlights curview iddrawn
4747 global fhl_list find_dirn
4749 if {![info exists filehighlight]} {
4753 while {[incr nr] <= 100 && [gets $filehighlight line] >= 0} {
4754 set line [string trim $line]
4755 set i [lsearch -exact $fhl_list $line]
4756 if {$i < 0} continue
4757 for {set j 0} {$j < $i} {incr j} {
4758 set id [lindex $fhl_list $j]
4759 set fhighlights($id) 0
4761 set fhl_list [lrange $fhl_list [expr {$i+1}] end]
4762 if {$line eq {}} continue
4763 if {![commitinview $line $curview]} continue
4764 if {[info exists iddrawn($line)] && ![ishighlighted $line]} {
4765 bolden $line mainfontbold
4767 set fhighlights($line) 1
4769 if {[eof $filehighlight]} {
4771 puts "oops, git diff-tree died"
4772 catch {close $filehighlight}
4776 if {[info exists find_dirn]} {
4782 proc doesmatch {f} {
4783 global findtype findpattern
4785 if {$findtype eq [mc "Regexp"]} {
4786 return [regexp $findpattern $f]
4787 } elseif {$findtype eq [mc "IgnCase"]} {
4788 return [string match -nocase $findpattern $f]
4790 return [string match $findpattern $f]
4794 proc askfindhighlight {row id} {
4795 global nhighlights commitinfo iddrawn
4797 global markingmatches
4799 if {![info exists commitinfo($id)]} {
4802 set info $commitinfo($id)
4804 set fldtypes [list [mc Headline] [mc Author] "" [mc Committer] "" [mc Comments]]
4805 foreach f $info ty $fldtypes {
4806 if {$ty eq ""} continue
4807 if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
4809 if {$ty eq [mc "Author"]} {
4816 if {$isbold && [info exists iddrawn($id)]} {
4817 if {![ishighlighted $id]} {
4818 bolden $id mainfontbold
4820 bolden_name $id mainfontbold
4823 if {$markingmatches} {
4824 markrowmatches $row $id
4827 set nhighlights($id) $isbold
4830 proc markrowmatches {row id} {
4831 global canv canv2 linehtag linentag commitinfo findloc
4833 set headline [lindex $commitinfo($id) 0]
4834 set author [lindex $commitinfo($id) 1]
4835 $canv delete match$row
4836 $canv2 delete match$row
4837 if {$findloc eq [mc "All fields"] || $findloc eq [mc "Headline"]} {
4838 set m [findmatches $headline]
4840 markmatches $canv $row $headline $linehtag($id) $m \
4841 [$canv itemcget $linehtag($id) -font] $row
4844 if {$findloc eq [mc "All fields"] || $findloc eq [mc "Author"]} {
4845 set m [findmatches $author]
4847 markmatches $canv2 $row $author $linentag($id) $m \
4848 [$canv2 itemcget $linentag($id) -font] $row
4853 proc vrel_change {name ix op} {
4854 global highlight_related
4857 if {$highlight_related ne [mc "None"]} {
4862 # prepare for testing whether commits are descendents or ancestors of a
4863 proc rhighlight_sel {a} {
4864 global descendent desc_todo ancestor anc_todo
4865 global highlight_related
4867 catch {unset descendent}
4868 set desc_todo [list $a]
4869 catch {unset ancestor}
4870 set anc_todo [list $a]
4871 if {$highlight_related ne [mc "None"]} {
4877 proc rhighlight_none {} {
4880 catch {unset rhighlights}
4884 proc is_descendent {a} {
4885 global curview children descendent desc_todo
4888 set la [rowofcommit $a]
4892 for {set i 0} {$i < [llength $todo]} {incr i} {
4893 set do [lindex $todo $i]
4894 if {[rowofcommit $do] < $la} {
4895 lappend leftover $do
4898 foreach nk $children($v,$do) {
4899 if {![info exists descendent($nk)]} {
4900 set descendent($nk) 1
4908 set desc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
4912 set descendent($a) 0
4913 set desc_todo $leftover
4916 proc is_ancestor {a} {
4917 global curview parents ancestor anc_todo
4920 set la [rowofcommit $a]
4924 for {set i 0} {$i < [llength $todo]} {incr i} {
4925 set do [lindex $todo $i]
4926 if {![commitinview $do $v] || [rowofcommit $do] > $la} {
4927 lappend leftover $do
4930 foreach np $parents($v,$do) {
4931 if {![info exists ancestor($np)]} {
4940 set anc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
4945 set anc_todo $leftover
4948 proc askrelhighlight {row id} {
4949 global descendent highlight_related iddrawn rhighlights
4950 global selectedline ancestor
4952 if {$selectedline eq {}} return
4954 if {$highlight_related eq [mc "Descendant"] ||
4955 $highlight_related eq [mc "Not descendant"]} {
4956 if {![info exists descendent($id)]} {
4959 if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} {
4962 } elseif {$highlight_related eq [mc "Ancestor"] ||
4963 $highlight_related eq [mc "Not ancestor"]} {
4964 if {![info exists ancestor($id)]} {
4967 if {$ancestor($id) == ($highlight_related eq [mc "Ancestor"])} {
4971 if {[info exists iddrawn($id)]} {
4972 if {$isbold && ![ishighlighted $id]} {
4973 bolden $id mainfontbold
4976 set rhighlights($id) $isbold
4979 # Graph layout functions
4981 proc shortids {ids} {
4984 if {[llength $id] > 1} {
4985 lappend res [shortids $id]
4986 } elseif {[regexp {^[0-9a-f]{40}$} $id]} {
4987 lappend res [string range $id 0 7]
4998 for {set mask 1} {$mask <= $n} {incr mask $mask} {
4999 if {($n & $mask) != 0} {
5000 set ret [concat $ret $o]
5002 set o [concat $o $o]
5007 proc ordertoken {id} {
5008 global ordertok curview varcid varcstart varctok curview parents children
5009 global nullid nullid2
5011 if {[info exists ordertok($id)]} {
5012 return $ordertok($id)
5017 if {[info exists varcid($curview,$id)]} {
5018 set a $varcid($curview,$id)
5019 set p [lindex $varcstart($curview) $a]
5021 set p [lindex $children($curview,$id) 0]
5023 if {[info exists ordertok($p)]} {
5024 set tok $ordertok($p)
5027 set id [first_real_child $curview,$p]
5030 set tok [lindex $varctok($curview) $varcid($curview,$p)]
5033 if {[llength $parents($curview,$id)] == 1} {
5034 lappend todo [list $p {}]
5036 set j [lsearch -exact $parents($curview,$id) $p]
5038 puts "oops didn't find [shortids $p] in parents of [shortids $id]"
5040 lappend todo [list $p [strrep $j]]
5043 for {set i [llength $todo]} {[incr i -1] >= 0} {} {
5044 set p [lindex $todo $i 0]
5045 append tok [lindex $todo $i 1]
5046 set ordertok($p) $tok
5048 set ordertok($origid) $tok
5052 # Work out where id should go in idlist so that order-token
5053 # values increase from left to right
5054 proc idcol {idlist id {i 0}} {
5055 set t [ordertoken $id]
5059 if {$i >= [llength $idlist] || $t < [ordertoken [lindex $idlist $i]]} {
5060 if {$i > [llength $idlist]} {
5061 set i [llength $idlist]
5063 while {[incr i -1] >= 0 && $t < [ordertoken [lindex $idlist $i]]} {}
5066 if {$t > [ordertoken [lindex $idlist $i]]} {
5067 while {[incr i] < [llength $idlist] &&
5068 $t >= [ordertoken [lindex $idlist $i]]} {}
5074 proc initlayout {} {
5075 global rowidlist rowisopt rowfinal displayorder parentlist
5076 global numcommits canvxmax canv
5078 global colormap rowtextx
5087 set canvxmax [$canv cget -width]
5088 catch {unset colormap}
5089 catch {unset rowtextx}
5093 proc setcanvscroll {} {
5094 global canv canv2 canv3 numcommits linespc canvxmax canvy0
5095 global lastscrollset lastscrollrows
5097 set ymax [expr {$canvy0 + ($numcommits - 0.5) * $linespc + 2}]
5098 $canv conf -scrollregion [list 0 0 $canvxmax $ymax]
5099 $canv2 conf -scrollregion [list 0 0 0 $ymax]
5100 $canv3 conf -scrollregion [list 0 0 0 $ymax]
5101 set lastscrollset [clock clicks -milliseconds]
5102 set lastscrollrows $numcommits
5105 proc visiblerows {} {
5106 global canv numcommits linespc
5108 set ymax [lindex [$canv cget -scrollregion] 3]
5109 if {$ymax eq {} || $ymax == 0} return
5111 set y0 [expr {int([lindex $f 0] * $ymax)}]
5112 set r0 [expr {int(($y0 - 3) / $linespc) - 1}]
5116 set y1 [expr {int([lindex $f 1] * $ymax)}]
5117 set r1 [expr {int(($y1 - 3) / $linespc) + 1}]
5118 if {$r1 >= $numcommits} {
5119 set r1 [expr {$numcommits - 1}]
5121 return [list $r0 $r1]
5124 proc layoutmore {} {
5125 global commitidx viewcomplete curview
5126 global numcommits pending_select curview
5127 global lastscrollset lastscrollrows
5129 if {$lastscrollrows < 100 || $viewcomplete($curview) ||
5130 [clock clicks -milliseconds] - $lastscrollset > 500} {
5133 if {[info exists pending_select] &&
5134 [commitinview $pending_select $curview]} {
5136 selectline [rowofcommit $pending_select] 1
5141 # With path limiting, we mightn't get the actual HEAD commit,
5142 # so ask git rev-list what is the first ancestor of HEAD that
5143 # touches a file in the path limit.
5144 proc get_viewmainhead {view} {
5145 global viewmainheadid vfilelimit viewinstances mainheadid
5148 set rfd [open [concat | git rev-list -1 $mainheadid \
5149 -- $vfilelimit($view)] r]
5150 set j [reg_instance $rfd]
5151 lappend viewinstances($view) $j
5152 fconfigure $rfd -blocking 0
5153 filerun $rfd [list getviewhead $rfd $j $view]
5154 set viewmainheadid($curview) {}
5158 # git rev-list should give us just 1 line to use as viewmainheadid($view)
5159 proc getviewhead {fd inst view} {
5160 global viewmainheadid commfd curview viewinstances showlocalchanges
5163 if {[gets $fd line] < 0} {
5167 } elseif {[string length $line] == 40 && [string is xdigit $line]} {
5170 set viewmainheadid($view) $id
5173 set i [lsearch -exact $viewinstances($view) $inst]
5175 set viewinstances($view) [lreplace $viewinstances($view) $i $i]
5177 if {$showlocalchanges && $id ne {} && $view == $curview} {
5183 proc doshowlocalchanges {} {
5184 global curview viewmainheadid
5186 if {$viewmainheadid($curview) eq {}} return
5187 if {[commitinview $viewmainheadid($curview) $curview]} {
5190 interestedin $viewmainheadid($curview) dodiffindex
5194 proc dohidelocalchanges {} {
5195 global nullid nullid2 lserial curview
5197 if {[commitinview $nullid $curview]} {
5198 removefakerow $nullid
5200 if {[commitinview $nullid2 $curview]} {
5201 removefakerow $nullid2
5206 # spawn off a process to do git diff-index --cached HEAD
5207 proc dodiffindex {} {
5208 global lserial showlocalchanges vfilelimit curview
5209 global hasworktree git_version
5211 if {!$showlocalchanges || !$hasworktree} return
5213 if {[package vcompare $git_version "1.7.2"] >= 0} {
5214 set cmd "|git diff-index --cached --ignore-submodules=dirty HEAD"
5216 set cmd "|git diff-index --cached HEAD"
5218 if {$vfilelimit($curview) ne {}} {
5219 set cmd [concat $cmd -- $vfilelimit($curview)]
5221 set fd [open $cmd r]
5222 fconfigure $fd -blocking 0
5223 set i [reg_instance $fd]
5224 filerun $fd [list readdiffindex $fd $lserial $i]
5227 proc readdiffindex {fd serial inst} {
5228 global viewmainheadid nullid nullid2 curview commitinfo commitdata lserial
5232 if {[gets $fd line] < 0} {
5238 # we only need to see one line and we don't really care what it says...
5241 if {$serial != $lserial} {
5245 # now see if there are any local changes not checked in to the index
5246 set cmd "|git diff-files"
5247 if {$vfilelimit($curview) ne {}} {
5248 set cmd [concat $cmd -- $vfilelimit($curview)]
5250 set fd [open $cmd r]
5251 fconfigure $fd -blocking 0
5252 set i [reg_instance $fd]
5253 filerun $fd [list readdifffiles $fd $serial $i]
5255 if {$isdiff && ![commitinview $nullid2 $curview]} {
5256 # add the line for the changes in the index to the graph
5257 set hl [mc "Local changes checked in to index but not committed"]
5258 set commitinfo($nullid2) [list $hl {} {} {} {} " $hl\n"]
5259 set commitdata($nullid2) "\n $hl\n"
5260 if {[commitinview $nullid $curview]} {
5261 removefakerow $nullid
5263 insertfakerow $nullid2 $viewmainheadid($curview)
5264 } elseif {!$isdiff && [commitinview $nullid2 $curview]} {
5265 if {[commitinview $nullid $curview]} {
5266 removefakerow $nullid
5268 removefakerow $nullid2
5273 proc readdifffiles {fd serial inst} {
5274 global viewmainheadid nullid nullid2 curview
5275 global commitinfo commitdata lserial
5278 if {[gets $fd line] < 0} {
5284 # we only need to see one line and we don't really care what it says...
5287 if {$serial != $lserial} {
5291 if {$isdiff && ![commitinview $nullid $curview]} {
5292 # add the line for the local diff to the graph
5293 set hl [mc "Local uncommitted changes, not checked in to index"]
5294 set commitinfo($nullid) [list $hl {} {} {} {} " $hl\n"]
5295 set commitdata($nullid) "\n $hl\n"
5296 if {[commitinview $nullid2 $curview]} {
5299 set p $viewmainheadid($curview)
5301 insertfakerow $nullid $p
5302 } elseif {!$isdiff && [commitinview $nullid $curview]} {
5303 removefakerow $nullid
5308 proc nextuse {id row} {
5309 global curview children
5311 if {[info exists children($curview,$id)]} {
5312 foreach kid $children($curview,$id) {
5313 if {![commitinview $kid $curview]} {
5316 if {[rowofcommit $kid] > $row} {
5317 return [rowofcommit $kid]
5321 if {[commitinview $id $curview]} {
5322 return [rowofcommit $id]
5327 proc prevuse {id row} {
5328 global curview children
5331 if {[info exists children($curview,$id)]} {
5332 foreach kid $children($curview,$id) {
5333 if {![commitinview $kid $curview]} break
5334 if {[rowofcommit $kid] < $row} {
5335 set ret [rowofcommit $kid]
5342 proc make_idlist {row} {
5343 global displayorder parentlist uparrowlen downarrowlen mingaplen
5344 global commitidx curview children
5346 set r [expr {$row - $mingaplen - $downarrowlen - 1}]
5350 set ra [expr {$row - $downarrowlen}]
5354 set rb [expr {$row + $uparrowlen}]
5355 if {$rb > $commitidx($curview)} {
5356 set rb $commitidx($curview)
5358 make_disporder $r [expr {$rb + 1}]
5360 for {} {$r < $ra} {incr r} {
5361 set nextid [lindex $displayorder [expr {$r + 1}]]
5362 foreach p [lindex $parentlist $r] {
5363 if {$p eq $nextid} continue
5364 set rn [nextuse $p $r]
5366 $rn <= $r + $downarrowlen + $mingaplen + $uparrowlen} {
5367 lappend ids [list [ordertoken $p] $p]
5371 for {} {$r < $row} {incr r} {
5372 set nextid [lindex $displayorder [expr {$r + 1}]]
5373 foreach p [lindex $parentlist $r] {
5374 if {$p eq $nextid} continue
5375 set rn [nextuse $p $r]
5376 if {$rn < 0 || $rn >= $row} {
5377 lappend ids [list [ordertoken $p] $p]
5381 set id [lindex $displayorder $row]
5382 lappend ids [list [ordertoken $id] $id]
5384 foreach p [lindex $parentlist $r] {
5385 set firstkid [lindex $children($curview,$p) 0]
5386 if {[rowofcommit $firstkid] < $row} {
5387 lappend ids [list [ordertoken $p] $p]
5391 set id [lindex $displayorder $r]
5393 set firstkid [lindex $children($curview,$id) 0]
5394 if {$firstkid ne {} && [rowofcommit $firstkid] < $row} {
5395 lappend ids [list [ordertoken $id] $id]
5400 foreach idx [lsort -unique $ids] {
5401 lappend idlist [lindex $idx 1]
5406 proc rowsequal {a b} {
5407 while {[set i [lsearch -exact $a {}]] >= 0} {
5408 set a [lreplace $a $i $i]
5410 while {[set i [lsearch -exact $b {}]] >= 0} {
5411 set b [lreplace $b $i $i]
5413 return [expr {$a eq $b}]
5416 proc makeupline {id row rend col} {
5417 global rowidlist uparrowlen downarrowlen mingaplen
5419 for {set r $rend} {1} {set r $rstart} {
5420 set rstart [prevuse $id $r]
5421 if {$rstart < 0} return
5422 if {$rstart < $row} break
5424 if {$rstart + $uparrowlen + $mingaplen + $downarrowlen < $rend} {
5425 set rstart [expr {$rend - $uparrowlen - 1}]
5427 for {set r $rstart} {[incr r] <= $row} {} {
5428 set idlist [lindex $rowidlist $r]
5429 if {$idlist ne {} && [lsearch -exact $idlist $id] < 0} {
5430 set col [idcol $idlist $id $col]
5431 lset rowidlist $r [linsert $idlist $col $id]
5437 proc layoutrows {row endrow} {
5438 global rowidlist rowisopt rowfinal displayorder
5439 global uparrowlen downarrowlen maxwidth mingaplen
5440 global children parentlist
5441 global commitidx viewcomplete curview
5443 make_disporder [expr {$row - 1}] [expr {$endrow + $uparrowlen}]
5446 set rm1 [expr {$row - 1}]
5447 foreach id [lindex $rowidlist $rm1] {
5452 set final [lindex $rowfinal $rm1]
5454 for {} {$row < $endrow} {incr row} {
5455 set rm1 [expr {$row - 1}]
5456 if {$rm1 < 0 || $idlist eq {}} {
5457 set idlist [make_idlist $row]
5460 set id [lindex $displayorder $rm1]
5461 set col [lsearch -exact $idlist $id]
5462 set idlist [lreplace $idlist $col $col]
5463 foreach p [lindex $parentlist $rm1] {
5464 if {[lsearch -exact $idlist $p] < 0} {
5465 set col [idcol $idlist $p $col]
5466 set idlist [linsert $idlist $col $p]
5467 # if not the first child, we have to insert a line going up
5468 if {$id ne [lindex $children($curview,$p) 0]} {
5469 makeupline $p $rm1 $row $col
5473 set id [lindex $displayorder $row]
5474 if {$row > $downarrowlen} {
5475 set termrow [expr {$row - $downarrowlen - 1}]
5476 foreach p [lindex $parentlist $termrow] {
5477 set i [lsearch -exact $idlist $p]
5478 if {$i < 0} continue
5479 set nr [nextuse $p $termrow]
5480 if {$nr < 0 || $nr >= $row + $mingaplen + $uparrowlen} {
5481 set idlist [lreplace $idlist $i $i]
5485 set col [lsearch -exact $idlist $id]
5487 set col [idcol $idlist $id]
5488 set idlist [linsert $idlist $col $id]
5489 if {$children($curview,$id) ne {}} {
5490 makeupline $id $rm1 $row $col
5493 set r [expr {$row + $uparrowlen - 1}]
5494 if {$r < $commitidx($curview)} {
5496 foreach p [lindex $parentlist $r] {
5497 if {[lsearch -exact $idlist $p] >= 0} continue
5498 set fk [lindex $children($curview,$p) 0]
5499 if {[rowofcommit $fk] < $row} {
5500 set x [idcol $idlist $p $x]
5501 set idlist [linsert $idlist $x $p]
5504 if {[incr r] < $commitidx($curview)} {
5505 set p [lindex $displayorder $r]
5506 if {[lsearch -exact $idlist $p] < 0} {
5507 set fk [lindex $children($curview,$p) 0]
5508 if {$fk ne {} && [rowofcommit $fk] < $row} {
5509 set x [idcol $idlist $p $x]
5510 set idlist [linsert $idlist $x $p]
5516 if {$final && !$viewcomplete($curview) &&
5517 $row + $uparrowlen + $mingaplen + $downarrowlen
5518 >= $commitidx($curview)} {
5521 set l [llength $rowidlist]
5523 lappend rowidlist $idlist
5525 lappend rowfinal $final
5526 } elseif {$row < $l} {
5527 if {![rowsequal $idlist [lindex $rowidlist $row]]} {
5528 lset rowidlist $row $idlist
5531 lset rowfinal $row $final
5533 set pad [ntimes [expr {$row - $l}] {}]
5534 set rowidlist [concat $rowidlist $pad]
5535 lappend rowidlist $idlist
5536 set rowfinal [concat $rowfinal $pad]
5537 lappend rowfinal $final
5538 set rowisopt [concat $rowisopt [ntimes [expr {$row - $l + 1}] 0]]
5544 proc changedrow {row} {
5545 global displayorder iddrawn rowisopt need_redisplay
5547 set l [llength $rowisopt]
5549 lset rowisopt $row 0
5550 if {$row + 1 < $l} {
5551 lset rowisopt [expr {$row + 1}] 0
5552 if {$row + 2 < $l} {
5553 lset rowisopt [expr {$row + 2}] 0
5557 set id [lindex $displayorder $row]
5558 if {[info exists iddrawn($id)]} {
5559 set need_redisplay 1
5563 proc insert_pad {row col npad} {
5566 set pad [ntimes $npad {}]
5567 set idlist [lindex $rowidlist $row]
5568 set bef [lrange $idlist 0 [expr {$col - 1}]]
5569 set aft [lrange $idlist $col end]
5570 set i [lsearch -exact $aft {}]
5572 set aft [lreplace $aft $i $i]
5574 lset rowidlist $row [concat $bef $pad $aft]
5578 proc optimize_rows {row col endrow} {
5579 global rowidlist rowisopt displayorder curview children
5584 for {} {$row < $endrow} {incr row; set col 0} {
5585 if {[lindex $rowisopt $row]} continue
5587 set y0 [expr {$row - 1}]
5588 set ym [expr {$row - 2}]
5589 set idlist [lindex $rowidlist $row]
5590 set previdlist [lindex $rowidlist $y0]
5591 if {$idlist eq {} || $previdlist eq {}} continue
5593 set pprevidlist [lindex $rowidlist $ym]
5594 if {$pprevidlist eq {}} continue
5600 for {} {$col < [llength $idlist]} {incr col} {
5601 set id [lindex $idlist $col]
5602 if {[lindex $previdlist $col] eq $id} continue
5607 set x0 [lsearch -exact $previdlist $id]
5608 if {$x0 < 0} continue
5609 set z [expr {$x0 - $col}]
5613 set xm [lsearch -exact $pprevidlist $id]
5615 set z0 [expr {$xm - $x0}]
5619 # if row y0 is the first child of $id then it's not an arrow
5620 if {[lindex $children($curview,$id) 0] ne
5621 [lindex $displayorder $y0]} {
5625 if {!$isarrow && $id ne [lindex $displayorder $row] &&
5626 [lsearch -exact [lindex $rowidlist [expr {$row+1}]] $id] < 0} {
5629 # Looking at lines from this row to the previous row,
5630 # make them go straight up if they end in an arrow on
5631 # the previous row; otherwise make them go straight up
5633 if {$z < -1 || ($z < 0 && $isarrow)} {
5634 # Line currently goes left too much;
5635 # insert pads in the previous row, then optimize it
5636 set npad [expr {-1 - $z + $isarrow}]
5637 insert_pad $y0 $x0 $npad
5639 optimize_rows $y0 $x0 $row
5641 set previdlist [lindex $rowidlist $y0]
5642 set x0 [lsearch -exact $previdlist $id]
5643 set z [expr {$x0 - $col}]
5645 set pprevidlist [lindex $rowidlist $ym]
5646 set xm [lsearch -exact $pprevidlist $id]
5647 set z0 [expr {$xm - $x0}]
5649 } elseif {$z > 1 || ($z > 0 && $isarrow)} {
5650 # Line currently goes right too much;
5651 # insert pads in this line
5652 set npad [expr {$z - 1 + $isarrow}]
5653 insert_pad $row $col $npad
5654 set idlist [lindex $rowidlist $row]
5656 set z [expr {$x0 - $col}]
5659 if {$z0 eq {} && !$isarrow && $ym >= 0} {
5660 # this line links to its first child on row $row-2
5661 set id [lindex $displayorder $ym]
5662 set xc [lsearch -exact $pprevidlist $id]
5664 set z0 [expr {$xc - $x0}]
5667 # avoid lines jigging left then immediately right
5668 if {$z0 ne {} && $z < 0 && $z0 > 0} {
5669 insert_pad $y0 $x0 1
5671 optimize_rows $y0 $x0 $row
5672 set previdlist [lindex $rowidlist $y0]
5676 # Find the first column that doesn't have a line going right
5677 for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
5678 set id [lindex $idlist $col]
5679 if {$id eq {}} break
5680 set x0 [lsearch -exact $previdlist $id]
5682 # check if this is the link to the first child
5683 set kid [lindex $displayorder $y0]
5684 if {[lindex $children($curview,$id) 0] eq $kid} {
5685 # it is, work out offset to child
5686 set x0 [lsearch -exact $previdlist $kid]
5689 if {$x0 <= $col} break
5691 # Insert a pad at that column as long as it has a line and
5692 # isn't the last column
5693 if {$x0 >= 0 && [incr col] < [llength $idlist]} {
5694 set idlist [linsert $idlist $col {}]
5695 lset rowidlist $row $idlist
5703 global canvx0 linespc
5704 return [expr {$canvx0 + $col * $linespc}]
5708 global canvy0 linespc
5709 return [expr {$canvy0 + $row * $linespc}]
5712 proc linewidth {id} {
5713 global thickerline lthickness
5716 if {[info exists thickerline] && $id eq $thickerline} {
5717 set wid [expr {2 * $lthickness}]
5722 proc rowranges {id} {
5723 global curview children uparrowlen downarrowlen
5726 set kids $children($curview,$id)
5732 foreach child $kids {
5733 if {![commitinview $child $curview]} break
5734 set row [rowofcommit $child]
5735 if {![info exists prev]} {
5736 lappend ret [expr {$row + 1}]
5738 if {$row <= $prevrow} {
5739 puts "oops children of [shortids $id] out of order [shortids $child] $row <= [shortids $prev] $prevrow"
5741 # see if the line extends the whole way from prevrow to row
5742 if {$row > $prevrow + $uparrowlen + $downarrowlen &&
5743 [lsearch -exact [lindex $rowidlist \
5744 [expr {int(($row + $prevrow) / 2)}]] $id] < 0} {
5745 # it doesn't, see where it ends
5746 set r [expr {$prevrow + $downarrowlen}]
5747 if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {
5748 while {[incr r -1] > $prevrow &&
5749 [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}
5751 while {[incr r] <= $row &&
5752 [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}
5756 # see where it starts up again
5757 set r [expr {$row - $uparrowlen}]
5758 if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {
5759 while {[incr r] < $row &&
5760 [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}
5762 while {[incr r -1] >= $prevrow &&
5763 [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}
5769 if {$child eq $id} {
5778 proc drawlineseg {id row endrow arrowlow} {
5779 global rowidlist displayorder iddrawn linesegs
5780 global canv colormap linespc curview maxlinelen parentlist
5782 set cols [list [lsearch -exact [lindex $rowidlist $row] $id]]
5783 set le [expr {$row + 1}]
5786 set c [lsearch -exact [lindex $rowidlist $le] $id]
5792 set x [lindex $displayorder $le]
5797 if {[info exists iddrawn($x)] || $le == $endrow} {
5798 set c [lsearch -exact [lindex $rowidlist [expr {$le+1}]] $id]
5814 if {[info exists linesegs($id)]} {
5815 set lines $linesegs($id)
5817 set r0 [lindex $li 0]
5819 if {$r0 == $le && [lindex $li 1] - $row <= $maxlinelen} {
5829 set li [lindex $lines [expr {$i-1}]]
5830 set r1 [lindex $li 1]
5831 if {$r1 == $row && $le - [lindex $li 0] <= $maxlinelen} {
5836 set x [lindex $cols [expr {$le - $row}]]
5837 set xp [lindex $cols [expr {$le - 1 - $row}]]
5838 set dir [expr {$xp - $x}]
5840 set ith [lindex $lines $i 2]
5841 set coords [$canv coords $ith]
5842 set ah [$canv itemcget $ith -arrow]
5843 set arrowhigh [expr {$ah eq "first" || $ah eq "both"}]
5844 set x2 [lindex $cols [expr {$le + 1 - $row}]]
5845 if {$x2 ne {} && $x - $x2 == $dir} {
5846 set coords [lrange $coords 0 end-2]
5849 set coords [list [xc $le $x] [yc $le]]
5852 set itl [lindex $lines [expr {$i-1}] 2]
5853 set al [$canv itemcget $itl -arrow]
5854 set arrowlow [expr {$al eq "last" || $al eq "both"}]
5855 } elseif {$arrowlow} {
5856 if {[lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0 ||
5857 [lsearch -exact [lindex $parentlist [expr {$row-1}]] $id] >= 0} {
5861 set arrow [lindex {none first last both} [expr {$arrowhigh + 2*$arrowlow}]]
5862 for {set y $le} {[incr y -1] > $row} {} {
5864 set xp [lindex $cols [expr {$y - 1 - $row}]]
5865 set ndir [expr {$xp - $x}]
5866 if {$dir != $ndir || $xp < 0} {
5867 lappend coords [xc $y $x] [yc $y]
5873 # join parent line to first child
5874 set ch [lindex $displayorder $row]
5875 set xc [lsearch -exact [lindex $rowidlist $row] $ch]
5877 puts "oops: drawlineseg: child $ch not on row $row"
5878 } elseif {$xc != $x} {
5879 if {($arrowhigh && $le == $row + 1) || $dir == 0} {
5880 set d [expr {int(0.5 * $linespc)}]
5883 set x2 [expr {$x1 - $d}]
5885 set x2 [expr {$x1 + $d}]
5888 set y1 [expr {$y2 + $d}]
5889 lappend coords $x1 $y1 $x2 $y2
5890 } elseif {$xc < $x - 1} {
5891 lappend coords [xc $row [expr {$x-1}]] [yc $row]
5892 } elseif {$xc > $x + 1} {
5893 lappend coords [xc $row [expr {$x+1}]] [yc $row]
5897 lappend coords [xc $row $x] [yc $row]
5899 set xn [xc $row $xp]
5901 lappend coords $xn $yn
5905 set t [$canv create line $coords -width [linewidth $id] \
5906 -fill $colormap($id) -tags lines.$id -arrow $arrow]
5909 set lines [linsert $lines $i [list $row $le $t]]
5911 $canv coords $ith $coords
5912 if {$arrow ne $ah} {
5913 $canv itemconf $ith -arrow $arrow
5915 lset lines $i 0 $row
5918 set xo [lsearch -exact [lindex $rowidlist [expr {$row - 1}]] $id]
5919 set ndir [expr {$xo - $xp}]
5920 set clow [$canv coords $itl]
5921 if {$dir == $ndir} {
5922 set clow [lrange $clow 2 end]
5924 set coords [concat $coords $clow]
5926 lset lines [expr {$i-1}] 1 $le
5928 # coalesce two pieces
5930 set b [lindex $lines [expr {$i-1}] 0]
5931 set e [lindex $lines $i 1]
5932 set lines [lreplace $lines [expr {$i-1}] $i [list $b $e $itl]]
5934 $canv coords $itl $coords
5935 if {$arrow ne $al} {
5936 $canv itemconf $itl -arrow $arrow
5940 set linesegs($id) $lines
5944 proc drawparentlinks {id row} {
5945 global rowidlist canv colormap curview parentlist
5946 global idpos linespc
5948 set rowids [lindex $rowidlist $row]
5949 set col [lsearch -exact $rowids $id]
5950 if {$col < 0} return
5951 set olds [lindex $parentlist $row]
5952 set row2 [expr {$row + 1}]
5953 set x [xc $row $col]
5956 set d [expr {int(0.5 * $linespc)}]
5957 set ymid [expr {$y + $d}]
5958 set ids [lindex $rowidlist $row2]
5959 # rmx = right-most X coord used
5962 set i [lsearch -exact $ids $p]
5964 puts "oops, parent $p of $id not in list"
5967 set x2 [xc $row2 $i]
5971 set j [lsearch -exact $rowids $p]
5973 # drawlineseg will do this one for us
5977 # should handle duplicated parents here...
5978 set coords [list $x $y]
5980 # if attaching to a vertical segment, draw a smaller
5981 # slant for visual distinctness
5984 lappend coords [expr {$x2 + $d}] $y $x2 $ymid
5986 lappend coords [expr {$x2 - $d}] $y $x2 $ymid
5988 } elseif {$i < $col && $i < $j} {
5989 # segment slants towards us already
5990 lappend coords [xc $row $j] $y
5992 if {$i < $col - 1} {
5993 lappend coords [expr {$x2 + $linespc}] $y
5994 } elseif {$i > $col + 1} {
5995 lappend coords [expr {$x2 - $linespc}] $y
5997 lappend coords $x2 $y2
6000 lappend coords $x2 $y2
6002 set t [$canv create line $coords -width [linewidth $p] \
6003 -fill $colormap($p) -tags lines.$p]
6007 if {$rmx > [lindex $idpos($id) 1]} {
6008 lset idpos($id) 1 $rmx
6013 proc drawlines {id} {
6016 $canv itemconf lines.$id -width [linewidth $id]
6019 proc drawcmittext {id row col} {
6020 global linespc canv canv2 canv3 fgcolor curview
6021 global cmitlisted commitinfo rowidlist parentlist
6022 global rowtextx idpos idtags idheads idotherrefs
6023 global linehtag linentag linedtag selectedline
6024 global canvxmax boldids boldnameids fgcolor markedid
6025 global mainheadid nullid nullid2 circleitem circlecolors ctxbut
6026 global mainheadcirclecolor workingfilescirclecolor indexcirclecolor
6027 global circleoutlinecolor
6029 # listed is 0 for boundary, 1 for normal, 2 for negative, 3 for left, 4 for right
6030 set listed $cmitlisted($curview,$id)
6031 if {$id eq $nullid} {
6032 set ofill $workingfilescirclecolor
6033 } elseif {$id eq $nullid2} {
6034 set ofill $indexcirclecolor
6035 } elseif {$id eq $mainheadid} {
6036 set ofill $mainheadcirclecolor
6038 set ofill [lindex $circlecolors $listed]
6040 set x [xc $row $col]
6042 set orad [expr {$linespc / 3}]
6044 set t [$canv create oval [expr {$x - $orad}] [expr {$y - $orad}] \
6045 [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
6046 -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]
6047 } elseif {$listed == 3} {
6048 # triangle pointing left for left-side commits
6049 set t [$canv create polygon \
6050 [expr {$x - $orad}] $y \
6051 [expr {$x + $orad - 1}] [expr {$y - $orad}] \
6052 [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
6053 -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]
6055 # triangle pointing right for right-side commits
6056 set t [$canv create polygon \
6057 [expr {$x + $orad - 1}] $y \
6058 [expr {$x - $orad}] [expr {$y - $orad}] \
6059 [expr {$x - $orad}] [expr {$y + $orad - 1}] \
6060 -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]
6062 set circleitem($row) $t
6064 $canv bind $t <1> {selcanvline {} %x %y}
6065 set rmx [llength [lindex $rowidlist $row]]
6066 set olds [lindex $parentlist $row]
6068 set nextids [lindex $rowidlist [expr {$row + 1}]]
6070 set i [lsearch -exact $nextids $p]
6076 set xt [xc $row $rmx]
6077 set rowtextx($row) $xt
6078 set idpos($id) [list $x $xt $y]
6079 if {[info exists idtags($id)] || [info exists idheads($id)]
6080 || [info exists idotherrefs($id)]} {
6081 set xt [drawtags $id $x $xt $y]
6083 if {[lindex $commitinfo($id) 6] > 0} {
6084 set xt [drawnotesign $xt $y]
6086 set headline [lindex $commitinfo($id) 0]
6087 set name [lindex $commitinfo($id) 1]
6088 set date [lindex $commitinfo($id) 2]
6089 set date [formatdate $date]
6092 set isbold [ishighlighted $id]
6095 set font mainfontbold
6097 lappend boldnameids $id
6098 set nfont mainfontbold
6101 set linehtag($id) [$canv create text $xt $y -anchor w -fill $fgcolor \
6102 -text $headline -font $font -tags text]
6103 $canv bind $linehtag($id) $ctxbut "rowmenu %X %Y $id"
6104 set linentag($id) [$canv2 create text 3 $y -anchor w -fill $fgcolor \
6105 -text $name -font $nfont -tags text]
6106 set linedtag($id) [$canv3 create text 3 $y -anchor w -fill $fgcolor \
6107 -text $date -font mainfont -tags text]
6108 if {$selectedline == $row} {
6111 if {[info exists markedid] && $markedid eq $id} {
6114 set xr [expr {$xt + [font measure $font $headline]}]
6115 if {$xr > $canvxmax} {
6121 proc drawcmitrow {row} {
6122 global displayorder rowidlist nrows_drawn
6123 global iddrawn markingmatches
6124 global commitinfo numcommits
6125 global filehighlight fhighlights findpattern nhighlights
6126 global hlview vhighlights
6127 global highlight_related rhighlights
6129 if {$row >= $numcommits} return
6131 set id [lindex $displayorder $row]
6132 if {[info exists hlview] && ![info exists vhighlights($id)]} {
6133 askvhighlight $row $id
6135 if {[info exists filehighlight] && ![info exists fhighlights($id)]} {
6136 askfilehighlight $row $id
6138 if {$findpattern ne {} && ![info exists nhighlights($id)]} {
6139 askfindhighlight $row $id
6141 if {$highlight_related ne [mc "None"] && ![info exists rhighlights($id)]} {
6142 askrelhighlight $row $id
6144 if {![info exists iddrawn($id)]} {
6145 set col [lsearch -exact [lindex $rowidlist $row] $id]
6147 puts "oops, row $row id $id not in list"
6150 if {![info exists commitinfo($id)]} {
6154 drawcmittext $id $row $col
6158 if {$markingmatches} {
6159 markrowmatches $row $id
6163 proc drawcommits {row {endrow {}}} {
6164 global numcommits iddrawn displayorder curview need_redisplay
6165 global parentlist rowidlist rowfinal uparrowlen downarrowlen nrows_drawn
6170 if {$endrow eq {}} {
6173 if {$endrow >= $numcommits} {
6174 set endrow [expr {$numcommits - 1}]
6177 set rl1 [expr {$row - $downarrowlen - 3}]
6181 set ro1 [expr {$row - 3}]
6185 set r2 [expr {$endrow + $uparrowlen + 3}]
6186 if {$r2 > $numcommits} {
6189 for {set r $rl1} {$r < $r2} {incr r} {
6190 if {[lindex $rowidlist $r] ne {} && [lindex $rowfinal $r]} {
6194 set rl1 [expr {$r + 1}]
6200 optimize_rows $ro1 0 $r2
6201 if {$need_redisplay || $nrows_drawn > 2000} {
6205 # make the lines join to already-drawn rows either side
6206 set r [expr {$row - 1}]
6207 if {$r < 0 || ![info exists iddrawn([lindex $displayorder $r])]} {
6210 set er [expr {$endrow + 1}]
6211 if {$er >= $numcommits ||
6212 ![info exists iddrawn([lindex $displayorder $er])]} {
6215 for {} {$r <= $er} {incr r} {
6216 set id [lindex $displayorder $r]
6217 set wasdrawn [info exists iddrawn($id)]
6219 if {$r == $er} break
6220 set nextid [lindex $displayorder [expr {$r + 1}]]
6221 if {$wasdrawn && [info exists iddrawn($nextid)]} continue
6222 drawparentlinks $id $r
6224 set rowids [lindex $rowidlist $r]
6225 foreach lid $rowids {
6226 if {$lid eq {}} continue
6227 if {[info exists lineend($lid)] && $lineend($lid) > $r} continue
6229 # see if this is the first child of any of its parents
6230 foreach p [lindex $parentlist $r] {
6231 if {[lsearch -exact $rowids $p] < 0} {
6232 # make this line extend up to the child
6233 set lineend($p) [drawlineseg $p $r $er 0]
6237 set lineend($lid) [drawlineseg $lid $r $er 1]
6243 proc undolayout {row} {
6244 global uparrowlen mingaplen downarrowlen
6245 global rowidlist rowisopt rowfinal need_redisplay
6247 set r [expr {$row - ($uparrowlen + $mingaplen + $downarrowlen)}]
6251 if {[llength $rowidlist] > $r} {
6253 set rowidlist [lrange $rowidlist 0 $r]
6254 set rowfinal [lrange $rowfinal 0 $r]
6255 set rowisopt [lrange $rowisopt 0 $r]
6256 set need_redisplay 1
6261 proc drawvisible {} {
6262 global canv linespc curview vrowmod selectedline targetrow targetid
6263 global need_redisplay cscroll numcommits
6265 set fs [$canv yview]
6266 set ymax [lindex [$canv cget -scrollregion] 3]
6267 if {$ymax eq {} || $ymax == 0 || $numcommits == 0} return
6268 set f0 [lindex $fs 0]
6269 set f1 [lindex $fs 1]
6270 set y0 [expr {int($f0 * $ymax)}]
6271 set y1 [expr {int($f1 * $ymax)}]
6273 if {[info exists targetid]} {
6274 if {[commitinview $targetid $curview]} {
6275 set r [rowofcommit $targetid]
6276 if {$r != $targetrow} {
6277 # Fix up the scrollregion and change the scrolling position
6278 # now that our target row has moved.
6279 set diff [expr {($r - $targetrow) * $linespc}]
6282 set ymax [lindex [$canv cget -scrollregion] 3]
6285 set f0 [expr {$y0 / $ymax}]
6286 set f1 [expr {$y1 / $ymax}]
6287 allcanvs yview moveto $f0
6288 $cscroll set $f0 $f1
6289 set need_redisplay 1
6296 set row [expr {int(($y0 - 3) / $linespc) - 1}]
6297 set endrow [expr {int(($y1 - 3) / $linespc) + 1}]
6298 if {$endrow >= $vrowmod($curview)} {
6299 update_arcrows $curview
6301 if {$selectedline ne {} &&
6302 $row <= $selectedline && $selectedline <= $endrow} {
6303 set targetrow $selectedline
6304 } elseif {[info exists targetid]} {
6305 set targetrow [expr {int(($row + $endrow) / 2)}]
6307 if {[info exists targetrow]} {
6308 if {$targetrow >= $numcommits} {
6309 set targetrow [expr {$numcommits - 1}]
6311 set targetid [commitonrow $targetrow]
6313 drawcommits $row $endrow
6316 proc clear_display {} {
6317 global iddrawn linesegs need_redisplay nrows_drawn
6318 global vhighlights fhighlights nhighlights rhighlights
6319 global linehtag linentag linedtag boldids boldnameids
6322 catch {unset iddrawn}
6323 catch {unset linesegs}
6324 catch {unset linehtag}
6325 catch {unset linentag}
6326 catch {unset linedtag}
6329 catch {unset vhighlights}
6330 catch {unset fhighlights}
6331 catch {unset nhighlights}
6332 catch {unset rhighlights}
6333 set need_redisplay 0
6337 proc findcrossings {id} {
6338 global rowidlist parentlist numcommits displayorder
6342 foreach {s e} [rowranges $id] {
6343 if {$e >= $numcommits} {
6344 set e [expr {$numcommits - 1}]
6346 if {$e <= $s} continue
6347 for {set row $e} {[incr row -1] >= $s} {} {
6348 set x [lsearch -exact [lindex $rowidlist $row] $id]
6350 set olds [lindex $parentlist $row]
6351 set kid [lindex $displayorder $row]
6352 set kidx [lsearch -exact [lindex $rowidlist $row] $kid]
6353 if {$kidx < 0} continue
6354 set nextrow [lindex $rowidlist [expr {$row + 1}]]
6356 set px [lsearch -exact $nextrow $p]
6357 if {$px < 0} continue
6358 if {($kidx < $x && $x < $px) || ($px < $x && $x < $kidx)} {
6359 if {[lsearch -exact $ccross $p] >= 0} continue
6360 if {$x == $px + ($kidx < $px? -1: 1)} {
6362 } elseif {[lsearch -exact $cross $p] < 0} {
6369 return [concat $ccross {{}} $cross]
6372 proc assigncolor {id} {
6373 global colormap colors nextcolor
6374 global parents children children curview
6376 if {[info exists colormap($id)]} return
6377 set ncolors [llength $colors]
6378 if {[info exists children($curview,$id)]} {
6379 set kids $children($curview,$id)
6383 if {[llength $kids] == 1} {
6384 set child [lindex $kids 0]
6385 if {[info exists colormap($child)]
6386 && [llength $parents($curview,$child)] == 1} {
6387 set colormap($id) $colormap($child)
6393 foreach x [findcrossings $id] {
6395 # delimiter between corner crossings and other crossings
6396 if {[llength $badcolors] >= $ncolors - 1} break
6397 set origbad $badcolors
6399 if {[info exists colormap($x)]
6400 && [lsearch -exact $badcolors $colormap($x)] < 0} {
6401 lappend badcolors $colormap($x)
6404 if {[llength $badcolors] >= $ncolors} {
6405 set badcolors $origbad
6407 set origbad $badcolors
6408 if {[llength $badcolors] < $ncolors - 1} {
6409 foreach child $kids {
6410 if {[info exists colormap($child)]
6411 && [lsearch -exact $badcolors $colormap($child)] < 0} {
6412 lappend badcolors $colormap($child)
6414 foreach p $parents($curview,$child) {
6415 if {[info exists colormap($p)]
6416 && [lsearch -exact $badcolors $colormap($p)] < 0} {
6417 lappend badcolors $colormap($p)
6421 if {[llength $badcolors] >= $ncolors} {
6422 set badcolors $origbad
6425 for {set i 0} {$i <= $ncolors} {incr i} {
6426 set c [lindex $colors $nextcolor]
6427 if {[incr nextcolor] >= $ncolors} {
6430 if {[lsearch -exact $badcolors $c]} break
6432 set colormap($id) $c
6435 proc bindline {t id} {
6438 $canv bind $t <Enter> "lineenter %x %y $id"
6439 $canv bind $t <Motion> "linemotion %x %y $id"
6440 $canv bind $t <Leave> "lineleave $id"
6441 $canv bind $t <Button-1> "lineclick %x %y $id 1"
6444 proc graph_pane_width {} {
6448 set g [.tf.histframe.pwclist sashpos 0]
6450 set g [.tf.histframe.pwclist sash coord 0]
6452 return [lindex $g 0]
6455 proc totalwidth {l font extra} {
6458 set tot [expr {$tot + [font measure $font $str] + $extra}]
6463 proc drawtags {id x xt y1} {
6464 global idtags idheads idotherrefs mainhead
6465 global linespc lthickness
6466 global canv rowtextx curview fgcolor bgcolor ctxbut
6467 global headbgcolor headfgcolor headoutlinecolor remotebgcolor
6468 global tagbgcolor tagfgcolor tagoutlinecolor
6477 set maxwidth [expr {[graph_pane_width] * $maxtagpct / 100}]
6478 set delta [expr {int(0.5 * ($linespc - $lthickness))}]
6479 set extra [expr {$delta + $lthickness + $linespc}]
6481 if {[info exists idtags($id)]} {
6482 set marks $idtags($id)
6483 set ntags [llength $marks]
6484 if {$ntags > $maxtags ||
6485 [totalwidth $marks mainfont $extra] > $maxwidth} {
6486 # show just a single "n tags..." tag
6489 set marks [list "tag..."]
6491 set marks [list [format "%d tags..." $ntags]]
6496 if {[info exists idheads($id)]} {
6497 set marks [concat $marks $idheads($id)]
6498 set nheads [llength $idheads($id)]
6500 if {[info exists idotherrefs($id)]} {
6501 set marks [concat $marks $idotherrefs($id)]
6507 set yt [expr {$y1 - 0.5 * $linespc}]
6508 set yb [expr {$yt + $linespc - 1}]
6512 foreach tag $marks {
6514 if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} {
6515 set wid [font measure mainfontbold $tag]
6517 set wid [font measure mainfont $tag]
6521 set xt [expr {$xt + $wid + $extra}]
6523 set t [$canv create line $x $y1 [lindex $xvals end] $y1 \
6524 -width $lthickness -fill $reflinecolor -tags tag.$id]
6526 foreach tag $marks x $xvals wid $wvals {
6527 set tag_quoted [string map {% %%} $tag]
6528 set xl [expr {$x + $delta}]
6529 set xr [expr {$x + $delta + $wid + $lthickness}]
6531 if {[incr ntags -1] >= 0} {
6533 set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
6534 $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
6535 -width 1 -outline $tagoutlinecolor -fill $tagbgcolor \
6538 set tagclick [list showtags $id 1]
6540 set tagclick [list showtag $tag_quoted 1]
6542 $canv bind $t <1> $tagclick
6543 set rowtextx([rowofcommit $id]) [expr {$xr + $linespc}]
6545 # draw a head or other ref
6546 if {[incr nheads -1] >= 0} {
6547 set col $headbgcolor
6548 if {$tag eq $mainhead} {
6549 set font mainfontbold
6554 set xl [expr {$xl - $delta/2}]
6555 $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
6556 -width 1 -outline black -fill $col -tags tag.$id
6557 if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
6558 set rwid [font measure mainfont $remoteprefix]
6559 set xi [expr {$x + 1}]
6560 set yti [expr {$yt + 1}]
6561 set xri [expr {$x + $rwid}]
6562 $canv create polygon $xi $yti $xri $yti $xri $yb $xi $yb \
6563 -width 0 -fill $remotebgcolor -tags tag.$id
6566 set t [$canv create text $xl $y1 -anchor w -text $tag -fill $headfgcolor \
6567 -font $font -tags [list tag.$id text]]
6569 $canv bind $t <1> $tagclick
6570 } elseif {$nheads >= 0} {
6571 $canv bind $t $ctxbut [list headmenu %X %Y $id $tag_quoted]
6577 proc drawnotesign {xt y} {
6578 global linespc canv fgcolor
6580 set orad [expr {$linespc / 3}]
6581 set t [$canv create rectangle [expr {$xt - $orad}] [expr {$y - $orad}] \
6582 [expr {$xt + $orad - 1}] [expr {$y + $orad - 1}] \
6583 -fill yellow -outline $fgcolor -width 1 -tags circle]
6584 set xt [expr {$xt + $orad * 3}]
6588 proc xcoord {i level ln} {
6589 global canvx0 xspc1 xspc2
6591 set x [expr {$canvx0 + $i * $xspc1($ln)}]
6592 if {$i > 0 && $i == $level} {
6593 set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}]
6594 } elseif {$i > $level} {
6595 set x [expr {$x + $xspc2 - $xspc1($ln)}]
6600 proc show_status {msg} {
6604 $canv create text 3 3 -anchor nw -text $msg -font mainfont \
6605 -tags text -fill $fgcolor
6608 # Don't change the text pane cursor if it is currently the hand cursor,
6609 # showing that we are over a sha1 ID link.
6610 proc settextcursor {c} {
6611 global ctext curtextcursor
6613 if {[$ctext cget -cursor] == $curtextcursor} {
6614 $ctext config -cursor $c
6616 set curtextcursor $c
6619 proc nowbusy {what {name {}}} {
6620 global isbusy busyname statusw
6622 if {[array names isbusy] eq {}} {
6623 . config -cursor watch
6627 set busyname($what) $name
6629 $statusw conf -text $name
6633 proc notbusy {what} {
6634 global isbusy maincursor textcursor busyname statusw
6638 if {$busyname($what) ne {} &&
6639 [$statusw cget -text] eq $busyname($what)} {
6640 $statusw conf -text {}
6643 if {[array names isbusy] eq {}} {
6644 . config -cursor $maincursor
6645 settextcursor $textcursor
6649 proc findmatches {f} {
6650 global findtype findstring
6651 if {$findtype == [mc "Regexp"]} {
6652 set matches [regexp -indices -all -inline $findstring $f]
6655 if {$findtype == [mc "IgnCase"]} {
6656 set f [string tolower $f]
6657 set fs [string tolower $fs]
6661 set l [string length $fs]
6662 while {[set j [string first $fs $f $i]] >= 0} {
6663 lappend matches [list $j [expr {$j+$l-1}]]
6664 set i [expr {$j + $l}]
6670 proc dofind {{dirn 1} {wrap 1}} {
6671 global findstring findstartline findcurline selectedline numcommits
6672 global gdttype filehighlight fh_serial find_dirn findallowwrap
6674 if {[info exists find_dirn]} {
6675 if {$find_dirn == $dirn} return
6679 if {$findstring eq {} || $numcommits == 0} return
6680 if {$selectedline eq {}} {
6681 set findstartline [lindex [visiblerows] [expr {$dirn < 0}]]
6683 set findstartline $selectedline
6685 set findcurline $findstartline
6686 nowbusy finding [mc "Searching"]
6687 if {$gdttype ne [mc "containing:"] && ![info exists filehighlight]} {
6688 after cancel do_file_hl $fh_serial
6689 do_file_hl $fh_serial
6692 set findallowwrap $wrap
6696 proc stopfinding {} {
6697 global find_dirn findcurline fprogcoord
6699 if {[info exists find_dirn]} {
6710 global commitdata commitinfo numcommits findpattern findloc
6711 global findstartline findcurline findallowwrap
6712 global find_dirn gdttype fhighlights fprogcoord
6713 global curview varcorder vrownum varccommits vrowmod
6715 if {![info exists find_dirn]} {
6718 set fldtypes [list [mc "Headline"] [mc "Author"] "" [mc "Committer"] "" [mc "Comments"]]
6721 if {$find_dirn > 0} {
6723 if {$l >= $numcommits} {
6726 if {$l <= $findstartline} {
6727 set lim [expr {$findstartline + 1}]
6730 set moretodo $findallowwrap
6737 if {$l >= $findstartline} {
6738 set lim [expr {$findstartline - 1}]
6741 set moretodo $findallowwrap
6744 set n [expr {($lim - $l) * $find_dirn}]
6749 if {$l + ($find_dirn > 0? $n: 1) > $vrowmod($curview)} {
6750 update_arcrows $curview
6754 set ai [bsearch $vrownum($curview) $l]
6755 set a [lindex $varcorder($curview) $ai]
6756 set arow [lindex $vrownum($curview) $ai]
6757 set ids [lindex $varccommits($curview,$a)]
6758 set arowend [expr {$arow + [llength $ids]}]
6759 if {$gdttype eq [mc "containing:"]} {
6760 for {} {$n > 0} {incr n -1; incr l $find_dirn} {
6761 if {$l < $arow || $l >= $arowend} {
6763 set a [lindex $varcorder($curview) $ai]
6764 set arow [lindex $vrownum($curview) $ai]
6765 set ids [lindex $varccommits($curview,$a)]
6766 set arowend [expr {$arow + [llength $ids]}]
6768 set id [lindex $ids [expr {$l - $arow}]]
6769 # shouldn't happen unless git log doesn't give all the commits...
6770 if {![info exists commitdata($id)] ||
6771 ![doesmatch $commitdata($id)]} {
6774 if {![info exists commitinfo($id)]} {
6777 set info $commitinfo($id)
6778 foreach f $info ty $fldtypes {
6779 if {$ty eq ""} continue
6780 if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
6789 for {} {$n > 0} {incr n -1; incr l $find_dirn} {
6790 if {$l < $arow || $l >= $arowend} {
6792 set a [lindex $varcorder($curview) $ai]
6793 set arow [lindex $vrownum($curview) $ai]
6794 set ids [lindex $varccommits($curview,$a)]
6795 set arowend [expr {$arow + [llength $ids]}]
6797 set id [lindex $ids [expr {$l - $arow}]]
6798 if {![info exists fhighlights($id)]} {
6799 # this sets fhighlights($id) to -1
6800 askfilehighlight $l $id
6802 if {$fhighlights($id) > 0} {
6806 if {$fhighlights($id) < 0} {
6809 set findcurline [expr {$l - $find_dirn}]
6814 if {$found || ($domore && !$moretodo)} {
6830 set findcurline [expr {$l - $find_dirn}]
6832 set n [expr {($findcurline - $findstartline) * $find_dirn - 1}]
6836 set fprogcoord [expr {$n * 1.0 / $numcommits}]
6841 proc findselectline {l} {
6842 global findloc commentend ctext findcurline markingmatches gdttype
6844 set markingmatches [expr {$gdttype eq [mc "containing:"]}]
6847 if {$markingmatches &&
6848 ($findloc eq [mc "All fields"] || $findloc eq [mc "Comments"])} {
6849 # highlight the matches in the comments
6850 set f [$ctext get 1.0 $commentend]
6851 set matches [findmatches $f]
6852 foreach match $matches {
6853 set start [lindex $match 0]
6854 set end [expr {[lindex $match 1] + 1}]
6855 $ctext tag add found "1.0 + $start c" "1.0 + $end c"
6861 # mark the bits of a headline or author that match a find string
6862 proc markmatches {canv l str tag matches font row} {
6865 set bbox [$canv bbox $tag]
6866 set x0 [lindex $bbox 0]
6867 set y0 [lindex $bbox 1]
6868 set y1 [lindex $bbox 3]
6869 foreach match $matches {
6870 set start [lindex $match 0]
6871 set end [lindex $match 1]
6872 if {$start > $end} continue
6873 set xoff [font measure $font [string range $str 0 [expr {$start-1}]]]
6874 set xlen [font measure $font [string range $str 0 [expr {$end}]]]
6875 set t [$canv create rect [expr {$x0+$xoff}] $y0 \
6876 [expr {$x0+$xlen+2}] $y1 \
6877 -outline {} -tags [list match$l matches] -fill yellow]
6879 if {$row == $selectedline} {
6880 $canv raise $t secsel
6885 proc unmarkmatches {} {
6886 global markingmatches
6888 allcanvs delete matches
6889 set markingmatches 0
6893 proc selcanvline {w x y} {
6894 global canv canvy0 ctext linespc
6896 set ymax [lindex [$canv cget -scrollregion] 3]
6897 if {$ymax == {}} return
6898 set yfrac [lindex [$canv yview] 0]
6899 set y [expr {$y + $yfrac * $ymax}]
6900 set l [expr {int(($y - $canvy0) / $linespc + 0.5)}]
6905 set xmax [lindex [$canv cget -scrollregion] 2]
6906 set xleft [expr {[lindex [$canv xview] 0] * $xmax}]
6907 if {![info exists rowtextx($l)] || $xleft + $x < $rowtextx($l)} return
6913 proc commit_descriptor {p} {
6915 if {![info exists commitinfo($p)]} {
6919 if {[llength $commitinfo($p)] > 1} {
6920 set l [lindex $commitinfo($p) 0]
6925 # append some text to the ctext widget, and make any SHA1 ID
6926 # that we know about be a clickable link.
6927 proc appendwithlinks {text tags} {
6928 global ctext linknum curview
6930 set start [$ctext index "end - 1c"]
6931 $ctext insert end $text $tags
6932 set links [regexp -indices -all -inline {(?:\m|-g)[0-9a-f]{6,40}\M} $text]
6936 set linkid [string range $text $s $e]
6938 $ctext tag delete link$linknum
6939 $ctext tag add link$linknum "$start + $s c" "$start + $e c"
6940 setlink $linkid link$linknum
6945 proc setlink {id lk} {
6946 global curview ctext pendinglinks
6949 if {[string range $id 0 1] eq "-g"} {
6950 set id [string range $id 2 end]
6954 if {[string length $id] < 40} {
6955 set matches [longid $id]
6956 if {[llength $matches] > 0} {
6957 if {[llength $matches] > 1} return
6959 set id [lindex $matches 0]
6962 set known [commitinview $id $curview]
6965 $ctext tag conf $lk -foreground $linkfgcolor -underline 1
6966 $ctext tag bind $lk <1> [list selbyid $id]
6967 $ctext tag bind $lk <Enter> {linkcursor %W 1}
6968 $ctext tag bind $lk <Leave> {linkcursor %W -1}
6970 lappend pendinglinks($id) $lk
6971 interestedin $id {makelink %P}
6975 proc appendshortlink {id {pre {}} {post {}}} {
6976 global ctext linknum
6978 $ctext insert end $pre
6979 $ctext tag delete link$linknum
6980 $ctext insert end [string range $id 0 7] link$linknum
6981 $ctext insert end $post
6982 setlink $id link$linknum
6986 proc makelink {id} {
6989 if {![info exists pendinglinks($id)]} return
6990 foreach lk $pendinglinks($id) {
6993 unset pendinglinks($id)
6996 proc linkcursor {w inc} {
6997 global linkentercount curtextcursor
6999 if {[incr linkentercount $inc] > 0} {
7000 $w configure -cursor hand2
7002 $w configure -cursor $curtextcursor
7003 if {$linkentercount < 0} {
7004 set linkentercount 0
7009 proc viewnextline {dir} {
7013 set ymax [lindex [$canv cget -scrollregion] 3]
7014 set wnow [$canv yview]
7015 set wtop [expr {[lindex $wnow 0] * $ymax}]
7016 set newtop [expr {$wtop + $dir * $linespc}]
7019 } elseif {$newtop > $ymax} {
7022 allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
7025 # add a list of tag or branch names at position pos
7026 # returns the number of names inserted
7027 proc appendrefs {pos ids var} {
7028 global ctext linknum curview $var maxrefs mainheadid
7030 if {[catch {$ctext index $pos}]} {
7033 $ctext conf -state normal
7034 $ctext delete $pos "$pos lineend"
7037 foreach tag [set $var\($id\)] {
7038 lappend tags [list $tag $id]
7043 set tags [lsort -index 0 -decreasing $tags]
7046 if {[llength $tags] > $maxrefs} {
7047 # If we are displaying heads, and there are too many,
7048 # see if there are some important heads to display.
7049 # Currently this means "master" and the current head.
7051 if {$var eq "idheads"} {
7054 set hname [lindex $ti 0]
7055 set id [lindex $ti 1]
7056 if {($hname eq "master" || $id eq $mainheadid) &&
7057 [llength $itags] < $maxrefs} {
7066 set str [mc "and many more"]
7071 $ctext insert $pos "$str ([llength $tags])"
7072 set nutags [llength $tags]
7077 set id [lindex $ti 1]
7080 $ctext tag delete $lk
7081 $ctext insert $pos $sep
7082 $ctext insert $pos [lindex $ti 0] $lk
7086 $ctext tag add wwrap "$pos linestart" "$pos lineend"
7087 $ctext conf -state disabled
7088 return [expr {[llength $tags] + $nutags}]
7091 # called when we have finished computing the nearby tags
7092 proc dispneartags {delay} {
7093 global selectedline currentid showneartags tagphase
7095 if {$selectedline eq {} || !$showneartags} return
7096 after cancel dispnexttag
7098 after 200 dispnexttag
7101 after idle dispnexttag
7106 proc dispnexttag {} {
7107 global selectedline currentid showneartags tagphase ctext
7109 if {$selectedline eq {} || !$showneartags} return
7110 switch -- $tagphase {
7112 set dtags [desctags $currentid]
7114 appendrefs precedes $dtags idtags
7118 set atags [anctags $currentid]
7120 appendrefs follows $atags idtags
7124 set dheads [descheads $currentid]
7125 if {$dheads ne {}} {
7126 if {[appendrefs branch $dheads idheads] > 1
7127 && [$ctext get "branch -3c"] eq "h"} {
7128 # turn "Branch" into "Branches"
7129 $ctext conf -state normal
7130 $ctext insert "branch -2c" "es"
7131 $ctext conf -state disabled
7136 if {[incr tagphase] <= 2} {
7137 after idle dispnexttag
7141 proc make_secsel {id} {
7142 global linehtag linentag linedtag canv canv2 canv3
7144 if {![info exists linehtag($id)]} return
7146 set t [eval $canv create rect [$canv bbox $linehtag($id)] -outline {{}} \
7147 -tags secsel -fill [$canv cget -selectbackground]]
7149 $canv2 delete secsel
7150 set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] -outline {{}} \
7151 -tags secsel -fill [$canv2 cget -selectbackground]]
7153 $canv3 delete secsel
7154 set t [eval $canv3 create rect [$canv3 bbox $linedtag($id)] -outline {{}} \
7155 -tags secsel -fill [$canv3 cget -selectbackground]]
7159 proc make_idmark {id} {
7160 global linehtag canv fgcolor
7162 if {![info exists linehtag($id)]} return
7164 set t [eval $canv create rect [$canv bbox $linehtag($id)] \
7165 -tags markid -outline $fgcolor]
7169 proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} {
7170 global canv ctext commitinfo selectedline
7171 global canvy0 linespc parents children curview
7172 global currentid sha1entry
7173 global commentend idtags linknum
7174 global mergemax numcommits pending_select
7175 global cmitmode showneartags allcommits
7176 global targetrow targetid lastscrollrows
7177 global autoselect autosellen jump_to_here
7180 catch {unset pending_select}
7185 if {$l < 0 || $l >= $numcommits} return
7186 set id [commitonrow $l]
7191 if {$lastscrollrows < $numcommits} {
7195 if {$cmitmode ne "patch" && $switch_to_patch} {
7196 set cmitmode "patch"
7199 set y [expr {$canvy0 + $l * $linespc}]
7200 set ymax [lindex [$canv cget -scrollregion] 3]
7201 set ytop [expr {$y - $linespc - 1}]
7202 set ybot [expr {$y + $linespc + 1}]
7203 set wnow [$canv yview]
7204 set wtop [expr {[lindex $wnow 0] * $ymax}]
7205 set wbot [expr {[lindex $wnow 1] * $ymax}]
7206 set wh [expr {$wbot - $wtop}]
7208 if {$ytop < $wtop} {
7209 if {$ybot < $wtop} {
7210 set newtop [expr {$y - $wh / 2.0}]
7213 if {$newtop > $wtop - $linespc} {
7214 set newtop [expr {$wtop - $linespc}]
7217 } elseif {$ybot > $wbot} {
7218 if {$ytop > $wbot} {
7219 set newtop [expr {$y - $wh / 2.0}]
7221 set newtop [expr {$ybot - $wh}]
7222 if {$newtop < $wtop + $linespc} {
7223 set newtop [expr {$wtop + $linespc}]
7227 if {$newtop != $wtop} {
7231 allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
7238 addtohistory [list selbyid $id 0] savecmitpos
7241 $sha1entry delete 0 end
7242 $sha1entry insert 0 $id
7244 $sha1entry selection range 0 $autosellen
7248 $ctext conf -state normal
7251 if {![info exists commitinfo($id)]} {
7254 set info $commitinfo($id)
7255 set date [formatdate [lindex $info 2]]
7256 $ctext insert end "[mc "Author"]: [lindex $info 1] $date\n"
7257 set date [formatdate [lindex $info 4]]
7258 $ctext insert end "[mc "Committer"]: [lindex $info 3] $date\n"
7259 if {[info exists idtags($id)]} {
7260 $ctext insert end [mc "Tags:"]
7261 foreach tag $idtags($id) {
7262 $ctext insert end " $tag"
7264 $ctext insert end "\n"
7268 set olds $parents($curview,$id)
7269 if {[llength $olds] > 1} {
7272 if {$np >= $mergemax} {
7277 $ctext insert end "[mc "Parent"]: " $tag
7278 appendwithlinks [commit_descriptor $p] {}
7283 append headers "[mc "Parent"]: [commit_descriptor $p]"
7287 foreach c $children($curview,$id) {
7288 append headers "[mc "Child"]: [commit_descriptor $c]"
7291 # make anything that looks like a SHA1 ID be a clickable link
7292 appendwithlinks $headers {}
7293 if {$showneartags} {
7294 if {![info exists allcommits]} {
7297 $ctext insert end "[mc "Branch"]: "
7298 $ctext mark set branch "end -1c"
7299 $ctext mark gravity branch left
7300 $ctext insert end "\n[mc "Follows"]: "
7301 $ctext mark set follows "end -1c"
7302 $ctext mark gravity follows left
7303 $ctext insert end "\n[mc "Precedes"]: "
7304 $ctext mark set precedes "end -1c"
7305 $ctext mark gravity precedes left
7306 $ctext insert end "\n"
7309 $ctext insert end "\n"
7310 set comment [lindex $info 5]
7311 if {[string first "\r" $comment] >= 0} {
7312 set comment [string map {"\r" "\n "} $comment]
7314 appendwithlinks $comment {comment}
7316 $ctext tag remove found 1.0 end
7317 $ctext conf -state disabled
7318 set commentend [$ctext index "end - 1c"]
7320 set jump_to_here $desired_loc
7321 init_flist [mc "Comments"]
7322 if {$cmitmode eq "tree"} {
7324 } elseif {$vinlinediff($curview) == 1} {
7326 } elseif {[llength $olds] <= 1} {
7333 proc selfirstline {} {
7338 proc sellastline {} {
7341 set l [expr {$numcommits - 1}]
7345 proc selnextline {dir} {
7348 if {$selectedline eq {}} return
7349 set l [expr {$selectedline + $dir}]
7354 proc selnextpage {dir} {
7355 global canv linespc selectedline numcommits
7357 set lpp [expr {([winfo height $canv] - 2) / $linespc}]
7361 allcanvs yview scroll [expr {$dir * $lpp}] units
7363 if {$selectedline eq {}} return
7364 set l [expr {$selectedline + $dir * $lpp}]
7367 } elseif {$l >= $numcommits} {
7368 set l [expr $numcommits - 1]
7374 proc unselectline {} {
7375 global selectedline currentid
7378 catch {unset currentid}
7379 allcanvs delete secsel
7383 proc reselectline {} {
7386 if {$selectedline ne {}} {
7387 selectline $selectedline 0
7391 proc addtohistory {cmd {saveproc {}}} {
7392 global history historyindex curview
7396 set elt [list $curview $cmd $saveproc {}]
7397 if {$historyindex > 0
7398 && [lindex $history [expr {$historyindex - 1}]] == $elt} {
7402 if {$historyindex < [llength $history]} {
7403 set history [lreplace $history $historyindex end $elt]
7405 lappend history $elt
7408 if {$historyindex > 1} {
7409 .tf.bar.leftbut conf -state normal
7411 .tf.bar.leftbut conf -state disabled
7413 .tf.bar.rightbut conf -state disabled
7416 # save the scrolling position of the diff display pane
7417 proc save_position {} {
7418 global historyindex history
7420 if {$historyindex < 1} return
7421 set hi [expr {$historyindex - 1}]
7422 set fn [lindex $history $hi 2]
7424 lset history $hi 3 [eval $fn]
7428 proc unset_posvars {} {
7431 if {[info exists last_posvars]} {
7432 foreach {var val} $last_posvars {
7441 global curview last_posvars
7443 set view [lindex $elt 0]
7444 set cmd [lindex $elt 1]
7445 set pv [lindex $elt 3]
7446 if {$curview != $view} {
7450 foreach {var val} $pv {
7454 set last_posvars $pv
7459 global history historyindex
7462 if {$historyindex > 1} {
7464 incr historyindex -1
7465 godo [lindex $history [expr {$historyindex - 1}]]
7466 .tf.bar.rightbut conf -state normal
7468 if {$historyindex <= 1} {
7469 .tf.bar.leftbut conf -state disabled
7474 global history historyindex
7477 if {$historyindex < [llength $history]} {
7479 set cmd [lindex $history $historyindex]
7482 .tf.bar.leftbut conf -state normal
7484 if {$historyindex >= [llength $history]} {
7485 .tf.bar.rightbut conf -state disabled
7490 global treefilelist treeidlist diffids diffmergeid treepending
7491 global nullid nullid2
7494 catch {unset diffmergeid}
7495 if {![info exists treefilelist($id)]} {
7496 if {![info exists treepending]} {
7497 if {$id eq $nullid} {
7498 set cmd [list | git ls-files]
7499 } elseif {$id eq $nullid2} {
7500 set cmd [list | git ls-files --stage -t]
7502 set cmd [list | git ls-tree -r $id]
7504 if {[catch {set gtf [open $cmd r]}]} {
7508 set treefilelist($id) {}
7509 set treeidlist($id) {}
7510 fconfigure $gtf -blocking 0 -encoding binary
7511 filerun $gtf [list gettreeline $gtf $id]
7518 proc gettreeline {gtf id} {
7519 global treefilelist treeidlist treepending cmitmode diffids nullid nullid2
7522 while {[incr nl] <= 1000 && [gets $gtf line] >= 0} {
7523 if {$diffids eq $nullid} {
7526 set i [string first "\t" $line]
7527 if {$i < 0} continue
7528 set fname [string range $line [expr {$i+1}] end]
7529 set line [string range $line 0 [expr {$i-1}]]
7530 if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue
7531 set sha1 [lindex $line 2]
7532 lappend treeidlist($id) $sha1
7534 if {[string index $fname 0] eq "\""} {
7535 set fname [lindex $fname 0]
7537 set fname [encoding convertfrom $fname]
7538 lappend treefilelist($id) $fname
7541 return [expr {$nl >= 1000? 2: 1}]
7545 if {$cmitmode ne "tree"} {
7546 if {![info exists diffmergeid]} {
7547 gettreediffs $diffids
7549 } elseif {$id ne $diffids} {
7558 global treefilelist treeidlist diffids nullid nullid2
7559 global ctext_file_names ctext_file_lines
7560 global ctext commentend
7562 set i [lsearch -exact $treefilelist($diffids) $f]
7564 puts "oops, $f not in list for id $diffids"
7567 if {$diffids eq $nullid} {
7568 if {[catch {set bf [open $f r]} err]} {
7569 puts "oops, can't read $f: $err"
7573 set blob [lindex $treeidlist($diffids) $i]
7574 if {[catch {set bf [open [concat | git cat-file blob $blob] r]} err]} {
7575 puts "oops, error reading blob $blob: $err"
7579 fconfigure $bf -blocking 0 -encoding [get_path_encoding $f]
7580 filerun $bf [list getblobline $bf $diffids]
7581 $ctext config -state normal
7582 clear_ctext $commentend
7583 lappend ctext_file_names $f
7584 lappend ctext_file_lines [lindex [split $commentend "."] 0]
7585 $ctext insert end "\n"
7586 $ctext insert end "$f\n" filesep
7587 $ctext config -state disabled
7588 $ctext yview $commentend
7592 proc getblobline {bf id} {
7593 global diffids cmitmode ctext
7595 if {$id ne $diffids || $cmitmode ne "tree"} {
7599 $ctext config -state normal
7601 while {[incr nl] <= 1000 && [gets $bf line] >= 0} {
7602 $ctext insert end "$line\n"
7605 global jump_to_here ctext_file_names commentend
7607 # delete last newline
7608 $ctext delete "end - 2c" "end - 1c"
7610 if {$jump_to_here ne {} &&
7611 [lindex $jump_to_here 0] eq [lindex $ctext_file_names 0]} {
7612 set lnum [expr {[lindex $jump_to_here 1] +
7613 [lindex [split $commentend .] 0]}]
7614 mark_ctext_line $lnum
7616 $ctext config -state disabled
7619 $ctext config -state disabled
7620 return [expr {$nl >= 1000? 2: 1}]
7623 proc mark_ctext_line {lnum} {
7624 global ctext markbgcolor
7626 $ctext tag delete omark
7627 $ctext tag add omark $lnum.0 "$lnum.0 + 1 line"
7628 $ctext tag conf omark -background $markbgcolor
7632 proc mergediff {id} {
7634 global diffids treediffs
7635 global parents curview
7639 set treediffs($id) {}
7640 set np [llength $parents($curview,$id)]
7645 proc startdiff {ids} {
7646 global treediffs diffids treepending diffmergeid nullid nullid2
7650 catch {unset diffmergeid}
7651 if {![info exists treediffs($ids)] ||
7652 [lsearch -exact $ids $nullid] >= 0 ||
7653 [lsearch -exact $ids $nullid2] >= 0} {
7654 if {![info exists treepending]} {
7662 proc showinlinediff {ids} {
7663 global commitinfo commitdata ctext
7666 set info $commitinfo($ids)
7667 set diff [lindex $info 7]
7668 set difflines [split $diff "\n"]
7674 foreach line $difflines {
7675 if {![string compare -length 5 "diff " $line]} {
7677 } elseif {$inhdr && ![string compare -length 4 "+++ " $line]} {
7678 # offset also accounts for the b/ prefix
7679 lappend treediff [string range $line 6 end]
7684 set treediffs($ids) $treediff
7687 $ctext conf -state normal
7688 foreach line $difflines {
7689 parseblobdiffline $ids $line
7691 maybe_scroll_ctext 1
7692 $ctext conf -state disabled
7695 # If the filename (name) is under any of the passed filter paths
7696 # then return true to include the file in the listing.
7697 proc path_filter {filter name} {
7698 set worktree [gitworktree]
7700 set fq_p [file normalize $p]
7701 set fq_n [file normalize [file join $worktree $name]]
7702 if {[string match [file normalize $fq_p]* $fq_n]} {
7709 proc addtocflist {ids} {
7712 add_flist $treediffs($ids)
7716 proc diffcmd {ids flags} {
7717 global log_showroot nullid nullid2 git_version
7719 set i [lsearch -exact $ids $nullid]
7720 set j [lsearch -exact $ids $nullid2]
7722 if {[llength $ids] > 1 && $j < 0} {
7723 # comparing working directory with some specific revision
7724 set cmd [concat | git diff-index $flags]
7726 lappend cmd -R [lindex $ids 1]
7728 lappend cmd [lindex $ids 0]
7731 # comparing working directory with index
7732 set cmd [concat | git diff-files $flags]
7737 } elseif {$j >= 0} {
7738 if {[package vcompare $git_version "1.7.2"] >= 0} {
7739 set flags "$flags --ignore-submodules=dirty"
7741 set cmd [concat | git diff-index --cached $flags]
7742 if {[llength $ids] > 1} {
7743 # comparing index with specific revision
7745 lappend cmd -R [lindex $ids 1]
7747 lappend cmd [lindex $ids 0]
7750 # comparing index with HEAD
7754 if {$log_showroot} {
7755 lappend flags --root
7757 set cmd [concat | git diff-tree -r $flags $ids]
7762 proc gettreediffs {ids} {
7763 global treediff treepending limitdiffs vfilelimit curview
7765 set cmd [diffcmd $ids {--no-commit-id}]
7766 if {$limitdiffs && $vfilelimit($curview) ne {}} {
7767 set cmd [concat $cmd -- $vfilelimit($curview)]
7769 if {[catch {set gdtf [open $cmd r]}]} return
7771 set treepending $ids
7773 fconfigure $gdtf -blocking 0 -encoding binary
7774 filerun $gdtf [list gettreediffline $gdtf $ids]
7777 proc gettreediffline {gdtf ids} {
7778 global treediff treediffs treepending diffids diffmergeid
7779 global cmitmode vfilelimit curview limitdiffs perfile_attrs
7784 if {$perfile_attrs} {
7785 # cache_gitattr is slow, and even slower on win32 where we
7786 # have to invoke it for only about 30 paths at a time
7788 if {[tk windowingsystem] == "win32"} {
7792 while {[incr nr] <= $max && [gets $gdtf line] >= 0} {
7793 set i [string first "\t" $line]
7795 set file [string range $line [expr {$i+1}] end]
7796 if {[string index $file 0] eq "\""} {
7797 set file [lindex $file 0]
7799 set file [encoding convertfrom $file]
7800 if {$file ne [lindex $treediff end]} {
7801 lappend treediff $file
7802 lappend sublist $file
7806 if {$perfile_attrs} {
7807 cache_gitattr encoding $sublist
7810 return [expr {$nr >= $max? 2: 1}]
7813 set treediffs($ids) $treediff
7815 if {$cmitmode eq "tree" && [llength $diffids] == 1} {
7817 } elseif {$ids != $diffids} {
7818 if {![info exists diffmergeid]} {
7819 gettreediffs $diffids
7827 # empty string or positive integer
7828 proc diffcontextvalidate {v} {
7829 return [regexp {^(|[1-9][0-9]*)$} $v]
7832 proc diffcontextchange {n1 n2 op} {
7833 global diffcontextstring diffcontext
7835 if {[string is integer -strict $diffcontextstring]} {
7836 if {$diffcontextstring >= 0} {
7837 set diffcontext $diffcontextstring
7843 proc changeignorespace {} {
7847 proc changeworddiff {name ix op} {
7851 proc initblobdiffvars {} {
7852 global diffencoding targetline diffnparents
7853 global diffinhdr currdiffsubmod diffseehere
7857 set diffencoding [get_path_encoding {}]
7858 set currdiffsubmod ""
7862 proc getblobdiffs {ids} {
7863 global blobdifffd diffids env
7868 global limitdiffs vfilelimit curview
7872 if {[package vcompare $git_version "1.6.1"] >= 0} {
7873 set textconv "--textconv"
7876 if {[package vcompare $git_version "1.6.6"] >= 0} {
7877 set submodule "--submodule"
7879 set cmd [diffcmd $ids "-p $textconv $submodule -C --cc --no-commit-id -U$diffcontext"]
7883 if {$worddiff ne [mc "Line diff"]} {
7884 append cmd " --word-diff=porcelain"
7886 if {$limitdiffs && $vfilelimit($curview) ne {}} {
7887 set cmd [concat $cmd -- $vfilelimit($curview)]
7889 if {[catch {set bdf [open $cmd r]} err]} {
7890 error_popup [mc "Error getting diffs: %s" $err]
7893 fconfigure $bdf -blocking 0 -encoding binary -eofchar {}
7894 set blobdifffd($ids) $bdf
7896 filerun $bdf [list getblobdiffline $bdf $diffids]
7899 proc savecmitpos {} {
7900 global ctext cmitmode
7902 if {$cmitmode eq "tree"} {
7905 return [list target_scrollpos [$ctext index @0,0]]
7908 proc savectextpos {} {
7911 return [list target_scrollpos [$ctext index @0,0]]
7914 proc maybe_scroll_ctext {ateof} {
7915 global ctext target_scrollpos
7917 if {![info exists target_scrollpos]} return
7919 set nlines [expr {[winfo height $ctext]
7920 / [font metrics textfont -linespace]}]
7921 if {[$ctext compare "$target_scrollpos + $nlines lines" <= end]} return
7923 $ctext yview $target_scrollpos
7924 unset target_scrollpos
7927 proc setinlist {var i val} {
7930 while {[llength [set $var]] < $i} {
7933 if {[llength [set $var]] == $i} {
7940 proc makediffhdr {fname ids} {
7941 global ctext curdiffstart treediffs diffencoding
7942 global ctext_file_names jump_to_here targetline diffline
7944 set fname [encoding convertfrom $fname]
7945 set diffencoding [get_path_encoding $fname]
7946 set i [lsearch -exact $treediffs($ids) $fname]
7948 setinlist difffilestart $i $curdiffstart
7950 lset ctext_file_names end $fname
7951 set l [expr {(78 - [string length $fname]) / 2}]
7952 set pad [string range "----------------------------------------" 1 $l]
7953 $ctext insert $curdiffstart "$pad $fname $pad" filesep
7955 if {$jump_to_here ne {} && [lindex $jump_to_here 0] eq $fname} {
7956 set targetline [lindex $jump_to_here 1]
7961 proc blobdiffmaybeseehere {ateof} {
7963 if {$diffseehere >= 0} {
7964 mark_ctext_line [lindex [split $diffseehere .] 0]
7966 maybe_scroll_ctext $ateof
7969 proc getblobdiffline {bdf ids} {
7970 global diffids blobdifffd
7974 $ctext conf -state normal
7975 while {[incr nr] <= 1000 && [gets $bdf line] >= 0} {
7976 if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
7980 parseblobdiffline $ids $line
7982 $ctext conf -state disabled
7983 blobdiffmaybeseehere [eof $bdf]
7988 return [expr {$nr >= 1000? 2: 1}]
7991 proc parseblobdiffline {ids line} {
7992 global ctext curdiffstart
7993 global diffnexthead diffnextnote difffilestart
7994 global ctext_file_names ctext_file_lines
7995 global diffinhdr treediffs mergemax diffnparents
7996 global diffencoding jump_to_here targetline diffline currdiffsubmod
7997 global worddiff diffseehere
7999 if {![string compare -length 5 "diff " $line]} {
8000 if {![regexp {^diff (--cc|--git) } $line m type]} {
8001 set line [encoding convertfrom $line]
8002 $ctext insert end "$line\n" hunksep
8005 # start of a new file
8007 $ctext insert end "\n"
8008 set curdiffstart [$ctext index "end - 1c"]
8009 lappend ctext_file_names ""
8010 lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
8011 $ctext insert end "\n" filesep
8013 if {$type eq "--cc"} {
8014 # start of a new file in a merge diff
8015 set fname [string range $line 10 end]
8016 if {[lsearch -exact $treediffs($ids) $fname] < 0} {
8017 lappend treediffs($ids) $fname
8018 add_flist [list $fname]
8022 set line [string range $line 11 end]
8023 # If the name hasn't changed the length will be odd,
8024 # the middle char will be a space, and the two bits either
8025 # side will be a/name and b/name, or "a/name" and "b/name".
8026 # If the name has changed we'll get "rename from" and
8027 # "rename to" or "copy from" and "copy to" lines following
8028 # this, and we'll use them to get the filenames.
8029 # This complexity is necessary because spaces in the
8030 # filename(s) don't get escaped.
8031 set l [string length $line]
8032 set i [expr {$l / 2}]
8033 if {!(($l & 1) && [string index $line $i] eq " " &&
8034 [string range $line 2 [expr {$i - 1}]] eq \
8035 [string range $line [expr {$i + 3}] end])} {
8038 # unescape if quoted and chop off the a/ from the front
8039 if {[string index $line 0] eq "\""} {
8040 set fname [string range [lindex $line 0] 2 end]
8042 set fname [string range $line 2 [expr {$i - 1}]]
8045 makediffhdr $fname $ids
8047 } elseif {![string compare -length 16 "* Unmerged path " $line]} {
8048 set fname [encoding convertfrom [string range $line 16 end]]
8049 $ctext insert end "\n"
8050 set curdiffstart [$ctext index "end - 1c"]
8051 lappend ctext_file_names $fname
8052 lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
8053 $ctext insert end "$line\n" filesep
8054 set i [lsearch -exact $treediffs($ids) $fname]
8056 setinlist difffilestart $i $curdiffstart
8059 } elseif {![string compare -length 2 "@@" $line]} {
8060 regexp {^@@+} $line ats
8061 set line [encoding convertfrom $diffencoding $line]
8062 $ctext insert end "$line\n" hunksep
8063 if {[regexp { \+(\d+),\d+ @@} $line m nl]} {
8066 set diffnparents [expr {[string length $ats] - 1}]
8069 } elseif {![string compare -length 10 "Submodule " $line]} {
8070 # start of a new submodule
8071 if {[regexp -indices "\[0-9a-f\]+\\.\\." $line nameend]} {
8072 set fname [string range $line 10 [expr [lindex $nameend 0] - 2]]
8074 set fname [string range $line 10 [expr [string first "contains " $line] - 2]]
8076 if {$currdiffsubmod != $fname} {
8077 $ctext insert end "\n"; # Add newline after commit message
8079 set curdiffstart [$ctext index "end - 1c"]
8080 lappend ctext_file_names ""
8081 if {$currdiffsubmod != $fname} {
8082 lappend ctext_file_lines $fname
8083 makediffhdr $fname $ids
8084 set currdiffsubmod $fname
8085 $ctext insert end "\n$line\n" filesep
8087 $ctext insert end "$line\n" filesep
8089 } elseif {![string compare -length 3 " >" $line]} {
8090 set $currdiffsubmod ""
8091 set line [encoding convertfrom $diffencoding $line]
8092 $ctext insert end "$line\n" dresult
8093 } elseif {![string compare -length 3 " <" $line]} {
8094 set $currdiffsubmod ""
8095 set line [encoding convertfrom $diffencoding $line]
8096 $ctext insert end "$line\n" d0
8097 } elseif {$diffinhdr} {
8098 if {![string compare -length 12 "rename from " $line]} {
8099 set fname [string range $line [expr 6 + [string first " from " $line] ] end]
8100 if {[string index $fname 0] eq "\""} {
8101 set fname [lindex $fname 0]
8103 set fname [encoding convertfrom $fname]
8104 set i [lsearch -exact $treediffs($ids) $fname]
8106 setinlist difffilestart $i $curdiffstart
8108 } elseif {![string compare -length 10 $line "rename to "] ||
8109 ![string compare -length 8 $line "copy to "]} {
8110 set fname [string range $line [expr 4 + [string first " to " $line] ] end]
8111 if {[string index $fname 0] eq "\""} {
8112 set fname [lindex $fname 0]
8114 makediffhdr $fname $ids
8115 } elseif {[string compare -length 3 $line "---"] == 0} {
8118 } elseif {[string compare -length 3 $line "+++"] == 0} {
8122 $ctext insert end "$line\n" filesep
8125 set line [string map {\x1A ^Z} \
8126 [encoding convertfrom $diffencoding $line]]
8127 # parse the prefix - one ' ', '-' or '+' for each parent
8128 set prefix [string range $line 0 [expr {$diffnparents - 1}]]
8129 set tag [expr {$diffnparents > 1? "m": "d"}]
8130 set dowords [expr {$worddiff ne [mc "Line diff"] && $diffnparents == 1}]
8131 set words_pre_markup ""
8132 set words_post_markup ""
8133 if {[string trim $prefix " -+"] eq {}} {
8134 # prefix only has " ", "-" and "+" in it: normal diff line
8135 set num [string first "-" $prefix]
8137 set line [string range $line 1 end]
8140 # removed line, first parent with line is $num
8141 if {$num >= $mergemax} {
8144 if {$dowords && $worddiff eq [mc "Markup words"]} {
8145 $ctext insert end "\[-$line-\]" $tag$num
8147 $ctext insert end "$line" $tag$num
8150 $ctext insert end "\n" $tag$num
8154 if {[string first "+" $prefix] >= 0} {
8156 lappend tags ${tag}result
8157 if {$diffnparents > 1} {
8158 set num [string first " " $prefix]
8160 if {$num >= $mergemax} {
8166 set words_pre_markup "{+"
8167 set words_post_markup "+}"
8169 if {$targetline ne {}} {
8170 if {$diffline == $targetline} {
8171 set diffseehere [$ctext index "end - 1 chars"]
8177 if {$dowords && $worddiff eq [mc "Markup words"]} {
8178 $ctext insert end "$words_pre_markup$line$words_post_markup" $tags
8180 $ctext insert end "$line" $tags
8183 $ctext insert end "\n" $tags
8186 } elseif {$dowords && $prefix eq "~"} {
8187 $ctext insert end "\n" {}
8189 # "\ No newline at end of file",
8190 # or something else we don't recognize
8191 $ctext insert end "$line\n" hunksep
8196 proc changediffdisp {} {
8197 global ctext diffelide
8199 $ctext tag conf d0 -elide [lindex $diffelide 0]
8200 $ctext tag conf dresult -elide [lindex $diffelide 1]
8203 proc highlightfile {cline} {
8204 global cflist cflist_top
8206 if {![info exists cflist_top]} return
8208 $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
8209 $cflist tag add highlight $cline.0 "$cline.0 lineend"
8210 $cflist see $cline.0
8211 set cflist_top $cline
8214 proc highlightfile_for_scrollpos {topidx} {
8215 global cmitmode difffilestart
8217 if {$cmitmode eq "tree"} return
8218 if {![info exists difffilestart]} return
8220 set top [lindex [split $topidx .] 0]
8221 if {$difffilestart eq {} || $top < [lindex $difffilestart 0]} {
8224 highlightfile [expr {[bsearch $difffilestart $top] + 2}]
8229 global difffilestart ctext cmitmode
8231 if {$cmitmode eq "tree"} return
8233 set here [$ctext index @0,0]
8234 foreach loc $difffilestart {
8235 if {[$ctext compare $loc >= $here]} {
8245 global difffilestart ctext cmitmode
8247 if {$cmitmode eq "tree"} return
8248 set here [$ctext index @0,0]
8249 foreach loc $difffilestart {
8250 if {[$ctext compare $loc > $here]} {
8257 proc clear_ctext {{first 1.0}} {
8258 global ctext smarktop smarkbot
8259 global ctext_file_names ctext_file_lines
8262 set l [lindex [split $first .] 0]
8263 if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} {
8266 if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} {
8269 $ctext delete $first end
8270 if {$first eq "1.0"} {
8271 catch {unset pendinglinks}
8273 set ctext_file_names {}
8274 set ctext_file_lines {}
8277 proc settabs {{firstab {}}} {
8278 global firsttabstop tabstop ctext have_tk85
8280 if {$firstab ne {} && $have_tk85} {
8281 set firsttabstop $firstab
8283 set w [font measure textfont "0"]
8284 if {$firsttabstop != 0} {
8285 $ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \
8286 [expr {($firsttabstop + 2 * $tabstop) * $w}]]
8287 } elseif {$have_tk85 || $tabstop != 8} {
8288 $ctext conf -tabs [expr {$tabstop * $w}]
8290 $ctext conf -tabs {}
8294 proc incrsearch {name ix op} {
8295 global ctext searchstring searchdirn
8297 if {[catch {$ctext index anchor}]} {
8298 # no anchor set, use start of selection, or of visible area
8299 set sel [$ctext tag ranges sel]
8301 $ctext mark set anchor [lindex $sel 0]
8302 } elseif {$searchdirn eq "-forwards"} {
8303 $ctext mark set anchor @0,0
8305 $ctext mark set anchor @0,[winfo height $ctext]
8308 if {$searchstring ne {}} {
8309 set here [$ctext search -count mlen $searchdirn -- $searchstring anchor]
8312 set mend "$here + $mlen c"
8313 $ctext tag remove sel 1.0 end
8314 $ctext tag add sel $here $mend
8315 suppress_highlighting_file_for_current_scrollpos
8316 highlightfile_for_scrollpos $here
8319 rehighlight_search_results
8323 global sstring ctext searchstring searchdirn
8326 $sstring icursor end
8327 set searchdirn -forwards
8328 if {$searchstring ne {}} {
8329 set sel [$ctext tag ranges sel]
8331 set start "[lindex $sel 0] + 1c"
8332 } elseif {[catch {set start [$ctext index anchor]}]} {
8335 set match [$ctext search -count mlen -- $searchstring $start]
8336 $ctext tag remove sel 1.0 end
8342 suppress_highlighting_file_for_current_scrollpos
8343 highlightfile_for_scrollpos $match
8344 set mend "$match + $mlen c"
8345 $ctext tag add sel $match $mend
8346 $ctext mark unset anchor
8347 rehighlight_search_results
8351 proc dosearchback {} {
8352 global sstring ctext searchstring searchdirn
8355 $sstring icursor end
8356 set searchdirn -backwards
8357 if {$searchstring ne {}} {
8358 set sel [$ctext tag ranges sel]
8360 set start [lindex $sel 0]
8361 } elseif {[catch {set start [$ctext index anchor]}]} {
8362 set start @0,[winfo height $ctext]
8364 set match [$ctext search -backwards -count ml -- $searchstring $start]
8365 $ctext tag remove sel 1.0 end
8371 suppress_highlighting_file_for_current_scrollpos
8372 highlightfile_for_scrollpos $match
8373 set mend "$match + $ml c"
8374 $ctext tag add sel $match $mend
8375 $ctext mark unset anchor
8376 rehighlight_search_results
8380 proc rehighlight_search_results {} {
8381 global ctext searchstring
8383 $ctext tag remove found 1.0 end
8384 $ctext tag remove currentsearchhit 1.0 end
8386 if {$searchstring ne {}} {
8391 proc searchmark {first last} {
8392 global ctext searchstring
8394 set sel [$ctext tag ranges sel]
8398 set match [$ctext search -count mlen -- $searchstring $mend $last.end]
8399 if {$match eq {}} break
8400 set mend "$match + $mlen c"
8401 if {$sel ne {} && [$ctext compare $match == [lindex $sel 0]]} {
8402 $ctext tag add currentsearchhit $match $mend
8404 $ctext tag add found $match $mend
8409 proc searchmarkvisible {doall} {
8410 global ctext smarktop smarkbot
8412 set topline [lindex [split [$ctext index @0,0] .] 0]
8413 set botline [lindex [split [$ctext index @0,[winfo height $ctext]] .] 0]
8414 if {$doall || $botline < $smarktop || $topline > $smarkbot} {
8415 # no overlap with previous
8416 searchmark $topline $botline
8417 set smarktop $topline
8418 set smarkbot $botline
8420 if {$topline < $smarktop} {
8421 searchmark $topline [expr {$smarktop-1}]
8422 set smarktop $topline
8424 if {$botline > $smarkbot} {
8425 searchmark [expr {$smarkbot+1}] $botline
8426 set smarkbot $botline
8431 proc suppress_highlighting_file_for_current_scrollpos {} {
8432 global ctext suppress_highlighting_file_for_this_scrollpos
8434 set suppress_highlighting_file_for_this_scrollpos [$ctext index @0,0]
8437 proc scrolltext {f0 f1} {
8438 global searchstring cmitmode ctext
8439 global suppress_highlighting_file_for_this_scrollpos
8441 set topidx [$ctext index @0,0]
8442 if {![info exists suppress_highlighting_file_for_this_scrollpos]
8443 || $topidx ne $suppress_highlighting_file_for_this_scrollpos} {
8444 highlightfile_for_scrollpos $topidx
8447 catch {unset suppress_highlighting_file_for_this_scrollpos}
8449 .bleft.bottom.sb set $f0 $f1
8450 if {$searchstring ne {}} {
8456 global linespc charspc canvx0 canvy0
8457 global xspc1 xspc2 lthickness
8459 set linespc [font metrics mainfont -linespace]
8460 set charspc [font measure mainfont "m"]
8461 set canvy0 [expr {int(3 + 0.5 * $linespc)}]
8462 set canvx0 [expr {int(3 + 0.5 * $linespc)}]
8463 set lthickness [expr {int($linespc / 9) + 1}]
8464 set xspc1(0) $linespc
8472 set ymax [lindex [$canv cget -scrollregion] 3]
8473 if {$ymax eq {} || $ymax == 0} return
8474 set span [$canv yview]
8477 allcanvs yview moveto [lindex $span 0]
8479 if {$selectedline ne {}} {
8480 selectline $selectedline 0
8481 allcanvs yview moveto [lindex $span 0]
8485 proc parsefont {f n} {
8488 set fontattr($f,family) [lindex $n 0]
8490 if {$s eq {} || $s == 0} {
8493 set s [expr {int(-$s / [winfo fpixels . 1p] + 0.5)}]
8495 set fontattr($f,size) $s
8496 set fontattr($f,weight) normal
8497 set fontattr($f,slant) roman
8498 foreach style [lrange $n 2 end] {
8501 "bold" {set fontattr($f,weight) $style}
8503 "italic" {set fontattr($f,slant) $style}
8508 proc fontflags {f {isbold 0}} {
8511 return [list -family $fontattr($f,family) -size $fontattr($f,size) \
8512 -weight [expr {$isbold? "bold": $fontattr($f,weight)}] \
8513 -slant $fontattr($f,slant)]
8519 set n [list $fontattr($f,family) $fontattr($f,size)]
8520 if {$fontattr($f,weight) eq "bold"} {
8523 if {$fontattr($f,slant) eq "italic"} {
8529 proc incrfont {inc} {
8530 global mainfont textfont ctext canv cflist showrefstop
8531 global stopped entries fontattr
8534 set s $fontattr(mainfont,size)
8539 set fontattr(mainfont,size) $s
8540 font config mainfont -size $s
8541 font config mainfontbold -size $s
8542 set mainfont [fontname mainfont]
8543 set s $fontattr(textfont,size)
8548 set fontattr(textfont,size) $s
8549 font config textfont -size $s
8550 font config textfontbold -size $s
8551 set textfont [fontname textfont]
8558 global sha1entry sha1string
8559 if {[string length $sha1string] == 40} {
8560 $sha1entry delete 0 end
8564 proc sha1change {n1 n2 op} {
8565 global sha1string currentid sha1but
8566 if {$sha1string == {}
8567 || ([info exists currentid] && $sha1string == $currentid)} {
8572 if {[$sha1but cget -state] == $state} return
8573 if {$state == "normal"} {
8574 $sha1but conf -state normal -relief raised -text "[mc "Goto:"] "
8576 $sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] "
8580 proc gotocommit {} {
8581 global sha1string tagids headids curview varcid
8583 if {$sha1string == {}
8584 || ([info exists currentid] && $sha1string == $currentid)} return
8585 if {[info exists tagids($sha1string)]} {
8586 set id $tagids($sha1string)
8587 } elseif {[info exists headids($sha1string)]} {
8588 set id $headids($sha1string)
8590 set id [string tolower $sha1string]
8591 if {[regexp {^[0-9a-f]{4,39}$} $id]} {
8592 set matches [longid $id]
8593 if {$matches ne {}} {
8594 if {[llength $matches] > 1} {
8595 error_popup [mc "Short SHA1 id %s is ambiguous" $id]
8598 set id [lindex $matches 0]
8601 if {[catch {set id [exec git rev-parse --verify $sha1string]}]} {
8602 error_popup [mc "Revision %s is not known" $sha1string]
8607 if {[commitinview $id $curview]} {
8608 selectline [rowofcommit $id] 1
8611 if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
8612 set msg [mc "SHA1 id %s is not known" $sha1string]
8614 set msg [mc "Revision %s is not in the current view" $sha1string]
8619 proc lineenter {x y id} {
8620 global hoverx hovery hoverid hovertimer
8621 global commitinfo canv
8623 if {![info exists commitinfo($id)] && ![getcommit $id]} return
8627 if {[info exists hovertimer]} {
8628 after cancel $hovertimer
8630 set hovertimer [after 500 linehover]
8634 proc linemotion {x y id} {
8635 global hoverx hovery hoverid hovertimer
8637 if {[info exists hoverid] && $id == $hoverid} {
8640 if {[info exists hovertimer]} {
8641 after cancel $hovertimer
8643 set hovertimer [after 500 linehover]
8647 proc lineleave {id} {
8648 global hoverid hovertimer canv
8650 if {[info exists hoverid] && $id == $hoverid} {
8652 if {[info exists hovertimer]} {
8653 after cancel $hovertimer
8661 global hoverx hovery hoverid hovertimer
8662 global canv linespc lthickness
8663 global linehoverbgcolor linehoverfgcolor linehoveroutlinecolor
8667 set text [lindex $commitinfo($hoverid) 0]
8668 set ymax [lindex [$canv cget -scrollregion] 3]
8669 if {$ymax == {}} return
8670 set yfrac [lindex [$canv yview] 0]
8671 set x [expr {$hoverx + 2 * $linespc}]
8672 set y [expr {$hovery + $yfrac * $ymax - $linespc / 2}]
8673 set x0 [expr {$x - 2 * $lthickness}]
8674 set y0 [expr {$y - 2 * $lthickness}]
8675 set x1 [expr {$x + [font measure mainfont $text] + 2 * $lthickness}]
8676 set y1 [expr {$y + $linespc + 2 * $lthickness}]
8677 set t [$canv create rectangle $x0 $y0 $x1 $y1 \
8678 -fill $linehoverbgcolor -outline $linehoveroutlinecolor \
8679 -width 1 -tags hover]
8681 set t [$canv create text $x $y -anchor nw -text $text -tags hover \
8682 -font mainfont -fill $linehoverfgcolor]
8686 proc clickisonarrow {id y} {
8689 set ranges [rowranges $id]
8690 set thresh [expr {2 * $lthickness + 6}]
8691 set n [expr {[llength $ranges] - 1}]
8692 for {set i 1} {$i < $n} {incr i} {
8693 set row [lindex $ranges $i]
8694 if {abs([yc $row] - $y) < $thresh} {
8701 proc arrowjump {id n y} {
8704 # 1 <-> 2, 3 <-> 4, etc...
8705 set n [expr {(($n - 1) ^ 1) + 1}]
8706 set row [lindex [rowranges $id] $n]
8708 set ymax [lindex [$canv cget -scrollregion] 3]
8709 if {$ymax eq {} || $ymax <= 0} return
8710 set view [$canv yview]
8711 set yspan [expr {[lindex $view 1] - [lindex $view 0]}]
8712 set yfrac [expr {$yt / $ymax - $yspan / 2}]
8716 allcanvs yview moveto $yfrac
8719 proc lineclick {x y id isnew} {
8720 global ctext commitinfo children canv thickerline curview
8722 if {![info exists commitinfo($id)] && ![getcommit $id]} return
8727 # draw this line thicker than normal
8731 set ymax [lindex [$canv cget -scrollregion] 3]
8732 if {$ymax eq {}} return
8733 set yfrac [lindex [$canv yview] 0]
8734 set y [expr {$y + $yfrac * $ymax}]
8736 set dirn [clickisonarrow $id $y]
8738 arrowjump $id $dirn $y
8743 addtohistory [list lineclick $x $y $id 0] savectextpos
8745 # fill the details pane with info about this line
8746 $ctext conf -state normal
8749 $ctext insert end "[mc "Parent"]:\t"
8750 $ctext insert end $id link0
8752 set info $commitinfo($id)
8753 $ctext insert end "\n\t[lindex $info 0]\n"
8754 $ctext insert end "\t[mc "Author"]:\t[lindex $info 1]\n"
8755 set date [formatdate [lindex $info 2]]
8756 $ctext insert end "\t[mc "Date"]:\t$date\n"
8757 set kids $children($curview,$id)
8759 $ctext insert end "\n[mc "Children"]:"
8761 foreach child $kids {
8763 if {![info exists commitinfo($child)] && ![getcommit $child]} continue
8764 set info $commitinfo($child)
8765 $ctext insert end "\n\t"
8766 $ctext insert end $child link$i
8767 setlink $child link$i
8768 $ctext insert end "\n\t[lindex $info 0]"
8769 $ctext insert end "\n\t[mc "Author"]:\t[lindex $info 1]"
8770 set date [formatdate [lindex $info 2]]
8771 $ctext insert end "\n\t[mc "Date"]:\t$date\n"
8774 maybe_scroll_ctext 1
8775 $ctext conf -state disabled
8779 proc normalline {} {
8781 if {[info exists thickerline]} {
8788 proc selbyid {id {isnew 1}} {
8790 if {[commitinview $id $curview]} {
8791 selectline [rowofcommit $id] $isnew
8797 if {![info exists startmstime]} {
8798 set startmstime [clock clicks -milliseconds]
8800 return [format "%.3f" [expr {([clock click -milliseconds] - $startmstime) / 1000.0}]]
8803 proc rowmenu {x y id} {
8804 global rowctxmenu selectedline rowmenuid curview
8805 global nullid nullid2 fakerowmenu mainhead markedid
8809 if {$selectedline eq {} || [rowofcommit $id] eq $selectedline} {
8814 if {[info exists markedid] && $markedid ne $id} {
8819 if {$id ne $nullid && $id ne $nullid2} {
8820 set menu $rowctxmenu
8821 if {$mainhead ne {}} {
8822 $menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead] -state normal
8824 $menu entryconfigure 7 -label [mc "Detached head: can't reset" $mainhead] -state disabled
8826 $menu entryconfigure 9 -state $mstate
8827 $menu entryconfigure 10 -state $mstate
8828 $menu entryconfigure 11 -state $mstate
8830 set menu $fakerowmenu
8832 $menu entryconfigure [mca "Diff this -> selected"] -state $state
8833 $menu entryconfigure [mca "Diff selected -> this"] -state $state
8834 $menu entryconfigure [mca "Make patch"] -state $state
8835 $menu entryconfigure [mca "Diff this -> marked commit"] -state $mstate
8836 $menu entryconfigure [mca "Diff marked commit -> this"] -state $mstate
8837 tk_popup $menu $x $y
8841 global rowmenuid markedid canv
8843 set markedid $rowmenuid
8844 make_idmark $markedid
8850 if {[info exists markedid]} {
8855 proc replace_by_kids {l r} {
8856 global curview children
8858 set id [commitonrow $r]
8859 set l [lreplace $l 0 0]
8860 foreach kid $children($curview,$id) {
8861 lappend l [rowofcommit $kid]
8863 return [lsort -integer -decreasing -unique $l]
8866 proc find_common_desc {} {
8867 global markedid rowmenuid curview children
8869 if {![info exists markedid]} return
8870 if {![commitinview $markedid $curview] ||
8871 ![commitinview $rowmenuid $curview]} return
8872 #set t1 [clock clicks -milliseconds]
8873 set l1 [list [rowofcommit $markedid]]
8874 set l2 [list [rowofcommit $rowmenuid]]
8876 set r1 [lindex $l1 0]
8877 set r2 [lindex $l2 0]
8878 if {$r1 eq {} || $r2 eq {}} break
8884 set l1 [replace_by_kids $l1 $r1]
8886 set l2 [replace_by_kids $l2 $r2]
8889 #set t2 [clock clicks -milliseconds]
8890 #puts "took [expr {$t2-$t1}]ms"
8893 proc compare_commits {} {
8894 global markedid rowmenuid curview children
8896 if {![info exists markedid]} return
8897 if {![commitinview $markedid $curview]} return
8898 addtohistory [list do_cmp_commits $markedid $rowmenuid]
8899 do_cmp_commits $markedid $rowmenuid
8902 proc getpatchid {id} {
8905 if {![info exists patchids($id)]} {
8906 set cmd [diffcmd [list $id] {-p --root}]
8907 # trim off the initial "|"
8908 set cmd [lrange $cmd 1 end]
8910 set x [eval exec $cmd | git patch-id]
8911 set patchids($id) [lindex $x 0]
8913 set patchids($id) "error"
8916 return $patchids($id)
8919 proc do_cmp_commits {a b} {
8920 global ctext curview parents children patchids commitinfo
8922 $ctext conf -state normal
8925 for {set i 0} {$i < 100} {incr i} {
8928 if {[llength $parents($curview,$a)] > 1} {
8929 appendshortlink $a [mc "Skipping merge commit "] "\n"
8932 set patcha [getpatchid $a]
8934 if {[llength $parents($curview,$b)] > 1} {
8935 appendshortlink $b [mc "Skipping merge commit "] "\n"
8938 set patchb [getpatchid $b]
8940 if {!$skipa && !$skipb} {
8941 set heada [lindex $commitinfo($a) 0]
8942 set headb [lindex $commitinfo($b) 0]
8943 if {$patcha eq "error"} {
8944 appendshortlink $a [mc "Error getting patch ID for "] \
8945 [mc " - stopping\n"]
8948 if {$patchb eq "error"} {
8949 appendshortlink $b [mc "Error getting patch ID for "] \
8950 [mc " - stopping\n"]
8953 if {$patcha eq $patchb} {
8954 if {$heada eq $headb} {
8955 appendshortlink $a [mc "Commit "]
8956 appendshortlink $b " == " " $heada\n"
8958 appendshortlink $a [mc "Commit "] " $heada\n"
8959 appendshortlink $b [mc " is the same patch as\n "] \
8965 $ctext insert end "\n"
8966 appendshortlink $a [mc "Commit "] " $heada\n"
8967 appendshortlink $b [mc " differs from\n "] \
8969 $ctext insert end [mc "Diff of commits:\n\n"]
8970 $ctext conf -state disabled
8977 set kids [real_children $curview,$a]
8978 if {[llength $kids] != 1} {
8979 $ctext insert end "\n"
8980 appendshortlink $a [mc "Commit "] \
8981 [mc " has %s children - stopping\n" [llength $kids]]
8984 set a [lindex $kids 0]
8987 set kids [real_children $curview,$b]
8988 if {[llength $kids] != 1} {
8989 appendshortlink $b [mc "Commit "] \
8990 [mc " has %s children - stopping\n" [llength $kids]]
8993 set b [lindex $kids 0]
8996 $ctext conf -state disabled
8999 proc diffcommits {a b} {
9000 global diffcontext diffids blobdifffd diffinhdr currdiffsubmod
9002 set tmpdir [gitknewtmpdir]
9003 set fna [file join $tmpdir "commit-[string range $a 0 7]"]
9004 set fnb [file join $tmpdir "commit-[string range $b 0 7]"]
9006 exec git diff-tree -p --pretty $a >$fna
9007 exec git diff-tree -p --pretty $b >$fnb
9009 error_popup [mc "Error writing commit to file: %s" $err]
9013 set fd [open "| diff -U$diffcontext $fna $fnb" r]
9015 error_popup [mc "Error diffing commits: %s" $err]
9018 set diffids [list commits $a $b]
9019 set blobdifffd($diffids) $fd
9021 set currdiffsubmod ""
9022 filerun $fd [list getblobdiffline $fd $diffids]
9025 proc diffvssel {dirn} {
9026 global rowmenuid selectedline
9028 if {$selectedline eq {}} return
9030 set oldid [commitonrow $selectedline]
9031 set newid $rowmenuid
9033 set oldid $rowmenuid
9034 set newid [commitonrow $selectedline]
9036 addtohistory [list doseldiff $oldid $newid] savectextpos
9037 doseldiff $oldid $newid
9040 proc diffvsmark {dirn} {
9041 global rowmenuid markedid
9043 if {![info exists markedid]} return
9046 set newid $rowmenuid
9048 set oldid $rowmenuid
9051 addtohistory [list doseldiff $oldid $newid] savectextpos
9052 doseldiff $oldid $newid
9055 proc doseldiff {oldid newid} {
9059 $ctext conf -state normal
9061 init_flist [mc "Top"]
9062 $ctext insert end "[mc "From"] "
9063 $ctext insert end $oldid link0
9064 setlink $oldid link0
9065 $ctext insert end "\n "
9066 $ctext insert end [lindex $commitinfo($oldid) 0]
9067 $ctext insert end "\n\n[mc "To"] "
9068 $ctext insert end $newid link1
9069 setlink $newid link1
9070 $ctext insert end "\n "
9071 $ctext insert end [lindex $commitinfo($newid) 0]
9072 $ctext insert end "\n"
9073 $ctext conf -state disabled
9074 $ctext tag remove found 1.0 end
9075 startdiff [list $oldid $newid]
9079 global rowmenuid currentid commitinfo patchtop patchnum NS
9081 if {![info exists currentid]} return
9082 set oldid $currentid
9083 set oldhead [lindex $commitinfo($oldid) 0]
9084 set newid $rowmenuid
9085 set newhead [lindex $commitinfo($newid) 0]
9088 catch {destroy $top}
9090 make_transient $top .
9091 ${NS}::label $top.title -text [mc "Generate patch"]
9092 grid $top.title - -pady 10
9093 ${NS}::label $top.from -text [mc "From:"]
9094 ${NS}::entry $top.fromsha1 -width 40
9095 $top.fromsha1 insert 0 $oldid
9096 $top.fromsha1 conf -state readonly
9097 grid $top.from $top.fromsha1 -sticky w
9098 ${NS}::entry $top.fromhead -width 60
9099 $top.fromhead insert 0 $oldhead
9100 $top.fromhead conf -state readonly
9101 grid x $top.fromhead -sticky w
9102 ${NS}::label $top.to -text [mc "To:"]
9103 ${NS}::entry $top.tosha1 -width 40
9104 $top.tosha1 insert 0 $newid
9105 $top.tosha1 conf -state readonly
9106 grid $top.to $top.tosha1 -sticky w
9107 ${NS}::entry $top.tohead -width 60
9108 $top.tohead insert 0 $newhead
9109 $top.tohead conf -state readonly
9110 grid x $top.tohead -sticky w
9111 ${NS}::button $top.rev -text [mc "Reverse"] -command mkpatchrev
9112 grid $top.rev x -pady 10 -padx 5
9113 ${NS}::label $top.flab -text [mc "Output file:"]
9114 ${NS}::entry $top.fname -width 60
9115 $top.fname insert 0 [file normalize "patch$patchnum.patch"]
9117 grid $top.flab $top.fname -sticky w
9118 ${NS}::frame $top.buts
9119 ${NS}::button $top.buts.gen -text [mc "Generate"] -command mkpatchgo
9120 ${NS}::button $top.buts.can -text [mc "Cancel"] -command mkpatchcan
9121 bind $top <Key-Return> mkpatchgo
9122 bind $top <Key-Escape> mkpatchcan
9123 grid $top.buts.gen $top.buts.can
9124 grid columnconfigure $top.buts 0 -weight 1 -uniform a
9125 grid columnconfigure $top.buts 1 -weight 1 -uniform a
9126 grid $top.buts - -pady 10 -sticky ew
9130 proc mkpatchrev {} {
9133 set oldid [$patchtop.fromsha1 get]
9134 set oldhead [$patchtop.fromhead get]
9135 set newid [$patchtop.tosha1 get]
9136 set newhead [$patchtop.tohead get]
9137 foreach e [list fromsha1 fromhead tosha1 tohead] \
9138 v [list $newid $newhead $oldid $oldhead] {
9139 $patchtop.$e conf -state normal
9140 $patchtop.$e delete 0 end
9141 $patchtop.$e insert 0 $v
9142 $patchtop.$e conf -state readonly
9147 global patchtop nullid nullid2
9149 set oldid [$patchtop.fromsha1 get]
9150 set newid [$patchtop.tosha1 get]
9151 set fname [$patchtop.fname get]
9152 set cmd [diffcmd [list $oldid $newid] -p]
9153 # trim off the initial "|"
9154 set cmd [lrange $cmd 1 end]
9155 lappend cmd >$fname &
9156 if {[catch {eval exec $cmd} err]} {
9157 error_popup "[mc "Error creating patch:"] $err" $patchtop
9159 catch {destroy $patchtop}
9163 proc mkpatchcan {} {
9166 catch {destroy $patchtop}
9171 global rowmenuid mktagtop commitinfo NS
9175 catch {destroy $top}
9177 make_transient $top .
9178 ${NS}::label $top.title -text [mc "Create tag"]
9179 grid $top.title - -pady 10
9180 ${NS}::label $top.id -text [mc "ID:"]
9181 ${NS}::entry $top.sha1 -width 40
9182 $top.sha1 insert 0 $rowmenuid
9183 $top.sha1 conf -state readonly
9184 grid $top.id $top.sha1 -sticky w
9185 ${NS}::entry $top.head -width 60
9186 $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
9187 $top.head conf -state readonly
9188 grid x $top.head -sticky w
9189 ${NS}::label $top.tlab -text [mc "Tag name:"]
9190 ${NS}::entry $top.tag -width 60
9191 grid $top.tlab $top.tag -sticky w
9192 ${NS}::label $top.op -text [mc "Tag message is optional"]
9193 grid $top.op -columnspan 2 -sticky we
9194 ${NS}::label $top.mlab -text [mc "Tag message:"]
9195 ${NS}::entry $top.msg -width 60
9196 grid $top.mlab $top.msg -sticky w
9197 ${NS}::frame $top.buts
9198 ${NS}::button $top.buts.gen -text [mc "Create"] -command mktaggo
9199 ${NS}::button $top.buts.can -text [mc "Cancel"] -command mktagcan
9200 bind $top <Key-Return> mktaggo
9201 bind $top <Key-Escape> mktagcan
9202 grid $top.buts.gen $top.buts.can
9203 grid columnconfigure $top.buts 0 -weight 1 -uniform a
9204 grid columnconfigure $top.buts 1 -weight 1 -uniform a
9205 grid $top.buts - -pady 10 -sticky ew
9210 global mktagtop env tagids idtags
9212 set id [$mktagtop.sha1 get]
9213 set tag [$mktagtop.tag get]
9214 set msg [$mktagtop.msg get]
9216 error_popup [mc "No tag name specified"] $mktagtop
9219 if {[info exists tagids($tag)]} {
9220 error_popup [mc "Tag \"%s\" already exists" $tag] $mktagtop
9225 exec git tag -a -m $msg $tag $id
9227 exec git tag $tag $id
9230 error_popup "[mc "Error creating tag:"] $err" $mktagtop
9234 set tagids($tag) $id
9235 lappend idtags($id) $tag
9243 proc redrawtags {id} {
9244 global canv linehtag idpos currentid curview cmitlisted markedid
9245 global canvxmax iddrawn circleitem mainheadid circlecolors
9246 global mainheadcirclecolor
9248 if {![commitinview $id $curview]} return
9249 if {![info exists iddrawn($id)]} return
9250 set row [rowofcommit $id]
9251 if {$id eq $mainheadid} {
9252 set ofill $mainheadcirclecolor
9254 set ofill [lindex $circlecolors $cmitlisted($curview,$id)]
9256 $canv itemconf $circleitem($row) -fill $ofill
9257 $canv delete tag.$id
9258 set xt [eval drawtags $id $idpos($id)]
9259 $canv coords $linehtag($id) $xt [lindex $idpos($id) 2]
9260 set text [$canv itemcget $linehtag($id) -text]
9261 set font [$canv itemcget $linehtag($id) -font]
9262 set xr [expr {$xt + [font measure $font $text]}]
9263 if {$xr > $canvxmax} {
9267 if {[info exists currentid] && $currentid == $id} {
9270 if {[info exists markedid] && $markedid eq $id} {
9278 catch {destroy $mktagtop}
9283 if {![domktag]} return
9287 proc writecommit {} {
9288 global rowmenuid wrcomtop commitinfo wrcomcmd NS
9290 set top .writecommit
9292 catch {destroy $top}
9294 make_transient $top .
9295 ${NS}::label $top.title -text [mc "Write commit to file"]
9296 grid $top.title - -pady 10
9297 ${NS}::label $top.id -text [mc "ID:"]
9298 ${NS}::entry $top.sha1 -width 40
9299 $top.sha1 insert 0 $rowmenuid
9300 $top.sha1 conf -state readonly
9301 grid $top.id $top.sha1 -sticky w
9302 ${NS}::entry $top.head -width 60
9303 $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
9304 $top.head conf -state readonly
9305 grid x $top.head -sticky w
9306 ${NS}::label $top.clab -text [mc "Command:"]
9307 ${NS}::entry $top.cmd -width 60 -textvariable wrcomcmd
9308 grid $top.clab $top.cmd -sticky w -pady 10
9309 ${NS}::label $top.flab -text [mc "Output file:"]
9310 ${NS}::entry $top.fname -width 60
9311 $top.fname insert 0 [file normalize "commit-[string range $rowmenuid 0 6]"]
9312 grid $top.flab $top.fname -sticky w
9313 ${NS}::frame $top.buts
9314 ${NS}::button $top.buts.gen -text [mc "Write"] -command wrcomgo
9315 ${NS}::button $top.buts.can -text [mc "Cancel"] -command wrcomcan
9316 bind $top <Key-Return> wrcomgo
9317 bind $top <Key-Escape> wrcomcan
9318 grid $top.buts.gen $top.buts.can
9319 grid columnconfigure $top.buts 0 -weight 1 -uniform a
9320 grid columnconfigure $top.buts 1 -weight 1 -uniform a
9321 grid $top.buts - -pady 10 -sticky ew
9328 set id [$wrcomtop.sha1 get]
9329 set cmd "echo $id | [$wrcomtop.cmd get]"
9330 set fname [$wrcomtop.fname get]
9331 if {[catch {exec sh -c $cmd >$fname &} err]} {
9332 error_popup "[mc "Error writing commit:"] $err" $wrcomtop
9334 catch {destroy $wrcomtop}
9341 catch {destroy $wrcomtop}
9346 global rowmenuid mkbrtop NS
9349 catch {destroy $top}
9351 make_transient $top .
9352 ${NS}::label $top.title -text [mc "Create new branch"]
9353 grid $top.title - -pady 10
9354 ${NS}::label $top.id -text [mc "ID:"]
9355 ${NS}::entry $top.sha1 -width 40
9356 $top.sha1 insert 0 $rowmenuid
9357 $top.sha1 conf -state readonly
9358 grid $top.id $top.sha1 -sticky w
9359 ${NS}::label $top.nlab -text [mc "Name:"]
9360 ${NS}::entry $top.name -width 40
9361 grid $top.nlab $top.name -sticky w
9362 ${NS}::frame $top.buts
9363 ${NS}::button $top.buts.go -text [mc "Create"] -command [list mkbrgo $top]
9364 ${NS}::button $top.buts.can -text [mc "Cancel"] -command "catch {destroy $top}"
9365 bind $top <Key-Return> [list mkbrgo $top]
9366 bind $top <Key-Escape> "catch {destroy $top}"
9367 grid $top.buts.go $top.buts.can
9368 grid columnconfigure $top.buts 0 -weight 1 -uniform a
9369 grid columnconfigure $top.buts 1 -weight 1 -uniform a
9370 grid $top.buts - -pady 10 -sticky ew
9375 global headids idheads
9377 set name [$top.name get]
9378 set id [$top.sha1 get]
9382 error_popup [mc "Please specify a name for the new branch"] $top
9385 if {[info exists headids($name)]} {
9386 if {![confirm_popup [mc \
9387 "Branch '%s' already exists. Overwrite?" $name] $top]} {
9390 set old_id $headids($name)
9393 catch {destroy $top}
9394 lappend cmdargs $name $id
9398 eval exec git branch $cmdargs
9404 if {$old_id ne {}} {
9410 set headids($name) $id
9411 lappend idheads($id) $name
9420 proc exec_citool {tool_args {baseid {}}} {
9421 global commitinfo env
9423 set save_env [array get env GIT_AUTHOR_*]
9425 if {$baseid ne {}} {
9426 if {![info exists commitinfo($baseid)]} {
9429 set author [lindex $commitinfo($baseid) 1]
9430 set date [lindex $commitinfo($baseid) 2]
9431 if {[regexp {^\s*(\S.*\S|\S)\s*<(.*)>\s*$} \
9432 $author author name email]
9434 set env(GIT_AUTHOR_NAME) $name
9435 set env(GIT_AUTHOR_EMAIL) $email
9436 set env(GIT_AUTHOR_DATE) $date
9440 eval exec git citool $tool_args &
9442 array unset env GIT_AUTHOR_*
9443 array set env $save_env
9446 proc cherrypick {} {
9447 global rowmenuid curview
9448 global mainhead mainheadid
9451 set oldhead [exec git rev-parse HEAD]
9452 set dheads [descheads $rowmenuid]
9453 if {$dheads ne {} && [lsearch -exact $dheads $oldhead] >= 0} {
9454 set ok [confirm_popup [mc "Commit %s is already\
9455 included in branch %s -- really re-apply it?" \
9456 [string range $rowmenuid 0 7] $mainhead]]
9459 nowbusy cherrypick [mc "Cherry-picking"]
9461 # Unfortunately git-cherry-pick writes stuff to stderr even when
9462 # no error occurs, and exec takes that as an indication of error...
9463 if {[catch {exec sh -c "git cherry-pick -r $rowmenuid 2>&1"} err]} {
9466 {Entry '(.*)' (would be overwritten by merge|not uptodate)} \
9468 error_popup [mc "Cherry-pick failed because of local changes\
9469 to file '%s'.\nPlease commit, reset or stash\
9470 your changes and try again." $fname]
9471 } elseif {[regexp -line \
9472 {^(CONFLICT \(.*\):|Automatic cherry-pick failed|error: could not apply)} \
9474 if {[confirm_popup [mc "Cherry-pick failed because of merge\
9475 conflict.\nDo you wish to run git citool to\
9477 # Force citool to read MERGE_MSG
9478 file delete [file join $gitdir "GITGUI_MSG"]
9479 exec_citool {} $rowmenuid
9487 set newhead [exec git rev-parse HEAD]
9488 if {$newhead eq $oldhead} {
9490 error_popup [mc "No changes committed"]
9493 addnewchild $newhead $oldhead
9494 if {[commitinview $oldhead $curview]} {
9495 # XXX this isn't right if we have a path limit...
9496 insertrow $newhead $oldhead $curview
9497 if {$mainhead ne {}} {
9498 movehead $newhead $mainhead
9499 movedhead $newhead $mainhead
9501 set mainheadid $newhead
9510 global rowmenuid curview
9511 global mainhead mainheadid
9514 set oldhead [exec git rev-parse HEAD]
9515 set dheads [descheads $rowmenuid]
9516 if { $dheads eq {} || [lsearch -exact $dheads $oldhead] == -1 } {
9517 set ok [confirm_popup [mc "Commit %s is not\
9518 included in branch %s -- really revert it?" \
9519 [string range $rowmenuid 0 7] $mainhead]]
9522 nowbusy revert [mc "Reverting"]
9525 if [catch {exec git revert --no-edit $rowmenuid} err] {
9527 if [regexp {files would be overwritten by merge:(\n(( |\t)+[^\n]+\n)+)}\
9529 regsub {\n( |\t)+} $files "\n" files
9530 error_popup [mc "Revert failed because of local changes to\
9531 the following files:%s Please commit, reset or stash \
9532 your changes and try again." $files]
9533 } elseif [regexp {error: could not revert} $err] {
9534 if [confirm_popup [mc "Revert failed because of merge conflict.\n\
9535 Do you wish to run git citool to resolve it?"]] {
9536 # Force citool to read MERGE_MSG
9537 file delete [file join $gitdir "GITGUI_MSG"]
9538 exec_citool {} $rowmenuid
9540 } else { error_popup $err }
9545 set newhead [exec git rev-parse HEAD]
9546 if { $newhead eq $oldhead } {
9548 error_popup [mc "No changes committed"]
9552 addnewchild $newhead $oldhead
9554 if [commitinview $oldhead $curview] {
9555 # XXX this isn't right if we have a path limit...
9556 insertrow $newhead $oldhead $curview
9557 if {$mainhead ne {}} {
9558 movehead $newhead $mainhead
9559 movedhead $newhead $mainhead
9561 set mainheadid $newhead
9571 global mainhead rowmenuid confirm_ok resettype NS
9574 set w ".confirmreset"
9577 wm title $w [mc "Confirm reset"]
9578 ${NS}::label $w.m -text \
9579 [mc "Reset branch %s to %s?" $mainhead [string range $rowmenuid 0 7]]
9580 pack $w.m -side top -fill x -padx 20 -pady 20
9581 ${NS}::labelframe $w.f -text [mc "Reset type:"]
9583 ${NS}::radiobutton $w.f.soft -value soft -variable resettype \
9584 -text [mc "Soft: Leave working tree and index untouched"]
9585 grid $w.f.soft -sticky w
9586 ${NS}::radiobutton $w.f.mixed -value mixed -variable resettype \
9587 -text [mc "Mixed: Leave working tree untouched, reset index"]
9588 grid $w.f.mixed -sticky w
9589 ${NS}::radiobutton $w.f.hard -value hard -variable resettype \
9590 -text [mc "Hard: Reset working tree and index\n(discard ALL local changes)"]
9591 grid $w.f.hard -sticky w
9592 pack $w.f -side top -fill x -padx 4
9593 ${NS}::button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w"
9594 pack $w.ok -side left -fill x -padx 20 -pady 20
9595 ${NS}::button $w.cancel -text [mc Cancel] -command "destroy $w"
9596 bind $w <Key-Escape> [list destroy $w]
9597 pack $w.cancel -side right -fill x -padx 20 -pady 20
9598 bind $w <Visibility> "grab $w; focus $w"
9600 if {!$confirm_ok} return
9601 if {[catch {set fd [open \
9602 [list | git reset --$resettype $rowmenuid 2>@1] r]} err]} {
9606 filerun $fd [list readresetstat $fd]
9607 nowbusy reset [mc "Resetting"]
9612 proc readresetstat {fd} {
9613 global mainhead mainheadid showlocalchanges rprogcoord
9615 if {[gets $fd line] >= 0} {
9616 if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
9617 set rprogcoord [expr {1.0 * $m / $n}]
9625 if {[catch {close $fd} err]} {
9628 set oldhead $mainheadid
9629 set newhead [exec git rev-parse HEAD]
9630 if {$newhead ne $oldhead} {
9631 movehead $newhead $mainhead
9632 movedhead $newhead $mainhead
9633 set mainheadid $newhead
9637 if {$showlocalchanges} {
9643 # context menu for a head
9644 proc headmenu {x y id head} {
9645 global headmenuid headmenuhead headctxmenu mainhead
9649 set headmenuhead $head
9651 if {[string match "remotes/*" $head]} {
9654 if {$head eq $mainhead} {
9657 $headctxmenu entryconfigure 0 -state $state
9658 $headctxmenu entryconfigure 1 -state $state
9659 tk_popup $headctxmenu $x $y
9663 global headmenuid headmenuhead headids
9664 global showlocalchanges
9666 # check the tree is clean first??
9667 nowbusy checkout [mc "Checking out"]
9671 set fd [open [list | git checkout $headmenuhead 2>@1] r]
9675 if {$showlocalchanges} {
9679 filerun $fd [list readcheckoutstat $fd $headmenuhead $headmenuid]
9683 proc readcheckoutstat {fd newhead newheadid} {
9684 global mainhead mainheadid headids showlocalchanges progresscoords
9685 global viewmainheadid curview
9687 if {[gets $fd line] >= 0} {
9688 if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
9689 set progresscoords [list 0 [expr {1.0 * $m / $n}]]
9694 set progresscoords {0 0}
9697 if {[catch {close $fd} err]} {
9700 set oldmainid $mainheadid
9701 set mainhead $newhead
9702 set mainheadid $newheadid
9703 set viewmainheadid($curview) $newheadid
9704 redrawtags $oldmainid
9705 redrawtags $newheadid
9707 if {$showlocalchanges} {
9713 global headmenuid headmenuhead mainhead
9716 set head $headmenuhead
9718 # this check shouldn't be needed any more...
9719 if {$head eq $mainhead} {
9720 error_popup [mc "Cannot delete the currently checked-out branch"]
9723 set dheads [descheads $id]
9724 if {[llength $dheads] == 1 && $idheads($dheads) eq $head} {
9725 # the stuff on this branch isn't on any other branch
9726 if {![confirm_popup [mc "The commits on branch %s aren't on any other\
9727 branch.\nReally delete branch %s?" $head $head]]} return
9731 if {[catch {exec git branch -D $head} err]} {
9736 removehead $id $head
9737 removedhead $id $head
9744 # Display a list of tags and heads
9746 global showrefstop bgcolor fgcolor selectbgcolor NS
9747 global bglist fglist reflistfilter reflist maincursor
9750 set showrefstop $top
9751 if {[winfo exists $top]} {
9757 wm title $top [mc "Tags and heads: %s" [file tail [pwd]]]
9758 make_transient $top .
9759 text $top.list -background $bgcolor -foreground $fgcolor \
9760 -selectbackground $selectbgcolor -font mainfont \
9761 -xscrollcommand "$top.xsb set" -yscrollcommand "$top.ysb set" \
9762 -width 30 -height 20 -cursor $maincursor \
9763 -spacing1 1 -spacing3 1 -state disabled
9764 $top.list tag configure highlight -background $selectbgcolor
9765 lappend bglist $top.list
9766 lappend fglist $top.list
9767 ${NS}::scrollbar $top.ysb -command "$top.list yview" -orient vertical
9768 ${NS}::scrollbar $top.xsb -command "$top.list xview" -orient horizontal
9769 grid $top.list $top.ysb -sticky nsew
9770 grid $top.xsb x -sticky ew
9772 ${NS}::label $top.f.l -text "[mc "Filter"]: "
9773 ${NS}::entry $top.f.e -width 20 -textvariable reflistfilter
9774 set reflistfilter "*"
9775 trace add variable reflistfilter write reflistfilter_change
9776 pack $top.f.e -side right -fill x -expand 1
9777 pack $top.f.l -side left
9778 grid $top.f - -sticky ew -pady 2
9779 ${NS}::button $top.close -command [list destroy $top] -text [mc "Close"]
9780 bind $top <Key-Escape> [list destroy $top]
9782 grid columnconfigure $top 0 -weight 1
9783 grid rowconfigure $top 0 -weight 1
9784 bind $top.list <1> {break}
9785 bind $top.list <B1-Motion> {break}
9786 bind $top.list <ButtonRelease-1> {sel_reflist %W %x %y; break}
9791 proc sel_reflist {w x y} {
9792 global showrefstop reflist headids tagids otherrefids
9794 if {![winfo exists $showrefstop]} return
9795 set l [lindex [split [$w index "@$x,$y"] "."] 0]
9796 set ref [lindex $reflist [expr {$l-1}]]
9797 set n [lindex $ref 0]
9798 switch -- [lindex $ref 1] {
9799 "H" {selbyid $headids($n)}
9800 "T" {selbyid $tagids($n)}
9801 "o" {selbyid $otherrefids($n)}
9803 $showrefstop.list tag add highlight $l.0 "$l.0 lineend"
9806 proc unsel_reflist {} {
9809 if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
9810 $showrefstop.list tag remove highlight 0.0 end
9813 proc reflistfilter_change {n1 n2 op} {
9814 global reflistfilter
9816 after cancel refill_reflist
9817 after 200 refill_reflist
9820 proc refill_reflist {} {
9821 global reflist reflistfilter showrefstop headids tagids otherrefids
9824 if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
9826 foreach n [array names headids] {
9827 if {[string match $reflistfilter $n]} {
9828 if {[commitinview $headids($n) $curview]} {
9829 lappend refs [list $n H]
9831 interestedin $headids($n) {run refill_reflist}
9835 foreach n [array names tagids] {
9836 if {[string match $reflistfilter $n]} {
9837 if {[commitinview $tagids($n) $curview]} {
9838 lappend refs [list $n T]
9840 interestedin $tagids($n) {run refill_reflist}
9844 foreach n [array names otherrefids] {
9845 if {[string match $reflistfilter $n]} {
9846 if {[commitinview $otherrefids($n) $curview]} {
9847 lappend refs [list $n o]
9849 interestedin $otherrefids($n) {run refill_reflist}
9853 set refs [lsort -index 0 $refs]
9854 if {$refs eq $reflist} return
9856 # Update the contents of $showrefstop.list according to the
9857 # differences between $reflist (old) and $refs (new)
9858 $showrefstop.list conf -state normal
9859 $showrefstop.list insert end "\n"
9862 while {$i < [llength $reflist] || $j < [llength $refs]} {
9863 if {$i < [llength $reflist]} {
9864 if {$j < [llength $refs]} {
9865 set cmp [string compare [lindex $reflist $i 0] \
9866 [lindex $refs $j 0]]
9868 set cmp [string compare [lindex $reflist $i 1] \
9869 [lindex $refs $j 1]]
9879 $showrefstop.list delete "[expr {$j+1}].0" "[expr {$j+2}].0"
9887 set l [expr {$j + 1}]
9888 $showrefstop.list image create $l.0 -align baseline \
9889 -image reficon-[lindex $refs $j 1] -padx 2
9890 $showrefstop.list insert $l.1 "[lindex $refs $j 0]\n"
9896 # delete last newline
9897 $showrefstop.list delete end-2c end-1c
9898 $showrefstop.list conf -state disabled
9901 # Stuff for finding nearby tags
9902 proc getallcommits {} {
9903 global allcommits nextarc seeds allccache allcwait cachedarcs allcupdate
9904 global idheads idtags idotherrefs allparents tagobjid
9907 if {![info exists allcommits]} {
9913 set allccache [file join $gitdir "gitk.cache"]
9915 set f [open $allccache r]
9924 set cmd [list | git rev-list --parents]
9925 set allcupdate [expr {$seeds ne {}}]
9929 set refs [concat [array names idheads] [array names idtags] \
9930 [array names idotherrefs]]
9933 foreach name [array names tagobjid] {
9934 lappend tagobjs $tagobjid($name)
9936 foreach id [lsort -unique $refs] {
9937 if {![info exists allparents($id)] &&
9938 [lsearch -exact $tagobjs $id] < 0} {
9949 set fd [open [concat $cmd $ids] r]
9950 fconfigure $fd -blocking 0
9953 filerun $fd [list getallclines $fd]
9959 # Since most commits have 1 parent and 1 child, we group strings of
9960 # such commits into "arcs" joining branch/merge points (BMPs), which
9961 # are commits that either don't have 1 parent or don't have 1 child.
9963 # arcnos(id) - incoming arcs for BMP, arc we're on for other nodes
9964 # arcout(id) - outgoing arcs for BMP
9965 # arcids(a) - list of IDs on arc including end but not start
9966 # arcstart(a) - BMP ID at start of arc
9967 # arcend(a) - BMP ID at end of arc
9968 # growing(a) - arc a is still growing
9969 # arctags(a) - IDs out of arcids (excluding end) that have tags
9970 # archeads(a) - IDs out of arcids (excluding end) that have heads
9971 # The start of an arc is at the descendent end, so "incoming" means
9972 # coming from descendents, and "outgoing" means going towards ancestors.
9974 proc getallclines {fd} {
9975 global allparents allchildren idtags idheads nextarc
9976 global arcnos arcids arctags arcout arcend arcstart archeads growing
9977 global seeds allcommits cachedarcs allcupdate
9980 while {[incr nid] <= 1000 && [gets $fd line] >= 0} {
9981 set id [lindex $line 0]
9982 if {[info exists allparents($id)]} {
9987 set olds [lrange $line 1 end]
9988 set allparents($id) $olds
9989 if {![info exists allchildren($id)]} {
9990 set allchildren($id) {}
9995 if {[llength $olds] == 1 && [llength $a] == 1} {
9996 lappend arcids($a) $id
9997 if {[info exists idtags($id)]} {
9998 lappend arctags($a) $id
10000 if {[info exists idheads($id)]} {
10001 lappend archeads($a) $id
10003 if {[info exists allparents($olds)]} {
10004 # seen parent already
10005 if {![info exists arcout($olds)]} {
10008 lappend arcids($a) $olds
10009 set arcend($a) $olds
10012 lappend allchildren($olds) $id
10013 lappend arcnos($olds) $a
10017 foreach a $arcnos($id) {
10018 lappend arcids($a) $id
10025 lappend allchildren($p) $id
10026 set a [incr nextarc]
10027 set arcstart($a) $id
10028 set archeads($a) {}
10030 set archeads($a) {}
10034 if {[info exists allparents($p)]} {
10035 # seen it already, may need to make a new branch
10036 if {![info exists arcout($p)]} {
10039 lappend arcids($a) $p
10043 lappend arcnos($p) $a
10045 set arcout($id) $ao
10048 global cached_dheads cached_dtags cached_atags
10049 catch {unset cached_dheads}
10050 catch {unset cached_dtags}
10051 catch {unset cached_atags}
10054 return [expr {$nid >= 1000? 2: 1}]
10058 fconfigure $fd -blocking 1
10061 # got an error reading the list of commits
10062 # if we were updating, try rereading the whole thing again
10068 error_popup "[mc "Error reading commit topology information;\
10069 branch and preceding/following tag information\
10070 will be incomplete."]\n($err)"
10073 if {[incr allcommits -1] == 0} {
10083 proc recalcarc {a} {
10084 global arctags archeads arcids idtags idheads
10088 foreach id [lrange $arcids($a) 0 end-1] {
10089 if {[info exists idtags($id)]} {
10092 if {[info exists idheads($id)]} {
10096 set arctags($a) $at
10097 set archeads($a) $ah
10100 proc splitarc {p} {
10101 global arcnos arcids nextarc arctags archeads idtags idheads
10102 global arcstart arcend arcout allparents growing
10105 if {[llength $a] != 1} {
10106 puts "oops splitarc called but [llength $a] arcs already"
10109 set a [lindex $a 0]
10110 set i [lsearch -exact $arcids($a) $p]
10112 puts "oops splitarc $p not in arc $a"
10115 set na [incr nextarc]
10116 if {[info exists arcend($a)]} {
10117 set arcend($na) $arcend($a)
10119 set l [lindex $allparents([lindex $arcids($a) end]) 0]
10120 set j [lsearch -exact $arcnos($l) $a]
10121 set arcnos($l) [lreplace $arcnos($l) $j $j $na]
10123 set tail [lrange $arcids($a) [expr {$i+1}] end]
10124 set arcids($a) [lrange $arcids($a) 0 $i]
10126 set arcstart($na) $p
10128 set arcids($na) $tail
10129 if {[info exists growing($a)]} {
10135 if {[llength $arcnos($id)] == 1} {
10136 set arcnos($id) $na
10138 set j [lsearch -exact $arcnos($id) $a]
10139 set arcnos($id) [lreplace $arcnos($id) $j $j $na]
10143 # reconstruct tags and heads lists
10144 if {$arctags($a) ne {} || $archeads($a) ne {}} {
10148 set arctags($na) {}
10149 set archeads($na) {}
10153 # Update things for a new commit added that is a child of one
10154 # existing commit. Used when cherry-picking.
10155 proc addnewchild {id p} {
10156 global allparents allchildren idtags nextarc
10157 global arcnos arcids arctags arcout arcend arcstart archeads growing
10158 global seeds allcommits
10160 if {![info exists allcommits] || ![info exists arcnos($p)]} return
10161 set allparents($id) [list $p]
10162 set allchildren($id) {}
10165 lappend allchildren($p) $id
10166 set a [incr nextarc]
10167 set arcstart($a) $id
10168 set archeads($a) {}
10170 set arcids($a) [list $p]
10172 if {![info exists arcout($p)]} {
10175 lappend arcnos($p) $a
10176 set arcout($id) [list $a]
10179 # This implements a cache for the topology information.
10180 # The cache saves, for each arc, the start and end of the arc,
10181 # the ids on the arc, and the outgoing arcs from the end.
10182 proc readcache {f} {
10183 global arcnos arcids arcout arcstart arcend arctags archeads nextarc
10184 global idtags idheads allparents cachedarcs possible_seeds seeds growing
10188 set lim $cachedarcs
10189 if {$lim - $a > 500} {
10190 set lim [expr {$a + 500}]
10194 # finish reading the cache and setting up arctags, etc.
10196 if {$line ne "1"} {error "bad final version"}
10198 foreach id [array names idtags] {
10199 if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 &&
10200 [llength $allparents($id)] == 1} {
10201 set a [lindex $arcnos($id) 0]
10202 if {$arctags($a) eq {}} {
10207 foreach id [array names idheads] {
10208 if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 &&
10209 [llength $allparents($id)] == 1} {
10210 set a [lindex $arcnos($id) 0]
10211 if {$archeads($a) eq {}} {
10216 foreach id [lsort -unique $possible_seeds] {
10217 if {$arcnos($id) eq {}} {
10223 while {[incr a] <= $lim} {
10225 if {[llength $line] != 3} {error "bad line"}
10226 set s [lindex $line 0]
10227 set arcstart($a) $s
10228 lappend arcout($s) $a
10229 if {![info exists arcnos($s)]} {
10230 lappend possible_seeds $s
10233 set e [lindex $line 1]
10238 if {![info exists arcout($e)]} {
10242 set arcids($a) [lindex $line 2]
10243 foreach id $arcids($a) {
10244 lappend allparents($s) $id
10246 lappend arcnos($id) $a
10248 if {![info exists allparents($s)]} {
10249 set allparents($s) {}
10252 set archeads($a) {}
10254 set nextarc [expr {$a - 1}]
10266 proc getcache {f} {
10267 global nextarc cachedarcs possible_seeds
10271 if {[llength $line] != 2 || [lindex $line 0] ne "1"} {error "bad version"}
10272 # make sure it's an integer
10273 set cachedarcs [expr {int([lindex $line 1])}]
10274 if {$cachedarcs < 0} {error "bad number of arcs"}
10276 set possible_seeds {}
10284 proc dropcache {err} {
10285 global allcwait nextarc cachedarcs seeds
10287 #puts "dropping cache ($err)"
10288 foreach v {arcnos arcout arcids arcstart arcend growing \
10289 arctags archeads allparents allchildren} {
10300 proc writecache {f} {
10301 global cachearc cachedarcs allccache
10302 global arcstart arcend arcnos arcids arcout
10305 set lim $cachedarcs
10306 if {$lim - $a > 1000} {
10307 set lim [expr {$a + 1000}]
10310 while {[incr a] <= $lim} {
10311 if {[info exists arcend($a)]} {
10312 puts $f [list $arcstart($a) $arcend($a) $arcids($a)]
10314 puts $f [list $arcstart($a) {} $arcids($a)]
10319 catch {file delete $allccache}
10320 #puts "writing cache failed ($err)"
10323 set cachearc [expr {$a - 1}]
10324 if {$a > $cachedarcs} {
10332 proc savecache {} {
10333 global nextarc cachedarcs cachearc allccache
10335 if {$nextarc == $cachedarcs} return
10337 set cachedarcs $nextarc
10339 set f [open $allccache w]
10340 puts $f [list 1 $cachedarcs]
10345 # Returns 1 if a is an ancestor of b, -1 if b is an ancestor of a,
10346 # or 0 if neither is true.
10347 proc anc_or_desc {a b} {
10348 global arcout arcstart arcend arcnos cached_isanc
10350 if {$arcnos($a) eq $arcnos($b)} {
10351 # Both are on the same arc(s); either both are the same BMP,
10352 # or if one is not a BMP, the other is also not a BMP or is
10353 # the BMP at end of the arc (and it only has 1 incoming arc).
10354 # Or both can be BMPs with no incoming arcs.
10355 if {$a eq $b || $arcnos($a) eq {}} {
10358 # assert {[llength $arcnos($a)] == 1}
10359 set arc [lindex $arcnos($a) 0]
10360 set i [lsearch -exact $arcids($arc) $a]
10361 set j [lsearch -exact $arcids($arc) $b]
10362 if {$i < 0 || $i > $j} {
10369 if {![info exists arcout($a)]} {
10370 set arc [lindex $arcnos($a) 0]
10371 if {[info exists arcend($arc)]} {
10372 set aend $arcend($arc)
10376 set a $arcstart($arc)
10380 if {![info exists arcout($b)]} {
10381 set arc [lindex $arcnos($b) 0]
10382 if {[info exists arcend($arc)]} {
10383 set bend $arcend($arc)
10387 set b $arcstart($arc)
10397 if {[info exists cached_isanc($a,$bend)]} {
10398 if {$cached_isanc($a,$bend)} {
10402 if {[info exists cached_isanc($b,$aend)]} {
10403 if {$cached_isanc($b,$aend)} {
10406 if {[info exists cached_isanc($a,$bend)]} {
10411 set todo [list $a $b]
10414 for {set i 0} {$i < [llength $todo]} {incr i} {
10415 set x [lindex $todo $i]
10416 if {$anc($x) eq {}} {
10419 foreach arc $arcnos($x) {
10420 set xd $arcstart($arc)
10421 if {$xd eq $bend} {
10422 set cached_isanc($a,$bend) 1
10423 set cached_isanc($b,$aend) 0
10425 } elseif {$xd eq $aend} {
10426 set cached_isanc($b,$aend) 1
10427 set cached_isanc($a,$bend) 0
10430 if {![info exists anc($xd)]} {
10431 set anc($xd) $anc($x)
10433 } elseif {$anc($xd) ne $anc($x)} {
10438 set cached_isanc($a,$bend) 0
10439 set cached_isanc($b,$aend) 0
10443 # This identifies whether $desc has an ancestor that is
10444 # a growing tip of the graph and which is not an ancestor of $anc
10445 # and returns 0 if so and 1 if not.
10446 # If we subsequently discover a tag on such a growing tip, and that
10447 # turns out to be a descendent of $anc (which it could, since we
10448 # don't necessarily see children before parents), then $desc
10449 # isn't a good choice to display as a descendent tag of
10450 # $anc (since it is the descendent of another tag which is
10451 # a descendent of $anc). Similarly, $anc isn't a good choice to
10452 # display as a ancestor tag of $desc.
10454 proc is_certain {desc anc} {
10455 global arcnos arcout arcstart arcend growing problems
10458 if {[llength $arcnos($anc)] == 1} {
10459 # tags on the same arc are certain
10460 if {$arcnos($desc) eq $arcnos($anc)} {
10463 if {![info exists arcout($anc)]} {
10464 # if $anc is partway along an arc, use the start of the arc instead
10465 set a [lindex $arcnos($anc) 0]
10466 set anc $arcstart($a)
10469 if {[llength $arcnos($desc)] > 1 || [info exists arcout($desc)]} {
10472 set a [lindex $arcnos($desc) 0]
10478 set anclist [list $x]
10482 for {set i 0} {$i < [llength $anclist] && ($nnh > 0 || $ngrowanc > 0)} {incr i} {
10483 set x [lindex $anclist $i]
10488 foreach a $arcout($x) {
10489 if {[info exists growing($a)]} {
10490 if {![info exists growanc($x)] && $dl($x)} {
10496 if {[info exists dl($y)]} {
10500 if {![info exists done($y)]} {
10503 if {[info exists growanc($x)]} {
10507 for {set k 0} {$k < [llength $xl]} {incr k} {
10508 set z [lindex $xl $k]
10509 foreach c $arcout($z) {
10510 if {[info exists arcend($c)]} {
10512 if {[info exists dl($v)] && $dl($v)} {
10514 if {![info exists done($v)]} {
10517 if {[info exists growanc($v)]} {
10527 } elseif {$y eq $anc || !$dl($x)} {
10538 foreach x [array names growanc] {
10547 proc validate_arctags {a} {
10548 global arctags idtags
10551 set na $arctags($a)
10552 foreach id $arctags($a) {
10554 if {![info exists idtags($id)]} {
10555 set na [lreplace $na $i $i]
10559 set arctags($a) $na
10562 proc validate_archeads {a} {
10563 global archeads idheads
10566 set na $archeads($a)
10567 foreach id $archeads($a) {
10569 if {![info exists idheads($id)]} {
10570 set na [lreplace $na $i $i]
10574 set archeads($a) $na
10577 # Return the list of IDs that have tags that are descendents of id,
10578 # ignoring IDs that are descendents of IDs already reported.
10579 proc desctags {id} {
10580 global arcnos arcstart arcids arctags idtags allparents
10581 global growing cached_dtags
10583 if {![info exists allparents($id)]} {
10586 set t1 [clock clicks -milliseconds]
10588 if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
10589 # part-way along an arc; check that arc first
10590 set a [lindex $arcnos($id) 0]
10591 if {$arctags($a) ne {}} {
10592 validate_arctags $a
10593 set i [lsearch -exact $arcids($a) $id]
10595 foreach t $arctags($a) {
10596 set j [lsearch -exact $arcids($a) $t]
10597 if {$j >= $i} break
10604 set id $arcstart($a)
10605 if {[info exists idtags($id)]} {
10609 if {[info exists cached_dtags($id)]} {
10610 return $cached_dtags($id)
10614 set todo [list $id]
10617 for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} {
10618 set id [lindex $todo $i]
10620 set ta [info exists hastaggedancestor($id)]
10624 # ignore tags on starting node
10625 if {!$ta && $i > 0} {
10626 if {[info exists idtags($id)]} {
10627 set tagloc($id) $id
10629 } elseif {[info exists cached_dtags($id)]} {
10630 set tagloc($id) $cached_dtags($id)
10634 foreach a $arcnos($id) {
10635 set d $arcstart($a)
10636 if {!$ta && $arctags($a) ne {}} {
10637 validate_arctags $a
10638 if {$arctags($a) ne {}} {
10639 lappend tagloc($id) [lindex $arctags($a) end]
10642 if {$ta || $arctags($a) ne {}} {
10643 set tomark [list $d]
10644 for {set j 0} {$j < [llength $tomark]} {incr j} {
10645 set dd [lindex $tomark $j]
10646 if {![info exists hastaggedancestor($dd)]} {
10647 if {[info exists done($dd)]} {
10648 foreach b $arcnos($dd) {
10649 lappend tomark $arcstart($b)
10651 if {[info exists tagloc($dd)]} {
10654 } elseif {[info exists queued($dd)]} {
10657 set hastaggedancestor($dd) 1
10661 if {![info exists queued($d)]} {
10664 if {![info exists hastaggedancestor($d)]} {
10671 foreach id [array names tagloc] {
10672 if {![info exists hastaggedancestor($id)]} {
10673 foreach t $tagloc($id) {
10674 if {[lsearch -exact $tags $t] < 0} {
10680 set t2 [clock clicks -milliseconds]
10683 # remove tags that are descendents of other tags
10684 for {set i 0} {$i < [llength $tags]} {incr i} {
10685 set a [lindex $tags $i]
10686 for {set j 0} {$j < $i} {incr j} {
10687 set b [lindex $tags $j]
10688 set r [anc_or_desc $a $b]
10690 set tags [lreplace $tags $j $j]
10693 } elseif {$r == -1} {
10694 set tags [lreplace $tags $i $i]
10701 if {[array names growing] ne {}} {
10702 # graph isn't finished, need to check if any tag could get
10703 # eclipsed by another tag coming later. Simply ignore any
10704 # tags that could later get eclipsed.
10707 if {[is_certain $t $origid]} {
10711 if {$tags eq $ctags} {
10712 set cached_dtags($origid) $tags
10717 set cached_dtags($origid) $tags
10719 set t3 [clock clicks -milliseconds]
10720 if {0 && $t3 - $t1 >= 100} {
10721 puts "iterating descendents ($loopix/[llength $todo] nodes) took\
10722 [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left"
10727 proc anctags {id} {
10728 global arcnos arcids arcout arcend arctags idtags allparents
10729 global growing cached_atags
10731 if {![info exists allparents($id)]} {
10734 set t1 [clock clicks -milliseconds]
10736 if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
10737 # part-way along an arc; check that arc first
10738 set a [lindex $arcnos($id) 0]
10739 if {$arctags($a) ne {}} {
10740 validate_arctags $a
10741 set i [lsearch -exact $arcids($a) $id]
10742 foreach t $arctags($a) {
10743 set j [lsearch -exact $arcids($a) $t]
10749 if {![info exists arcend($a)]} {
10753 if {[info exists idtags($id)]} {
10757 if {[info exists cached_atags($id)]} {
10758 return $cached_atags($id)
10762 set todo [list $id]
10766 for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} {
10767 set id [lindex $todo $i]
10769 set td [info exists hastaggeddescendent($id)]
10773 # ignore tags on starting node
10774 if {!$td && $i > 0} {
10775 if {[info exists idtags($id)]} {
10776 set tagloc($id) $id
10778 } elseif {[info exists cached_atags($id)]} {
10779 set tagloc($id) $cached_atags($id)
10783 foreach a $arcout($id) {
10784 if {!$td && $arctags($a) ne {}} {
10785 validate_arctags $a
10786 if {$arctags($a) ne {}} {
10787 lappend tagloc($id) [lindex $arctags($a) 0]
10790 if {![info exists arcend($a)]} continue
10792 if {$td || $arctags($a) ne {}} {
10793 set tomark [list $d]
10794 for {set j 0} {$j < [llength $tomark]} {incr j} {
10795 set dd [lindex $tomark $j]
10796 if {![info exists hastaggeddescendent($dd)]} {
10797 if {[info exists done($dd)]} {
10798 foreach b $arcout($dd) {
10799 if {[info exists arcend($b)]} {
10800 lappend tomark $arcend($b)
10803 if {[info exists tagloc($dd)]} {
10806 } elseif {[info exists queued($dd)]} {
10809 set hastaggeddescendent($dd) 1
10813 if {![info exists queued($d)]} {
10816 if {![info exists hastaggeddescendent($d)]} {
10822 set t2 [clock clicks -milliseconds]
10825 foreach id [array names tagloc] {
10826 if {![info exists hastaggeddescendent($id)]} {
10827 foreach t $tagloc($id) {
10828 if {[lsearch -exact $tags $t] < 0} {
10835 # remove tags that are ancestors of other tags
10836 for {set i 0} {$i < [llength $tags]} {incr i} {
10837 set a [lindex $tags $i]
10838 for {set j 0} {$j < $i} {incr j} {
10839 set b [lindex $tags $j]
10840 set r [anc_or_desc $a $b]
10842 set tags [lreplace $tags $j $j]
10845 } elseif {$r == 1} {
10846 set tags [lreplace $tags $i $i]
10853 if {[array names growing] ne {}} {
10854 # graph isn't finished, need to check if any tag could get
10855 # eclipsed by another tag coming later. Simply ignore any
10856 # tags that could later get eclipsed.
10859 if {[is_certain $origid $t]} {
10863 if {$tags eq $ctags} {
10864 set cached_atags($origid) $tags
10869 set cached_atags($origid) $tags
10871 set t3 [clock clicks -milliseconds]
10872 if {0 && $t3 - $t1 >= 100} {
10873 puts "iterating ancestors ($loopix/[llength $todo] nodes) took\
10874 [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left"
10879 # Return the list of IDs that have heads that are descendents of id,
10880 # including id itself if it has a head.
10881 proc descheads {id} {
10882 global arcnos arcstart arcids archeads idheads cached_dheads
10883 global allparents arcout
10885 if {![info exists allparents($id)]} {
10889 if {![info exists arcout($id)]} {
10890 # part-way along an arc; check it first
10891 set a [lindex $arcnos($id) 0]
10892 if {$archeads($a) ne {}} {
10893 validate_archeads $a
10894 set i [lsearch -exact $arcids($a) $id]
10895 foreach t $archeads($a) {
10896 set j [lsearch -exact $arcids($a) $t]
10901 set id $arcstart($a)
10904 set todo [list $id]
10907 for {set i 0} {$i < [llength $todo]} {incr i} {
10908 set id [lindex $todo $i]
10909 if {[info exists cached_dheads($id)]} {
10910 set ret [concat $ret $cached_dheads($id)]
10912 if {[info exists idheads($id)]} {
10915 foreach a $arcnos($id) {
10916 if {$archeads($a) ne {}} {
10917 validate_archeads $a
10918 if {$archeads($a) ne {}} {
10919 set ret [concat $ret $archeads($a)]
10922 set d $arcstart($a)
10923 if {![info exists seen($d)]} {
10930 set ret [lsort -unique $ret]
10931 set cached_dheads($origid) $ret
10932 return [concat $ret $aret]
10935 proc addedtag {id} {
10936 global arcnos arcout cached_dtags cached_atags
10938 if {![info exists arcnos($id)]} return
10939 if {![info exists arcout($id)]} {
10940 recalcarc [lindex $arcnos($id) 0]
10942 catch {unset cached_dtags}
10943 catch {unset cached_atags}
10946 proc addedhead {hid head} {
10947 global arcnos arcout cached_dheads
10949 if {![info exists arcnos($hid)]} return
10950 if {![info exists arcout($hid)]} {
10951 recalcarc [lindex $arcnos($hid) 0]
10953 catch {unset cached_dheads}
10956 proc removedhead {hid head} {
10957 global cached_dheads
10959 catch {unset cached_dheads}
10962 proc movedhead {hid head} {
10963 global arcnos arcout cached_dheads
10965 if {![info exists arcnos($hid)]} return
10966 if {![info exists arcout($hid)]} {
10967 recalcarc [lindex $arcnos($hid) 0]
10969 catch {unset cached_dheads}
10972 proc changedrefs {} {
10973 global cached_dheads cached_dtags cached_atags cached_tagcontent
10974 global arctags archeads arcnos arcout idheads idtags
10976 foreach id [concat [array names idheads] [array names idtags]] {
10977 if {[info exists arcnos($id)] && ![info exists arcout($id)]} {
10978 set a [lindex $arcnos($id) 0]
10979 if {![info exists donearc($a)]} {
10985 catch {unset cached_tagcontent}
10986 catch {unset cached_dtags}
10987 catch {unset cached_atags}
10988 catch {unset cached_dheads}
10991 proc rereadrefs {} {
10992 global idtags idheads idotherrefs mainheadid
10994 set refids [concat [array names idtags] \
10995 [array names idheads] [array names idotherrefs]]
10996 foreach id $refids {
10997 if {![info exists ref($id)]} {
10998 set ref($id) [listrefs $id]
11001 set oldmainhead $mainheadid
11004 set refids [lsort -unique [concat $refids [array names idtags] \
11005 [array names idheads] [array names idotherrefs]]]
11006 foreach id $refids {
11007 set v [listrefs $id]
11008 if {![info exists ref($id)] || $ref($id) != $v} {
11012 if {$oldmainhead ne $mainheadid} {
11013 redrawtags $oldmainhead
11014 redrawtags $mainheadid
11019 proc listrefs {id} {
11020 global idtags idheads idotherrefs
11023 if {[info exists idtags($id)]} {
11027 if {[info exists idheads($id)]} {
11028 set y $idheads($id)
11031 if {[info exists idotherrefs($id)]} {
11032 set z $idotherrefs($id)
11034 return [list $x $y $z]
11037 proc add_tag_ctext {tag} {
11038 global ctext cached_tagcontent tagids
11040 if {![info exists cached_tagcontent($tag)]} {
11042 set cached_tagcontent($tag) [exec git cat-file -p $tag]
11045 $ctext insert end "[mc "Tag"]: $tag\n" bold
11046 if {[info exists cached_tagcontent($tag)]} {
11047 set text $cached_tagcontent($tag)
11049 set text "[mc "Id"]: $tagids($tag)"
11051 appendwithlinks $text {}
11054 proc showtag {tag isnew} {
11055 global ctext cached_tagcontent tagids linknum tagobjid
11058 addtohistory [list showtag $tag 0] savectextpos
11060 $ctext conf -state normal
11065 maybe_scroll_ctext 1
11066 $ctext conf -state disabled
11070 proc showtags {id isnew} {
11071 global idtags ctext linknum
11074 addtohistory [list showtags $id 0] savectextpos
11076 $ctext conf -state normal
11081 foreach tag $idtags($id) {
11082 $ctext insert end $sep
11086 maybe_scroll_ctext 1
11087 $ctext conf -state disabled
11099 if {[info exists gitktmpdir]} {
11100 catch {file delete -force $gitktmpdir}
11104 proc mkfontdisp {font top which} {
11105 global fontattr fontpref $font NS use_ttk
11107 set fontpref($font) [set $font]
11108 ${NS}::button $top.${font}but -text $which \
11109 -command [list choosefont $font $which]
11110 ${NS}::label $top.$font -relief flat -font $font \
11111 -text $fontattr($font,family) -justify left
11112 grid x $top.${font}but $top.$font -sticky w
11115 proc choosefont {font which} {
11116 global fontparam fontlist fonttop fontattr
11119 set fontparam(which) $which
11120 set fontparam(font) $font
11121 set fontparam(family) [font actual $font -family]
11122 set fontparam(size) $fontattr($font,size)
11123 set fontparam(weight) $fontattr($font,weight)
11124 set fontparam(slant) $fontattr($font,slant)
11127 if {![winfo exists $top]} {
11129 eval font config sample [font actual $font]
11131 make_transient $top $prefstop
11132 wm title $top [mc "Gitk font chooser"]
11133 ${NS}::label $top.l -textvariable fontparam(which)
11134 pack $top.l -side top
11135 set fontlist [lsort [font families]]
11136 ${NS}::frame $top.f
11137 listbox $top.f.fam -listvariable fontlist \
11138 -yscrollcommand [list $top.f.sb set]
11139 bind $top.f.fam <<ListboxSelect>> selfontfam
11140 ${NS}::scrollbar $top.f.sb -command [list $top.f.fam yview]
11141 pack $top.f.sb -side right -fill y
11142 pack $top.f.fam -side left -fill both -expand 1
11143 pack $top.f -side top -fill both -expand 1
11144 ${NS}::frame $top.g
11145 spinbox $top.g.size -from 4 -to 40 -width 4 \
11146 -textvariable fontparam(size) \
11147 -validatecommand {string is integer -strict %s}
11148 checkbutton $top.g.bold -padx 5 \
11149 -font {{Times New Roman} 12 bold} -text [mc "B"] -indicatoron 0 \
11150 -variable fontparam(weight) -onvalue bold -offvalue normal
11151 checkbutton $top.g.ital -padx 5 \
11152 -font {{Times New Roman} 12 italic} -text [mc "I"] -indicatoron 0 \
11153 -variable fontparam(slant) -onvalue italic -offvalue roman
11154 pack $top.g.size $top.g.bold $top.g.ital -side left
11155 pack $top.g -side top
11156 canvas $top.c -width 150 -height 50 -border 2 -relief sunk \
11158 $top.c create text 100 25 -anchor center -text $which -font sample \
11159 -fill black -tags text
11160 bind $top.c <Configure> [list centertext $top.c]
11161 pack $top.c -side top -fill x
11162 ${NS}::frame $top.buts
11163 ${NS}::button $top.buts.ok -text [mc "OK"] -command fontok -default active
11164 ${NS}::button $top.buts.can -text [mc "Cancel"] -command fontcan -default normal
11165 bind $top <Key-Return> fontok
11166 bind $top <Key-Escape> fontcan
11167 grid $top.buts.ok $top.buts.can
11168 grid columnconfigure $top.buts 0 -weight 1 -uniform a
11169 grid columnconfigure $top.buts 1 -weight 1 -uniform a
11170 pack $top.buts -side bottom -fill x
11171 trace add variable fontparam write chg_fontparam
11174 $top.c itemconf text -text $which
11176 set i [lsearch -exact $fontlist $fontparam(family)]
11178 $top.f.fam selection set $i
11183 proc centertext {w} {
11184 $w coords text [expr {[winfo width $w] / 2}] [expr {[winfo height $w] / 2}]
11188 global fontparam fontpref prefstop
11190 set f $fontparam(font)
11191 set fontpref($f) [list $fontparam(family) $fontparam(size)]
11192 if {$fontparam(weight) eq "bold"} {
11193 lappend fontpref($f) "bold"
11195 if {$fontparam(slant) eq "italic"} {
11196 lappend fontpref($f) "italic"
11198 set w $prefstop.notebook.fonts.$f
11199 $w conf -text $fontparam(family) -font $fontpref($f)
11205 global fonttop fontparam
11207 if {[info exists fonttop]} {
11208 catch {destroy $fonttop}
11209 catch {font delete sample}
11215 if {[package vsatisfies [package provide Tk] 8.6]} {
11216 # In Tk 8.6 we have a native font chooser dialog. Overwrite the above
11217 # function to make use of it.
11218 proc choosefont {font which} {
11219 tk fontchooser configure -title $which -font $font \
11220 -command [list on_choosefont $font $which]
11221 tk fontchooser show
11223 proc on_choosefont {font which newfont} {
11225 puts stderr "$font $newfont"
11226 array set f [font actual $newfont]
11227 set fontparam(which) $which
11228 set fontparam(font) $font
11229 set fontparam(family) $f(-family)
11230 set fontparam(size) $f(-size)
11231 set fontparam(weight) $f(-weight)
11232 set fontparam(slant) $f(-slant)
11237 proc selfontfam {} {
11238 global fonttop fontparam
11240 set i [$fonttop.f.fam curselection]
11242 set fontparam(family) [$fonttop.f.fam get $i]
11246 proc chg_fontparam {v sub op} {
11249 font config sample -$sub $fontparam($sub)
11252 # Create a property sheet tab page
11253 proc create_prefs_page {w} {
11255 set parent [join [lrange [split $w .] 0 end-1] .]
11256 if {[winfo class $parent] eq "TNotebook"} {
11259 ${NS}::labelframe $w
11263 proc prefspage_general {notebook} {
11264 global NS maxwidth maxgraphpct showneartags showlocalchanges
11265 global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs
11266 global hideremotes want_ttk have_ttk maxrefs
11268 set page [create_prefs_page $notebook.general]
11270 ${NS}::label $page.ldisp -text [mc "Commit list display options"]
11271 grid $page.ldisp - -sticky w -pady 10
11272 ${NS}::label $page.spacer -text " "
11273 ${NS}::label $page.maxwidthl -text [mc "Maximum graph width (lines)"]
11274 spinbox $page.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
11275 grid $page.spacer $page.maxwidthl $page.maxwidth -sticky w
11276 ${NS}::label $page.maxpctl -text [mc "Maximum graph width (% of pane)"]
11277 spinbox $page.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
11278 grid x $page.maxpctl $page.maxpct -sticky w
11279 ${NS}::checkbutton $page.showlocal -text [mc "Show local changes"] \
11280 -variable showlocalchanges
11281 grid x $page.showlocal -sticky w
11282 ${NS}::checkbutton $page.autoselect -text [mc "Auto-select SHA1 (length)"] \
11283 -variable autoselect
11284 spinbox $page.autosellen -from 1 -to 40 -width 4 -textvariable autosellen
11285 grid x $page.autoselect $page.autosellen -sticky w
11286 ${NS}::checkbutton $page.hideremotes -text [mc "Hide remote refs"] \
11287 -variable hideremotes
11288 grid x $page.hideremotes -sticky w
11290 ${NS}::label $page.ddisp -text [mc "Diff display options"]
11291 grid $page.ddisp - -sticky w -pady 10
11292 ${NS}::label $page.tabstopl -text [mc "Tab spacing"]
11293 spinbox $page.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
11294 grid x $page.tabstopl $page.tabstop -sticky w
11295 ${NS}::checkbutton $page.ntag -text [mc "Display nearby tags/heads"] \
11296 -variable showneartags
11297 grid x $page.ntag -sticky w
11298 ${NS}::label $page.maxrefsl -text [mc "Maximum # tags/heads to show"]
11299 spinbox $page.maxrefs -from 1 -to 1000 -width 4 -textvariable maxrefs
11300 grid x $page.maxrefsl $page.maxrefs -sticky w
11301 ${NS}::checkbutton $page.ldiff -text [mc "Limit diffs to listed paths"] \
11302 -variable limitdiffs
11303 grid x $page.ldiff -sticky w
11304 ${NS}::checkbutton $page.lattr -text [mc "Support per-file encodings"] \
11305 -variable perfile_attrs
11306 grid x $page.lattr -sticky w
11308 ${NS}::entry $page.extdifft -textvariable extdifftool
11309 ${NS}::frame $page.extdifff
11310 ${NS}::label $page.extdifff.l -text [mc "External diff tool" ]
11311 ${NS}::button $page.extdifff.b -text [mc "Choose..."] -command choose_extdiff
11312 pack $page.extdifff.l $page.extdifff.b -side left
11313 pack configure $page.extdifff.l -padx 10
11314 grid x $page.extdifff $page.extdifft -sticky ew
11316 ${NS}::label $page.lgen -text [mc "General options"]
11317 grid $page.lgen - -sticky w -pady 10
11318 ${NS}::checkbutton $page.want_ttk -variable want_ttk \
11319 -text [mc "Use themed widgets"]
11321 ${NS}::label $page.ttk_note -text [mc "(change requires restart)"]
11323 ${NS}::label $page.ttk_note -text [mc "(currently unavailable)"]
11325 grid x $page.want_ttk $page.ttk_note -sticky w
11329 proc prefspage_colors {notebook} {
11330 global NS uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
11332 set page [create_prefs_page $notebook.colors]
11334 ${NS}::label $page.cdisp -text [mc "Colors: press to choose"]
11335 grid $page.cdisp - -sticky w -pady 10
11336 label $page.ui -padx 40 -relief sunk -background $uicolor
11337 ${NS}::button $page.uibut -text [mc "Interface"] \
11338 -command [list choosecolor uicolor {} $page.ui [mc "interface"] setui]
11339 grid x $page.uibut $page.ui -sticky w
11340 label $page.bg -padx 40 -relief sunk -background $bgcolor
11341 ${NS}::button $page.bgbut -text [mc "Background"] \
11342 -command [list choosecolor bgcolor {} $page.bg [mc "background"] setbg]
11343 grid x $page.bgbut $page.bg -sticky w
11344 label $page.fg -padx 40 -relief sunk -background $fgcolor
11345 ${NS}::button $page.fgbut -text [mc "Foreground"] \
11346 -command [list choosecolor fgcolor {} $page.fg [mc "foreground"] setfg]
11347 grid x $page.fgbut $page.fg -sticky w
11348 label $page.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]
11349 ${NS}::button $page.diffoldbut -text [mc "Diff: old lines"] \
11350 -command [list choosecolor diffcolors 0 $page.diffold [mc "diff old lines"] \
11351 [list $ctext tag conf d0 -foreground]]
11352 grid x $page.diffoldbut $page.diffold -sticky w
11353 label $page.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1]
11354 ${NS}::button $page.diffnewbut -text [mc "Diff: new lines"] \
11355 -command [list choosecolor diffcolors 1 $page.diffnew [mc "diff new lines"] \
11356 [list $ctext tag conf dresult -foreground]]
11357 grid x $page.diffnewbut $page.diffnew -sticky w
11358 label $page.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2]
11359 ${NS}::button $page.hunksepbut -text [mc "Diff: hunk header"] \
11360 -command [list choosecolor diffcolors 2 $page.hunksep \
11361 [mc "diff hunk header"] \
11362 [list $ctext tag conf hunksep -foreground]]
11363 grid x $page.hunksepbut $page.hunksep -sticky w
11364 label $page.markbgsep -padx 40 -relief sunk -background $markbgcolor
11365 ${NS}::button $page.markbgbut -text [mc "Marked line bg"] \
11366 -command [list choosecolor markbgcolor {} $page.markbgsep \
11367 [mc "marked line background"] \
11368 [list $ctext tag conf omark -background]]
11369 grid x $page.markbgbut $page.markbgsep -sticky w
11370 label $page.selbgsep -padx 40 -relief sunk -background $selectbgcolor
11371 ${NS}::button $page.selbgbut -text [mc "Select bg"] \
11372 -command [list choosecolor selectbgcolor {} $page.selbgsep [mc "background"] setselbg]
11373 grid x $page.selbgbut $page.selbgsep -sticky w
11377 proc prefspage_fonts {notebook} {
11379 set page [create_prefs_page $notebook.fonts]
11380 ${NS}::label $page.cfont -text [mc "Fonts: press to choose"]
11381 grid $page.cfont - -sticky w -pady 10
11382 mkfontdisp mainfont $page [mc "Main font"]
11383 mkfontdisp textfont $page [mc "Diff display font"]
11384 mkfontdisp uifont $page [mc "User interface font"]
11389 global maxwidth maxgraphpct use_ttk NS
11390 global oldprefs prefstop showneartags showlocalchanges
11391 global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
11392 global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs
11393 global hideremotes want_ttk have_ttk
11397 if {[winfo exists $top]} {
11401 foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
11402 limitdiffs tabstop perfile_attrs hideremotes want_ttk} {
11403 set oldprefs($v) [set $v]
11406 wm title $top [mc "Gitk preferences"]
11407 make_transient $top .
11409 if {[set use_notebook [expr {$use_ttk && [info command ::ttk::notebook] ne ""}]]} {
11410 set notebook [ttk::notebook $top.notebook]
11412 set notebook [${NS}::frame $top.notebook -borderwidth 0 -relief flat]
11415 lappend pages [prefspage_general $notebook] [mc "General"]
11416 lappend pages [prefspage_colors $notebook] [mc "Colors"]
11417 lappend pages [prefspage_fonts $notebook] [mc "Fonts"]
11419 foreach {page title} $pages {
11420 if {$use_notebook} {
11421 $notebook add $page -text $title
11423 set btn [${NS}::button $notebook.b_[string map {. X} $page] \
11424 -text $title -command [list raise $page]]
11425 $page configure -text $title
11426 grid $btn -row 0 -column [incr col] -sticky w
11427 grid $page -row 1 -column 0 -sticky news -columnspan 100
11431 if {!$use_notebook} {
11432 grid columnconfigure $notebook 0 -weight 1
11433 grid rowconfigure $notebook 1 -weight 1
11434 raise [lindex $pages 0]
11437 grid $notebook -sticky news -padx 2 -pady 2
11438 grid rowconfigure $top 0 -weight 1
11439 grid columnconfigure $top 0 -weight 1
11441 ${NS}::frame $top.buts
11442 ${NS}::button $top.buts.ok -text [mc "OK"] -command prefsok -default active
11443 ${NS}::button $top.buts.can -text [mc "Cancel"] -command prefscan -default normal
11444 bind $top <Key-Return> prefsok
11445 bind $top <Key-Escape> prefscan
11446 grid $top.buts.ok $top.buts.can
11447 grid columnconfigure $top.buts 0 -weight 1 -uniform a
11448 grid columnconfigure $top.buts 1 -weight 1 -uniform a
11449 grid $top.buts - - -pady 10 -sticky ew
11450 grid columnconfigure $top 2 -weight 1
11451 bind $top <Visibility> [list focus $top.buts.ok]
11454 proc choose_extdiff {} {
11457 set prog [tk_getOpenFile -title [mc "External diff tool"] -multiple false]
11459 set extdifftool $prog
11463 proc choosecolor {v vi w x cmd} {
11466 set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \
11467 -title [mc "Gitk: choose color for %s" $x]]
11468 if {$c eq {}} return
11469 $w conf -background $c
11474 proc setselbg {c} {
11475 global bglist cflist
11476 foreach w $bglist {
11477 $w configure -selectbackground $c
11479 $cflist tag configure highlight \
11480 -background [$cflist cget -selectbackground]
11481 allcanvs itemconf secsel -fill $c
11484 # This sets the background color and the color scheme for the whole UI.
11485 # For some reason, tk_setPalette chooses a nasty dark red for selectColor
11486 # if we don't specify one ourselves, which makes the checkbuttons and
11487 # radiobuttons look bad. This chooses white for selectColor if the
11488 # background color is light, or black if it is dark.
11490 if {[tk windowingsystem] eq "win32"} { return }
11491 set bg [winfo rgb . $c]
11493 if {[lindex $bg 0] + 1.5 * [lindex $bg 1] + 0.5 * [lindex $bg 2] > 100000} {
11496 tk_setPalette background $c selectColor $selc
11502 foreach w $bglist {
11503 $w conf -background $c
11510 foreach w $fglist {
11511 $w conf -foreground $c
11513 allcanvs itemconf text -fill $c
11514 $canv itemconf circle -outline $c
11515 $canv itemconf markid -outline $c
11519 global oldprefs prefstop
11521 foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
11522 limitdiffs tabstop perfile_attrs hideremotes want_ttk} {
11524 set $v $oldprefs($v)
11526 catch {destroy $prefstop}
11532 global maxwidth maxgraphpct
11533 global oldprefs prefstop showneartags showlocalchanges
11534 global fontpref mainfont textfont uifont
11535 global limitdiffs treediffs perfile_attrs
11538 catch {destroy $prefstop}
11542 if {$mainfont ne $fontpref(mainfont)} {
11543 set mainfont $fontpref(mainfont)
11544 parsefont mainfont $mainfont
11545 eval font configure mainfont [fontflags mainfont]
11546 eval font configure mainfontbold [fontflags mainfont 1]
11550 if {$textfont ne $fontpref(textfont)} {
11551 set textfont $fontpref(textfont)
11552 parsefont textfont $textfont
11553 eval font configure textfont [fontflags textfont]
11554 eval font configure textfontbold [fontflags textfont 1]
11556 if {$uifont ne $fontpref(uifont)} {
11557 set uifont $fontpref(uifont)
11558 parsefont uifont $uifont
11559 eval font configure uifont [fontflags uifont]
11562 if {$showlocalchanges != $oldprefs(showlocalchanges)} {
11563 if {$showlocalchanges} {
11569 if {$limitdiffs != $oldprefs(limitdiffs) ||
11570 ($perfile_attrs && !$oldprefs(perfile_attrs))} {
11571 # treediffs elements are limited by path;
11572 # won't have encodings cached if perfile_attrs was just turned on
11573 catch {unset treediffs}
11575 if {$fontchanged || $maxwidth != $oldprefs(maxwidth)
11576 || $maxgraphpct != $oldprefs(maxgraphpct)} {
11578 } elseif {$showneartags != $oldprefs(showneartags) ||
11579 $limitdiffs != $oldprefs(limitdiffs)} {
11582 if {$hideremotes != $oldprefs(hideremotes)} {
11587 proc formatdate {d} {
11588 global datetimeformat
11590 # If $datetimeformat includes a timezone, display in the
11591 # timezone of the argument. Otherwise, display in local time.
11592 if {[string match {*%[zZ]*} $datetimeformat]} {
11593 if {[catch {set d [clock format [lindex $d 0] -timezone [lindex $d 1] -format $datetimeformat]}]} {
11594 # Tcl < 8.5 does not support -timezone. Emulate it by
11595 # setting TZ (e.g. TZ=<-0430>+04:30).
11597 if {[info exists env(TZ)]} {
11598 set savedTZ $env(TZ)
11600 set zone [lindex $d 1]
11601 set sign [string map {+ - - +} [string index $zone 0]]
11602 set env(TZ) <$zone>$sign[string range $zone 1 2]:[string range $zone 3 4]
11603 set d [clock format [lindex $d 0] -format $datetimeformat]
11604 if {[info exists savedTZ]} {
11605 set env(TZ) $savedTZ
11611 set d [clock format [lindex $d 0] -format $datetimeformat]
11617 # This list of encoding names and aliases is distilled from
11618 # http://www.iana.org/assignments/character-sets.
11619 # Not all of them are supported by Tcl.
11620 set encoding_aliases {
11621 { ANSI_X3.4-1968 iso-ir-6 ANSI_X3.4-1986 ISO_646.irv:1991 ASCII
11622 ISO646-US US-ASCII us IBM367 cp367 csASCII }
11623 { ISO-10646-UTF-1 csISO10646UTF1 }
11624 { ISO_646.basic:1983 ref csISO646basic1983 }
11625 { INVARIANT csINVARIANT }
11626 { ISO_646.irv:1983 iso-ir-2 irv csISO2IntlRefVersion }
11627 { BS_4730 iso-ir-4 ISO646-GB gb uk csISO4UnitedKingdom }
11628 { NATS-SEFI iso-ir-8-1 csNATSSEFI }
11629 { NATS-SEFI-ADD iso-ir-8-2 csNATSSEFIADD }
11630 { NATS-DANO iso-ir-9-1 csNATSDANO }
11631 { NATS-DANO-ADD iso-ir-9-2 csNATSDANOADD }
11632 { SEN_850200_B iso-ir-10 FI ISO646-FI ISO646-SE se csISO10Swedish }
11633 { SEN_850200_C iso-ir-11 ISO646-SE2 se2 csISO11SwedishForNames }
11634 { KS_C_5601-1987 iso-ir-149 KS_C_5601-1989 KSC_5601 korean csKSC56011987 }
11635 { ISO-2022-KR csISO2022KR }
11637 { ISO-2022-JP csISO2022JP }
11638 { ISO-2022-JP-2 csISO2022JP2 }
11639 { JIS_C6220-1969-jp JIS_C6220-1969 iso-ir-13 katakana x0201-7
11640 csISO13JISC6220jp }
11641 { JIS_C6220-1969-ro iso-ir-14 jp ISO646-JP csISO14JISC6220ro }
11642 { IT iso-ir-15 ISO646-IT csISO15Italian }
11643 { PT iso-ir-16 ISO646-PT csISO16Portuguese }
11644 { ES iso-ir-17 ISO646-ES csISO17Spanish }
11645 { greek7-old iso-ir-18 csISO18Greek7Old }
11646 { latin-greek iso-ir-19 csISO19LatinGreek }
11647 { DIN_66003 iso-ir-21 de ISO646-DE csISO21German }
11648 { NF_Z_62-010_(1973) iso-ir-25 ISO646-FR1 csISO25French }
11649 { Latin-greek-1 iso-ir-27 csISO27LatinGreek1 }
11650 { ISO_5427 iso-ir-37 csISO5427Cyrillic }
11651 { JIS_C6226-1978 iso-ir-42 csISO42JISC62261978 }
11652 { BS_viewdata iso-ir-47 csISO47BSViewdata }
11653 { INIS iso-ir-49 csISO49INIS }
11654 { INIS-8 iso-ir-50 csISO50INIS8 }
11655 { INIS-cyrillic iso-ir-51 csISO51INISCyrillic }
11656 { ISO_5427:1981 iso-ir-54 ISO5427Cyrillic1981 }
11657 { ISO_5428:1980 iso-ir-55 csISO5428Greek }
11658 { GB_1988-80 iso-ir-57 cn ISO646-CN csISO57GB1988 }
11659 { GB_2312-80 iso-ir-58 chinese csISO58GB231280 }
11660 { NS_4551-1 iso-ir-60 ISO646-NO no csISO60DanishNorwegian
11661 csISO60Norwegian1 }
11662 { NS_4551-2 ISO646-NO2 iso-ir-61 no2 csISO61Norwegian2 }
11663 { NF_Z_62-010 iso-ir-69 ISO646-FR fr csISO69French }
11664 { videotex-suppl iso-ir-70 csISO70VideotexSupp1 }
11665 { PT2 iso-ir-84 ISO646-PT2 csISO84Portuguese2 }
11666 { ES2 iso-ir-85 ISO646-ES2 csISO85Spanish2 }
11667 { MSZ_7795.3 iso-ir-86 ISO646-HU hu csISO86Hungarian }
11668 { JIS_C6226-1983 iso-ir-87 x0208 JIS_X0208-1983 csISO87JISX0208 }
11669 { greek7 iso-ir-88 csISO88Greek7 }
11670 { ASMO_449 ISO_9036 arabic7 iso-ir-89 csISO89ASMO449 }
11671 { iso-ir-90 csISO90 }
11672 { JIS_C6229-1984-a iso-ir-91 jp-ocr-a csISO91JISC62291984a }
11673 { JIS_C6229-1984-b iso-ir-92 ISO646-JP-OCR-B jp-ocr-b
11674 csISO92JISC62991984b }
11675 { JIS_C6229-1984-b-add iso-ir-93 jp-ocr-b-add csISO93JIS62291984badd }
11676 { JIS_C6229-1984-hand iso-ir-94 jp-ocr-hand csISO94JIS62291984hand }
11677 { JIS_C6229-1984-hand-add iso-ir-95 jp-ocr-hand-add
11678 csISO95JIS62291984handadd }
11679 { JIS_C6229-1984-kana iso-ir-96 csISO96JISC62291984kana }
11680 { ISO_2033-1983 iso-ir-98 e13b csISO2033 }
11681 { ANSI_X3.110-1983 iso-ir-99 CSA_T500-1983 NAPLPS csISO99NAPLPS }
11682 { ISO_8859-1:1987 iso-ir-100 ISO_8859-1 ISO-8859-1 latin1 l1 IBM819
11683 CP819 csISOLatin1 }
11684 { ISO_8859-2:1987 iso-ir-101 ISO_8859-2 ISO-8859-2 latin2 l2 csISOLatin2 }
11685 { T.61-7bit iso-ir-102 csISO102T617bit }
11686 { T.61-8bit T.61 iso-ir-103 csISO103T618bit }
11687 { ISO_8859-3:1988 iso-ir-109 ISO_8859-3 ISO-8859-3 latin3 l3 csISOLatin3 }
11688 { ISO_8859-4:1988 iso-ir-110 ISO_8859-4 ISO-8859-4 latin4 l4 csISOLatin4 }
11689 { ECMA-cyrillic iso-ir-111 KOI8-E csISO111ECMACyrillic }
11690 { CSA_Z243.4-1985-1 iso-ir-121 ISO646-CA csa7-1 ca csISO121Canadian1 }
11691 { CSA_Z243.4-1985-2 iso-ir-122 ISO646-CA2 csa7-2 csISO122Canadian2 }
11692 { CSA_Z243.4-1985-gr iso-ir-123 csISO123CSAZ24341985gr }
11693 { ISO_8859-6:1987 iso-ir-127 ISO_8859-6 ISO-8859-6 ECMA-114 ASMO-708
11694 arabic csISOLatinArabic }
11695 { ISO_8859-6-E csISO88596E ISO-8859-6-E }
11696 { ISO_8859-6-I csISO88596I ISO-8859-6-I }
11697 { ISO_8859-7:1987 iso-ir-126 ISO_8859-7 ISO-8859-7 ELOT_928 ECMA-118
11698 greek greek8 csISOLatinGreek }
11699 { T.101-G2 iso-ir-128 csISO128T101G2 }
11700 { ISO_8859-8:1988 iso-ir-138 ISO_8859-8 ISO-8859-8 hebrew
11702 { ISO_8859-8-E csISO88598E ISO-8859-8-E }
11703 { ISO_8859-8-I csISO88598I ISO-8859-8-I }
11704 { CSN_369103 iso-ir-139 csISO139CSN369103 }
11705 { JUS_I.B1.002 iso-ir-141 ISO646-YU js yu csISO141JUSIB1002 }
11706 { ISO_6937-2-add iso-ir-142 csISOTextComm }
11707 { IEC_P27-1 iso-ir-143 csISO143IECP271 }
11708 { ISO_8859-5:1988 iso-ir-144 ISO_8859-5 ISO-8859-5 cyrillic
11709 csISOLatinCyrillic }
11710 { JUS_I.B1.003-serb iso-ir-146 serbian csISO146Serbian }
11711 { JUS_I.B1.003-mac macedonian iso-ir-147 csISO147Macedonian }
11712 { ISO_8859-9:1989 iso-ir-148 ISO_8859-9 ISO-8859-9 latin5 l5 csISOLatin5 }
11713 { greek-ccitt iso-ir-150 csISO150 csISO150GreekCCITT }
11714 { NC_NC00-10:81 cuba iso-ir-151 ISO646-CU csISO151Cuba }
11715 { ISO_6937-2-25 iso-ir-152 csISO6937Add }
11716 { GOST_19768-74 ST_SEV_358-88 iso-ir-153 csISO153GOST1976874 }
11717 { ISO_8859-supp iso-ir-154 latin1-2-5 csISO8859Supp }
11718 { ISO_10367-box iso-ir-155 csISO10367Box }
11719 { ISO-8859-10 iso-ir-157 l6 ISO_8859-10:1992 csISOLatin6 latin6 }
11720 { latin-lap lap iso-ir-158 csISO158Lap }
11721 { JIS_X0212-1990 x0212 iso-ir-159 csISO159JISX02121990 }
11722 { DS_2089 DS2089 ISO646-DK dk csISO646Danish }
11725 { JIS_X0201 X0201 csHalfWidthKatakana }
11726 { KSC5636 ISO646-KR csKSC5636 }
11727 { ISO-10646-UCS-2 csUnicode }
11728 { ISO-10646-UCS-4 csUCS4 }
11729 { DEC-MCS dec csDECMCS }
11730 { hp-roman8 roman8 r8 csHPRoman8 }
11731 { macintosh mac csMacintosh }
11732 { IBM037 cp037 ebcdic-cp-us ebcdic-cp-ca ebcdic-cp-wt ebcdic-cp-nl
11734 { IBM038 EBCDIC-INT cp038 csIBM038 }
11735 { IBM273 CP273 csIBM273 }
11736 { IBM274 EBCDIC-BE CP274 csIBM274 }
11737 { IBM275 EBCDIC-BR cp275 csIBM275 }
11738 { IBM277 EBCDIC-CP-DK EBCDIC-CP-NO csIBM277 }
11739 { IBM278 CP278 ebcdic-cp-fi ebcdic-cp-se csIBM278 }
11740 { IBM280 CP280 ebcdic-cp-it csIBM280 }
11741 { IBM281 EBCDIC-JP-E cp281 csIBM281 }
11742 { IBM284 CP284 ebcdic-cp-es csIBM284 }
11743 { IBM285 CP285 ebcdic-cp-gb csIBM285 }
11744 { IBM290 cp290 EBCDIC-JP-kana csIBM290 }
11745 { IBM297 cp297 ebcdic-cp-fr csIBM297 }
11746 { IBM420 cp420 ebcdic-cp-ar1 csIBM420 }
11747 { IBM423 cp423 ebcdic-cp-gr csIBM423 }
11748 { IBM424 cp424 ebcdic-cp-he csIBM424 }
11749 { IBM437 cp437 437 csPC8CodePage437 }
11750 { IBM500 CP500 ebcdic-cp-be ebcdic-cp-ch csIBM500 }
11751 { IBM775 cp775 csPC775Baltic }
11752 { IBM850 cp850 850 csPC850Multilingual }
11753 { IBM851 cp851 851 csIBM851 }
11754 { IBM852 cp852 852 csPCp852 }
11755 { IBM855 cp855 855 csIBM855 }
11756 { IBM857 cp857 857 csIBM857 }
11757 { IBM860 cp860 860 csIBM860 }
11758 { IBM861 cp861 861 cp-is csIBM861 }
11759 { IBM862 cp862 862 csPC862LatinHebrew }
11760 { IBM863 cp863 863 csIBM863 }
11761 { IBM864 cp864 csIBM864 }
11762 { IBM865 cp865 865 csIBM865 }
11763 { IBM866 cp866 866 csIBM866 }
11764 { IBM868 CP868 cp-ar csIBM868 }
11765 { IBM869 cp869 869 cp-gr csIBM869 }
11766 { IBM870 CP870 ebcdic-cp-roece ebcdic-cp-yu csIBM870 }
11767 { IBM871 CP871 ebcdic-cp-is csIBM871 }
11768 { IBM880 cp880 EBCDIC-Cyrillic csIBM880 }
11769 { IBM891 cp891 csIBM891 }
11770 { IBM903 cp903 csIBM903 }
11771 { IBM904 cp904 904 csIBBM904 }
11772 { IBM905 CP905 ebcdic-cp-tr csIBM905 }
11773 { IBM918 CP918 ebcdic-cp-ar2 csIBM918 }
11774 { IBM1026 CP1026 csIBM1026 }
11775 { EBCDIC-AT-DE csIBMEBCDICATDE }
11776 { EBCDIC-AT-DE-A csEBCDICATDEA }
11777 { EBCDIC-CA-FR csEBCDICCAFR }
11778 { EBCDIC-DK-NO csEBCDICDKNO }
11779 { EBCDIC-DK-NO-A csEBCDICDKNOA }
11780 { EBCDIC-FI-SE csEBCDICFISE }
11781 { EBCDIC-FI-SE-A csEBCDICFISEA }
11782 { EBCDIC-FR csEBCDICFR }
11783 { EBCDIC-IT csEBCDICIT }
11784 { EBCDIC-PT csEBCDICPT }
11785 { EBCDIC-ES csEBCDICES }
11786 { EBCDIC-ES-A csEBCDICESA }
11787 { EBCDIC-ES-S csEBCDICESS }
11788 { EBCDIC-UK csEBCDICUK }
11789 { EBCDIC-US csEBCDICUS }
11790 { UNKNOWN-8BIT csUnknown8BiT }
11791 { MNEMONIC csMnemonic }
11793 { VISCII csVISCII }
11796 { IBM00858 CCSID00858 CP00858 PC-Multilingual-850+euro }
11797 { IBM00924 CCSID00924 CP00924 ebcdic-Latin9--euro }
11798 { IBM01140 CCSID01140 CP01140 ebcdic-us-37+euro }
11799 { IBM01141 CCSID01141 CP01141 ebcdic-de-273+euro }
11800 { IBM01142 CCSID01142 CP01142 ebcdic-dk-277+euro ebcdic-no-277+euro }
11801 { IBM01143 CCSID01143 CP01143 ebcdic-fi-278+euro ebcdic-se-278+euro }
11802 { IBM01144 CCSID01144 CP01144 ebcdic-it-280+euro }
11803 { IBM01145 CCSID01145 CP01145 ebcdic-es-284+euro }
11804 { IBM01146 CCSID01146 CP01146 ebcdic-gb-285+euro }
11805 { IBM01147 CCSID01147 CP01147 ebcdic-fr-297+euro }
11806 { IBM01148 CCSID01148 CP01148 ebcdic-international-500+euro }
11807 { IBM01149 CCSID01149 CP01149 ebcdic-is-871+euro }
11808 { IBM1047 IBM-1047 }
11809 { PTCP154 csPTCP154 PT154 CP154 Cyrillic-Asian }
11810 { Amiga-1251 Ami1251 Amiga1251 Ami-1251 }
11811 { UNICODE-1-1 csUnicode11 }
11812 { CESU-8 csCESU-8 }
11813 { BOCU-1 csBOCU-1 }
11814 { UNICODE-1-1-UTF-7 csUnicode11UTF7 }
11815 { ISO-8859-14 iso-ir-199 ISO_8859-14:1998 ISO_8859-14 latin8 iso-celtic
11817 { ISO-8859-15 ISO_8859-15 Latin-9 }
11818 { ISO-8859-16 iso-ir-226 ISO_8859-16:2001 ISO_8859-16 latin10 l10 }
11819 { GBK CP936 MS936 windows-936 }
11820 { JIS_Encoding csJISEncoding }
11821 { Shift_JIS MS_Kanji csShiftJIS ShiftJIS Shift-JIS }
11822 { Extended_UNIX_Code_Packed_Format_for_Japanese csEUCPkdFmtJapanese
11824 { Extended_UNIX_Code_Fixed_Width_for_Japanese csEUCFixWidJapanese }
11825 { ISO-10646-UCS-Basic csUnicodeASCII }
11826 { ISO-10646-Unicode-Latin1 csUnicodeLatin1 ISO-10646 }
11827 { ISO-Unicode-IBM-1261 csUnicodeIBM1261 }
11828 { ISO-Unicode-IBM-1268 csUnicodeIBM1268 }
11829 { ISO-Unicode-IBM-1276 csUnicodeIBM1276 }
11830 { ISO-Unicode-IBM-1264 csUnicodeIBM1264 }
11831 { ISO-Unicode-IBM-1265 csUnicodeIBM1265 }
11832 { ISO-8859-1-Windows-3.0-Latin-1 csWindows30Latin1 }
11833 { ISO-8859-1-Windows-3.1-Latin-1 csWindows31Latin1 }
11834 { ISO-8859-2-Windows-Latin-2 csWindows31Latin2 }
11835 { ISO-8859-9-Windows-Latin-5 csWindows31Latin5 }
11836 { Adobe-Standard-Encoding csAdobeStandardEncoding }
11837 { Ventura-US csVenturaUS }
11838 { Ventura-International csVenturaInternational }
11839 { PC8-Danish-Norwegian csPC8DanishNorwegian }
11840 { PC8-Turkish csPC8Turkish }
11841 { IBM-Symbols csIBMSymbols }
11842 { IBM-Thai csIBMThai }
11843 { HP-Legal csHPLegal }
11844 { HP-Pi-font csHPPiFont }
11845 { HP-Math8 csHPMath8 }
11846 { Adobe-Symbol-Encoding csHPPSMath }
11847 { HP-DeskTop csHPDesktop }
11848 { Ventura-Math csVenturaMath }
11849 { Microsoft-Publishing csMicrosoftPublishing }
11850 { Windows-31J csWindows31J }
11851 { GB2312 csGB2312 }
11855 proc tcl_encoding {enc} {
11856 global encoding_aliases tcl_encoding_cache
11857 if {[info exists tcl_encoding_cache($enc)]} {
11858 return $tcl_encoding_cache($enc)
11860 set names [encoding names]
11861 set lcnames [string tolower $names]
11862 set enc [string tolower $enc]
11863 set i [lsearch -exact $lcnames $enc]
11865 # look for "isonnn" instead of "iso-nnn" or "iso_nnn"
11866 if {[regsub {^(iso|cp|ibm|jis)[-_]} $enc {\1} encx]} {
11867 set i [lsearch -exact $lcnames $encx]
11871 foreach l $encoding_aliases {
11872 set ll [string tolower $l]
11873 if {[lsearch -exact $ll $enc] < 0} continue
11874 # look through the aliases for one that tcl knows about
11876 set i [lsearch -exact $lcnames $e]
11878 if {[regsub {^(iso|cp|ibm|jis)[-_]} $e {\1} ex]} {
11879 set i [lsearch -exact $lcnames $ex]
11889 set tclenc [lindex $names $i]
11891 set tcl_encoding_cache($enc) $tclenc
11895 proc gitattr {path attr default} {
11896 global path_attr_cache
11897 if {[info exists path_attr_cache($attr,$path)]} {
11898 set r $path_attr_cache($attr,$path)
11900 set r "unspecified"
11901 if {![catch {set line [exec git check-attr $attr -- $path]}]} {
11902 regexp "(.*): $attr: (.*)" $line m f r
11904 set path_attr_cache($attr,$path) $r
11906 if {$r eq "unspecified"} {
11912 proc cache_gitattr {attr pathlist} {
11913 global path_attr_cache
11915 foreach path $pathlist {
11916 if {![info exists path_attr_cache($attr,$path)]} {
11917 lappend newlist $path
11921 if {[tk windowingsystem] == "win32"} {
11922 # windows has a 32k limit on the arguments to a command...
11925 while {$newlist ne {}} {
11926 set head [lrange $newlist 0 [expr {$lim - 1}]]
11927 set newlist [lrange $newlist $lim end]
11928 if {![catch {set rlist [eval exec git check-attr $attr -- $head]}]} {
11929 foreach row [split $rlist "\n"] {
11930 if {[regexp "(.*): $attr: (.*)" $row m path value]} {
11931 if {[string index $path 0] eq "\""} {
11932 set path [encoding convertfrom [lindex $path 0]]
11934 set path_attr_cache($attr,$path) $value
11941 proc get_path_encoding {path} {
11942 global gui_encoding perfile_attrs
11943 set tcl_enc $gui_encoding
11944 if {$path ne {} && $perfile_attrs} {
11945 set enc2 [tcl_encoding [gitattr $path encoding $tcl_enc]]
11953 # First check that Tcl/Tk is recent enough
11954 if {[catch {package require Tk 8.4} err]} {
11955 show_error {} . "Sorry, gitk cannot run with this version of Tcl/Tk.\n\
11956 Gitk requires at least Tcl/Tk 8.4." list
11960 # on OSX bring the current Wish process window to front
11961 if {[tk windowingsystem] eq "aqua"} {
11962 exec osascript -e [format {
11963 tell application "System Events"
11964 set frontmost of processes whose unix id is %d to true
11969 # Unset GIT_TRACE var if set
11970 if { [info exists ::env(GIT_TRACE)] } {
11971 unset ::env(GIT_TRACE)
11975 set wrcomcmd "git diff-tree --stdin -p --pretty"
11979 set gitencoding [exec git config --get i18n.commitencoding]
11982 set gitencoding [exec git config --get i18n.logoutputencoding]
11984 if {$gitencoding == ""} {
11985 set gitencoding "utf-8"
11987 set tclencoding [tcl_encoding $gitencoding]
11988 if {$tclencoding == {}} {
11989 puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
11992 set gui_encoding [encoding system]
11994 set enc [exec git config --get gui.encoding]
11996 set tclenc [tcl_encoding $enc]
11997 if {$tclenc ne {}} {
11998 set gui_encoding $tclenc
12000 puts stderr "Warning: encoding $enc is not supported by Tcl/Tk"
12005 set log_showroot true
12007 set log_showroot [exec git config --bool --get log.showroot]
12010 if {[tk windowingsystem] eq "aqua"} {
12011 set mainfont {{Lucida Grande} 9}
12012 set textfont {Monaco 9}
12013 set uifont {{Lucida Grande} 9 bold}
12014 } elseif {![catch {::tk::pkgconfig get fontsystem} xft] && $xft eq "xft"} {
12016 set mainfont {sans 9}
12017 set textfont {monospace 9}
12018 set uifont {sans 9 bold}
12020 set mainfont {Helvetica 9}
12021 set textfont {Courier 9}
12022 set uifont {Helvetica 9 bold}
12025 set findmergefiles 0
12033 set cmitmode "patch"
12034 set wrapcomment "none"
12039 set showlocalchanges 1
12041 set datetimeformat "%Y-%m-%d %H:%M:%S"
12044 set perfile_attrs 0
12047 if {[tk windowingsystem] eq "aqua"} {
12048 set extdifftool "opendiff"
12050 set extdifftool "meld"
12053 set colors {green red blue magenta darkgrey brown orange}
12054 if {[tk windowingsystem] eq "win32"} {
12055 set uicolor SystemButtonFace
12056 set uifgcolor SystemButtonText
12057 set uifgdisabledcolor SystemDisabledText
12058 set bgcolor SystemWindow
12059 set fgcolor SystemWindowText
12060 set selectbgcolor SystemHighlight
12063 set uifgcolor black
12064 set uifgdisabledcolor "#999"
12067 set selectbgcolor gray85
12069 set diffcolors {red "#00a000" blue}
12071 set mergecolors {red blue green purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
12074 set markbgcolor "#e0e0ff"
12076 set headbgcolor green
12077 set headfgcolor black
12078 set headoutlinecolor black
12079 set remotebgcolor #ffddaa
12080 set tagbgcolor yellow
12081 set tagfgcolor black
12082 set tagoutlinecolor black
12083 set reflinecolor black
12084 set filesepbgcolor #aaaaaa
12085 set filesepfgcolor black
12086 set linehoverbgcolor #ffff80
12087 set linehoverfgcolor black
12088 set linehoveroutlinecolor black
12089 set mainheadcirclecolor yellow
12090 set workingfilescirclecolor red
12091 set indexcirclecolor green
12092 set circlecolors {white blue gray blue blue}
12093 set linkfgcolor blue
12094 set circleoutlinecolor $fgcolor
12095 set foundbgcolor yellow
12096 set currentsearchhitbgcolor orange
12098 # button for popping up context menus
12099 if {[tk windowingsystem] eq "aqua"} {
12100 set ctxbut <Button-2>
12102 set ctxbut <Button-3>
12105 ## For msgcat loading, first locate the installation location.
12106 if { [info exists ::env(GITK_MSGSDIR)] } {
12107 ## Msgsdir was manually set in the environment.
12108 set gitk_msgsdir $::env(GITK_MSGSDIR)
12110 ## Let's guess the prefix from argv0.
12111 set gitk_prefix [file dirname [file dirname [file normalize $argv0]]]
12112 set gitk_libdir [file join $gitk_prefix share gitk lib]
12113 set gitk_msgsdir [file join $gitk_libdir msgs]
12117 ## Internationalization (i18n) through msgcat and gettext. See
12118 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
12119 package require msgcat
12120 namespace import ::msgcat::mc
12121 ## And eventually load the actual message catalog
12122 ::msgcat::mcload $gitk_msgsdir
12125 # follow the XDG base directory specification by default. See
12126 # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
12127 if {[info exists env(XDG_CONFIG_HOME)] && $env(XDG_CONFIG_HOME) ne ""} {
12128 # XDG_CONFIG_HOME environment variable is set
12129 set config_file [file join $env(XDG_CONFIG_HOME) git gitk]
12130 set config_file_tmp [file join $env(XDG_CONFIG_HOME) git gitk-tmp]
12132 # default XDG_CONFIG_HOME
12133 set config_file "~/.config/git/gitk"
12134 set config_file_tmp "~/.config/git/gitk-tmp"
12136 if {![file exists $config_file]} {
12137 # for backward compatibility use the old config file if it exists
12138 if {[file exists "~/.gitk"]} {
12139 set config_file "~/.gitk"
12140 set config_file_tmp "~/.gitk-tmp"
12141 } elseif {![file exists [file dirname $config_file]]} {
12142 file mkdir [file dirname $config_file]
12145 source $config_file
12148 parsefont mainfont $mainfont
12149 eval font create mainfont [fontflags mainfont]
12150 eval font create mainfontbold [fontflags mainfont 1]
12152 parsefont textfont $textfont
12153 eval font create textfont [fontflags textfont]
12154 eval font create textfontbold [fontflags textfont 1]
12156 parsefont uifont $uifont
12157 eval font create uifont [fontflags uifont]
12163 # check that we can find a .git directory somewhere...
12164 if {[catch {set gitdir [exec git rev-parse --git-dir]}]} {
12165 show_error {} . [mc "Cannot find a git repository here."]
12170 set selectheadid {}
12173 set cmdline_files {}
12175 set revtreeargscmd {}
12176 foreach arg $argv {
12177 switch -glob -- $arg {
12180 set cmdline_files [lrange $argv [expr {$i + 1}] end]
12183 "--select-commit=*" {
12184 set selecthead [string range $arg 16 end]
12187 set revtreeargscmd [string range $arg 10 end]
12190 lappend revtreeargs $arg
12196 if {$selecthead eq "HEAD"} {
12200 if {$i >= [llength $argv] && $revtreeargs ne {}} {
12201 # no -- on command line, but some arguments (other than --argscmd)
12203 set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs]
12204 set cmdline_files [split $f "\n"]
12205 set n [llength $cmdline_files]
12206 set revtreeargs [lrange $revtreeargs 0 end-$n]
12207 # Unfortunately git rev-parse doesn't produce an error when
12208 # something is both a revision and a filename. To be consistent
12209 # with git log and git rev-list, check revtreeargs for filenames.
12210 foreach arg $revtreeargs {
12211 if {[file exists $arg]} {
12212 show_error {} . [mc "Ambiguous argument '%s': both revision\
12213 and filename" $arg]
12218 # unfortunately we get both stdout and stderr in $err,
12219 # so look for "fatal:".
12220 set i [string first "fatal:" $err]
12222 set err [string range $err [expr {$i + 6}] end]
12224 show_error {} . "[mc "Bad arguments to gitk:"]\n$err"
12229 set nullid "0000000000000000000000000000000000000000"
12230 set nullid2 "0000000000000000000000000000000000000001"
12231 set nullfile "/dev/null"
12233 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
12234 if {![info exists have_ttk]} {
12235 set have_ttk [llength [info commands ::ttk::style]]
12237 set use_ttk [expr {$have_ttk && $want_ttk}]
12238 set NS [expr {$use_ttk ? "ttk" : ""}]
12240 regexp {^git version ([\d.]*\d)} [exec git version] _ git_version
12243 if {[package vcompare $git_version "1.6.6.2"] >= 0} {
12244 set show_notes "--show-notes"
12254 set highlight_paths {}
12256 set searchdirn -forwards
12259 set diffelide {0 0}
12260 set markingmatches 0
12261 set linkentercount 0
12262 set need_redisplay 0
12269 set selectedhlview [mc "None"]
12270 set highlight_related [mc "None"]
12271 set highlight_files {}
12272 set viewfiles(0) {}
12275 set viewargscmd(0) {}
12277 set selectedline {}
12285 set hasworktree [hasworktree]
12287 if {[expr {[exec git rev-parse --is-inside-work-tree] == "true"}]} {
12288 set cdup [exec git rev-parse --show-cdup]
12290 set worktree [exec git rev-parse --show-toplevel]
12294 image create photo gitlogo -width 16 -height 16
12296 image create photo gitlogominus -width 4 -height 2
12297 gitlogominus put #C00000 -to 0 0 4 2
12298 gitlogo copy gitlogominus -to 1 5
12299 gitlogo copy gitlogominus -to 6 5
12300 gitlogo copy gitlogominus -to 11 5
12301 image delete gitlogominus
12303 image create photo gitlogoplus -width 4 -height 4
12304 gitlogoplus put #008000 -to 1 0 3 4
12305 gitlogoplus put #008000 -to 0 1 4 3
12306 gitlogo copy gitlogoplus -to 1 9
12307 gitlogo copy gitlogoplus -to 6 9
12308 gitlogo copy gitlogoplus -to 11 9
12309 image delete gitlogoplus
12311 image create photo gitlogo32 -width 32 -height 32
12312 gitlogo32 copy gitlogo -zoom 2 2
12314 wm iconphoto . -default gitlogo gitlogo32
12316 # wait for the window to become visible
12317 tkwait visibility .
12318 wm title . "$appname: [reponame]"
12322 if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} {
12323 # create a view for the files/dirs specified on the command line
12327 set viewname(1) [mc "Command line"]
12328 set viewfiles(1) $cmdline_files
12329 set viewargs(1) $revtreeargs
12330 set viewargscmd(1) $revtreeargscmd
12334 .bar.view entryconf [mca "Edit view..."] -state normal
12335 .bar.view entryconf [mca "Delete view"] -state normal
12338 if {[info exists permviews]} {
12339 foreach v $permviews {
12342 set viewname($n) [lindex $v 0]
12343 set viewfiles($n) [lindex $v 1]
12344 set viewargs($n) [lindex $v 2]
12345 set viewargscmd($n) [lindex $v 3]
12351 if {[tk windowingsystem] eq "win32"} {
12359 # indent-tabs-mode: t