2 # Tcl ignores the next line -*- tcl -*- \
5 # Copyright © 2005-2011 Paul Mackerras. All rights reserved.
6 # This program is free software; it may be used, copied, modified
7 # and distributed under the terms of the GNU General Public Licence,
8 # either version 2, or (at your option) any later version.
13 return [expr {[exec git rev-parse
--is-bare-repository] == "false" &&
14 [exec git rev-parse
--is-inside-git-dir] == "false"}]
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
159 global worddiff git_version
167 set origargs $arglist
171 foreach arg $arglist {
178 switch -glob -- $arg {
182 # remove from origargs in case we hit an unknown option
183 set origargs [lreplace $origargs $i $i]
187 "--no-renames" - "--full-index" - "--binary" - "--abbrev=*" -
188 "--find-copies-harder" - "-l*" - "--ext-diff" - "--no-ext-diff" -
189 "--src-prefix=*" - "--dst-prefix=*" - "--no-prefix" -
190 "-O*" - "--text" - "--full-diff" - "--ignore-space-at-eol" -
191 "--ignore-space-change" - "-U*" - "--unified=*" {
192 # These request or affect diff output, which we don't want.
193 # Some could be used to set our defaults for diff display.
194 lappend diffargs
$arg
196 "--raw" - "--patch-with-raw" - "--patch-with-stat" -
197 "--name-only" - "--name-status" - "--color" -
198 "--log-size" - "--pretty=*" - "--decorate" - "--abbrev-commit" -
199 "--cc" - "-z" - "--header" - "--parents" - "--boundary" -
200 "--no-color" - "-g" - "--walk-reflogs" - "--no-walk" -
201 "--timestamp" - "relative-date" - "--date=*" - "--stdin" -
202 "--objects" - "--objects-edge" - "--reverse" {
203 # These cause our parsing of git log's output to fail, or else
204 # they're options we want to set ourselves, so ignore them.
206 "--color-words*" - "--word-diff=color" {
207 # These trigger a word diff in the console interface,
208 # so help the user by enabling our own support
209 if {[package vcompare
$git_version "1.7.2"] >= 0} {
210 set worddiff
[mc
"Color words"]
214 if {[package vcompare
$git_version "1.7.2"] >= 0} {
215 set worddiff
[mc
"Markup words"]
218 "--stat=*" - "--numstat" - "--shortstat" - "--summary" -
219 "--check" - "--exit-code" - "--quiet" - "--topo-order" -
220 "--full-history" - "--dense" - "--sparse" -
221 "--follow" - "--left-right" - "--encoding=*" {
222 # These are harmless, and some are even useful
225 "--diff-filter=*" - "--no-merges" - "--unpacked" -
226 "--max-count=*" - "--skip=*" - "--since=*" - "--after=*" -
227 "--until=*" - "--before=*" - "--max-age=*" - "--min-age=*" -
228 "--author=*" - "--committer=*" - "--grep=*" - "-[iE]" -
229 "--remove-empty" - "--first-parent" - "--cherry-pick" -
230 "-S*" - "--pickaxe-all" - "--pickaxe-regex" -
231 "--simplify-by-decoration" {
232 # These mean that we get a subset of the commits
237 # This appears to be the only one that has a value as a
238 # separate word following it
248 # git rev-parse doesn't understand --merge
249 lappend revargs
--gitk-symmetric-diff-marker MERGE_HEAD...HEAD
251 "--no-replace-objects" {
252 set env
(GIT_NO_REPLACE_OBJECTS
) "1"
255 # Other flag arguments including -<n>
256 if {[string is digit
-strict [string range
$arg 1 end
]]} {
259 # a flag argument that we don't recognize;
260 # that means we can't optimize
266 # Non-flag arguments specify commits or ranges of commits
267 if {[string match
"*...*" $arg]} {
268 lappend revargs
--gitk-symmetric-diff-marker
274 set vdflags
($n) $diffargs
275 set vflags
($n) $glflags
276 set vrevs
($n) $revargs
277 set vfiltered
($n) $filtered
278 set vorigargs
($n) $origargs
282 proc parseviewrevs
{view revs
} {
283 global vposids vnegids
288 if {[catch
{set ids
[eval exec git rev-parse
$revs]} err
]} {
289 # we get stdout followed by stderr in $err
290 # for an unknown rev, git rev-parse echoes it and then errors out
291 set errlines
[split $err "\n"]
293 for {set l
0} {$l < [llength
$errlines]} {incr l
} {
294 set line
[lindex
$errlines $l]
295 if {!([string length
$line] == 40 && [string is xdigit
$line])} {
296 if {[string match
"fatal:*" $line]} {
297 if {[string match
"fatal: ambiguous argument*" $line]
299 if {[llength
$badrev] == 1} {
300 set err
"unknown revision $badrev"
302 set err
"unknown revisions: [join $badrev ", "]"
305 set err
[join [lrange
$errlines $l end
] "\n"]
312 error_popup
"[mc "Error parsing revisions
:"] $err"
319 foreach id
[split $ids "\n"] {
320 if {$id eq
"--gitk-symmetric-diff-marker"} {
322 } elseif
{[string match
"^*" $id]} {
329 lappend neg
[string range
$id 1 end
]
334 lset ret end
$id...
[lindex
$ret end
]
340 set vposids
($view) $pos
341 set vnegids
($view) $neg
345 # Start off a git log process and arrange to read its output
346 proc start_rev_list
{view
} {
347 global startmsecs commitidx viewcomplete curview
349 global viewargs viewargscmd viewfiles vfilelimit
350 global showlocalchanges
351 global viewactive viewinstances vmergeonly
352 global mainheadid viewmainheadid viewmainheadid_orig
353 global vcanopt vflags vrevs vorigargs
356 set startmsecs
[clock clicks
-milliseconds]
357 set commitidx
($view) 0
358 # these are set this way for the error exits
359 set viewcomplete
($view) 1
360 set viewactive
($view) 0
363 set args
$viewargs($view)
364 if {$viewargscmd($view) ne
{}} {
366 set str
[exec sh
-c $viewargscmd($view)]
368 error_popup
"[mc "Error executing
--argscmd command:"] $err"
371 set args
[concat
$args [split $str "\n"]]
373 set vcanopt
($view) [parseviewargs
$view $args]
375 set files
$viewfiles($view)
376 if {$vmergeonly($view)} {
377 set files
[unmerged_files
$files]
380 if {$nr_unmerged == 0} {
381 error_popup
[mc
"No files selected: --merge specified but\
382 no files are unmerged."]
384 error_popup
[mc
"No files selected: --merge specified but\
385 no unmerged files are within file limit."]
390 set vfilelimit
($view) $files
392 if {$vcanopt($view)} {
393 set revs
[parseviewrevs
$view $vrevs($view)]
397 set args
[concat
$vflags($view) $revs]
399 set args
$vorigargs($view)
403 set fd
[open
[concat | git log
--no-color -z --pretty=raw
$show_notes \
404 --parents --boundary $args "--" $files] r
]
406 error_popup
"[mc "Error executing git log
:"] $err"
409 set i
[reg_instance
$fd]
410 set viewinstances
($view) [list
$i]
411 set viewmainheadid
($view) $mainheadid
412 set viewmainheadid_orig
($view) $mainheadid
413 if {$files ne
{} && $mainheadid ne
{}} {
414 get_viewmainhead
$view
416 if {$showlocalchanges && $viewmainheadid($view) ne
{}} {
417 interestedin
$viewmainheadid($view) dodiffindex
419 fconfigure
$fd -blocking 0 -translation lf
-eofchar {}
420 if {$tclencoding != {}} {
421 fconfigure
$fd -encoding $tclencoding
423 filerun
$fd [list getcommitlines
$fd $i $view 0]
424 nowbusy
$view [mc
"Reading"]
425 set viewcomplete
($view) 0
426 set viewactive
($view) 1
430 proc stop_instance
{inst
} {
431 global commfd leftover
433 set fd
$commfd($inst)
437 if {$
::tcl_platform
(platform
) eq
{windows
}} {
446 unset leftover
($inst)
449 proc stop_backends
{} {
452 foreach inst
[array names commfd
] {
457 proc stop_rev_list
{view
} {
460 foreach inst
$viewinstances($view) {
463 set viewinstances
($view) {}
466 proc reset_pending_select
{selid
} {
467 global pending_select mainheadid selectheadid
470 set pending_select
$selid
471 } elseif
{$selectheadid ne
{}} {
472 set pending_select
$selectheadid
474 set pending_select
$mainheadid
478 proc getcommits
{selid
} {
479 global canv curview need_redisplay viewactive
482 if {[start_rev_list
$curview]} {
483 reset_pending_select
$selid
484 show_status
[mc
"Reading commits..."]
487 show_status
[mc
"No commits selected"]
491 proc updatecommits
{} {
492 global curview vcanopt vorigargs vfilelimit viewinstances
493 global viewactive viewcomplete tclencoding
494 global startmsecs showneartags showlocalchanges
495 global mainheadid viewmainheadid viewmainheadid_orig pending_select
497 global varcid vposids vnegids vflags vrevs
500 set hasworktree
[hasworktree
]
503 if {$mainheadid ne
$viewmainheadid_orig($view)} {
504 if {$showlocalchanges} {
507 set viewmainheadid
($view) $mainheadid
508 set viewmainheadid_orig
($view) $mainheadid
509 if {$vfilelimit($view) ne
{}} {
510 get_viewmainhead
$view
513 if {$showlocalchanges} {
516 if {$vcanopt($view)} {
517 set oldpos
$vposids($view)
518 set oldneg
$vnegids($view)
519 set revs
[parseviewrevs
$view $vrevs($view)]
523 # note: getting the delta when negative refs change is hard,
524 # and could require multiple git log invocations, so in that
525 # case we ask git log for all the commits (not just the delta)
526 if {$oldneg eq
$vnegids($view)} {
529 # take out positive refs that we asked for before or
530 # that we have already seen
532 if {[string length
$rev] == 40} {
533 if {[lsearch
-exact $oldpos $rev] < 0
534 && ![info exists varcid
($view,$rev)]} {
539 lappend
$newrevs $rev
542 if {$npos == 0} return
544 set vposids
($view) [lsort
-unique [concat
$oldpos $vposids($view)]]
546 set args
[concat
$vflags($view) $revs --not $oldpos]
548 set args
$vorigargs($view)
551 set fd
[open
[concat | git log
--no-color -z --pretty=raw
$show_notes \
552 --parents --boundary $args "--" $vfilelimit($view)] r
]
554 error_popup
"[mc "Error executing git log
:"] $err"
557 if {$viewactive($view) == 0} {
558 set startmsecs
[clock clicks
-milliseconds]
560 set i
[reg_instance
$fd]
561 lappend viewinstances
($view) $i
562 fconfigure
$fd -blocking 0 -translation lf
-eofchar {}
563 if {$tclencoding != {}} {
564 fconfigure
$fd -encoding $tclencoding
566 filerun
$fd [list getcommitlines
$fd $i $view 1]
567 incr viewactive
($view)
568 set viewcomplete
($view) 0
569 reset_pending_select
{}
570 nowbusy
$view [mc
"Reading"]
576 proc reloadcommits
{} {
577 global curview viewcomplete selectedline currentid thickerline
578 global showneartags treediffs commitinterest cached_commitrow
582 if {$selectedline ne
{}} {
586 if {!$viewcomplete($curview)} {
587 stop_rev_list
$curview
591 catch
{unset currentid
}
592 catch
{unset thickerline
}
593 catch
{unset treediffs
}
600 catch
{unset commitinterest
}
601 catch
{unset cached_commitrow
}
602 catch
{unset targetid
}
608 # This makes a string representation of a positive integer which
609 # sorts as a string in numerical order
612 return [format
"%x" $n]
613 } elseif
{$n < 256} {
614 return [format
"x%.2x" $n]
615 } elseif
{$n < 65536} {
616 return [format
"y%.4x" $n]
618 return [format
"z%.8x" $n]
621 # Procedures used in reordering commits from git log (without
622 # --topo-order) into the order for display.
624 proc varcinit
{view
} {
625 global varcstart vupptr vdownptr vleftptr vbackptr varctok varcrow
626 global vtokmod varcmod vrowmod varcix vlastins
628 set varcstart
($view) {{}}
629 set vupptr
($view) {0}
630 set vdownptr
($view) {0}
631 set vleftptr
($view) {0}
632 set vbackptr
($view) {0}
633 set varctok
($view) {{}}
634 set varcrow
($view) {{}}
635 set vtokmod
($view) {}
638 set varcix
($view) {{}}
639 set vlastins
($view) {0}
642 proc resetvarcs
{view
} {
643 global varcid varccommits parents children vseedcount ordertok
646 foreach vid
[array names varcid
$view,*] {
651 foreach vid
[array names vshortids
$view,*] {
652 unset vshortids
($vid)
654 # some commits might have children but haven't been seen yet
655 foreach vid
[array names children
$view,*] {
658 foreach va
[array names varccommits
$view,*] {
659 unset varccommits
($va)
661 foreach vd
[array names vseedcount
$view,*] {
662 unset vseedcount
($vd)
664 catch
{unset ordertok
}
667 # returns a list of the commits with no children
669 global vdownptr vleftptr varcstart
672 set a
[lindex
$vdownptr($v) 0]
674 lappend ret
[lindex
$varcstart($v) $a]
675 set a
[lindex
$vleftptr($v) $a]
680 proc newvarc
{view id
} {
681 global varcid varctok parents children vdatemode
682 global vupptr vdownptr vleftptr vbackptr varcrow varcix varcstart
683 global commitdata commitinfo vseedcount varccommits vlastins
685 set a
[llength
$varctok($view)]
687 if {[llength
$children($vid)] == 0 ||
$vdatemode($view)} {
688 if {![info exists commitinfo
($id)]} {
689 parsecommit
$id $commitdata($id) 1
691 set cdate
[lindex
[lindex
$commitinfo($id) 4] 0]
692 if {![string is integer
-strict $cdate]} {
695 if {![info exists vseedcount
($view,$cdate)]} {
696 set vseedcount
($view,$cdate) -1
698 set c
[incr vseedcount
($view,$cdate)]
699 set cdate
[expr {$cdate ^
0xffffffff}]
700 set tok
"s[strrep $cdate][strrep $c]"
705 if {[llength
$children($vid)] > 0} {
706 set kid
[lindex
$children($vid) end
]
707 set k
$varcid($view,$kid)
708 if {[string compare
[lindex
$varctok($view) $k] $tok] > 0} {
711 set tok
[lindex
$varctok($view) $k]
715 set i
[lsearch
-exact $parents($view,$ki) $id]
716 set j
[expr {[llength
$parents($view,$ki)] - 1 - $i}]
717 append tok
[strrep
$j]
719 set c
[lindex
$vlastins($view) $ka]
720 if {$c == 0 ||
[string compare
$tok [lindex
$varctok($view) $c]] < 0} {
722 set b
[lindex
$vdownptr($view) $ka]
724 set b
[lindex
$vleftptr($view) $c]
726 while {$b != 0 && [string compare
$tok [lindex
$varctok($view) $b]] >= 0} {
728 set b
[lindex
$vleftptr($view) $c]
731 lset vdownptr
($view) $ka $a
732 lappend vbackptr
($view) 0
734 lset vleftptr
($view) $c $a
735 lappend vbackptr
($view) $c
737 lset vlastins
($view) $ka $a
738 lappend vupptr
($view) $ka
739 lappend vleftptr
($view) $b
741 lset vbackptr
($view) $b $a
743 lappend varctok
($view) $tok
744 lappend varcstart
($view) $id
745 lappend vdownptr
($view) 0
746 lappend varcrow
($view) {}
747 lappend varcix
($view) {}
748 set varccommits
($view,$a) {}
749 lappend vlastins
($view) 0
753 proc splitvarc
{p v
} {
754 global varcid varcstart varccommits varctok vtokmod
755 global vupptr vdownptr vleftptr vbackptr varcix varcrow vlastins
757 set oa
$varcid($v,$p)
758 set otok
[lindex
$varctok($v) $oa]
759 set ac
$varccommits($v,$oa)
760 set i
[lsearch
-exact $varccommits($v,$oa) $p]
762 set na
[llength
$varctok($v)]
763 # "%" sorts before "0"...
764 set tok
"$otok%[strrep $i]"
765 lappend varctok
($v) $tok
766 lappend varcrow
($v) {}
767 lappend varcix
($v) {}
768 set varccommits
($v,$oa) [lrange
$ac 0 [expr {$i - 1}]]
769 set varccommits
($v,$na) [lrange
$ac $i end
]
770 lappend varcstart
($v) $p
771 foreach id
$varccommits($v,$na) {
772 set varcid
($v,$id) $na
774 lappend vdownptr
($v) [lindex
$vdownptr($v) $oa]
775 lappend vlastins
($v) [lindex
$vlastins($v) $oa]
776 lset vdownptr
($v) $oa $na
777 lset vlastins
($v) $oa 0
778 lappend vupptr
($v) $oa
779 lappend vleftptr
($v) 0
780 lappend vbackptr
($v) 0
781 for {set b
[lindex
$vdownptr($v) $na]} {$b != 0} {set b
[lindex
$vleftptr($v) $b]} {
782 lset vupptr
($v) $b $na
784 if {[string compare
$otok $vtokmod($v)] <= 0} {
789 proc renumbervarc
{a v
} {
790 global parents children varctok varcstart varccommits
791 global vupptr vdownptr vleftptr vbackptr vlastins varcid vtokmod vdatemode
793 set t1
[clock clicks
-milliseconds]
799 if {[info exists isrelated
($a)]} {
801 set id
[lindex
$varccommits($v,$a) end
]
802 foreach p
$parents($v,$id) {
803 if {[info exists varcid
($v,$p)]} {
804 set isrelated
($varcid($v,$p)) 1
809 set b
[lindex
$vdownptr($v) $a]
812 set b
[lindex
$vleftptr($v) $a]
814 set a
[lindex
$vupptr($v) $a]
820 if {![info exists kidchanged
($a)]} continue
821 set id
[lindex
$varcstart($v) $a]
822 if {[llength
$children($v,$id)] > 1} {
823 set children
($v,$id) [lsort
-command [list vtokcmp
$v] \
826 set oldtok
[lindex
$varctok($v) $a]
827 if {!$vdatemode($v)} {
833 set kid
[last_real_child
$v,$id]
835 set k
$varcid($v,$kid)
836 if {[string compare
[lindex
$varctok($v) $k] $tok] > 0} {
839 set tok
[lindex
$varctok($v) $k]
843 set i
[lsearch
-exact $parents($v,$ki) $id]
844 set j
[expr {[llength
$parents($v,$ki)] - 1 - $i}]
845 append tok
[strrep
$j]
847 if {$tok eq
$oldtok} {
850 set id
[lindex
$varccommits($v,$a) end
]
851 foreach p
$parents($v,$id) {
852 if {[info exists varcid
($v,$p)]} {
853 set kidchanged
($varcid($v,$p)) 1
858 lset varctok
($v) $a $tok
859 set b
[lindex
$vupptr($v) $a]
861 if {[string compare
[lindex
$varctok($v) $ka] $vtokmod($v)] < 0} {
864 if {[string compare
[lindex
$varctok($v) $b] $vtokmod($v)] < 0} {
867 set c
[lindex
$vbackptr($v) $a]
868 set d
[lindex
$vleftptr($v) $a]
870 lset vdownptr
($v) $b $d
872 lset vleftptr
($v) $c $d
875 lset vbackptr
($v) $d $c
877 if {[lindex
$vlastins($v) $b] == $a} {
878 lset vlastins
($v) $b $c
880 lset vupptr
($v) $a $ka
881 set c
[lindex
$vlastins($v) $ka]
883 [string compare
$tok [lindex
$varctok($v) $c]] < 0} {
885 set b
[lindex
$vdownptr($v) $ka]
887 set b
[lindex
$vleftptr($v) $c]
890 [string compare
$tok [lindex
$varctok($v) $b]] >= 0} {
892 set b
[lindex
$vleftptr($v) $c]
895 lset vdownptr
($v) $ka $a
896 lset vbackptr
($v) $a 0
898 lset vleftptr
($v) $c $a
899 lset vbackptr
($v) $a $c
901 lset vleftptr
($v) $a $b
903 lset vbackptr
($v) $b $a
905 lset vlastins
($v) $ka $a
908 foreach id
[array names sortkids
] {
909 if {[llength
$children($v,$id)] > 1} {
910 set children
($v,$id) [lsort
-command [list vtokcmp
$v] \
914 set t2
[clock clicks
-milliseconds]
915 #puts "renumbervarc did [llength $todo] of $ntot arcs in [expr {$t2-$t1}]ms"
918 # Fix up the graph after we have found out that in view $v,
919 # $p (a commit that we have already seen) is actually the parent
920 # of the last commit in arc $a.
921 proc fix_reversal
{p a v
} {
922 global varcid varcstart varctok vupptr
924 set pa
$varcid($v,$p)
925 if {$p ne
[lindex
$varcstart($v) $pa]} {
927 set pa
$varcid($v,$p)
929 # seeds always need to be renumbered
930 if {[lindex
$vupptr($v) $pa] == 0 ||
931 [string compare
[lindex
$varctok($v) $a] \
932 [lindex
$varctok($v) $pa]] > 0} {
937 proc insertrow
{id p v
} {
938 global cmitlisted children parents varcid varctok vtokmod
939 global varccommits ordertok commitidx numcommits curview
940 global targetid targetrow vshortids
944 set cmitlisted
($vid) 1
945 set children
($vid) {}
946 set parents
($vid) [list
$p]
947 set a
[newvarc
$v $id]
949 lappend vshortids
($v,[string range
$id 0 3]) $id
950 if {[string compare
[lindex
$varctok($v) $a] $vtokmod($v)] < 0} {
953 lappend varccommits
($v,$a) $id
955 if {[llength
[lappend children
($vp) $id]] > 1} {
956 set children
($vp) [lsort
-command [list vtokcmp
$v] $children($vp)]
957 catch
{unset ordertok
}
959 fix_reversal
$p $a $v
961 if {$v == $curview} {
962 set numcommits
$commitidx($v)
964 if {[info exists targetid
]} {
965 if {![comes_before
$targetid $p]} {
972 proc insertfakerow
{id p
} {
973 global varcid varccommits parents children cmitlisted
974 global commitidx varctok vtokmod targetid targetrow curview numcommits
978 set i
[lsearch
-exact $varccommits($v,$a) $p]
980 puts
"oops: insertfakerow can't find [shortids $p] on arc $a"
983 set children
($v,$id) {}
984 set parents
($v,$id) [list
$p]
985 set varcid
($v,$id) $a
986 lappend children
($v,$p) $id
987 set cmitlisted
($v,$id) 1
988 set numcommits
[incr commitidx
($v)]
989 # note we deliberately don't update varcstart($v) even if $i == 0
990 set varccommits
($v,$a) [linsert
$varccommits($v,$a) $i $id]
992 if {[info exists targetid
]} {
993 if {![comes_before
$targetid $p]} {
1001 proc removefakerow
{id
} {
1002 global varcid varccommits parents children commitidx
1003 global varctok vtokmod cmitlisted currentid selectedline
1004 global targetid curview numcommits
1007 if {[llength
$parents($v,$id)] != 1} {
1008 puts
"oops: removefakerow [shortids $id] has [llength $parents($v,$id)] parents"
1011 set p
[lindex
$parents($v,$id) 0]
1012 set a
$varcid($v,$id)
1013 set i
[lsearch
-exact $varccommits($v,$a) $id]
1015 puts
"oops: removefakerow can't find [shortids $id] on arc $a"
1018 unset varcid
($v,$id)
1019 set varccommits
($v,$a) [lreplace
$varccommits($v,$a) $i $i]
1020 unset parents
($v,$id)
1021 unset children
($v,$id)
1022 unset cmitlisted
($v,$id)
1023 set numcommits
[incr commitidx
($v) -1]
1024 set j
[lsearch
-exact $children($v,$p) $id]
1026 set children
($v,$p) [lreplace
$children($v,$p) $j $j]
1029 if {[info exist currentid
] && $id eq
$currentid} {
1033 if {[info exists targetid
] && $targetid eq
$id} {
1040 proc real_children
{vp
} {
1041 global children nullid nullid2
1044 foreach id
$children($vp) {
1045 if {$id ne
$nullid && $id ne
$nullid2} {
1052 proc first_real_child
{vp
} {
1053 global children nullid nullid2
1055 foreach id
$children($vp) {
1056 if {$id ne
$nullid && $id ne
$nullid2} {
1063 proc last_real_child
{vp
} {
1064 global children nullid nullid2
1066 set kids
$children($vp)
1067 for {set i
[llength
$kids]} {[incr i
-1] >= 0} {} {
1068 set id
[lindex
$kids $i]
1069 if {$id ne
$nullid && $id ne
$nullid2} {
1076 proc vtokcmp
{v a b
} {
1077 global varctok varcid
1079 return [string compare
[lindex
$varctok($v) $varcid($v,$a)] \
1080 [lindex
$varctok($v) $varcid($v,$b)]]
1083 # This assumes that if lim is not given, the caller has checked that
1084 # arc a's token is less than $vtokmod($v)
1085 proc modify_arc
{v a
{lim
{}}} {
1086 global varctok vtokmod varcmod varcrow vupptr curview vrowmod varccommits
1089 set c
[string compare
[lindex
$varctok($v) $a] $vtokmod($v)]
1092 set r
[lindex
$varcrow($v) $a]
1093 if {$r ne
{} && $vrowmod($v) <= $r + $lim} return
1096 set vtokmod
($v) [lindex
$varctok($v) $a]
1098 if {$v == $curview} {
1099 while {$a != 0 && [lindex
$varcrow($v) $a] eq
{}} {
1100 set a
[lindex
$vupptr($v) $a]
1106 set lim
[llength
$varccommits($v,$a)]
1108 set r
[expr {[lindex
$varcrow($v) $a] + $lim}]
1115 proc update_arcrows
{v
} {
1116 global vtokmod varcmod vrowmod varcrow commitidx currentid selectedline
1117 global varcid vrownum varcorder varcix varccommits
1118 global vupptr vdownptr vleftptr varctok
1119 global displayorder parentlist curview cached_commitrow
1121 if {$vrowmod($v) == $commitidx($v)} return
1122 if {$v == $curview} {
1123 if {[llength
$displayorder] > $vrowmod($v)} {
1124 set displayorder
[lrange
$displayorder 0 [expr {$vrowmod($v) - 1}]]
1125 set parentlist
[lrange
$parentlist 0 [expr {$vrowmod($v) - 1}]]
1127 catch
{unset cached_commitrow
}
1129 set narctot
[expr {[llength
$varctok($v)] - 1}]
1131 while {$a != 0 && [lindex
$varcix($v) $a] eq
{}} {
1132 # go up the tree until we find something that has a row number,
1133 # or we get to a seed
1134 set a
[lindex
$vupptr($v) $a]
1137 set a
[lindex
$vdownptr($v) 0]
1140 set varcorder
($v) [list
$a]
1141 lset varcix
($v) $a 0
1142 lset varcrow
($v) $a 0
1146 set arcn
[lindex
$varcix($v) $a]
1147 if {[llength
$vrownum($v)] > $arcn + 1} {
1148 set vrownum
($v) [lrange
$vrownum($v) 0 $arcn]
1149 set varcorder
($v) [lrange
$varcorder($v) 0 $arcn]
1151 set row
[lindex
$varcrow($v) $a]
1155 incr row
[llength
$varccommits($v,$a)]
1156 # go down if possible
1157 set b
[lindex
$vdownptr($v) $a]
1159 # if not, go left, or go up until we can go left
1161 set b
[lindex
$vleftptr($v) $a]
1163 set a
[lindex
$vupptr($v) $a]
1169 lappend vrownum
($v) $row
1170 lappend varcorder
($v) $a
1171 lset varcix
($v) $a $arcn
1172 lset varcrow
($v) $a $row
1174 set vtokmod
($v) [lindex
$varctok($v) $p]
1176 set vrowmod
($v) $row
1177 if {[info exists currentid
]} {
1178 set selectedline
[rowofcommit
$currentid]
1182 # Test whether view $v contains commit $id
1183 proc commitinview
{id v
} {
1186 return [info exists varcid
($v,$id)]
1189 # Return the row number for commit $id in the current view
1190 proc rowofcommit
{id
} {
1191 global varcid varccommits varcrow curview cached_commitrow
1192 global varctok vtokmod
1195 if {![info exists varcid
($v,$id)]} {
1196 puts
"oops rowofcommit no arc for [shortids $id]"
1199 set a
$varcid($v,$id)
1200 if {[string compare
[lindex
$varctok($v) $a] $vtokmod($v)] >= 0} {
1203 if {[info exists cached_commitrow
($id)]} {
1204 return $cached_commitrow($id)
1206 set i
[lsearch
-exact $varccommits($v,$a) $id]
1208 puts
"oops didn't find commit [shortids $id] in arc $a"
1211 incr i
[lindex
$varcrow($v) $a]
1212 set cached_commitrow
($id) $i
1216 # Returns 1 if a is on an earlier row than b, otherwise 0
1217 proc comes_before
{a b
} {
1218 global varcid varctok curview
1221 if {$a eq
$b ||
![info exists varcid
($v,$a)] || \
1222 ![info exists varcid
($v,$b)]} {
1225 if {$varcid($v,$a) != $varcid($v,$b)} {
1226 return [expr {[string compare
[lindex
$varctok($v) $varcid($v,$a)] \
1227 [lindex
$varctok($v) $varcid($v,$b)]] < 0}]
1229 return [expr {[rowofcommit
$a] < [rowofcommit
$b]}]
1232 proc bsearch
{l elt
} {
1233 if {[llength
$l] == 0 ||
$elt <= [lindex
$l 0]} {
1238 while {$hi - $lo > 1} {
1239 set mid
[expr {int
(($lo + $hi) / 2)}]
1240 set t
[lindex
$l $mid]
1243 } elseif
{$elt > $t} {
1252 # Make sure rows $start..$end-1 are valid in displayorder and parentlist
1253 proc make_disporder
{start end
} {
1254 global vrownum curview commitidx displayorder parentlist
1255 global varccommits varcorder parents vrowmod varcrow
1256 global d_valid_start d_valid_end
1258 if {$end > $vrowmod($curview)} {
1259 update_arcrows
$curview
1261 set ai
[bsearch
$vrownum($curview) $start]
1262 set start
[lindex
$vrownum($curview) $ai]
1263 set narc
[llength
$vrownum($curview)]
1264 for {set r
$start} {$ai < $narc && $r < $end} {incr ai
} {
1265 set a
[lindex
$varcorder($curview) $ai]
1266 set l
[llength
$displayorder]
1267 set al
[llength
$varccommits($curview,$a)]
1268 if {$l < $r + $al} {
1270 set pad
[ntimes
[expr {$r - $l}] {}]
1271 set displayorder
[concat
$displayorder $pad]
1272 set parentlist
[concat
$parentlist $pad]
1273 } elseif
{$l > $r} {
1274 set displayorder
[lrange
$displayorder 0 [expr {$r - 1}]]
1275 set parentlist
[lrange
$parentlist 0 [expr {$r - 1}]]
1277 foreach id
$varccommits($curview,$a) {
1278 lappend displayorder
$id
1279 lappend parentlist
$parents($curview,$id)
1281 } elseif
{[lindex
$displayorder [expr {$r + $al - 1}]] eq
{}} {
1283 foreach id
$varccommits($curview,$a) {
1284 lset displayorder
$i $id
1285 lset parentlist
$i $parents($curview,$id)
1293 proc commitonrow
{row
} {
1296 set id
[lindex
$displayorder $row]
1298 make_disporder
$row [expr {$row + 1}]
1299 set id
[lindex
$displayorder $row]
1304 proc closevarcs
{v
} {
1305 global varctok varccommits varcid parents children
1306 global cmitlisted commitidx vtokmod
1308 set missing_parents
0
1310 set narcs
[llength
$varctok($v)]
1311 for {set a
1} {$a < $narcs} {incr a
} {
1312 set id
[lindex
$varccommits($v,$a) end
]
1313 foreach p
$parents($v,$id) {
1314 if {[info exists varcid
($v,$p)]} continue
1315 # add p as a new commit
1316 incr missing_parents
1317 set cmitlisted
($v,$p) 0
1318 set parents
($v,$p) {}
1319 if {[llength
$children($v,$p)] == 1 &&
1320 [llength
$parents($v,$id)] == 1} {
1323 set b
[newvarc
$v $p]
1325 set varcid
($v,$p) $b
1326 if {[string compare
[lindex
$varctok($v) $b] $vtokmod($v)] < 0} {
1329 lappend varccommits
($v,$b) $p
1331 set scripts
[check_interest
$p $scripts]
1334 if {$missing_parents > 0} {
1335 foreach s
$scripts {
1341 # Use $rwid as a substitute for $id, i.e. reparent $id's children to $rwid
1342 # Assumes we already have an arc for $rwid.
1343 proc rewrite_commit
{v id rwid
} {
1344 global children parents varcid varctok vtokmod varccommits
1346 foreach ch
$children($v,$id) {
1347 # make $rwid be $ch's parent in place of $id
1348 set i
[lsearch
-exact $parents($v,$ch) $id]
1350 puts
"oops rewrite_commit didn't find $id in parent list for $ch"
1352 set parents
($v,$ch) [lreplace
$parents($v,$ch) $i $i $rwid]
1353 # add $ch to $rwid's children and sort the list if necessary
1354 if {[llength
[lappend children
($v,$rwid) $ch]] > 1} {
1355 set children
($v,$rwid) [lsort
-command [list vtokcmp
$v] \
1356 $children($v,$rwid)]
1358 # fix the graph after joining $id to $rwid
1359 set a
$varcid($v,$ch)
1360 fix_reversal
$rwid $a $v
1361 # parentlist is wrong for the last element of arc $a
1362 # even if displayorder is right, hence the 3rd arg here
1363 modify_arc
$v $a [expr {[llength
$varccommits($v,$a)] - 1}]
1367 # Mechanism for registering a command to be executed when we come
1368 # across a particular commit. To handle the case when only the
1369 # prefix of the commit is known, the commitinterest array is now
1370 # indexed by the first 4 characters of the ID. Each element is a
1371 # list of id, cmd pairs.
1372 proc interestedin
{id cmd
} {
1373 global commitinterest
1375 lappend commitinterest
([string range
$id 0 3]) $id $cmd
1378 proc check_interest
{id scripts
} {
1379 global commitinterest
1381 set prefix
[string range
$id 0 3]
1382 if {[info exists commitinterest
($prefix)]} {
1384 foreach
{i
script} $commitinterest($prefix) {
1385 if {[string match
"$i*" $id]} {
1386 lappend scripts
[string map
[list
"%I" $id "%P" $i] $script]
1388 lappend newlist
$i $script
1391 if {$newlist ne
{}} {
1392 set commitinterest
($prefix) $newlist
1394 unset commitinterest
($prefix)
1400 proc getcommitlines
{fd inst view updating
} {
1401 global cmitlisted leftover
1402 global commitidx commitdata vdatemode
1403 global parents children curview hlview
1404 global idpending ordertok
1405 global varccommits varcid varctok vtokmod vfilelimit vshortids
1407 set stuff
[read $fd 500000]
1408 # git log doesn't terminate the last commit with a null...
1409 if {$stuff == {} && $leftover($inst) ne
{} && [eof
$fd]} {
1416 global commfd viewcomplete viewactive viewname
1417 global viewinstances
1419 set i
[lsearch
-exact $viewinstances($view) $inst]
1421 set viewinstances
($view) [lreplace
$viewinstances($view) $i $i]
1423 # set it blocking so we wait for the process to terminate
1424 fconfigure
$fd -blocking 1
1425 if {[catch
{close
$fd} err
]} {
1427 if {$view != $curview} {
1428 set fv
" for the \"$viewname($view)\" view"
1430 if {[string range
$err 0 4] == "usage"} {
1431 set err
"Gitk: error reading commits$fv:\
1432 bad arguments to git log."
1433 if {$viewname($view) eq
"Command line"} {
1435 " (Note: arguments to gitk are passed to git log\
1436 to allow selection of commits to be displayed.)"
1439 set err
"Error reading commits$fv: $err"
1443 if {[incr viewactive
($view) -1] <= 0} {
1444 set viewcomplete
($view) 1
1445 # Check if we have seen any ids listed as parents that haven't
1446 # appeared in the list
1450 if {$view == $curview} {
1459 set i
[string first
"\0" $stuff $start]
1461 append leftover
($inst) [string range
$stuff $start end
]
1465 set cmit
$leftover($inst)
1466 append cmit
[string range
$stuff 0 [expr {$i - 1}]]
1467 set leftover
($inst) {}
1469 set cmit
[string range
$stuff $start [expr {$i - 1}]]
1471 set start
[expr {$i + 1}]
1472 set j
[string first
"\n" $cmit]
1475 if {$j >= 0 && [string match
"commit *" $cmit]} {
1476 set ids
[string range
$cmit 7 [expr {$j - 1}]]
1477 if {[string match
{[-^
<>]*} $ids]} {
1478 switch
-- [string index
$ids 0] {
1484 set ids
[string range
$ids 1 end
]
1488 if {[string length
$id] != 40} {
1496 if {[string length
$shortcmit] > 80} {
1497 set shortcmit
"[string range $shortcmit 0 80]..."
1499 error_popup
"[mc "Can
't parse git log output:"] {$shortcmit}"
1502 set id [lindex $ids 0]
1505 lappend vshortids($view,[string range $id 0 3]) $id
1507 if {!$listed && $updating && ![info exists varcid($vid)] &&
1508 $vfilelimit($view) ne {}} {
1509 # git log doesn't rewrite parents
for unlisted commits
1510 # when doing path limiting, so work around that here
1511 # by working out the rewritten parent with git rev-list
1512 # and if we already know about it, using the rewritten
1513 # parent as a substitute parent for $id's children.
1515 set rwid
[exec git rev-list
--first-parent --max-count=1 \
1516 $id -- $vfilelimit($view)]
1518 if {$rwid ne
{} && [info exists varcid
($view,$rwid)]} {
1519 # use $rwid in place of $id
1520 rewrite_commit
$view $id $rwid
1527 if {[info exists varcid
($vid)]} {
1528 if {$cmitlisted($vid) ||
!$listed} continue
1532 set olds
[lrange
$ids 1 end
]
1536 set commitdata
($id) [string range
$cmit [expr {$j + 1}] end
]
1537 set cmitlisted
($vid) $listed
1538 set parents
($vid) $olds
1539 if {![info exists children
($vid)]} {
1540 set children
($vid) {}
1541 } elseif
{$a == 0 && [llength
$children($vid)] == 1} {
1542 set k
[lindex
$children($vid) 0]
1543 if {[llength
$parents($view,$k)] == 1 &&
1544 (!$vdatemode($view) ||
1545 $varcid($view,$k) == [llength
$varctok($view)] - 1)} {
1546 set a
$varcid($view,$k)
1551 set a
[newvarc
$view $id]
1553 if {[string compare
[lindex
$varctok($view) $a] $vtokmod($view)] < 0} {
1556 if {![info exists varcid
($vid)]} {
1558 lappend varccommits
($view,$a) $id
1559 incr commitidx
($view)
1564 if {$i == 0 ||
[lsearch
-exact $olds $p] >= $i} {
1566 if {[llength
[lappend children
($vp) $id]] > 1 &&
1567 [vtokcmp
$view [lindex
$children($vp) end-1
] $id] > 0} {
1568 set children
($vp) [lsort
-command [list vtokcmp
$view] \
1570 catch
{unset ordertok
}
1572 if {[info exists varcid
($view,$p)]} {
1573 fix_reversal
$p $a $view
1579 set scripts
[check_interest
$id $scripts]
1583 global numcommits hlview
1585 if {$view == $curview} {
1586 set numcommits
$commitidx($view)
1589 if {[info exists hlview
] && $view == $hlview} {
1590 # we never actually get here...
1593 foreach s
$scripts {
1600 proc chewcommits
{} {
1601 global curview hlview viewcomplete
1602 global pending_select
1605 if {$viewcomplete($curview)} {
1606 global commitidx varctok
1607 global numcommits startmsecs
1609 if {[info exists pending_select
]} {
1611 reset_pending_select
{}
1613 if {[commitinview
$pending_select $curview]} {
1614 selectline
[rowofcommit
$pending_select] 1
1616 set row
[first_real_row
]
1620 if {$commitidx($curview) > 0} {
1621 #set ms [expr {[clock clicks -milliseconds] - $startmsecs}]
1622 #puts "overall $ms ms for $numcommits commits"
1623 #puts "[llength $varctok($view)] arcs, $commitidx($view) commits"
1625 show_status
[mc
"No commits selected"]
1632 proc do_readcommit
{id
} {
1635 # Invoke git-log to handle automatic encoding conversion
1636 set fd
[open
[concat | git log
--no-color --pretty=raw
-1 $id] r
]
1637 # Read the results using i18n.logoutputencoding
1638 fconfigure
$fd -translation lf
-eofchar {}
1639 if {$tclencoding != {}} {
1640 fconfigure
$fd -encoding $tclencoding
1642 set contents
[read $fd]
1644 # Remove the heading line
1645 regsub
{^commit
[0-9a-f]+\n} $contents {} contents
1650 proc readcommit
{id
} {
1651 if {[catch
{set contents
[do_readcommit
$id]}]} return
1652 parsecommit
$id $contents 1
1655 proc parsecommit
{id contents listed
} {
1665 set hdrend
[string first
"\n\n" $contents]
1667 # should never happen...
1668 set hdrend
[string length
$contents]
1670 set header
[string range
$contents 0 [expr {$hdrend - 1}]]
1671 set comment
[string range
$contents [expr {$hdrend + 2}] end
]
1672 foreach line
[split $header "\n"] {
1673 set line
[split $line " "]
1674 set tag
[lindex
$line 0]
1675 if {$tag == "author"} {
1676 set audate
[lrange
$line end-1 end
]
1677 set auname
[join [lrange
$line 1 end-2
] " "]
1678 } elseif
{$tag == "committer"} {
1679 set comdate
[lrange
$line end-1 end
]
1680 set comname
[join [lrange
$line 1 end-2
] " "]
1684 # take the first non-blank line of the comment as the headline
1685 set headline
[string trimleft
$comment]
1686 set i
[string first
"\n" $headline]
1688 set headline
[string range
$headline 0 $i]
1690 set headline
[string trimright
$headline]
1691 set i
[string first
"\r" $headline]
1693 set headline
[string trimright
[string range
$headline 0 $i]]
1696 # git log indents the comment by 4 spaces;
1697 # if we got this via git cat-file, add the indentation
1699 foreach line
[split $comment "\n"] {
1700 append newcomment
" "
1701 append newcomment
$line
1702 append newcomment
"\n"
1704 set comment
$newcomment
1706 set hasnote
[string first
"\nNotes:\n" $contents]
1707 set commitinfo
($id) [list
$headline $auname $audate \
1708 $comname $comdate $comment $hasnote]
1711 proc getcommit
{id
} {
1712 global commitdata commitinfo
1714 if {[info exists commitdata
($id)]} {
1715 parsecommit
$id $commitdata($id) 1
1718 if {![info exists commitinfo
($id)]} {
1719 set commitinfo
($id) [list
[mc
"No commit information available"]]
1725 # Expand an abbreviated commit ID to a list of full 40-char IDs that match
1726 # and are present in the current view.
1727 # This is fairly slow...
1728 proc longid
{prefix
} {
1729 global varcid curview vshortids
1732 if {[string length
$prefix] >= 4} {
1733 set vshortid
$curview,[string range
$prefix 0 3]
1734 if {[info exists vshortids
($vshortid)]} {
1735 foreach id
$vshortids($vshortid) {
1736 if {[string match
"$prefix*" $id]} {
1737 if {[lsearch
-exact $ids $id] < 0} {
1739 if {[llength
$ids] >= 2} break
1745 foreach match
[array names varcid
"$curview,$prefix*"] {
1746 lappend ids
[lindex
[split $match ","] 1]
1747 if {[llength
$ids] >= 2} break
1754 global tagids idtags headids idheads tagobjid
1755 global otherrefids idotherrefs mainhead mainheadid
1756 global selecthead selectheadid
1759 foreach v
{tagids idtags headids idheads otherrefids idotherrefs
} {
1762 set refd
[open
[list | git show-ref
-d] r
]
1763 while {[gets
$refd line
] >= 0} {
1764 if {[string index
$line 40] ne
" "} continue
1765 set id
[string range
$line 0 39]
1766 set ref
[string range
$line 41 end
]
1767 if {![string match
"refs/*" $ref]} continue
1768 set name
[string range
$ref 5 end
]
1769 if {[string match
"remotes/*" $name]} {
1770 if {![string match
"*/HEAD" $name] && !$hideremotes} {
1771 set headids
($name) $id
1772 lappend idheads
($id) $name
1774 } elseif
{[string match
"heads/*" $name]} {
1775 set name
[string range
$name 6 end
]
1776 set headids
($name) $id
1777 lappend idheads
($id) $name
1778 } elseif
{[string match
"tags/*" $name]} {
1779 # this lets refs/tags/foo^{} overwrite refs/tags/foo,
1780 # which is what we want since the former is the commit ID
1781 set name
[string range
$name 5 end
]
1782 if {[string match
"*^{}" $name]} {
1783 set name
[string range
$name 0 end-3
]
1785 set tagobjid
($name) $id
1787 set tagids
($name) $id
1788 lappend idtags
($id) $name
1790 set otherrefids
($name) $id
1791 lappend idotherrefs
($id) $name
1798 set mainheadid
[exec git rev-parse HEAD
]
1799 set thehead
[exec git symbolic-ref HEAD
]
1800 if {[string match
"refs/heads/*" $thehead]} {
1801 set mainhead
[string range
$thehead 11 end
]
1805 if {$selecthead ne
{}} {
1807 set selectheadid
[exec git rev-parse
--verify $selecthead]
1812 # skip over fake commits
1813 proc first_real_row
{} {
1814 global nullid nullid2 numcommits
1816 for {set row
0} {$row < $numcommits} {incr row
} {
1817 set id
[commitonrow
$row]
1818 if {$id ne
$nullid && $id ne
$nullid2} {
1825 # update things for a head moved to a child of its previous location
1826 proc movehead
{id name
} {
1827 global headids idheads
1829 removehead
$headids($name) $name
1830 set headids
($name) $id
1831 lappend idheads
($id) $name
1834 # update things when a head has been removed
1835 proc removehead
{id name
} {
1836 global headids idheads
1838 if {$idheads($id) eq
$name} {
1841 set i
[lsearch
-exact $idheads($id) $name]
1843 set idheads
($id) [lreplace
$idheads($id) $i $i]
1846 unset headids
($name)
1849 proc ttk_toplevel
{w args
} {
1851 eval [linsert
$args 0 ::toplevel
$w]
1853 place
[ttk
::frame
$w._toplevel_background
] -x 0 -y 0 -relwidth 1 -relheight 1
1858 proc make_transient
{window origin
} {
1861 # In MacOS Tk 8.4 transient appears to work by setting
1862 # overrideredirect, which is utterly useless, since the
1863 # windows get no border, and are not even kept above
1865 if {!$have_tk85 && [tk windowingsystem
] eq
{aqua
}} return
1867 wm transient
$window $origin
1869 # Windows fails to place transient windows normally, so
1870 # schedule a callback to center them on the parent.
1871 if {[tk windowingsystem
] eq
{win32
}} {
1872 after idle
[list tk
::PlaceWindow
$window widget
$origin]
1876 proc show_error
{w top msg
{mc mc
}} {
1878 if {![info exists NS
]} {set NS
""}
1879 if {[wm state
$top] eq
"withdrawn"} { wm deiconify
$top }
1880 message
$w.m
-text $msg -justify center
-aspect 400
1881 pack
$w.m
-side top
-fill x
-padx 20 -pady 20
1882 ${NS}::button
$w.ok
-default active
-text [$mc OK
] -command "destroy $top"
1883 pack
$w.ok
-side bottom
-fill x
1884 bind $top <Visibility
> "grab $top; focus $top"
1885 bind $top <Key-Return
> "destroy $top"
1886 bind $top <Key-space
> "destroy $top"
1887 bind $top <Key-Escape
> "destroy $top"
1891 proc error_popup
{msg
{owner .
}} {
1892 if {[tk windowingsystem
] eq
"win32"} {
1893 tk_messageBox
-icon error
-type ok
-title [wm title .
] \
1894 -parent $owner -message $msg
1898 make_transient
$w $owner
1899 show_error
$w $w $msg
1903 proc confirm_popup
{msg
{owner .
}} {
1904 global confirm_ok NS
1908 make_transient
$w $owner
1909 message
$w.m
-text $msg -justify center
-aspect 400
1910 pack
$w.m
-side top
-fill x
-padx 20 -pady 20
1911 ${NS}::button
$w.ok
-text [mc OK
] -command "set confirm_ok 1; destroy $w"
1912 pack
$w.ok
-side left
-fill x
1913 ${NS}::button
$w.cancel
-text [mc Cancel
] -command "destroy $w"
1914 pack
$w.cancel
-side right
-fill x
1915 bind $w <Visibility
> "grab $w; focus $w"
1916 bind $w <Key-Return
> "set confirm_ok 1; destroy $w"
1917 bind $w <Key-space
> "set confirm_ok 1; destroy $w"
1918 bind $w <Key-Escape
> "destroy $w"
1919 tk
::PlaceWindow
$w widget
$owner
1924 proc setoptions
{} {
1925 if {[tk windowingsystem
] ne
"win32"} {
1926 option add
*Panedwindow.showHandle
1 startupFile
1927 option add
*Panedwindow.sashRelief raised startupFile
1928 if {[tk windowingsystem
] ne
"aqua"} {
1929 option add
*Menu.font uifont startupFile
1932 option add
*Menu.TearOff
0 startupFile
1934 option add
*Button.font uifont startupFile
1935 option add
*Checkbutton.font uifont startupFile
1936 option add
*Radiobutton.font uifont startupFile
1937 option add
*Menubutton.font uifont startupFile
1938 option add
*Label.font uifont startupFile
1939 option add
*Message.font uifont startupFile
1940 option add
*Entry.font textfont startupFile
1941 option add
*Text.font textfont startupFile
1942 option add
*Labelframe.font uifont startupFile
1943 option add
*Spinbox.font textfont startupFile
1944 option add
*Listbox.font mainfont startupFile
1947 # Make a menu and submenus.
1948 # m is the window name for the menu, items is the list of menu items to add.
1949 # Each item is a list {mc label type description options...}
1950 # mc is ignored; it's so we can put mc there to alert xgettext
1951 # label is the string that appears in the menu
1952 # type is cascade, command or radiobutton (should add checkbutton)
1953 # description depends on type; it's the sublist for cascade, the
1954 # command to invoke for command, or {variable value} for radiobutton
1955 proc makemenu
{m items
} {
1957 if {[tk windowingsystem
] eq
{aqua
}} {
1963 set name
[mc
[lindex
$i 1]]
1964 set type [lindex
$i 2]
1965 set thing
[lindex
$i 3]
1966 set params
[list
$type]
1968 set u
[string first
"&" [string map
{&& x
} $name]]
1969 lappend params
-label [string map
{&& & & {}} $name]
1971 lappend params
-underline $u
1976 set submenu
[string tolower
[string map
{& ""} [lindex
$i 1]]]
1977 lappend params
-menu $m.
$submenu
1980 lappend params
-command $thing
1983 lappend params
-variable [lindex
$thing 0] \
1984 -value [lindex
$thing 1]
1987 set tail [lrange
$i 4 end
]
1988 regsub
-all {\yMeta1\y
} $tail $Meta1 tail
1989 eval $m add
$params $tail
1990 if {$type eq
"cascade"} {
1991 makemenu
$m.
$submenu $thing
1996 # translate string and remove ampersands
1998 return [string map
{&& & & {}} [mc
$str]]
2001 proc cleardropsel
{w
} {
2004 proc makedroplist
{w varname args
} {
2008 foreach label
$args {
2009 set cx
[string length
$label]
2010 if {$cx > $width} {set width
$cx}
2012 set gm
[ttk
::combobox
$w -width $width -state readonly\
2013 -textvariable $varname -values $args \
2014 -exportselection false
]
2015 bind $gm <<ComboboxSelected>> [list $gm selection clear]
2017 set gm [eval [linsert $args 0 tk_optionMenu $w $varname]]
2022 proc makewindow {} {
2023 global canv canv2 canv3 linespc charspc ctext cflist cscroll
2025 global findtype findtypemenu findloc findstring fstring geometry
2026 global entries sha1entry sha1string sha1but
2027 global diffcontextstring diffcontext
2029 global maincursor textcursor curtextcursor
2030 global rowctxmenu fakerowmenu mergemax wrapcomment
2031 global highlight_files gdttype
2032 global searchstring sstring
2033 global bgcolor fgcolor bglist fglist diffcolors selectbgcolor
2034 global uifgcolor uifgdisabledcolor
2035 global filesepbgcolor filesepfgcolor
2036 global mergecolors foundbgcolor currentsearchhitbgcolor
2037 global headctxmenu progresscanv progressitem progresscoords statusw
2038 global fprogitem fprogcoord lastprogupdate progupdatepending
2039 global rprogitem rprogcoord rownumsel numcommits
2040 global have_tk85 use_ttk NS
2044 # The "mc" arguments here are purely so that xgettext
2045 # sees the following string as needing to be translated
2048 {mc "Update" command updatecommits -accelerator F5}
2049 {mc "Reload" command reloadcommits -accelerator Shift-F5}
2050 {mc "Reread references" command rereadrefs}
2051 {mc "List references" command showrefs -accelerator F2}
2053 {mc "Start git gui" command {exec git gui &}}
2055 {mc "Quit" command doquit -accelerator Meta1-Q}
2059 {mc "Preferences" command doprefs}
2063 {mc "New view..." command {newview 0} -accelerator Shift-F4}
2064 {mc "Edit view..." command editview -state disabled -accelerator F4}
2065 {mc "Delete view" command delview -state disabled}
2067 {mc "All files" radiobutton {selectedview 0} -command {showview 0}}
2069 if {[tk windowingsystem] ne "aqua"} {
2072 {mc "About gitk" command about}
2073 {mc "Key bindings" command keys}
2075 set bar [list $file $edit $view $help]
2077 proc ::tk::mac::ShowPreferences {} {doprefs}
2078 proc ::tk::mac::Quit {} {doquit}
2079 lset file end [lreplace [lindex $file end] end-1 end]
2081 xx "Apple" cascade {
2082 {mc "About gitk" command about}
2087 {mc "Key bindings" command keys}
2089 set bar [list $apple $file $view $help]
2092 . configure -menu .bar
2095 # cover the non-themed toplevel with a themed frame.
2096 place [ttk::frame ._main_background] -x 0 -y 0 -relwidth 1 -relheight 1
2099 # the gui has upper and lower half, parts of a paned window.
2100 ${NS}::panedwindow .ctop -orient vertical
2102 # possibly use assumed geometry
2103 if {![info exists geometry(pwsash0)]} {
2104 set geometry(topheight) [expr {15 * $linespc}]
2105 set geometry(topwidth) [expr {80 * $charspc}]
2106 set geometry(botheight) [expr {15 * $linespc}]
2107 set geometry(botwidth) [expr {50 * $charspc}]
2108 set geometry(pwsash0) [list [expr {40 * $charspc}] 2]
2109 set geometry(pwsash1) [list [expr {60 * $charspc}] 2]
2112 # the upper half will have a paned window, a scroll bar to the right, and some stuff below
2113 ${NS}::frame .tf -height $geometry(topheight) -width $geometry(topwidth)
2114 ${NS}::frame .tf.histframe
2115 ${NS}::panedwindow .tf.histframe.pwclist -orient horizontal
2117 .tf.histframe.pwclist configure -sashpad 0 -handlesize 4
2120 # create three canvases
2121 set cscroll .tf.histframe.csb
2122 set canv .tf.histframe.pwclist.canv
2124 -selectbackground $selectbgcolor \
2125 -background $bgcolor -bd 0 \
2126 -yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
2127 .tf.histframe.pwclist add $canv
2128 set canv2 .tf.histframe.pwclist.canv2
2130 -selectbackground $selectbgcolor \
2131 -background $bgcolor -bd 0 -yscrollincr $linespc
2132 .tf.histframe.pwclist add $canv2
2133 set canv3 .tf.histframe.pwclist.canv3
2135 -selectbackground $selectbgcolor \
2136 -background $bgcolor -bd 0 -yscrollincr $linespc
2137 .tf.histframe.pwclist add $canv3
2139 bind .tf.histframe.pwclist <Map> {
2141 .tf.histframe.pwclist sashpos 1 [lindex $::geometry(pwsash1) 0]
2142 .tf.histframe.pwclist sashpos 0 [lindex $::geometry(pwsash0) 0]
2145 eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0)
2146 eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1)
2149 # a scroll bar to rule them
2150 ${NS}::scrollbar $cscroll -command {allcanvs yview}
2151 if {!$use_ttk} {$cscroll configure -highlightthickness 0}
2152 pack $cscroll -side right -fill y
2153 bind .tf.histframe.pwclist <Configure> {resizeclistpanes %W %w}
2154 lappend bglist $canv $canv2 $canv3
2155 pack .tf.histframe.pwclist -fill both -expand 1 -side left
2157 # we have two button bars at bottom of top frame. Bar 1
2158 ${NS}::frame .tf.bar
2159 ${NS}::frame .tf.lbar -height 15
2161 set sha1entry .tf.bar.sha1
2162 set entries $sha1entry
2163 set sha1but .tf.bar.sha1label
2164 button $sha1but -text "[mc "SHA1 ID:"] " -state disabled -relief flat \
2165 -command gotocommit -width 8
2166 $sha1but conf -disabledforeground [$sha1but cget -foreground]
2167 pack .tf.bar.sha1label -side left
2168 ${NS}::entry $sha1entry -width 40 -font textfont -textvariable sha1string
2169 trace add variable sha1string write sha1change
2170 pack $sha1entry -side left -pady 2
2173 #define left_width 16
2174 #define left_height 16
2175 static unsigned char left_bits[] = {
2176 0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
2177 0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00,
2178 0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01};
2181 #define right_width 16
2182 #define right_height 16
2183 static unsigned char right_bits[] = {
2184 0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c,
2185 0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c,
2186 0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01};
2188 image create bitmap bm-left -data $bm_left_data -foreground $uifgcolor
2189 image create bitmap bm-left-gray -data $bm_left_data -foreground $uifgdisabledcolor
2190 image create bitmap bm-right -data $bm_right_data -foreground $uifgcolor
2191 image create bitmap bm-right-gray -data $bm_right_data -foreground $uifgdisabledcolor
2193 ${NS}::button .tf.bar.leftbut -command goback -state disabled -width 26
2195 .tf.bar.leftbut configure -image [list bm-left disabled bm-left-gray]
2197 .tf.bar.leftbut configure -image bm-left
2199 pack .tf.bar.leftbut -side left -fill y
2200 ${NS}::button .tf.bar.rightbut -command goforw -state disabled -width 26
2202 .tf.bar.rightbut configure -image [list bm-right disabled bm-right-gray]
2204 .tf.bar.rightbut configure -image bm-right
2206 pack .tf.bar.rightbut -side left -fill y
2208 ${NS}::label .tf.bar.rowlabel -text [mc "Row"]
2210 ${NS}::label .tf.bar.rownum -width 7 -textvariable rownumsel \
2211 -relief sunken -anchor e
2212 ${NS}::label .tf.bar.rowlabel2 -text "/"
2213 ${NS}::label .tf.bar.numcommits -width 7 -textvariable numcommits \
2214 -relief sunken -anchor e
2215 pack .tf.bar.rowlabel .tf.bar.rownum .tf.bar.rowlabel2 .tf.bar.numcommits \
2218 foreach w {rownum numcommits} {.tf.bar.$w configure -font textfont}
2221 trace add variable selectedline write selectedline_change
2223 # Status label and progress bar
2224 set statusw .tf.bar.status
2225 ${NS}::label $statusw -width 15 -relief sunken
2226 pack $statusw -side left -padx 5
2228 set progresscanv [ttk::progressbar .tf.bar.progress]
2230 set h [expr {[font metrics uifont -linespace] + 2}]
2231 set progresscanv .tf.bar.progress
2232 canvas $progresscanv -relief sunken -height $h -borderwidth 2
2233 set progressitem [$progresscanv create rect -1 0 0 $h -fill green]
2234 set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow]
2235 set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
2237 pack $progresscanv -side right -expand 1 -fill x -padx {0 2}
2238 set progresscoords {0 0}
2241 bind $progresscanv <Configure> adjustprogress
2242 set lastprogupdate [clock clicks -milliseconds]
2243 set progupdatepending 0
2245 # build up the bottom bar of upper window
2246 ${NS}::label .tf.lbar.flabel -text "[mc "Find"] "
2247 ${NS}::button .tf.lbar.fnext -text [mc "next"] -command {dofind 1 1}
2248 ${NS}::button .tf.lbar.fprev -text [mc "prev"] -command {dofind -1 1}
2249 ${NS}::label .tf.lbar.flab2 -text " [mc "commit"] "
2250 pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \
2252 set gdttype [mc "containing:"]
2253 set gm [makedroplist .tf.lbar.gdttype gdttype \
2254 [mc "containing:"] \
2255 [mc "touching paths:"] \
2256 [mc "adding/removing string:"]]
2257 trace add variable gdttype write gdttype_change
2258 pack .tf.lbar.gdttype -side left -fill y
2261 set fstring .tf.lbar.findstring
2262 lappend entries $fstring
2263 ${NS}::entry $fstring -width 30 -textvariable findstring
2264 trace add variable findstring write find_change
2265 set findtype [mc "Exact"]
2266 set findtypemenu [makedroplist .tf.lbar.findtype \
2267 findtype [mc "Exact"] [mc "IgnCase"] [mc "Regexp"]]
2268 trace add variable findtype write findcom_change
2269 set findloc [mc "All fields"]
2270 makedroplist .tf.lbar.findloc findloc [mc "All fields"] [mc "Headline"] \
2271 [mc "Comments"] [mc "Author"] [mc "Committer"]
2272 trace add variable findloc write find_change
2273 pack .tf.lbar.findloc -side right
2274 pack .tf.lbar.findtype -side right
2275 pack $fstring -side left -expand 1 -fill x
2277 # Finish putting the upper half of the viewer together
2278 pack .tf.lbar -in .tf -side bottom -fill x
2279 pack .tf.bar -in .tf -side bottom -fill x
2280 pack .tf.histframe -fill both -side top -expand 1
2283 .ctop paneconfigure .tf -height $geometry(topheight)
2284 .ctop paneconfigure .tf -width $geometry(topwidth)
2287 # now build up the bottom
2288 ${NS}::panedwindow .pwbottom -orient horizontal
2290 # lower left, a text box over search bar, scroll bar to the right
2291 # if we know window height, then that will set the lower text height, otherwise
2292 # we set lower text height which will drive window height
2293 if {[info exists geometry(main)]} {
2294 ${NS}::frame .bleft -width $geometry(botwidth)
2296 ${NS}::frame .bleft -width $geometry(botwidth) -height $geometry(botheight)
2298 ${NS}::frame .bleft.top
2299 ${NS}::frame .bleft.mid
2300 ${NS}::frame .bleft.bottom
2302 ${NS}::button .bleft.top.search -text [mc "Search"] -command dosearch
2303 pack .bleft.top.search -side left -padx 5
2304 set sstring .bleft.top.sstring
2306 ${NS}::entry $sstring -width 20 -textvariable searchstring
2307 lappend entries $sstring
2308 trace add variable searchstring write incrsearch
2309 pack $sstring -side left -expand 1 -fill x
2310 ${NS}::radiobutton .bleft.mid.diff -text [mc "Diff"] \
2311 -command changediffdisp -variable diffelide -value {0 0}
2312 ${NS}::radiobutton .bleft.mid.old -text [mc "Old version"] \
2313 -command changediffdisp -variable diffelide -value {0 1}
2314 ${NS}::radiobutton .bleft.mid.new -text [mc "New version"] \
2315 -command changediffdisp -variable diffelide -value {1 0}
2316 ${NS}::label .bleft.mid.labeldiffcontext -text " [mc "Lines of context"]: "
2317 pack .bleft.mid.diff .bleft.mid.old .bleft.mid.new -side left
2318 spinbox .bleft.mid.diffcontext -width 5 \
2319 -from 0 -increment 1 -to 10000000 \
2320 -validate all -validatecommand "diffcontextvalidate %P" \
2321 -textvariable diffcontextstring
2322 .bleft.mid.diffcontext set $diffcontext
2323 trace add variable diffcontextstring write diffcontextchange
2324 lappend entries .bleft.mid.diffcontext
2325 pack .bleft.mid.labeldiffcontext .bleft.mid.diffcontext -side left
2326 ${NS}::checkbutton .bleft.mid.ignspace -text [mc "Ignore space change"] \
2327 -command changeignorespace -variable ignorespace
2328 pack .bleft.mid.ignspace -side left -padx 5
2330 set worddiff [mc "Line diff"]
2331 if {[package vcompare $git_version "1.7.2"] >= 0} {
2332 makedroplist .bleft.mid.worddiff worddiff [mc "Line diff"] \
2333 [mc "Markup words"] [mc "Color words"]
2334 trace add variable worddiff write changeworddiff
2335 pack .bleft.mid.worddiff -side left -padx 5
2338 set ctext .bleft.bottom.ctext
2339 text $ctext -background $bgcolor -foreground $fgcolor \
2340 -state disabled -font textfont \
2341 -yscrollcommand scrolltext -wrap none \
2342 -xscrollcommand ".bleft.bottom.sbhorizontal set"
2344 $ctext conf -tabstyle wordprocessor
2346 ${NS}::scrollbar .bleft.bottom.sb -command "$ctext yview"
2347 ${NS}::scrollbar .bleft.bottom.sbhorizontal -command "$ctext xview" -orient h
2348 pack .bleft.top -side top -fill x
2349 pack .bleft.mid -side top -fill x
2350 grid $ctext .bleft.bottom.sb -sticky nsew
2351 grid .bleft.bottom.sbhorizontal -sticky ew
2352 grid columnconfigure .bleft.bottom 0 -weight 1
2353 grid rowconfigure .bleft.bottom 0 -weight 1
2354 grid rowconfigure .bleft.bottom 1 -weight 0
2355 pack .bleft.bottom -side top -fill both -expand 1
2356 lappend bglist $ctext
2357 lappend fglist $ctext
2359 $ctext tag conf comment -wrap $wrapcomment
2360 $ctext tag conf filesep -font textfontbold -fore $filesepfgcolor -back $filesepbgcolor
2361 $ctext tag conf hunksep -fore [lindex $diffcolors 2]
2362 $ctext tag conf d0 -fore [lindex $diffcolors 0]
2363 $ctext tag conf dresult -fore [lindex $diffcolors 1]
2364 $ctext tag conf m0 -fore [lindex $mergecolors 0]
2365 $ctext tag conf m1 -fore [lindex $mergecolors 1]
2366 $ctext tag conf m2 -fore [lindex $mergecolors 2]
2367 $ctext tag conf m3 -fore [lindex $mergecolors 3]
2368 $ctext tag conf m4 -fore [lindex $mergecolors 4]
2369 $ctext tag conf m5 -fore [lindex $mergecolors 5]
2370 $ctext tag conf m6 -fore [lindex $mergecolors 6]
2371 $ctext tag conf m7 -fore [lindex $mergecolors 7]
2372 $ctext tag conf m8 -fore [lindex $mergecolors 8]
2373 $ctext tag conf m9 -fore [lindex $mergecolors 9]
2374 $ctext tag conf m10 -fore [lindex $mergecolors 10]
2375 $ctext tag conf m11 -fore [lindex $mergecolors 11]
2376 $ctext tag conf m12 -fore [lindex $mergecolors 12]
2377 $ctext tag conf m13 -fore [lindex $mergecolors 13]
2378 $ctext tag conf m14 -fore [lindex $mergecolors 14]
2379 $ctext tag conf m15 -fore [lindex $mergecolors 15]
2380 $ctext tag conf mmax -fore darkgrey
2382 $ctext tag conf mresult -font textfontbold
2383 $ctext tag conf msep -font textfontbold
2384 $ctext tag conf found -back $foundbgcolor
2385 $ctext tag conf currentsearchhit -back $currentsearchhitbgcolor
2386 $ctext tag conf wwrap -wrap word
2388 .pwbottom add .bleft
2390 .pwbottom paneconfigure .bleft -width $geometry(botwidth)
2394 ${NS}::frame .bright
2395 ${NS}::frame .bright.mode
2396 ${NS}::radiobutton .bright.mode.patch -text [mc "Patch"] \
2397 -command reselectline -variable cmitmode -value "patch"
2398 ${NS}::radiobutton .bright.mode.tree -text [mc "Tree"] \
2399 -command reselectline -variable cmitmode -value "tree"
2400 grid .bright.mode.patch .bright.mode.tree -sticky ew
2401 pack .bright.mode -side top -fill x
2402 set cflist .bright.cfiles
2403 set indent [font measure mainfont "nn"]
2405 -selectbackground $selectbgcolor \
2406 -background $bgcolor -foreground $fgcolor \
2408 -tabs [list $indent [expr {2 * $indent}]] \
2409 -yscrollcommand ".bright.sb set" \
2410 -cursor [. cget -cursor] \
2411 -spacing1 1 -spacing3 1
2412 lappend bglist $cflist
2413 lappend fglist $cflist
2414 ${NS}::scrollbar .bright.sb -command "$cflist yview"
2415 pack .bright.sb -side right -fill y
2416 pack $cflist -side left -fill both -expand 1
2417 $cflist tag configure highlight \
2418 -background [$cflist cget -selectbackground]
2419 $cflist tag configure bold -font mainfontbold
2421 .pwbottom add .bright
2424 # restore window width & height if known
2425 if {[info exists geometry(main)]} {
2426 if {[scan $geometry(main) "%dx%d" w h] >= 2} {
2427 if {$w > [winfo screenwidth .]} {
2428 set w [winfo screenwidth .]
2430 if {$h > [winfo screenheight .]} {
2431 set h [winfo screenheight .]
2433 wm geometry . "${w}x$h"
2437 if {[info exists geometry(state)] && $geometry(state) eq "zoomed"} {
2438 wm state . $geometry(state)
2441 if {[tk windowingsystem] eq {aqua}} {
2452 %W sashpos 0 $::geometry(topheight)
2454 bind .pwbottom <Map> {
2456 %W sashpos 0 $::geometry(botwidth)
2460 bind .pwbottom <Configure> {resizecdetpanes %W %w}
2461 pack .ctop -fill both -expand 1
2462 bindall <1> {selcanvline %W %x %y}
2463 #bindall <B1-Motion> {selcanvline %W %x %y}
2464 if {[tk windowingsystem] == "win32"} {
2465 bind . <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D }
2466 bind $ctext <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D ; break }
2468 bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
2469 bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
2470 if {[tk windowingsystem] eq "aqua"} {
2471 bindall <MouseWheel> {
2472 set delta [expr {- (%D)}]
2473 allcanvs yview scroll $delta units
2475 bindall <Shift-MouseWheel> {
2476 set delta [expr {- (%D)}]
2477 $canv xview scroll $delta units
2481 bindall <$::BM> "canvscan mark %W %x %y"
2482 bindall <B$::BM-Motion> "canvscan dragto %W %x %y"
2483 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2484 bind . <$M1B-Key-w> doquit
2485 bindkey <Home> selfirstline
2486 bindkey <End> sellastline
2487 bind . <Key-Up> "selnextline -1"
2488 bind . <Key-Down> "selnextline 1"
2489 bind . <Shift-Key-Up> "dofind -1 0"
2490 bind . <Shift-Key-Down> "dofind 1 0"
2491 bindkey <Key-Right> "goforw"
2492 bindkey <Key-Left> "goback"
2493 bind . <Key-Prior> "selnextpage -1"
2494 bind . <Key-Next> "selnextpage 1"
2495 bind . <$M1B-Home> "allcanvs yview moveto 0.0"
2496 bind . <$M1B-End> "allcanvs yview moveto 1.0"
2497 bind . <$M1B-Key-Up> "allcanvs yview scroll -1 units"
2498 bind . <$M1B-Key-Down> "allcanvs yview scroll 1 units"
2499 bind . <$M1B-Key-Prior> "allcanvs yview scroll -1 pages"
2500 bind . <$M1B-Key-Next> "allcanvs yview scroll 1 pages"
2501 bindkey <Key-Delete> "$ctext yview scroll -1 pages"
2502 bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
2503 bindkey <Key-space> "$ctext yview scroll 1 pages"
2504 bindkey p "selnextline -1"
2505 bindkey n "selnextline 1"
2508 bindkey k "selnextline -1"
2509 bindkey j "selnextline 1"
2513 bindkey d "$ctext yview scroll 18 units"
2514 bindkey u "$ctext yview scroll -18 units"
2515 bindkey / {focus $fstring}
2516 bindkey <Key-KP_Divide> {focus $fstring}
2517 bindkey <Key-Return> {dofind 1 1}
2518 bindkey ? {dofind -1 1}
2520 bind . <F5> updatecommits
2521 bindmodfunctionkey Shift 5 reloadcommits
2522 bind . <F2> showrefs
2523 bindmodfunctionkey Shift 4 {newview 0}
2524 bind . <F4> edit_or_newview
2525 bind . <$M1B-q> doquit
2526 bind . <$M1B-f> {dofind 1 1}
2527 bind . <$M1B-g> {dofind 1 0}
2528 bind . <$M1B-r> dosearchback
2529 bind . <$M1B-s> dosearch
2530 bind . <$M1B-equal> {incrfont 1}
2531 bind . <$M1B-plus> {incrfont 1}
2532 bind . <$M1B-KP_Add> {incrfont 1}
2533 bind . <$M1B-minus> {incrfont -1}
2534 bind . <$M1B-KP_Subtract> {incrfont -1}
2535 wm protocol . WM_DELETE_WINDOW doquit
2536 bind . <Destroy> {stop_backends}
2537 bind . <Button-1> "click %W"
2538 bind $fstring <Key-Return> {dofind 1 1}
2539 bind $sha1entry <Key-Return> {gotocommit; break}
2540 bind $sha1entry <<PasteSelection>> clearsha1
2541 bind $cflist <1> {sel_flist %W %x %y; break}
2542 bind $cflist <B1-Motion> {sel_flist %W %x %y; break}
2543 bind $cflist <ButtonRelease-1> {treeclick %W %x %y}
2545 bind $cflist $ctxbut {pop_flist_menu %W %X %Y %x %y}
2546 bind $ctext $ctxbut {pop_diff_menu %W %X %Y %x %y}
2547 bind $ctext <Button-1> {focus %W}
2548 bind $ctext <<Selection>> rehighlight_search_results
2550 set maincursor [. cget -cursor]
2551 set textcursor [$ctext cget -cursor]
2552 set curtextcursor $textcursor
2554 set rowctxmenu .rowctxmenu
2555 makemenu $rowctxmenu {
2556 {mc "Diff this -> selected" command {diffvssel 0}}
2557 {mc "Diff selected -> this" command {diffvssel 1}}
2558 {mc "Make patch" command mkpatch}
2559 {mc "Create tag" command mktag}
2560 {mc "Write commit to file" command writecommit}
2561 {mc "Create new branch" command mkbranch}
2562 {mc "Cherry-pick this commit" command cherrypick}
2563 {mc "Reset HEAD branch to here" command resethead}
2564 {mc "Mark this commit" command markhere}
2565 {mc "Return to mark" command gotomark}
2566 {mc "Find descendant of this and mark" command find_common_desc}
2567 {mc "Compare with marked commit" command compare_commits}
2568 {mc "Diff this -> marked commit" command {diffvsmark 0}}
2569 {mc "Diff marked commit -> this" command {diffvsmark 1}}
2570 {mc "Revert this commit" command revert}
2572 $rowctxmenu configure -tearoff 0
2574 set fakerowmenu .fakerowmenu
2575 makemenu $fakerowmenu {
2576 {mc "Diff this -> selected" command {diffvssel 0}}
2577 {mc "Diff selected -> this" command {diffvssel 1}}
2578 {mc "Make patch" command mkpatch}
2579 {mc "Diff this -> marked commit" command {diffvsmark 0}}
2580 {mc "Diff marked commit -> this" command {diffvsmark 1}}
2582 $fakerowmenu configure -tearoff 0
2584 set headctxmenu .headctxmenu
2585 makemenu $headctxmenu {
2586 {mc "Check out this branch" command cobranch}
2587 {mc "Remove this branch" command rmbranch}
2589 $headctxmenu configure -tearoff 0
2592 set flist_menu .flistctxmenu
2593 makemenu $flist_menu {
2594 {mc "Highlight this too" command {flist_hl 0}}
2595 {mc "Highlight this only" command {flist_hl 1}}
2596 {mc "External diff" command {external_diff}}
2597 {mc "Blame parent commit" command {external_blame 1}}
2599 $flist_menu configure -tearoff 0
2602 set diff_menu .diffctxmenu
2603 makemenu $diff_menu {
2604 {mc "Show origin of this line" command show_line_source}
2605 {mc "Run git gui blame on this line" command {external_blame_diff}}
2607 $diff_menu configure -tearoff 0
2610 # Windows sends all mouse wheel events to the current focused window, not
2611 # the one where the mouse hovers, so bind those events here and redirect
2612 # to the correct window
2613 proc windows_mousewheel_redirector {W X Y D} {
2614 global canv canv2 canv3
2615 set w [winfo containing -displayof $W $X $Y]
2617 set u [expr {$D < 0 ? 5 : -5}]
2618 if {$w == $canv || $w == $canv2 || $w == $canv3} {
2619 allcanvs yview scroll $u units
2622 $w yview scroll $u units
2628 # Update row number label when selectedline changes
2629 proc selectedline_change {n1 n2 op} {
2630 global selectedline rownumsel
2632 if {$selectedline eq {}} {
2635 set rownumsel [expr {$selectedline + 1}]
2639 # mouse-2 makes all windows scan vertically, but only the one
2640 # the cursor is in scans horizontally
2641 proc canvscan {op w x y} {
2642 global canv canv2 canv3
2643 foreach c [list $canv $canv2 $canv3] {
2652 proc scrollcanv {cscroll f0 f1} {
2653 $cscroll set $f0 $f1
2658 # when we make a key binding for the toplevel, make sure
2659 # it doesn't get triggered when that key is pressed in the
2660 # find string entry widget.
2661 proc bindkey {ev script} {
2664 set escript [bind Entry $ev]
2665 if {$escript == {}} {
2666 set escript [bind Entry <Key>]
2668 foreach e $entries {
2669 bind $e $ev "$escript; break"
2673 proc bindmodfunctionkey {mod n script} {
2674 bind . <$mod-F$n> $script
2675 catch { bind . <$mod-XF86_Switch_VT_$n> $script }
2678 # set the focus back to the toplevel for any click outside
2681 global ctext entries
2682 foreach e [concat $entries $ctext] {
2683 if {$w == $e} return
2688 # Adjust the progress bar for a change in requested extent or canvas size
2689 proc adjustprogress {} {
2690 global progresscanv progressitem progresscoords
2691 global fprogitem fprogcoord lastprogupdate progupdatepending
2692 global rprogitem rprogcoord use_ttk
2695 $progresscanv configure -value [expr {int($fprogcoord * 100)}]
2699 set w [expr {[winfo width $progresscanv] - 4}]
2700 set x0 [expr {$w * [lindex $progresscoords 0]}]
2701 set x1 [expr {$w * [lindex $progresscoords 1]}]
2702 set h [winfo height $progresscanv]
2703 $progresscanv coords $progressitem $x0 0 $x1 $h
2704 $progresscanv coords $fprogitem 0 0 [expr {$w * $fprogcoord}] $h
2705 $progresscanv coords $rprogitem 0 0 [expr {$w * $rprogcoord}] $h
2706 set now [clock clicks -milliseconds]
2707 if {$now >= $lastprogupdate + 100} {
2708 set progupdatepending 0
2710 } elseif {!$progupdatepending} {
2711 set progupdatepending 1
2712 after [expr {$lastprogupdate + 100 - $now}] doprogupdate
2716 proc doprogupdate {} {
2717 global lastprogupdate progupdatepending
2719 if {$progupdatepending} {
2720 set progupdatepending 0
2721 set lastprogupdate [clock clicks -milliseconds]
2726 proc savestuff {w} {
2727 global canv canv2 canv3 mainfont textfont uifont tabstop
2728 global stuffsaved findmergefiles maxgraphpct
2729 global maxwidth showneartags showlocalchanges
2730 global viewname viewfiles viewargs viewargscmd viewperm nextviewnum
2731 global cmitmode wrapcomment datetimeformat limitdiffs
2732 global colors uicolor bgcolor fgcolor diffcolors diffcontext selectbgcolor
2733 global uifgcolor uifgdisabledcolor
2734 global headbgcolor headfgcolor headoutlinecolor remotebgcolor
2735 global tagbgcolor tagfgcolor tagoutlinecolor
2736 global reflinecolor filesepbgcolor filesepfgcolor
2737 global mergecolors foundbgcolor currentsearchhitbgcolor
2738 global linehoverbgcolor linehoverfgcolor linehoveroutlinecolor circlecolors
2739 global mainheadcirclecolor workingfilescirclecolor indexcirclecolor
2740 global linkfgcolor circleoutlinecolor
2741 global autoselect autosellen extdifftool perfile_attrs markbgcolor use_ttk
2742 global hideremotes want_ttk maxrefs
2744 if {$stuffsaved} return
2745 if {![winfo viewable .]} return
2747 if {[file exists ~/.gitk-new]} {file delete -force ~/.gitk-new}
2748 set f [open "~/.gitk-new" w]
2749 if {$::tcl_platform(platform) eq {windows}} {
2750 file attributes "~/.gitk-new" -hidden true
2752 puts $f [list set mainfont $mainfont]
2753 puts $f [list set textfont $textfont]
2754 puts $f [list set uifont $uifont]
2755 puts $f [list set tabstop $tabstop]
2756 puts $f [list set findmergefiles $findmergefiles]
2757 puts $f [list set maxgraphpct $maxgraphpct]
2758 puts $f [list set maxwidth $maxwidth]
2759 puts $f [list set cmitmode $cmitmode]
2760 puts $f [list set wrapcomment $wrapcomment]
2761 puts $f [list set autoselect $autoselect]
2762 puts $f [list set autosellen $autosellen]
2763 puts $f [list set showneartags $showneartags]
2764 puts $f [list set maxrefs $maxrefs]
2765 puts $f [list set hideremotes $hideremotes]
2766 puts $f [list set showlocalchanges $showlocalchanges]
2767 puts $f [list set datetimeformat $datetimeformat]
2768 puts $f [list set limitdiffs $limitdiffs]
2769 puts $f [list set uicolor $uicolor]
2770 puts $f [list set want_ttk $want_ttk]
2771 puts $f [list set bgcolor $bgcolor]
2772 puts $f [list set fgcolor $fgcolor]
2773 puts $f [list set uifgcolor $uifgcolor]
2774 puts $f [list set uifgdisabledcolor $uifgdisabledcolor]
2775 puts $f [list set colors $colors]
2776 puts $f [list set diffcolors $diffcolors]
2777 puts $f [list set mergecolors $mergecolors]
2778 puts $f [list set markbgcolor $markbgcolor]
2779 puts $f [list set diffcontext $diffcontext]
2780 puts $f [list set selectbgcolor $selectbgcolor]
2781 puts $f [list set foundbgcolor $foundbgcolor]
2782 puts $f [list set currentsearchhitbgcolor $currentsearchhitbgcolor]
2783 puts $f [list set extdifftool $extdifftool]
2784 puts $f [list set perfile_attrs $perfile_attrs]
2785 puts $f [list set headbgcolor $headbgcolor]
2786 puts $f [list set headfgcolor $headfgcolor]
2787 puts $f [list set headoutlinecolor $headoutlinecolor]
2788 puts $f [list set remotebgcolor $remotebgcolor]
2789 puts $f [list set tagbgcolor $tagbgcolor]
2790 puts $f [list set tagfgcolor $tagfgcolor]
2791 puts $f [list set tagoutlinecolor $tagoutlinecolor]
2792 puts $f [list set reflinecolor $reflinecolor]
2793 puts $f [list set filesepbgcolor $filesepbgcolor]
2794 puts $f [list set filesepfgcolor $filesepfgcolor]
2795 puts $f [list set linehoverbgcolor $linehoverbgcolor]
2796 puts $f [list set linehoverfgcolor $linehoverfgcolor]
2797 puts $f [list set linehoveroutlinecolor $linehoveroutlinecolor]
2798 puts $f [list set mainheadcirclecolor $mainheadcirclecolor]
2799 puts $f [list set workingfilescirclecolor $workingfilescirclecolor]
2800 puts $f [list set indexcirclecolor $indexcirclecolor]
2801 puts $f [list set circlecolors $circlecolors]
2802 puts $f [list set linkfgcolor $linkfgcolor]
2803 puts $f [list set circleoutlinecolor $circleoutlinecolor]
2805 puts $f "set geometry(main) [wm geometry .]"
2806 puts $f "set geometry(state) [wm state .]"
2807 puts $f "set geometry(topwidth) [winfo width .tf]"
2808 puts $f "set geometry(topheight) [winfo height .tf]"
2810 puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sashpos 0] 1\""
2811 puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sashpos 1] 1\""
2813 puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\""
2814 puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\""
2816 puts $f "set geometry(botwidth) [winfo width .bleft]"
2817 puts $f "set geometry(botheight) [winfo height .bleft]"
2819 puts -nonewline $f "set permviews {"
2820 for {set v 0} {$v < $nextviewnum} {incr v} {
2821 if {$viewperm($v)} {
2822 puts $f "{[list $viewname($v) $viewfiles($v) $viewargs($v) $viewargscmd($v)]}"
2827 file rename -force "~/.gitk-new" "~/.gitk"
2832 proc resizeclistpanes {win w} {
2833 global oldwidth use_ttk
2834 if {[info exists oldwidth($win)]} {
2836 set s0 [$win sashpos 0]
2837 set s1 [$win sashpos 1]
2839 set s0 [$win sash coord 0]
2840 set s1 [$win sash coord 1]
2843 set sash0 [expr {int($w/2 - 2)}]
2844 set sash1 [expr {int($w*5/6 - 2)}]
2846 set factor [expr {1.0 * $w / $oldwidth($win)}]
2847 set sash0 [expr {int($factor * [lindex $s0 0])}]
2848 set sash1 [expr {int($factor * [lindex $s1 0])}]
2852 if {$sash1 < $sash0 + 20} {
2853 set sash1 [expr {$sash0 + 20}]
2855 if {$sash1 > $w - 10} {
2856 set sash1 [expr {$w - 10}]
2857 if {$sash0 > $sash1 - 20} {
2858 set sash0 [expr {$sash1 - 20}]
2863 $win sashpos 0 $sash0
2864 $win sashpos 1 $sash1
2866 $win sash place 0 $sash0 [lindex $s0 1]
2867 $win sash place 1 $sash1 [lindex $s1 1]
2870 set oldwidth($win) $w
2873 proc resizecdetpanes {win w} {
2874 global oldwidth use_ttk
2875 if {[info exists oldwidth($win)]} {
2877 set s0 [$win sashpos 0]
2879 set s0 [$win sash coord 0]
2882 set sash0 [expr {int($w*3/4 - 2)}]
2884 set factor [expr {1.0 * $w / $oldwidth($win)}]
2885 set sash0 [expr {int($factor * [lindex $s0 0])}]
2889 if {$sash0 > $w - 15} {
2890 set sash0 [expr {$w - 15}]
2894 $win sashpos 0 $sash0
2896 $win sash place 0 $sash0 [lindex $s0 1]
2899 set oldwidth($win) $w
2902 proc allcanvs args {
2903 global canv canv2 canv3
2909 proc bindall {event action} {
2910 global canv canv2 canv3
2911 bind $canv $event $action
2912 bind $canv2 $event $action
2913 bind $canv3 $event $action
2919 if {[winfo exists $w]} {
2924 wm title $w [mc "About gitk"]
2926 message $w.m -text [mc "
2927 Gitk - a commit viewer for git
2929 Copyright \u00a9 2005-2011 Paul Mackerras
2931 Use and redistribute under the terms of the GNU General Public License"] \
2932 -justify center -aspect 400 -border 2 -bg white -relief groove
2933 pack $w.m -side top -fill x -padx 2 -pady 2
2934 ${NS}::button $w.ok -text [mc "Close"] -command "destroy $w" -default active
2935 pack $w.ok -side bottom
2936 bind $w <Visibility> "focus $w.ok"
2937 bind $w <Key-Escape> "destroy $w"
2938 bind $w <Key-Return> "destroy $w"
2939 tk::PlaceWindow $w widget .
2945 if {[winfo exists $w]} {
2949 if {[tk windowingsystem] eq {aqua}} {
2955 wm title $w [mc "Gitk key bindings"]
2957 message $w.m -text "
2958 [mc "Gitk key bindings:"]
2960 [mc "<%s-Q> Quit" $M1T]
2961 [mc "<%s-W> Close window" $M1T]
2962 [mc "<Home> Move to first commit"]
2963 [mc "<End> Move to last commit"]
2964 [mc "<Up>, p, k Move up one commit"]
2965 [mc "<Down>, n, j Move down one commit"]
2966 [mc "<Left>, z, h Go back in history list"]
2967 [mc "<Right>, x, l Go forward in history list"]
2968 [mc "<PageUp> Move up one page in commit list"]
2969 [mc "<PageDown> Move down one page in commit list"]
2970 [mc "<%s-Home> Scroll to top of commit list" $M1T]
2971 [mc "<%s-End> Scroll to bottom of commit list" $M1T]
2972 [mc "<%s-Up> Scroll commit list up one line" $M1T]
2973 [mc "<%s-Down> Scroll commit list down one line" $M1T]
2974 [mc "<%s-PageUp> Scroll commit list up one page" $M1T]
2975 [mc "<%s-PageDown> Scroll commit list down one page" $M1T]
2976 [mc "<Shift-Up> Find backwards (upwards, later commits)"]
2977 [mc "<Shift-Down> Find forwards (downwards, earlier commits)"]
2978 [mc "<Delete>, b Scroll diff view up one page"]
2979 [mc "<Backspace> Scroll diff view up one page"]
2980 [mc "<Space> Scroll diff view down one page"]
2981 [mc "u Scroll diff view up 18 lines"]
2982 [mc "d Scroll diff view down 18 lines"]
2983 [mc "<%s-F> Find" $M1T]
2984 [mc "<%s-G> Move to next find hit" $M1T]
2985 [mc "<Return> Move to next find hit"]
2986 [mc "/ Focus the search box"]
2987 [mc "? Move to previous find hit"]
2988 [mc "f Scroll diff view to next file"]
2989 [mc "<%s-S> Search for next hit in diff view" $M1T]
2990 [mc "<%s-R> Search for previous hit in diff view" $M1T]
2991 [mc "<%s-KP+> Increase font size" $M1T]
2992 [mc "<%s-plus> Increase font size" $M1T]
2993 [mc "<%s-KP-> Decrease font size" $M1T]
2994 [mc "<%s-minus> Decrease font size" $M1T]
2997 -justify left -bg white -border 2 -relief groove
2998 pack $w.m -side top -fill both -padx 2 -pady 2
2999 ${NS}::button $w.ok -text [mc "Close"] -command "destroy $w" -default active
3000 bind $w <Key-Escape> [list destroy $w]
3001 pack $w.ok -side bottom
3002 bind $w <Visibility> "focus $w.ok"
3003 bind $w <Key-Escape> "destroy $w"
3004 bind $w <Key-Return> "destroy $w"
3007 # Procedures for manipulating the file list window at the
3008 # bottom right of the overall window.
3010 proc treeview {w l openlevs} {
3011 global treecontents treediropen treeheight treeparent treeindex
3021 set treecontents() {}
3022 $w conf -state normal
3024 while {[string range $f 0 $prefixend] ne $prefix} {
3025 if {$lev <= $openlevs} {
3026 $w mark set e:$treeindex($prefix) "end -1c"
3027 $w mark gravity e:$treeindex($prefix) left
3029 set treeheight($prefix) $ht
3030 incr ht [lindex $htstack end]
3031 set htstack [lreplace $htstack end end]
3032 set prefixend [lindex $prefendstack end]
3033 set prefendstack [lreplace $prefendstack end end]
3034 set prefix [string range $prefix 0 $prefixend]
3037 set tail [string range $f [expr {$prefixend+1}] end]
3038 while {[set slash [string first "/" $tail]] >= 0} {
3041 lappend prefendstack $prefixend
3042 incr prefixend [expr {$slash + 1}]
3043 set d [string range $tail 0 $slash]
3044 lappend treecontents($prefix) $d
3045 set oldprefix $prefix
3047 set treecontents($prefix) {}
3048 set treeindex($prefix) [incr ix]
3049 set treeparent($prefix) $oldprefix
3050 set tail [string range $tail [expr {$slash+1}] end]
3051 if {$lev <= $openlevs} {
3053 set treediropen($prefix) [expr {$lev < $openlevs}]
3054 set bm [expr {$lev == $openlevs? "tri-rt": "tri-dn"}]
3055 $w mark set d:$ix "end -1c"
3056 $w mark gravity d:$ix left
3058 for {set i 0} {$i < $lev} {incr i} {append str "\t"}
3060 $w image create end -align center -image $bm -padx 1 \
3062 $w insert end $d [highlight_tag $prefix]
3063 $w mark set s:$ix "end -1c"
3064 $w mark gravity s:$ix left
3069 if {$lev <= $openlevs} {
3072 for {set i 0} {$i < $lev} {incr i} {append str "\t"}
3074 $w insert end $tail [highlight_tag $f]
3076 lappend treecontents($prefix) $tail
3079 while {$htstack ne {}} {
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]
3087 $w conf -state disabled
3090 proc linetoelt {l} {
3091 global treeheight treecontents
3096 foreach e $treecontents($prefix) {
3101 if {[string index $e end] eq "/"} {
3102 set n $treeheight($prefix$e)
3114 proc highlight_tree {y prefix} {
3115 global treeheight treecontents cflist
3117 foreach e $treecontents($prefix) {
3119 if {[highlight_tag $path] ne {}} {
3120 $cflist tag add bold $y.0 "$y.0 lineend"
3123 if {[string index $e end] eq "/" && $treeheight($path) > 1} {
3124 set y [highlight_tree $y $path]
3130 proc treeclosedir {w dir} {
3131 global treediropen treeheight treeparent treeindex
3133 set ix $treeindex($dir)
3134 $w conf -state normal
3135 $w delete s:$ix e:$ix
3136 set treediropen($dir) 0
3137 $w image configure a:$ix -image tri-rt
3138 $w conf -state disabled
3139 set n [expr {1 - $treeheight($dir)}]
3140 while {$dir ne {}} {
3141 incr treeheight($dir) $n
3142 set dir $treeparent($dir)
3146 proc treeopendir {w dir} {
3147 global treediropen treeheight treeparent treecontents treeindex
3149 set ix $treeindex($dir)
3150 $w conf -state normal
3151 $w image configure a:$ix -image tri-dn
3152 $w mark set e:$ix s:$ix
3153 $w mark gravity e:$ix right
3156 set n [llength $treecontents($dir)]
3157 for {set x $dir} {$x ne {}} {set x $treeparent($x)} {
3160 incr treeheight($x) $n
3162 foreach e $treecontents($dir) {
3164 if {[string index $e end] eq "/"} {
3165 set iy $treeindex($de)
3166 $w mark set d:$iy e:$ix
3167 $w mark gravity d:$iy left
3168 $w insert e:$ix $str
3169 set treediropen($de) 0
3170 $w image create e:$ix -align center -image tri-rt -padx 1 \
3172 $w insert e:$ix $e [highlight_tag $de]
3173 $w mark set s:$iy e:$ix
3174 $w mark gravity s:$iy left
3175 set treeheight($de) 1
3177 $w insert e:$ix $str
3178 $w insert e:$ix $e [highlight_tag $de]
3181 $w mark gravity e:$ix right
3182 $w conf -state disabled
3183 set treediropen($dir) 1
3184 set top [lindex [split [$w index @0,0] .] 0]
3185 set ht [$w cget -height]
3186 set l [lindex [split [$w index s:$ix] .] 0]
3189 } elseif {$l + $n + 1 > $top + $ht} {
3190 set top [expr {$l + $n + 2 - $ht}]
3198 proc treeclick {w x y} {
3199 global treediropen cmitmode ctext cflist cflist_top
3201 if {$cmitmode ne "tree"} return
3202 if {![info exists cflist_top]} return
3203 set l [lindex [split [$w index "@$x,$y"] "."] 0]
3204 $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
3205 $cflist tag add highlight $l.0 "$l.0 lineend"
3211 set e [linetoelt $l]
3212 if {[string index $e end] ne "/"} {
3214 } elseif {$treediropen($e)} {
3221 proc setfilelist {id} {
3222 global treefilelist cflist jump_to_here
3224 treeview $cflist $treefilelist($id) 0
3225 if {$jump_to_here ne {}} {
3226 set f [lindex $jump_to_here 0]
3227 if {[lsearch -exact $treefilelist($id) $f] >= 0} {
3233 image create bitmap tri-rt -background black -foreground blue -data {
3234 #define tri-rt_width 13
3235 #define tri-rt_height 13
3236 static unsigned char tri-rt_bits[] = {
3237 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x00, 0x70, 0x00, 0xf0, 0x00,
3238 0xf0, 0x01, 0xf0, 0x00, 0x70, 0x00, 0x30, 0x00, 0x10, 0x00, 0x00, 0x00,
3241 #define tri-rt-mask_width 13
3242 #define tri-rt-mask_height 13
3243 static unsigned char tri-rt-mask_bits[] = {
3244 0x08, 0x00, 0x18, 0x00, 0x38, 0x00, 0x78, 0x00, 0xf8, 0x00, 0xf8, 0x01,
3245 0xf8, 0x03, 0xf8, 0x01, 0xf8, 0x00, 0x78, 0x00, 0x38, 0x00, 0x18, 0x00,
3248 image create bitmap tri-dn -background black -foreground blue -data {
3249 #define tri-dn_width 13
3250 #define tri-dn_height 13
3251 static unsigned char tri-dn_bits[] = {
3252 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x07, 0xf8, 0x03,
3253 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
3256 #define tri-dn-mask_width 13
3257 #define tri-dn-mask_height 13
3258 static unsigned char tri-dn-mask_bits[] = {
3259 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0xfe, 0x0f, 0xfc, 0x07,
3260 0xf8, 0x03, 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
3264 image create bitmap reficon-T -background black -foreground yellow -data {
3265 #define tagicon_width 13
3266 #define tagicon_height 9
3267 static unsigned char tagicon_bits[] = {
3268 0x00, 0x00, 0x00, 0x00, 0xf0, 0x07, 0xf8, 0x07,
3269 0xfc, 0x07, 0xf8, 0x07, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00};
3271 #define tagicon-mask_width 13
3272 #define tagicon-mask_height 9
3273 static unsigned char tagicon-mask_bits[] = {
3274 0x00, 0x00, 0xf0, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f,
3275 0xfe, 0x0f, 0xfc, 0x0f, 0xf8, 0x0f, 0xf0, 0x0f, 0x00, 0x00};
3278 #define headicon_width 13
3279 #define headicon_height 9
3280 static unsigned char headicon_bits[] = {
3281 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xf8, 0x07,
3282 0xf8, 0x07, 0xf8, 0x07, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00};
3285 #define headicon-mask_width 13
3286 #define headicon-mask_height 9
3287 static unsigned char headicon-mask_bits[] = {
3288 0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
3289 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00};
3291 image create bitmap reficon-H -background black -foreground green \
3292 -data $rectdata -maskdata $rectmask
3293 image create bitmap reficon-o -background black -foreground "#ddddff" \
3294 -data $rectdata -maskdata $rectmask
3296 proc init_flist {first} {
3297 global cflist cflist_top difffilestart
3299 $cflist conf -state normal
3300 $cflist delete 0.0 end
3302 $cflist insert end $first
3304 $cflist tag add highlight 1.0 "1.0 lineend"
3306 catch {unset cflist_top}
3308 $cflist conf -state disabled
3309 set difffilestart {}
3312 proc highlight_tag {f} {
3313 global highlight_paths
3315 foreach p $highlight_paths {
3316 if {[string match $p $f]} {
3323 proc highlight_filelist {} {
3324 global cmitmode cflist
3326 $cflist conf -state normal
3327 if {$cmitmode ne "tree"} {
3328 set end [lindex [split [$cflist index end] .] 0]
3329 for {set l 2} {$l < $end} {incr l} {
3330 set line [$cflist get $l.0 "$l.0 lineend"]
3331 if {[highlight_tag $line] ne {}} {
3332 $cflist tag add bold $l.0 "$l.0 lineend"
3338 $cflist conf -state disabled
3341 proc unhighlight_filelist {} {
3344 $cflist conf -state normal
3345 $cflist tag remove bold 1.0 end
3346 $cflist conf -state disabled
3349 proc add_flist {fl} {
3352 $cflist conf -state normal
3354 $cflist insert end "\n"
3355 $cflist insert end $f [highlight_tag $f]
3357 $cflist conf -state disabled
3360 proc sel_flist {w x y} {
3361 global ctext difffilestart cflist cflist_top cmitmode
3363 if {$cmitmode eq "tree"} return
3364 if {![info exists cflist_top]} return
3365 set l [lindex [split [$w index "@$x,$y"] "."] 0]
3366 $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
3367 $cflist tag add highlight $l.0 "$l.0 lineend"
3372 catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
3374 suppress_highlighting_file_for_current_scrollpos
3377 proc pop_flist_menu {w X Y x y} {
3378 global ctext cflist cmitmode flist_menu flist_menu_file
3379 global treediffs diffids
3382 set l [lindex [split [$w index "@$x,$y"] "."] 0]
3384 if {$cmitmode eq "tree"} {
3385 set e [linetoelt $l]
3386 if {[string index $e end] eq "/"} return
3388 set e [lindex $treediffs($diffids) [expr {$l-2}]]
3390 set flist_menu_file $e
3391 set xdiffstate "normal"
3392 if {$cmitmode eq "tree"} {
3393 set xdiffstate "disabled"
3395 # Disable "External diff" item in tree mode
3396 $flist_menu entryconf 2 -state $xdiffstate
3397 tk_popup $flist_menu $X $Y
3400 proc find_ctext_fileinfo {line} {
3401 global ctext_file_names ctext_file_lines
3403 set ok [bsearch $ctext_file_lines $line]
3404 set tline [lindex $ctext_file_lines $ok]
3406 if {$ok >= [llength $ctext_file_lines] || $line < $tline} {
3409 return [list [lindex $ctext_file_names $ok] $tline]
3413 proc pop_diff_menu {w X Y x y} {
3414 global ctext diff_menu flist_menu_file
3415 global diff_menu_txtpos diff_menu_line
3416 global diff_menu_filebase
3418 set diff_menu_txtpos [split [$w index "@$x,$y"] "."]
3419 set diff_menu_line [lindex $diff_menu_txtpos 0]
3420 # don't pop up the menu on hunk-separator or file-separator lines
3421 if {[lsearch -glob [$ctext tag names $diff_menu_line.0] "*sep"] >= 0} {
3425 set f [find_ctext_fileinfo $diff_menu_line]
3426 if {$f eq {}} return
3427 set flist_menu_file [lindex $f 0]
3428 set diff_menu_filebase [lindex $f 1]
3429 tk_popup $diff_menu $X $Y
3432 proc flist_hl {only} {
3433 global flist_menu_file findstring gdttype
3435 set x [shellquote $flist_menu_file]
3436 if {$only || $findstring eq {} || $gdttype ne [mc "touching paths:"]} {
3439 append findstring " " $x
3441 set gdttype [mc "touching paths:"]
3444 proc gitknewtmpdir {} {
3445 global diffnum gitktmpdir gitdir
3447 if {![info exists gitktmpdir]} {
3448 set gitktmpdir [file join $gitdir [format ".gitk-tmp.%s" [pid]]]
3449 if {[catch {file mkdir $gitktmpdir} err]} {
3450 error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err"
3457 set diffdir [file join $gitktmpdir $diffnum]
3458 if {[catch {file mkdir $diffdir} err]} {
3459 error_popup "[mc "Error creating temporary directory %s:" $diffdir] $err"
3465 proc save_file_from_commit {filename output what} {
3468 if {[catch {exec git show $filename -- > $output} err]} {
3469 if {[string match "fatal: bad revision *" $err]} {
3472 error_popup "[mc "Error getting \"%s\" from %s:" $filename $what] $err"
3478 proc external_diff_get_one_file {diffid filename diffdir} {
3479 global nullid nullid2 nullfile
3482 if {$diffid == $nullid} {
3483 set difffile [file join $worktree $filename]
3484 if {[file exists $difffile]} {
3489 if {$diffid == $nullid2} {
3490 set difffile [file join $diffdir "\[index\] [file tail $filename]"]
3491 return [save_file_from_commit :$filename $difffile index]
3493 set difffile [file join $diffdir "\[$diffid\] [file tail $filename]"]
3494 return [save_file_from_commit $diffid:$filename $difffile \
3498 proc external_diff {} {
3499 global nullid nullid2
3500 global flist_menu_file
3504 if {[llength $diffids] == 1} {
3505 # no reference commit given
3506 set diffidto [lindex $diffids 0]
3507 if {$diffidto eq $nullid} {
3508 # diffing working copy with index
3509 set diffidfrom $nullid2
3510 } elseif {$diffidto eq $nullid2} {
3511 # diffing index with HEAD
3512 set diffidfrom "HEAD"
3514 # use first parent commit
3515 global parentlist selectedline
3516 set diffidfrom [lindex $parentlist $selectedline 0]
3519 set diffidfrom [lindex $diffids 0]
3520 set diffidto [lindex $diffids 1]
3523 # make sure that several diffs wont collide
3524 set diffdir [gitknewtmpdir]
3525 if {$diffdir eq {}} return
3527 # gather files to diff
3528 set difffromfile [external_diff_get_one_file $diffidfrom $flist_menu_file $diffdir]
3529 set difftofile [external_diff_get_one_file $diffidto $flist_menu_file $diffdir]
3531 if {$difffromfile ne {} && $difftofile ne {}} {
3532 set cmd [list [shellsplit $extdifftool] $difffromfile $difftofile]
3533 if {[catch {set fl [open |$cmd r]} err]} {
3534 file delete -force $diffdir
3535 error_popup "$extdifftool: [mc "command failed:"] $err"
3537 fconfigure $fl -blocking 0
3538 filerun $fl [list delete_at_eof $fl $diffdir]
3543 proc find_hunk_blamespec {base line} {
3546 # Find and parse the hunk header
3547 set s_lix [$ctext search -backwards -regexp ^@@ "$line.0 lineend" $base.0]
3548 if {$s_lix eq {}} return
3550 set s_line [$ctext get $s_lix "$s_lix + 1 lines"]
3551 if {![regexp {^@@@*(( -\d+(,\d+)?)+) \+(\d+)(,\d+)? @@} $s_line \
3552 s_line old_specs osz osz1 new_line nsz]} {
3556 # base lines for the parents
3557 set base_lines [list $new_line]
3558 foreach old_spec [lrange [split $old_specs " "] 1 end] {
3559 if {![regexp -- {-(\d+)(,\d+)?} $old_spec \
3560 old_spec old_line osz]} {
3563 lappend base_lines $old_line
3566 # Now scan the lines to determine offset within the hunk
3567 set max_parent [expr {[llength $base_lines]-2}]
3569 set s_lno [lindex [split $s_lix "."] 0]
3571 # Determine if the line is removed
3572 set chunk [$ctext get $line.0 "$line.1 + $max_parent chars"]
3573 if {[string match {[-+ ]*} $chunk]} {
3574 set removed_idx [string first "-" $chunk]
3575 # Choose a parent index
3576 if {$removed_idx >= 0} {
3577 set parent $removed_idx
3579 set unchanged_idx [string first " " $chunk]
3580 if {$unchanged_idx >= 0} {
3581 set parent $unchanged_idx
3583 # blame the current commit
3587 # then count other lines that belong to it
3588 for {set i $line} {[incr i -1] > $s_lno} {} {
3589 set chunk [$ctext get $i.0 "$i.1 + $max_parent chars"]
3590 # Determine if the line is removed
3591 set removed_idx [string first "-" $chunk]
3593 set code [string index $chunk $parent]
3594 if {$code eq "-" || ($removed_idx < 0 && $code ne "+")} {
3598 if {$removed_idx < 0} {
3608 incr dline [lindex $base_lines $parent]
3609 return [list $parent $dline]
3612 proc external_blame_diff {} {
3613 global currentid cmitmode
3614 global diff_menu_txtpos diff_menu_line
3615 global diff_menu_filebase flist_menu_file
3617 if {$cmitmode eq "tree"} {
3619 set line [expr {$diff_menu_line - $diff_menu_filebase}]
3621 set hinfo [find_hunk_blamespec $diff_menu_filebase $diff_menu_line]
3623 set parent_idx [lindex $hinfo 0]
3624 set line [lindex $hinfo 1]
3631 external_blame $parent_idx $line
3634 # Find the SHA1 ID of the blob for file $fname in the index
3636 proc index_sha1 {fname} {
3637 set f [open [list | git ls-files -s $fname] r]
3638 while {[gets $f line] >= 0} {
3639 set info [lindex [split $line "\t"] 0]
3640 set stage [lindex $info 2]
3641 if {$stage eq "0" || $stage eq "2"} {
3643 return [lindex $info 1]
3650 # Turn an absolute path into one relative to the current directory
3651 proc make_relative {f} {
3652 if {[file pathtype $f] eq "relative"} {
3655 set elts [file split $f]
3656 set here [file split [pwd]]
3661 if {$ei < $hi || $ei >= [llength $elts] || [lindex $elts $ei] ne $d} {
3668 set elts [concat $res [lrange $elts $ei end]]
3669 return [eval file join $elts]
3672 proc external_blame {parent_idx {line {}}} {
3673 global flist_menu_file cdup
3674 global nullid nullid2
3675 global parentlist selectedline currentid
3677 if {$parent_idx > 0} {
3678 set base_commit [lindex $parentlist $selectedline [expr {$parent_idx-1}]]
3680 set base_commit $currentid
3683 if {$base_commit eq {} || $base_commit eq $nullid || $base_commit eq $nullid2} {
3684 error_popup [mc "No such commit"]
3688 set cmdline [list git gui blame]
3689 if {$line ne {} && $line > 1} {
3690 lappend cmdline "--line=$line"
3692 set f [file join $cdup $flist_menu_file]
3693 # Unfortunately it seems git gui blame doesn't like
3694 # being given an absolute path...
3695 set f [make_relative $f]
3696 lappend cmdline $base_commit $f
3697 if {[catch {eval exec $cmdline &} err]} {
3698 error_popup "[mc "git gui blame: command failed:"] $err"
3702 proc show_line_source {} {
3703 global cmitmode currentid parents curview blamestuff blameinst
3704 global diff_menu_line diff_menu_filebase flist_menu_file
3705 global nullid nullid2 gitdir cdup
3708 if {$cmitmode eq "tree"} {
3710 set line [expr {$diff_menu_line - $diff_menu_filebase}]
3712 set h [find_hunk_blamespec $diff_menu_filebase $diff_menu_line]
3713 if {$h eq {}} return
3714 set pi [lindex $h 0]
3716 mark_ctext_line $diff_menu_line
3720 if {$currentid eq $nullid} {
3722 # must be a merge in progress...
3724 # get the last line from .git/MERGE_HEAD
3725 set f [open [file join $gitdir MERGE_HEAD] r]
3726 set id [lindex [split [read $f] "\n"] end-1]
3729 error_popup [mc "Couldn't read merge head: %s" $err]
3732 } elseif {$parents($curview,$currentid) eq $nullid2} {
3733 # need to do the blame from the index
3735 set from_index [index_sha1 $flist_menu_file]
3737 error_popup [mc "Error reading index: %s" $err]
3741 set id $parents($curview,$currentid)
3744 set id [lindex $parents($curview,$currentid) $pi]
3746 set line [lindex $h 1]
3749 if {$from_index ne {}} {
3750 lappend blameargs | git cat-file blob $from_index
3752 lappend blameargs | git blame -p -L$line,+1
3753 if {$from_index ne {}} {
3754 lappend blameargs --contents -
3756 lappend blameargs $id
3758 lappend blameargs -- [file join $cdup $flist_menu_file]
3760 set f [open $blameargs r]
3762 error_popup [mc "Couldn't start git blame: %s" $err]
3765 nowbusy blaming [mc "Searching"]
3766 fconfigure $f -blocking 0
3767 set i [reg_instance $f]
3768 set blamestuff($i) {}
3770 filerun $f [list read_line_source $f $i]
3773 proc stopblaming {} {
3776 if {[info exists blameinst]} {
3777 stop_instance $blameinst
3783 proc read_line_source {fd inst} {
3784 global blamestuff curview commfd blameinst nullid nullid2
3786 while {[gets $fd line] >= 0} {
3787 lappend blamestuff($inst) $line
3795 fconfigure $fd -blocking 1
3796 if {[catch {close $fd} err]} {
3797 error_popup [mc "Error running git blame: %s" $err]
3802 set line [split [lindex $blamestuff($inst) 0] " "]
3803 set id [lindex $line 0]
3804 set lnum [lindex $line 1]
3805 if {[string length $id] == 40 && [string is xdigit $id] &&
3806 [string is digit -strict $lnum]} {
3807 # look for "filename" line
3808 foreach l $blamestuff($inst) {
3809 if {[string match "filename *" $l]} {
3810 set fname [string range $l 9 end]
3816 # all looks good, select it
3817 if {$id eq $nullid} {
3818 # blame uses all-zeroes to mean not committed,
3819 # which would mean a change in the index
3822 if {[commitinview $id $curview]} {
3823 selectline [rowofcommit $id] 1 [list $fname $lnum]
3825 error_popup [mc "That line comes from commit %s, \
3826 which is not in this view" [shortids $id]]
3829 puts "oops couldn't parse git blame output"
3834 # delete $dir when we see eof on $f (presumably because the child has exited)
3835 proc delete_at_eof {f dir} {
3836 while {[gets $f line] >= 0} {}
3838 if {[catch {close $f} err]} {
3839 error_popup "[mc "External diff viewer failed:"] $err"
3841 file delete -force $dir
3847 # Functions for adding and removing shell-type quoting
3849 proc shellquote {str} {
3850 if {![string match "*\['\"\\ \t]*" $str]} {
3853 if {![string match "*\['\"\\]*" $str]} {
3856 if {![string match "*'*" $str]} {
3859 return "\"[string map {\" \\\" \\ \\\\} $str]\""
3862 proc shellarglist {l} {
3868 append str [shellquote $a]
3873 proc shelldequote {str} {
3878 if {![regexp -start $used -indices "\['\"\\\\ \t]" $str first]} {
3879 append ret [string range $str $used end]
3880 set used [string length $str]
3883 set first [lindex $first 0]
3884 set ch [string index $str $first]
3885 if {$first > $used} {
3886 append ret [string range $str $used [expr {$first - 1}]]
3889 if {$ch eq " " || $ch eq "\t"} break
3892 set first [string first "'" $str $used]
3894 error "unmatched single-quote"
3896 append ret [string range $str $used [expr {$first - 1}]]
3901 if {$used >= [string length $str]} {
3902 error "trailing backslash"
3904 append ret [string index $str $used]
3909 if {![regexp -start $used -indices "\[\"\\\\]" $str first]} {
3910 error "unmatched double-quote"
3912 set first [lindex $first 0]
3913 set ch [string index $str $first]
3914 if {$first > $used} {
3915 append ret [string range $str $used [expr {$first - 1}]]
3918 if {$ch eq "\""} break
3920 append ret [string index $str $used]
3924 return [list $used $ret]
3927 proc shellsplit {str} {
3930 set str [string trimleft $str]
3931 if {$str eq {}} break
3932 set dq [shelldequote $str]
3933 set n [lindex $dq 0]
3934 set word [lindex $dq 1]
3935 set str [string range $str $n end]
3941 # Code to implement multiple views
3943 proc newview {ishighlight} {
3944 global nextviewnum newviewname newishighlight
3945 global revtreeargs viewargscmd newviewopts curview
3947 set newishighlight $ishighlight
3949 if {[winfo exists $top]} {
3953 decode_view_opts $nextviewnum $revtreeargs
3954 set newviewname($nextviewnum) "[mc "View"] $nextviewnum"
3955 set newviewopts($nextviewnum,perm) 0
3956 set newviewopts($nextviewnum,cmd) $viewargscmd($curview)
3957 vieweditor $top $nextviewnum [mc "Gitk view definition"]
3960 set known_view_options {
3961 {perm b . {} {mc "Remember this view"}}
3962 {reflabel l + {} {mc "References (space separated list):"}}
3963 {refs t15 .. {} {mc "Branches & tags:"}}
3964 {allrefs b *. "--all" {mc "All refs"}}
3965 {branches b . "--branches" {mc "All (local) branches"}}
3966 {tags b . "--tags" {mc "All tags"}}
3967 {remotes b . "--remotes" {mc "All remote-tracking branches"}}
3968 {commitlbl l + {} {mc "Commit Info (regular expressions):"}}
3969 {author t15 .. "--author=*" {mc "Author:"}}
3970 {committer t15 . "--committer=*" {mc "Committer:"}}
3971 {loginfo t15 .. "--grep=*" {mc "Commit Message:"}}
3972 {allmatch b .. "--all-match" {mc "Matches all Commit Info criteria"}}
3973 {changes_l l + {} {mc "Changes to Files:"}}
3974 {pickaxe_s r0 . {} {mc "Fixed String"}}
3975 {pickaxe_t r1 . "--pickaxe-regex" {mc "Regular Expression"}}
3976 {pickaxe t15 .. "-S*" {mc "Search string:"}}
3977 {datelabel l + {} {mc "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 15:27:38\"):"}}
3978 {since t15 .. {"--since=*" "--after=*"} {mc "Since:"}}
3979 {until t15 . {"--until=*" "--before=*"} {mc "Until:"}}
3980 {limit_lbl l + {} {mc "Limit and/or skip a number of revisions (positive integer):"}}
3981 {limit t10 *. "--max-count=*" {mc "Number to show:"}}
3982 {skip t10 . "--skip=*" {mc "Number to skip:"}}
3983 {misc_lbl l + {} {mc "Miscellaneous options:"}}
3984 {dorder b *. {"--date-order" "-d"} {mc "Strictly sort by date"}}
3985 {lright b . "--left-right" {mc "Mark branch sides"}}
3986 {first b . "--first-parent" {mc "Limit to first parent"}}
3987 {smplhst b . "--simplify-by-decoration" {mc "Simple history"}}
3988 {args t50 *. {} {mc "Additional arguments to git log:"}}
3989 {allpaths path + {} {mc "Enter files and directories to include, one per line:"}}
3990 {cmd t50= + {} {mc "Command to generate more commits to include:"}}
3993 # Convert $newviewopts($n, ...) into args for git log.
3994 proc encode_view_opts {n} {
3995 global known_view_options newviewopts
3998 foreach opt $known_view_options {
3999 set patterns [lindex $opt 3]
4000 if {$patterns eq {}} continue
4001 set pattern [lindex $patterns 0]
4003 if {[lindex $opt 1] eq "b"} {
4004 set val $newviewopts($n,[lindex $opt 0])
4006 lappend rargs $pattern
4008 } elseif {[regexp {^r(\d+)$} [lindex $opt 1] type value]} {
4009 regexp {^(.*_)} [lindex $opt 0] uselessvar button_id
4010 set val $newviewopts($n,$button_id)
4011 if {$val eq $value} {
4012 lappend rargs $pattern
4015 set val $newviewopts($n,[lindex $opt 0])
4016 set val [string trim $val]
4018 set pfix [string range $pattern 0 end-1]
4019 lappend rargs $pfix$val
4023 set rargs [concat $rargs [shellsplit $newviewopts($n,refs)]]
4024 return [concat $rargs [shellsplit $newviewopts($n,args)]]
4027 # Fill $newviewopts($n, ...) based on args for git log.
4028 proc decode_view_opts {n view_args} {
4029 global known_view_options newviewopts
4031 foreach opt $known_view_options {
4032 set id [lindex $opt 0]
4033 if {[lindex $opt 1] eq "b"} {
4036 } elseif {[regexp {^r(\d+)$} [lindex $opt 1]]} {
4038 regexp {^(.*_)} $id uselessvar id
4044 set newviewopts($n,$id) $val
4048 foreach arg $view_args {
4049 if {[regexp -- {^-([0-9]+)$} $arg arg cnt]
4050 && ![info exists found(limit)]} {
4051 set newviewopts($n,limit) $cnt
4056 foreach opt $known_view_options {
4057 set id [lindex $opt 0]
4058 if {[info exists found($id)]} continue
4059 foreach pattern [lindex $opt 3] {
4060 if {![string match $pattern $arg]} continue
4061 if {[lindex $opt 1] eq "b"} {
4064 } elseif {[regexp {^r(\d+)$} [lindex $opt 1] match num]} {
4066 regexp {^(.*_)} $id uselessvar id
4070 set size [string length $pattern]
4071 set val [string range $arg [expr {$size-1}] end]
4073 set newviewopts($n,$id) $val
4077 if {[info exists val]} break
4079 if {[info exists val]} continue
4080 if {[regexp {^-} $arg]} {
4083 lappend refargs $arg
4086 set newviewopts($n,refs) [shellarglist $refargs]
4087 set newviewopts($n,args) [shellarglist $oargs]
4090 proc edit_or_newview {} {
4102 global viewname viewperm newviewname newviewopts
4103 global viewargs viewargscmd
4105 set top .gitkvedit-$curview
4106 if {[winfo exists $top]} {
4110 decode_view_opts $curview $viewargs($curview)
4111 set newviewname($curview) $viewname($curview)
4112 set newviewopts($curview,perm) $viewperm($curview)
4113 set newviewopts($curview,cmd) $viewargscmd($curview)
4114 vieweditor $top $curview "[mc "Gitk: edit view"] $viewname($curview)"
4117 proc vieweditor {top n title} {
4118 global newviewname newviewopts viewfiles bgcolor
4119 global known_view_options NS
4122 wm title $top [concat $title [mc "-- criteria for selecting revisions"]]
4123 make_transient $top .
4126 ${NS}::frame $top.nfr
4127 ${NS}::label $top.nl -text [mc "View Name"]
4128 ${NS}::entry $top.name -width 20 -textvariable newviewname($n)
4129 pack $top.nfr -in $top -fill x -pady 5 -padx 3
4130 pack $top.nl -in $top.nfr -side left -padx {0 5}
4131 pack $top.name -in $top.nfr -side left -padx {0 25}
4137 foreach opt $known_view_options {
4138 set id [lindex $opt 0]
4139 set type [lindex $opt 1]
4140 set flags [lindex $opt 2]
4141 set title [eval [lindex $opt 4]]
4144 if {$flags eq "+" || $flags eq "*"} {
4145 set cframe $top.fr$cnt
4147 ${NS}::frame $cframe
4148 pack $cframe -in $top -fill x -pady 3 -padx 3
4149 set cexpand [expr {$flags eq "*"}]
4150 } elseif {$flags eq ".." || $flags eq "*."} {
4151 set cframe $top.fr$cnt
4153 ${NS}::frame $cframe
4154 pack $cframe -in $top -fill x -pady 3 -padx [list 15 3]
4155 set cexpand [expr {$flags eq "*."}]
4161 ${NS}::label $cframe.l_$id -text $title
4162 pack $cframe.l_$id -in $cframe -side left -pady [list 3 0] -anchor w
4163 } elseif {$type eq "b"} {
4164 ${NS}::checkbutton $cframe.c_$id -text $title -variable newviewopts($n,$id)
4165 pack $cframe.c_$id -in $cframe -side left \
4166 -padx [list $lxpad 0] -expand $cexpand -anchor w
4167 } elseif {[regexp {^r(\d+)$} $type type sz]} {
4168 regexp {^(.*_)} $id uselessvar button_id
4169 ${NS}::radiobutton $cframe.c_$id -text $title -variable newviewopts($n,$button_id) -value $sz
4170 pack $cframe.c_$id -in $cframe -side left \
4171 -padx [list $lxpad 0] -expand $cexpand -anchor w
4172 } elseif {[regexp {^t(\d+)$} $type type sz]} {
4173 ${NS}::label $cframe.l_$id -text $title
4174 ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \
4175 -textvariable newviewopts($n,$id)
4176 pack $cframe.l_$id -in $cframe -side left -padx [list $lxpad 0]
4177 pack $cframe.e_$id -in $cframe -side left -expand 1 -fill x
4178 } elseif {[regexp {^t(\d+)=$} $type type sz]} {
4179 ${NS}::label $cframe.l_$id -text $title
4180 ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \
4181 -textvariable newviewopts($n,$id)
4182 pack $cframe.l_$id -in $cframe -side top -pady [list 3 0] -anchor w
4183 pack $cframe.e_$id -in $cframe -side top -fill x
4184 } elseif {$type eq "path"} {
4185 ${NS}::label $top.l -text $title
4186 pack $top.l -in $top -side top -pady [list 3 0] -anchor w -padx 3
4187 text $top.t -width 40 -height 5 -background $bgcolor
4188 if {[info exists viewfiles($n)]} {
4189 foreach f $viewfiles($n) {
4190 $top.t insert end $f
4191 $top.t insert end "\n"
4193 $top.t delete {end - 1c} end
4194 $top.t mark set insert 0.0
4196 pack $top.t -in $top -side top -pady [list 0 5] -fill both -expand 1 -padx 3
4200 ${NS}::frame $top.buts
4201 ${NS}::button $top.buts.ok -text [mc "OK"] -command [list newviewok $top $n]
4202 ${NS}::button $top.buts.apply -text [mc "Apply (F5)"] -command [list newviewok $top $n 1]
4203 ${NS}::button $top.buts.can -text [mc "Cancel"] -command [list destroy $top]
4204 bind $top <Control-Return> [list newviewok $top $n]
4205 bind $top <F5> [list newviewok $top $n 1]
4206 bind $top <Escape> [list destroy $top]
4207 grid $top.buts.ok $top.buts.apply $top.buts.can
4208 grid columnconfigure $top.buts 0 -weight 1 -uniform a
4209 grid columnconfigure $top.buts 1 -weight 1 -uniform a
4210 grid columnconfigure $top.buts 2 -weight 1 -uniform a
4211 pack $top.buts -in $top -side top -fill x
4215 proc doviewmenu {m first cmd op argv} {
4216 set nmenu [$m index end]
4217 for {set i $first} {$i <= $nmenu} {incr i} {
4218 if {[$m entrycget $i -command] eq $cmd} {
4219 eval $m $op $i $argv
4225 proc allviewmenus {n op args} {
4228 doviewmenu .bar.view 5 [list showview $n] $op $args
4229 # doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
4232 proc newviewok {top n {apply 0}} {
4233 global nextviewnum newviewperm newviewname newishighlight
4234 global viewname viewfiles viewperm selectedview curview
4235 global viewargs viewargscmd newviewopts viewhlmenu
4238 set newargs [encode_view_opts $n]
4240 error_popup "[mc "Error in commit selection arguments:"] $err" $top
4244 foreach f [split [$top.t get 0.0 end] "\n"] {
4245 set ft [string trim $f]
4250 if {![info exists viewfiles($n)]} {
4251 # creating a new view
4253 set viewname($n) $newviewname($n)
4254 set viewperm($n) $newviewopts($n,perm)
4255 set viewfiles($n) $files
4256 set viewargs($n) $newargs
4257 set viewargscmd($n) $newviewopts($n,cmd)
4259 if {!$newishighlight} {
4262 run addvhighlight $n
4265 # editing an existing view
4266 set viewperm($n) $newviewopts($n,perm)
4267 if {$newviewname($n) ne $viewname($n)} {
4268 set viewname($n) $newviewname($n)
4269 doviewmenu .bar.view 5 [list showview $n] \
4270 entryconf [list -label $viewname($n)]
4271 # doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
4272 # entryconf [list -label $viewname($n) -value $viewname($n)]
4274 if {$files ne $viewfiles($n) || $newargs ne $viewargs($n) || \
4275 $newviewopts($n,cmd) ne $viewargscmd($n)} {
4276 set viewfiles($n) $files
4277 set viewargs($n) $newargs
4278 set viewargscmd($n) $newviewopts($n,cmd)
4279 if {$curview == $n} {
4285 catch {destroy $top}
4289 global curview viewperm hlview selectedhlview
4291 if {$curview == 0} return
4292 if {[info exists hlview] && $hlview == $curview} {
4293 set selectedhlview [mc "None"]
4296 allviewmenus $curview delete
4297 set viewperm($curview) 0
4301 proc addviewmenu {n} {
4302 global viewname viewhlmenu
4304 .bar.view add radiobutton -label $viewname($n) \
4305 -command [list showview $n] -variable selectedview -value $n
4306 #$viewhlmenu add radiobutton -label $viewname($n) \
4307 # -command [list addvhighlight $n] -variable selectedhlview
4311 global curview cached_commitrow ordertok
4312 global displayorder parentlist rowidlist rowisopt rowfinal
4313 global colormap rowtextx nextcolor canvxmax
4314 global numcommits viewcomplete
4315 global selectedline currentid canv canvy0
4317 global pending_select mainheadid
4320 global hlview selectedhlview commitinterest
4322 if {$n == $curview} return
4324 set ymax [lindex [$canv cget -scrollregion] 3]
4325 set span [$canv yview]
4326 set ytop [expr {[lindex $span 0] * $ymax}]
4327 set ybot [expr {[lindex $span 1] * $ymax}]
4328 set yscreen [expr {($ybot - $ytop) / 2}]
4329 if {$selectedline ne {}} {
4330 set selid $currentid
4331 set y [yc $selectedline]
4332 if {$ytop < $y && $y < $ybot} {
4333 set yscreen [expr {$y - $ytop}]
4335 } elseif {[info exists pending_select]} {
4336 set selid $pending_select
4337 unset pending_select
4341 catch {unset treediffs}
4343 if {[info exists hlview] && $hlview == $n} {
4345 set selectedhlview [mc "None"]
4347 catch {unset commitinterest}
4348 catch {unset cached_commitrow}
4349 catch {unset ordertok}
4353 .bar.view entryconf [mca "Edit view..."] -state [expr {$n == 0? "disabled": "normal"}]
4354 .bar.view entryconf [mca "Delete view"] -state [expr {$n == 0? "disabled": "normal"}]
4357 if {![info exists viewcomplete($n)]} {
4367 set numcommits $commitidx($n)
4369 catch {unset colormap}
4370 catch {unset rowtextx}
4372 set canvxmax [$canv cget -width]
4378 if {$selid ne {} && [commitinview $selid $n]} {
4379 set row [rowofcommit $selid]
4380 # try to get the selected row in the same position on the screen
4381 set ymax [lindex [$canv cget -scrollregion] 3]
4382 set ytop [expr {[yc $row] - $yscreen}]
4386 set yf [expr {$ytop * 1.0 / $ymax}]
4388 allcanvs yview moveto $yf
4392 } elseif {!$viewcomplete($n)} {
4393 reset_pending_select $selid
4395 reset_pending_select {}
4397 if {[commitinview $pending_select $curview]} {
4398 selectline [rowofcommit $pending_select] 1
4400 set row [first_real_row]
4401 if {$row < $numcommits} {
4406 if {!$viewcomplete($n)} {
4407 if {$numcommits == 0} {
4408 show_status [mc "Reading commits..."]
4410 } elseif {$numcommits == 0} {
4411 show_status [mc "No commits selected"]
4415 # Stuff relating to the highlighting facility
4417 proc ishighlighted {id} {
4418 global vhighlights fhighlights nhighlights rhighlights
4420 if {[info exists nhighlights($id)] && $nhighlights($id) > 0} {
4421 return $nhighlights($id)
4423 if {[info exists vhighlights($id)] && $vhighlights($id) > 0} {
4424 return $vhighlights($id)
4426 if {[info exists fhighlights($id)] && $fhighlights($id) > 0} {
4427 return $fhighlights($id)
4429 if {[info exists rhighlights($id)] && $rhighlights($id) > 0} {
4430 return $rhighlights($id)
4435 proc bolden {id font} {
4436 global canv linehtag currentid boldids need_redisplay markedid
4438 # need_redisplay = 1 means the display is stale and about to be redrawn
4439 if {$need_redisplay} return
4441 $canv itemconf $linehtag($id) -font $font
4442 if {[info exists currentid] && $id eq $currentid} {
4444 set t [eval $canv create rect [$canv bbox $linehtag($id)] \
4445 -outline {{}} -tags secsel \
4446 -fill [$canv cget -selectbackground]]
4449 if {[info exists markedid] && $id eq $markedid} {
4454 proc bolden_name {id font} {
4455 global canv2 linentag currentid boldnameids need_redisplay
4457 if {$need_redisplay} return
4458 lappend boldnameids $id
4459 $canv2 itemconf $linentag($id) -font $font
4460 if {[info exists currentid] && $id eq $currentid} {
4461 $canv2 delete secsel
4462 set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] \
4463 -outline {{}} -tags secsel \
4464 -fill [$canv2 cget -selectbackground]]
4473 foreach id $boldids {
4474 if {![ishighlighted $id]} {
4477 lappend stillbold $id
4480 set boldids $stillbold
4483 proc addvhighlight {n} {
4484 global hlview viewcomplete curview vhl_done commitidx
4486 if {[info exists hlview]} {
4490 if {$n != $curview && ![info exists viewcomplete($n)]} {
4493 set vhl_done $commitidx($hlview)
4494 if {$vhl_done > 0} {
4499 proc delvhighlight {} {
4500 global hlview vhighlights
4502 if {![info exists hlview]} return
4504 catch {unset vhighlights}
4508 proc vhighlightmore {} {
4509 global hlview vhl_done commitidx vhighlights curview
4511 set max $commitidx($hlview)
4512 set vr [visiblerows]
4513 set r0 [lindex $vr 0]
4514 set r1 [lindex $vr 1]
4515 for {set i $vhl_done} {$i < $max} {incr i} {
4516 set id [commitonrow $i $hlview]
4517 if {[commitinview $id $curview]} {
4518 set row [rowofcommit $id]
4519 if {$r0 <= $row && $row <= $r1} {
4520 if {![highlighted $row]} {
4521 bolden $id mainfontbold
4523 set vhighlights($id) 1
4531 proc askvhighlight {row id} {
4532 global hlview vhighlights iddrawn
4534 if {[commitinview $id $hlview]} {
4535 if {[info exists iddrawn($id)] && ![ishighlighted $id]} {
4536 bolden $id mainfontbold
4538 set vhighlights($id) 1
4540 set vhighlights($id) 0
4544 proc hfiles_change {} {
4545 global highlight_files filehighlight fhighlights fh_serial
4546 global highlight_paths
4548 if {[info exists filehighlight]} {
4549 # delete previous highlights
4550 catch {close $filehighlight}
4552 catch {unset fhighlights}
4554 unhighlight_filelist
4556 set highlight_paths {}
4557 after cancel do_file_hl $fh_serial
4559 if {$highlight_files ne {}} {
4560 after 300 do_file_hl $fh_serial
4564 proc gdttype_change {name ix op} {
4565 global gdttype highlight_files findstring findpattern
4568 if {$findstring ne {}} {
4569 if {$gdttype eq [mc "containing:"]} {
4570 if {$highlight_files ne {}} {
4571 set highlight_files {}
4576 if {$findpattern ne {}} {
4580 set highlight_files $findstring
4585 # enable/disable findtype/findloc menus too
4588 proc find_change {name ix op} {
4589 global gdttype findstring highlight_files
4592 if {$gdttype eq [mc "containing:"]} {
4595 if {$highlight_files ne $findstring} {
4596 set highlight_files $findstring
4603 proc findcom_change args {
4604 global nhighlights boldnameids
4605 global findpattern findtype findstring gdttype
4608 # delete previous highlights, if any
4609 foreach id $boldnameids {
4610 bolden_name $id mainfont
4613 catch {unset nhighlights}
4616 if {$gdttype ne [mc "containing:"] || $findstring eq {}} {
4618 } elseif {$findtype eq [mc "Regexp"]} {
4619 set findpattern $findstring
4621 set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
4623 set findpattern "*$e*"
4627 proc makepatterns {l} {
4630 set ee [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} $e]
4631 if {[string index $ee end] eq "/"} {
4641 proc do_file_hl {serial} {
4642 global highlight_files filehighlight highlight_paths gdttype fhl_list
4643 global cdup findtype
4645 if {$gdttype eq [mc "touching paths:"]} {
4646 # If "exact" match then convert backslashes to forward slashes.
4647 # Most useful to support Windows-flavoured file paths.
4648 if {$findtype eq [mc "Exact"]} {
4649 set highlight_files [string map {"\\" "/"} $highlight_files]
4651 if {[catch {set paths [shellsplit $highlight_files]}]} return
4652 set highlight_paths [makepatterns $paths]
4654 set relative_paths {}
4655 foreach path $paths {
4656 lappend relative_paths [file join $cdup $path]
4658 set gdtargs [concat -- $relative_paths]
4659 } elseif {$gdttype eq [mc "adding/removing string:"]} {
4660 set gdtargs [list "-S$highlight_files"]
4662 # must be "containing:", i.e. we're searching commit info
4665 set cmd [concat | git diff-tree -r -s --stdin $gdtargs]
4666 set filehighlight [open $cmd r+]
4667 fconfigure $filehighlight -blocking 0
4668 filerun $filehighlight readfhighlight
4674 proc flushhighlights {} {
4675 global filehighlight fhl_list
4677 if {[info exists filehighlight]} {
4679 puts $filehighlight ""
4680 flush $filehighlight
4684 proc askfilehighlight {row id} {
4685 global filehighlight fhighlights fhl_list
4687 lappend fhl_list $id
4688 set fhighlights($id) -1
4689 puts $filehighlight $id
4692 proc readfhighlight {} {
4693 global filehighlight fhighlights curview iddrawn
4694 global fhl_list find_dirn
4696 if {![info exists filehighlight]} {
4700 while {[incr nr] <= 100 && [gets $filehighlight line] >= 0} {
4701 set line [string trim $line]
4702 set i [lsearch -exact $fhl_list $line]
4703 if {$i < 0} continue
4704 for {set j 0} {$j < $i} {incr j} {
4705 set id [lindex $fhl_list $j]
4706 set fhighlights($id) 0
4708 set fhl_list [lrange $fhl_list [expr {$i+1}] end]
4709 if {$line eq {}} continue
4710 if {![commitinview $line $curview]} continue
4711 if {[info exists iddrawn($line)] && ![ishighlighted $line]} {
4712 bolden $line mainfontbold
4714 set fhighlights($line) 1
4716 if {[eof $filehighlight]} {
4718 puts "oops, git diff-tree died"
4719 catch {close $filehighlight}
4723 if {[info exists find_dirn]} {
4729 proc doesmatch {f} {
4730 global findtype findpattern
4732 if {$findtype eq [mc "Regexp"]} {
4733 return [regexp $findpattern $f]
4734 } elseif {$findtype eq [mc "IgnCase"]} {
4735 return [string match -nocase $findpattern $f]
4737 return [string match $findpattern $f]
4741 proc askfindhighlight {row id} {
4742 global nhighlights commitinfo iddrawn
4744 global markingmatches
4746 if {![info exists commitinfo($id)]} {
4749 set info $commitinfo($id)
4751 set fldtypes [list [mc Headline] [mc Author] "" [mc Committer] "" [mc Comments]]
4752 foreach f $info ty $fldtypes {
4753 if {$ty eq ""} continue
4754 if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
4756 if {$ty eq [mc "Author"]} {
4763 if {$isbold && [info exists iddrawn($id)]} {
4764 if {![ishighlighted $id]} {
4765 bolden $id mainfontbold
4767 bolden_name $id mainfontbold
4770 if {$markingmatches} {
4771 markrowmatches $row $id
4774 set nhighlights($id) $isbold
4777 proc markrowmatches {row id} {
4778 global canv canv2 linehtag linentag commitinfo findloc
4780 set headline [lindex $commitinfo($id) 0]
4781 set author [lindex $commitinfo($id) 1]
4782 $canv delete match$row
4783 $canv2 delete match$row
4784 if {$findloc eq [mc "All fields"] || $findloc eq [mc "Headline"]} {
4785 set m [findmatches $headline]
4787 markmatches $canv $row $headline $linehtag($id) $m \
4788 [$canv itemcget $linehtag($id) -font] $row
4791 if {$findloc eq [mc "All fields"] || $findloc eq [mc "Author"]} {
4792 set m [findmatches $author]
4794 markmatches $canv2 $row $author $linentag($id) $m \
4795 [$canv2 itemcget $linentag($id) -font] $row
4800 proc vrel_change {name ix op} {
4801 global highlight_related
4804 if {$highlight_related ne [mc "None"]} {
4809 # prepare for testing whether commits are descendents or ancestors of a
4810 proc rhighlight_sel {a} {
4811 global descendent desc_todo ancestor anc_todo
4812 global highlight_related
4814 catch {unset descendent}
4815 set desc_todo [list $a]
4816 catch {unset ancestor}
4817 set anc_todo [list $a]
4818 if {$highlight_related ne [mc "None"]} {
4824 proc rhighlight_none {} {
4827 catch {unset rhighlights}
4831 proc is_descendent {a} {
4832 global curview children descendent desc_todo
4835 set la [rowofcommit $a]
4839 for {set i 0} {$i < [llength $todo]} {incr i} {
4840 set do [lindex $todo $i]
4841 if {[rowofcommit $do] < $la} {
4842 lappend leftover $do
4845 foreach nk $children($v,$do) {
4846 if {![info exists descendent($nk)]} {
4847 set descendent($nk) 1
4855 set desc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
4859 set descendent($a) 0
4860 set desc_todo $leftover
4863 proc is_ancestor {a} {
4864 global curview parents ancestor anc_todo
4867 set la [rowofcommit $a]
4871 for {set i 0} {$i < [llength $todo]} {incr i} {
4872 set do [lindex $todo $i]
4873 if {![commitinview $do $v] || [rowofcommit $do] > $la} {
4874 lappend leftover $do
4877 foreach np $parents($v,$do) {
4878 if {![info exists ancestor($np)]} {
4887 set anc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
4892 set anc_todo $leftover
4895 proc askrelhighlight {row id} {
4896 global descendent highlight_related iddrawn rhighlights
4897 global selectedline ancestor
4899 if {$selectedline eq {}} return
4901 if {$highlight_related eq [mc "Descendant"] ||
4902 $highlight_related eq [mc "Not descendant"]} {
4903 if {![info exists descendent($id)]} {
4906 if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} {
4909 } elseif {$highlight_related eq [mc "Ancestor"] ||
4910 $highlight_related eq [mc "Not ancestor"]} {
4911 if {![info exists ancestor($id)]} {
4914 if {$ancestor($id) == ($highlight_related eq [mc "Ancestor"])} {
4918 if {[info exists iddrawn($id)]} {
4919 if {$isbold && ![ishighlighted $id]} {
4920 bolden $id mainfontbold
4923 set rhighlights($id) $isbold
4926 # Graph layout functions
4928 proc shortids {ids} {
4931 if {[llength $id] > 1} {
4932 lappend res [shortids $id]
4933 } elseif {[regexp {^[0-9a-f]{40}$} $id]} {
4934 lappend res [string range $id 0 7]
4945 for {set mask 1} {$mask <= $n} {incr mask $mask} {
4946 if {($n & $mask) != 0} {
4947 set ret [concat $ret $o]
4949 set o [concat $o $o]
4954 proc ordertoken {id} {
4955 global ordertok curview varcid varcstart varctok curview parents children
4956 global nullid nullid2
4958 if {[info exists ordertok($id)]} {
4959 return $ordertok($id)
4964 if {[info exists varcid($curview,$id)]} {
4965 set a $varcid($curview,$id)
4966 set p [lindex $varcstart($curview) $a]
4968 set p [lindex $children($curview,$id) 0]
4970 if {[info exists ordertok($p)]} {
4971 set tok $ordertok($p)
4974 set id [first_real_child $curview,$p]
4977 set tok [lindex $varctok($curview) $varcid($curview,$p)]
4980 if {[llength $parents($curview,$id)] == 1} {
4981 lappend todo [list $p {}]
4983 set j [lsearch -exact $parents($curview,$id) $p]
4985 puts "oops didn't find [shortids $p] in parents of [shortids $id]"
4987 lappend todo [list $p [strrep $j]]
4990 for {set i [llength $todo]} {[incr i -1] >= 0} {} {
4991 set p [lindex $todo $i 0]
4992 append tok [lindex $todo $i 1]
4993 set ordertok($p) $tok
4995 set ordertok($origid) $tok
4999 # Work out where id should go in idlist so that order-token
5000 # values increase from left to right
5001 proc idcol {idlist id {i 0}} {
5002 set t [ordertoken $id]
5006 if {$i >= [llength $idlist] || $t < [ordertoken [lindex $idlist $i]]} {
5007 if {$i > [llength $idlist]} {
5008 set i [llength $idlist]
5010 while {[incr i -1] >= 0 && $t < [ordertoken [lindex $idlist $i]]} {}
5013 if {$t > [ordertoken [lindex $idlist $i]]} {
5014 while {[incr i] < [llength $idlist] &&
5015 $t >= [ordertoken [lindex $idlist $i]]} {}
5021 proc initlayout {} {
5022 global rowidlist rowisopt rowfinal displayorder parentlist
5023 global numcommits canvxmax canv
5025 global colormap rowtextx
5034 set canvxmax [$canv cget -width]
5035 catch {unset colormap}
5036 catch {unset rowtextx}
5040 proc setcanvscroll {} {
5041 global canv canv2 canv3 numcommits linespc canvxmax canvy0
5042 global lastscrollset lastscrollrows
5044 set ymax [expr {$canvy0 + ($numcommits - 0.5) * $linespc + 2}]
5045 $canv conf -scrollregion [list 0 0 $canvxmax $ymax]
5046 $canv2 conf -scrollregion [list 0 0 0 $ymax]
5047 $canv3 conf -scrollregion [list 0 0 0 $ymax]
5048 set lastscrollset [clock clicks -milliseconds]
5049 set lastscrollrows $numcommits
5052 proc visiblerows {} {
5053 global canv numcommits linespc
5055 set ymax [lindex [$canv cget -scrollregion] 3]
5056 if {$ymax eq {} || $ymax == 0} return
5058 set y0 [expr {int([lindex $f 0] * $ymax)}]
5059 set r0 [expr {int(($y0 - 3) / $linespc) - 1}]
5063 set y1 [expr {int([lindex $f 1] * $ymax)}]
5064 set r1 [expr {int(($y1 - 3) / $linespc) + 1}]
5065 if {$r1 >= $numcommits} {
5066 set r1 [expr {$numcommits - 1}]
5068 return [list $r0 $r1]
5071 proc layoutmore {} {
5072 global commitidx viewcomplete curview
5073 global numcommits pending_select curview
5074 global lastscrollset lastscrollrows
5076 if {$lastscrollrows < 100 || $viewcomplete($curview) ||
5077 [clock clicks -milliseconds] - $lastscrollset > 500} {
5080 if {[info exists pending_select] &&
5081 [commitinview $pending_select $curview]} {
5083 selectline [rowofcommit $pending_select] 1
5088 # With path limiting, we mightn't get the actual HEAD commit,
5089 # so ask git rev-list what is the first ancestor of HEAD that
5090 # touches a file in the path limit.
5091 proc get_viewmainhead {view} {
5092 global viewmainheadid vfilelimit viewinstances mainheadid
5095 set rfd [open [concat | git rev-list -1 $mainheadid \
5096 -- $vfilelimit($view)] r]
5097 set j [reg_instance $rfd]
5098 lappend viewinstances($view) $j
5099 fconfigure $rfd -blocking 0
5100 filerun $rfd [list getviewhead $rfd $j $view]
5101 set viewmainheadid($curview) {}
5105 # git rev-list should give us just 1 line to use as viewmainheadid($view)
5106 proc getviewhead {fd inst view} {
5107 global viewmainheadid commfd curview viewinstances showlocalchanges
5110 if {[gets $fd line] < 0} {
5114 } elseif {[string length $line] == 40 && [string is xdigit $line]} {
5117 set viewmainheadid($view) $id
5120 set i [lsearch -exact $viewinstances($view) $inst]
5122 set viewinstances($view) [lreplace $viewinstances($view) $i $i]
5124 if {$showlocalchanges && $id ne {} && $view == $curview} {
5130 proc doshowlocalchanges {} {
5131 global curview viewmainheadid
5133 if {$viewmainheadid($curview) eq {}} return
5134 if {[commitinview $viewmainheadid($curview) $curview]} {
5137 interestedin $viewmainheadid($curview) dodiffindex
5141 proc dohidelocalchanges {} {
5142 global nullid nullid2 lserial curview
5144 if {[commitinview $nullid $curview]} {
5145 removefakerow $nullid
5147 if {[commitinview $nullid2 $curview]} {
5148 removefakerow $nullid2
5153 # spawn off a process to do git diff-index --cached HEAD
5154 proc dodiffindex {} {
5155 global lserial showlocalchanges vfilelimit curview
5158 if {!$showlocalchanges || !$hasworktree} return
5160 set cmd "|git diff-index --cached HEAD"
5161 if {$vfilelimit($curview) ne {}} {
5162 set cmd [concat $cmd -- $vfilelimit($curview)]
5164 set fd [open $cmd r]
5165 fconfigure $fd -blocking 0
5166 set i [reg_instance $fd]
5167 filerun $fd [list readdiffindex $fd $lserial $i]
5170 proc readdiffindex {fd serial inst} {
5171 global viewmainheadid nullid nullid2 curview commitinfo commitdata lserial
5175 if {[gets $fd line] < 0} {
5181 # we only need to see one line and we don't really care what it says...
5184 if {$serial != $lserial} {
5188 # now see if there are any local changes not checked in to the index
5189 set cmd "|git diff-files"
5190 if {$vfilelimit($curview) ne {}} {
5191 set cmd [concat $cmd -- $vfilelimit($curview)]
5193 set fd [open $cmd r]
5194 fconfigure $fd -blocking 0
5195 set i [reg_instance $fd]
5196 filerun $fd [list readdifffiles $fd $serial $i]
5198 if {$isdiff && ![commitinview $nullid2 $curview]} {
5199 # add the line for the changes in the index to the graph
5200 set hl [mc "Local changes checked in to index but not committed"]
5201 set commitinfo($nullid2) [list $hl {} {} {} {} " $hl\n"]
5202 set commitdata($nullid2) "\n $hl\n"
5203 if {[commitinview $nullid $curview]} {
5204 removefakerow $nullid
5206 insertfakerow $nullid2 $viewmainheadid($curview)
5207 } elseif {!$isdiff && [commitinview $nullid2 $curview]} {
5208 if {[commitinview $nullid $curview]} {
5209 removefakerow $nullid
5211 removefakerow $nullid2
5216 proc readdifffiles {fd serial inst} {
5217 global viewmainheadid nullid nullid2 curview
5218 global commitinfo commitdata lserial
5221 if {[gets $fd line] < 0} {
5227 # we only need to see one line and we don't really care what it says...
5230 if {$serial != $lserial} {
5234 if {$isdiff && ![commitinview $nullid $curview]} {
5235 # add the line for the local diff to the graph
5236 set hl [mc "Local uncommitted changes, not checked in to index"]
5237 set commitinfo($nullid) [list $hl {} {} {} {} " $hl\n"]
5238 set commitdata($nullid) "\n $hl\n"
5239 if {[commitinview $nullid2 $curview]} {
5242 set p $viewmainheadid($curview)
5244 insertfakerow $nullid $p
5245 } elseif {!$isdiff && [commitinview $nullid $curview]} {
5246 removefakerow $nullid
5251 proc nextuse {id row} {
5252 global curview children
5254 if {[info exists children($curview,$id)]} {
5255 foreach kid $children($curview,$id) {
5256 if {![commitinview $kid $curview]} {
5259 if {[rowofcommit $kid] > $row} {
5260 return [rowofcommit $kid]
5264 if {[commitinview $id $curview]} {
5265 return [rowofcommit $id]
5270 proc prevuse {id row} {
5271 global curview children
5274 if {[info exists children($curview,$id)]} {
5275 foreach kid $children($curview,$id) {
5276 if {![commitinview $kid $curview]} break
5277 if {[rowofcommit $kid] < $row} {
5278 set ret [rowofcommit $kid]
5285 proc make_idlist {row} {
5286 global displayorder parentlist uparrowlen downarrowlen mingaplen
5287 global commitidx curview children
5289 set r [expr {$row - $mingaplen - $downarrowlen - 1}]
5293 set ra [expr {$row - $downarrowlen}]
5297 set rb [expr {$row + $uparrowlen}]
5298 if {$rb > $commitidx($curview)} {
5299 set rb $commitidx($curview)
5301 make_disporder $r [expr {$rb + 1}]
5303 for {} {$r < $ra} {incr r} {
5304 set nextid [lindex $displayorder [expr {$r + 1}]]
5305 foreach p [lindex $parentlist $r] {
5306 if {$p eq $nextid} continue
5307 set rn [nextuse $p $r]
5309 $rn <= $r + $downarrowlen + $mingaplen + $uparrowlen} {
5310 lappend ids [list [ordertoken $p] $p]
5314 for {} {$r < $row} {incr r} {
5315 set nextid [lindex $displayorder [expr {$r + 1}]]
5316 foreach p [lindex $parentlist $r] {
5317 if {$p eq $nextid} continue
5318 set rn [nextuse $p $r]
5319 if {$rn < 0 || $rn >= $row} {
5320 lappend ids [list [ordertoken $p] $p]
5324 set id [lindex $displayorder $row]
5325 lappend ids [list [ordertoken $id] $id]
5327 foreach p [lindex $parentlist $r] {
5328 set firstkid [lindex $children($curview,$p) 0]
5329 if {[rowofcommit $firstkid] < $row} {
5330 lappend ids [list [ordertoken $p] $p]
5334 set id [lindex $displayorder $r]
5336 set firstkid [lindex $children($curview,$id) 0]
5337 if {$firstkid ne {} && [rowofcommit $firstkid] < $row} {
5338 lappend ids [list [ordertoken $id] $id]
5343 foreach idx [lsort -unique $ids] {
5344 lappend idlist [lindex $idx 1]
5349 proc rowsequal {a b} {
5350 while {[set i [lsearch -exact $a {}]] >= 0} {
5351 set a [lreplace $a $i $i]
5353 while {[set i [lsearch -exact $b {}]] >= 0} {
5354 set b [lreplace $b $i $i]
5356 return [expr {$a eq $b}]
5359 proc makeupline {id row rend col} {
5360 global rowidlist uparrowlen downarrowlen mingaplen
5362 for {set r $rend} {1} {set r $rstart} {
5363 set rstart [prevuse $id $r]
5364 if {$rstart < 0} return
5365 if {$rstart < $row} break
5367 if {$rstart + $uparrowlen + $mingaplen + $downarrowlen < $rend} {
5368 set rstart [expr {$rend - $uparrowlen - 1}]
5370 for {set r $rstart} {[incr r] <= $row} {} {
5371 set idlist [lindex $rowidlist $r]
5372 if {$idlist ne {} && [lsearch -exact $idlist $id] < 0} {
5373 set col [idcol $idlist $id $col]
5374 lset rowidlist $r [linsert $idlist $col $id]
5380 proc layoutrows {row endrow} {
5381 global rowidlist rowisopt rowfinal displayorder
5382 global uparrowlen downarrowlen maxwidth mingaplen
5383 global children parentlist
5384 global commitidx viewcomplete curview
5386 make_disporder [expr {$row - 1}] [expr {$endrow + $uparrowlen}]
5389 set rm1 [expr {$row - 1}]
5390 foreach id [lindex $rowidlist $rm1] {
5395 set final [lindex $rowfinal $rm1]
5397 for {} {$row < $endrow} {incr row} {
5398 set rm1 [expr {$row - 1}]
5399 if {$rm1 < 0 || $idlist eq {}} {
5400 set idlist [make_idlist $row]
5403 set id [lindex $displayorder $rm1]
5404 set col [lsearch -exact $idlist $id]
5405 set idlist [lreplace $idlist $col $col]
5406 foreach p [lindex $parentlist $rm1] {
5407 if {[lsearch -exact $idlist $p] < 0} {
5408 set col [idcol $idlist $p $col]
5409 set idlist [linsert $idlist $col $p]
5410 # if not the first child, we have to insert a line going up
5411 if {$id ne [lindex $children($curview,$p) 0]} {
5412 makeupline $p $rm1 $row $col
5416 set id [lindex $displayorder $row]
5417 if {$row > $downarrowlen} {
5418 set termrow [expr {$row - $downarrowlen - 1}]
5419 foreach p [lindex $parentlist $termrow] {
5420 set i [lsearch -exact $idlist $p]
5421 if {$i < 0} continue
5422 set nr [nextuse $p $termrow]
5423 if {$nr < 0 || $nr >= $row + $mingaplen + $uparrowlen} {
5424 set idlist [lreplace $idlist $i $i]
5428 set col [lsearch -exact $idlist $id]
5430 set col [idcol $idlist $id]
5431 set idlist [linsert $idlist $col $id]
5432 if {$children($curview,$id) ne {}} {
5433 makeupline $id $rm1 $row $col
5436 set r [expr {$row + $uparrowlen - 1}]
5437 if {$r < $commitidx($curview)} {
5439 foreach p [lindex $parentlist $r] {
5440 if {[lsearch -exact $idlist $p] >= 0} continue
5441 set fk [lindex $children($curview,$p) 0]
5442 if {[rowofcommit $fk] < $row} {
5443 set x [idcol $idlist $p $x]
5444 set idlist [linsert $idlist $x $p]
5447 if {[incr r] < $commitidx($curview)} {
5448 set p [lindex $displayorder $r]
5449 if {[lsearch -exact $idlist $p] < 0} {
5450 set fk [lindex $children($curview,$p) 0]
5451 if {$fk ne {} && [rowofcommit $fk] < $row} {
5452 set x [idcol $idlist $p $x]
5453 set idlist [linsert $idlist $x $p]
5459 if {$final && !$viewcomplete($curview) &&
5460 $row + $uparrowlen + $mingaplen + $downarrowlen
5461 >= $commitidx($curview)} {
5464 set l [llength $rowidlist]
5466 lappend rowidlist $idlist
5468 lappend rowfinal $final
5469 } elseif {$row < $l} {
5470 if {![rowsequal $idlist [lindex $rowidlist $row]]} {
5471 lset rowidlist $row $idlist
5474 lset rowfinal $row $final
5476 set pad [ntimes [expr {$row - $l}] {}]
5477 set rowidlist [concat $rowidlist $pad]
5478 lappend rowidlist $idlist
5479 set rowfinal [concat $rowfinal $pad]
5480 lappend rowfinal $final
5481 set rowisopt [concat $rowisopt [ntimes [expr {$row - $l + 1}] 0]]
5487 proc changedrow {row} {
5488 global displayorder iddrawn rowisopt need_redisplay
5490 set l [llength $rowisopt]
5492 lset rowisopt $row 0
5493 if {$row + 1 < $l} {
5494 lset rowisopt [expr {$row + 1}] 0
5495 if {$row + 2 < $l} {
5496 lset rowisopt [expr {$row + 2}] 0
5500 set id [lindex $displayorder $row]
5501 if {[info exists iddrawn($id)]} {
5502 set need_redisplay 1
5506 proc insert_pad {row col npad} {
5509 set pad [ntimes $npad {}]
5510 set idlist [lindex $rowidlist $row]
5511 set bef [lrange $idlist 0 [expr {$col - 1}]]
5512 set aft [lrange $idlist $col end]
5513 set i [lsearch -exact $aft {}]
5515 set aft [lreplace $aft $i $i]
5517 lset rowidlist $row [concat $bef $pad $aft]
5521 proc optimize_rows {row col endrow} {
5522 global rowidlist rowisopt displayorder curview children
5527 for {} {$row < $endrow} {incr row; set col 0} {
5528 if {[lindex $rowisopt $row]} continue
5530 set y0 [expr {$row - 1}]
5531 set ym [expr {$row - 2}]
5532 set idlist [lindex $rowidlist $row]
5533 set previdlist [lindex $rowidlist $y0]
5534 if {$idlist eq {} || $previdlist eq {}} continue
5536 set pprevidlist [lindex $rowidlist $ym]
5537 if {$pprevidlist eq {}} continue
5543 for {} {$col < [llength $idlist]} {incr col} {
5544 set id [lindex $idlist $col]
5545 if {[lindex $previdlist $col] eq $id} continue
5550 set x0 [lsearch -exact $previdlist $id]
5551 if {$x0 < 0} continue
5552 set z [expr {$x0 - $col}]
5556 set xm [lsearch -exact $pprevidlist $id]
5558 set z0 [expr {$xm - $x0}]
5562 # if row y0 is the first child of $id then it's not an arrow
5563 if {[lindex $children($curview,$id) 0] ne
5564 [lindex $displayorder $y0]} {
5568 if {!$isarrow && $id ne [lindex $displayorder $row] &&
5569 [lsearch -exact [lindex $rowidlist [expr {$row+1}]] $id] < 0} {
5572 # Looking at lines from this row to the previous row,
5573 # make them go straight up if they end in an arrow on
5574 # the previous row; otherwise make them go straight up
5576 if {$z < -1 || ($z < 0 && $isarrow)} {
5577 # Line currently goes left too much;
5578 # insert pads in the previous row, then optimize it
5579 set npad [expr {-1 - $z + $isarrow}]
5580 insert_pad $y0 $x0 $npad
5582 optimize_rows $y0 $x0 $row
5584 set previdlist [lindex $rowidlist $y0]
5585 set x0 [lsearch -exact $previdlist $id]
5586 set z [expr {$x0 - $col}]
5588 set pprevidlist [lindex $rowidlist $ym]
5589 set xm [lsearch -exact $pprevidlist $id]
5590 set z0 [expr {$xm - $x0}]
5592 } elseif {$z > 1 || ($z > 0 && $isarrow)} {
5593 # Line currently goes right too much;
5594 # insert pads in this line
5595 set npad [expr {$z - 1 + $isarrow}]
5596 insert_pad $row $col $npad
5597 set idlist [lindex $rowidlist $row]
5599 set z [expr {$x0 - $col}]
5602 if {$z0 eq {} && !$isarrow && $ym >= 0} {
5603 # this line links to its first child on row $row-2
5604 set id [lindex $displayorder $ym]
5605 set xc [lsearch -exact $pprevidlist $id]
5607 set z0 [expr {$xc - $x0}]
5610 # avoid lines jigging left then immediately right
5611 if {$z0 ne {} && $z < 0 && $z0 > 0} {
5612 insert_pad $y0 $x0 1
5614 optimize_rows $y0 $x0 $row
5615 set previdlist [lindex $rowidlist $y0]
5619 # Find the first column that doesn't have a line going right
5620 for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
5621 set id [lindex $idlist $col]
5622 if {$id eq {}} break
5623 set x0 [lsearch -exact $previdlist $id]
5625 # check if this is the link to the first child
5626 set kid [lindex $displayorder $y0]
5627 if {[lindex $children($curview,$id) 0] eq $kid} {
5628 # it is, work out offset to child
5629 set x0 [lsearch -exact $previdlist $kid]
5632 if {$x0 <= $col} break
5634 # Insert a pad at that column as long as it has a line and
5635 # isn't the last column
5636 if {$x0 >= 0 && [incr col] < [llength $idlist]} {
5637 set idlist [linsert $idlist $col {}]
5638 lset rowidlist $row $idlist
5646 global canvx0 linespc
5647 return [expr {$canvx0 + $col * $linespc}]
5651 global canvy0 linespc
5652 return [expr {$canvy0 + $row * $linespc}]
5655 proc linewidth {id} {
5656 global thickerline lthickness
5659 if {[info exists thickerline] && $id eq $thickerline} {
5660 set wid [expr {2 * $lthickness}]
5665 proc rowranges {id} {
5666 global curview children uparrowlen downarrowlen
5669 set kids $children($curview,$id)
5675 foreach child $kids {
5676 if {![commitinview $child $curview]} break
5677 set row [rowofcommit $child]
5678 if {![info exists prev]} {
5679 lappend ret [expr {$row + 1}]
5681 if {$row <= $prevrow} {
5682 puts "oops children of [shortids $id] out of order [shortids $child] $row <= [shortids $prev] $prevrow"
5684 # see if the line extends the whole way from prevrow to row
5685 if {$row > $prevrow + $uparrowlen + $downarrowlen &&
5686 [lsearch -exact [lindex $rowidlist \
5687 [expr {int(($row + $prevrow) / 2)}]] $id] < 0} {
5688 # it doesn't, see where it ends
5689 set r [expr {$prevrow + $downarrowlen}]
5690 if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {
5691 while {[incr r -1] > $prevrow &&
5692 [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}
5694 while {[incr r] <= $row &&
5695 [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}
5699 # see where it starts up again
5700 set r [expr {$row - $uparrowlen}]
5701 if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {
5702 while {[incr r] < $row &&
5703 [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}
5705 while {[incr r -1] >= $prevrow &&
5706 [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}
5712 if {$child eq $id} {
5721 proc drawlineseg {id row endrow arrowlow} {
5722 global rowidlist displayorder iddrawn linesegs
5723 global canv colormap linespc curview maxlinelen parentlist
5725 set cols [list [lsearch -exact [lindex $rowidlist $row] $id]]
5726 set le [expr {$row + 1}]
5729 set c [lsearch -exact [lindex $rowidlist $le] $id]
5735 set x [lindex $displayorder $le]
5740 if {[info exists iddrawn($x)] || $le == $endrow} {
5741 set c [lsearch -exact [lindex $rowidlist [expr {$le+1}]] $id]
5757 if {[info exists linesegs($id)]} {
5758 set lines $linesegs($id)
5760 set r0 [lindex $li 0]
5762 if {$r0 == $le && [lindex $li 1] - $row <= $maxlinelen} {
5772 set li [lindex $lines [expr {$i-1}]]
5773 set r1 [lindex $li 1]
5774 if {$r1 == $row && $le - [lindex $li 0] <= $maxlinelen} {
5779 set x [lindex $cols [expr {$le - $row}]]
5780 set xp [lindex $cols [expr {$le - 1 - $row}]]
5781 set dir [expr {$xp - $x}]
5783 set ith [lindex $lines $i 2]
5784 set coords [$canv coords $ith]
5785 set ah [$canv itemcget $ith -arrow]
5786 set arrowhigh [expr {$ah eq "first" || $ah eq "both"}]
5787 set x2 [lindex $cols [expr {$le + 1 - $row}]]
5788 if {$x2 ne {} && $x - $x2 == $dir} {
5789 set coords [lrange $coords 0 end-2]
5792 set coords [list [xc $le $x] [yc $le]]
5795 set itl [lindex $lines [expr {$i-1}] 2]
5796 set al [$canv itemcget $itl -arrow]
5797 set arrowlow [expr {$al eq "last" || $al eq "both"}]
5798 } elseif {$arrowlow} {
5799 if {[lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0 ||
5800 [lsearch -exact [lindex $parentlist [expr {$row-1}]] $id] >= 0} {
5804 set arrow [lindex {none first last both} [expr {$arrowhigh + 2*$arrowlow}]]
5805 for {set y $le} {[incr y -1] > $row} {} {
5807 set xp [lindex $cols [expr {$y - 1 - $row}]]
5808 set ndir [expr {$xp - $x}]
5809 if {$dir != $ndir || $xp < 0} {
5810 lappend coords [xc $y $x] [yc $y]
5816 # join parent line to first child
5817 set ch [lindex $displayorder $row]
5818 set xc [lsearch -exact [lindex $rowidlist $row] $ch]
5820 puts "oops: drawlineseg: child $ch not on row $row"
5821 } elseif {$xc != $x} {
5822 if {($arrowhigh && $le == $row + 1) || $dir == 0} {
5823 set d [expr {int(0.5 * $linespc)}]
5826 set x2 [expr {$x1 - $d}]
5828 set x2 [expr {$x1 + $d}]
5831 set y1 [expr {$y2 + $d}]
5832 lappend coords $x1 $y1 $x2 $y2
5833 } elseif {$xc < $x - 1} {
5834 lappend coords [xc $row [expr {$x-1}]] [yc $row]
5835 } elseif {$xc > $x + 1} {
5836 lappend coords [xc $row [expr {$x+1}]] [yc $row]
5840 lappend coords [xc $row $x] [yc $row]
5842 set xn [xc $row $xp]
5844 lappend coords $xn $yn
5848 set t [$canv create line $coords -width [linewidth $id] \
5849 -fill $colormap($id) -tags lines.$id -arrow $arrow]
5852 set lines [linsert $lines $i [list $row $le $t]]
5854 $canv coords $ith $coords
5855 if {$arrow ne $ah} {
5856 $canv itemconf $ith -arrow $arrow
5858 lset lines $i 0 $row
5861 set xo [lsearch -exact [lindex $rowidlist [expr {$row - 1}]] $id]
5862 set ndir [expr {$xo - $xp}]
5863 set clow [$canv coords $itl]
5864 if {$dir == $ndir} {
5865 set clow [lrange $clow 2 end]
5867 set coords [concat $coords $clow]
5869 lset lines [expr {$i-1}] 1 $le
5871 # coalesce two pieces
5873 set b [lindex $lines [expr {$i-1}] 0]
5874 set e [lindex $lines $i 1]
5875 set lines [lreplace $lines [expr {$i-1}] $i [list $b $e $itl]]
5877 $canv coords $itl $coords
5878 if {$arrow ne $al} {
5879 $canv itemconf $itl -arrow $arrow
5883 set linesegs($id) $lines
5887 proc drawparentlinks {id row} {
5888 global rowidlist canv colormap curview parentlist
5889 global idpos linespc
5891 set rowids [lindex $rowidlist $row]
5892 set col [lsearch -exact $rowids $id]
5893 if {$col < 0} return
5894 set olds [lindex $parentlist $row]
5895 set row2 [expr {$row + 1}]
5896 set x [xc $row $col]
5899 set d [expr {int(0.5 * $linespc)}]
5900 set ymid [expr {$y + $d}]
5901 set ids [lindex $rowidlist $row2]
5902 # rmx = right-most X coord used
5905 set i [lsearch -exact $ids $p]
5907 puts "oops, parent $p of $id not in list"
5910 set x2 [xc $row2 $i]
5914 set j [lsearch -exact $rowids $p]
5916 # drawlineseg will do this one for us
5920 # should handle duplicated parents here...
5921 set coords [list $x $y]
5923 # if attaching to a vertical segment, draw a smaller
5924 # slant for visual distinctness
5927 lappend coords [expr {$x2 + $d}] $y $x2 $ymid
5929 lappend coords [expr {$x2 - $d}] $y $x2 $ymid
5931 } elseif {$i < $col && $i < $j} {
5932 # segment slants towards us already
5933 lappend coords [xc $row $j] $y
5935 if {$i < $col - 1} {
5936 lappend coords [expr {$x2 + $linespc}] $y
5937 } elseif {$i > $col + 1} {
5938 lappend coords [expr {$x2 - $linespc}] $y
5940 lappend coords $x2 $y2
5943 lappend coords $x2 $y2
5945 set t [$canv create line $coords -width [linewidth $p] \
5946 -fill $colormap($p) -tags lines.$p]
5950 if {$rmx > [lindex $idpos($id) 1]} {
5951 lset idpos($id) 1 $rmx
5956 proc drawlines {id} {
5959 $canv itemconf lines.$id -width [linewidth $id]
5962 proc drawcmittext {id row col} {
5963 global linespc canv canv2 canv3 fgcolor curview
5964 global cmitlisted commitinfo rowidlist parentlist
5965 global rowtextx idpos idtags idheads idotherrefs
5966 global linehtag linentag linedtag selectedline
5967 global canvxmax boldids boldnameids fgcolor markedid
5968 global mainheadid nullid nullid2 circleitem circlecolors ctxbut
5969 global mainheadcirclecolor workingfilescirclecolor indexcirclecolor
5970 global circleoutlinecolor
5972 # listed is 0 for boundary, 1 for normal, 2 for negative, 3 for left, 4 for right
5973 set listed $cmitlisted($curview,$id)
5974 if {$id eq $nullid} {
5975 set ofill $workingfilescirclecolor
5976 } elseif {$id eq $nullid2} {
5977 set ofill $indexcirclecolor
5978 } elseif {$id eq $mainheadid} {
5979 set ofill $mainheadcirclecolor
5981 set ofill [lindex $circlecolors $listed]
5983 set x [xc $row $col]
5985 set orad [expr {$linespc / 3}]
5987 set t [$canv create oval [expr {$x - $orad}] [expr {$y - $orad}] \
5988 [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
5989 -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]
5990 } elseif {$listed == 3} {
5991 # triangle pointing left for left-side commits
5992 set t [$canv create polygon \
5993 [expr {$x - $orad}] $y \
5994 [expr {$x + $orad - 1}] [expr {$y - $orad}] \
5995 [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
5996 -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]
5998 # triangle pointing right for right-side commits
5999 set t [$canv create polygon \
6000 [expr {$x + $orad - 1}] $y \
6001 [expr {$x - $orad}] [expr {$y - $orad}] \
6002 [expr {$x - $orad}] [expr {$y + $orad - 1}] \
6003 -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]
6005 set circleitem($row) $t
6007 $canv bind $t <1> {selcanvline {} %x %y}
6008 set rmx [llength [lindex $rowidlist $row]]
6009 set olds [lindex $parentlist $row]
6011 set nextids [lindex $rowidlist [expr {$row + 1}]]
6013 set i [lsearch -exact $nextids $p]
6019 set xt [xc $row $rmx]
6020 set rowtextx($row) $xt
6021 set idpos($id) [list $x $xt $y]
6022 if {[info exists idtags($id)] || [info exists idheads($id)]
6023 || [info exists idotherrefs($id)]} {
6024 set xt [drawtags $id $x $xt $y]
6026 if {[lindex $commitinfo($id) 6] > 0} {
6027 set xt [drawnotesign $xt $y]
6029 set headline [lindex $commitinfo($id) 0]
6030 set name [lindex $commitinfo($id) 1]
6031 set date [lindex $commitinfo($id) 2]
6032 set date [formatdate $date]
6035 set isbold [ishighlighted $id]
6038 set font mainfontbold
6040 lappend boldnameids $id
6041 set nfont mainfontbold
6044 set linehtag($id) [$canv create text $xt $y -anchor w -fill $fgcolor \
6045 -text $headline -font $font -tags text]
6046 $canv bind $linehtag($id) $ctxbut "rowmenu %X %Y $id"
6047 set linentag($id) [$canv2 create text 3 $y -anchor w -fill $fgcolor \
6048 -text $name -font $nfont -tags text]
6049 set linedtag($id) [$canv3 create text 3 $y -anchor w -fill $fgcolor \
6050 -text $date -font mainfont -tags text]
6051 if {$selectedline == $row} {
6054 if {[info exists markedid] && $markedid eq $id} {
6057 set xr [expr {$xt + [font measure $font $headline]}]
6058 if {$xr > $canvxmax} {
6064 proc drawcmitrow {row} {
6065 global displayorder rowidlist nrows_drawn
6066 global iddrawn markingmatches
6067 global commitinfo numcommits
6068 global filehighlight fhighlights findpattern nhighlights
6069 global hlview vhighlights
6070 global highlight_related rhighlights
6072 if {$row >= $numcommits} return
6074 set id [lindex $displayorder $row]
6075 if {[info exists hlview] && ![info exists vhighlights($id)]} {
6076 askvhighlight $row $id
6078 if {[info exists filehighlight] && ![info exists fhighlights($id)]} {
6079 askfilehighlight $row $id
6081 if {$findpattern ne {} && ![info exists nhighlights($id)]} {
6082 askfindhighlight $row $id
6084 if {$highlight_related ne [mc "None"] && ![info exists rhighlights($id)]} {
6085 askrelhighlight $row $id
6087 if {![info exists iddrawn($id)]} {
6088 set col [lsearch -exact [lindex $rowidlist $row] $id]
6090 puts "oops, row $row id $id not in list"
6093 if {![info exists commitinfo($id)]} {
6097 drawcmittext $id $row $col
6101 if {$markingmatches} {
6102 markrowmatches $row $id
6106 proc drawcommits {row {endrow {}}} {
6107 global numcommits iddrawn displayorder curview need_redisplay
6108 global parentlist rowidlist rowfinal uparrowlen downarrowlen nrows_drawn
6113 if {$endrow eq {}} {
6116 if {$endrow >= $numcommits} {
6117 set endrow [expr {$numcommits - 1}]
6120 set rl1 [expr {$row - $downarrowlen - 3}]
6124 set ro1 [expr {$row - 3}]
6128 set r2 [expr {$endrow + $uparrowlen + 3}]
6129 if {$r2 > $numcommits} {
6132 for {set r $rl1} {$r < $r2} {incr r} {
6133 if {[lindex $rowidlist $r] ne {} && [lindex $rowfinal $r]} {
6137 set rl1 [expr {$r + 1}]
6143 optimize_rows $ro1 0 $r2
6144 if {$need_redisplay || $nrows_drawn > 2000} {
6148 # make the lines join to already-drawn rows either side
6149 set r [expr {$row - 1}]
6150 if {$r < 0 || ![info exists iddrawn([lindex $displayorder $r])]} {
6153 set er [expr {$endrow + 1}]
6154 if {$er >= $numcommits ||
6155 ![info exists iddrawn([lindex $displayorder $er])]} {
6158 for {} {$r <= $er} {incr r} {
6159 set id [lindex $displayorder $r]
6160 set wasdrawn [info exists iddrawn($id)]
6162 if {$r == $er} break
6163 set nextid [lindex $displayorder [expr {$r + 1}]]
6164 if {$wasdrawn && [info exists iddrawn($nextid)]} continue
6165 drawparentlinks $id $r
6167 set rowids [lindex $rowidlist $r]
6168 foreach lid $rowids {
6169 if {$lid eq {}} continue
6170 if {[info exists lineend($lid)] && $lineend($lid) > $r} continue
6172 # see if this is the first child of any of its parents
6173 foreach p [lindex $parentlist $r] {
6174 if {[lsearch -exact $rowids $p] < 0} {
6175 # make this line extend up to the child
6176 set lineend($p) [drawlineseg $p $r $er 0]
6180 set lineend($lid) [drawlineseg $lid $r $er 1]
6186 proc undolayout {row} {
6187 global uparrowlen mingaplen downarrowlen
6188 global rowidlist rowisopt rowfinal need_redisplay
6190 set r [expr {$row - ($uparrowlen + $mingaplen + $downarrowlen)}]
6194 if {[llength $rowidlist] > $r} {
6196 set rowidlist [lrange $rowidlist 0 $r]
6197 set rowfinal [lrange $rowfinal 0 $r]
6198 set rowisopt [lrange $rowisopt 0 $r]
6199 set need_redisplay 1
6204 proc drawvisible {} {
6205 global canv linespc curview vrowmod selectedline targetrow targetid
6206 global need_redisplay cscroll numcommits
6208 set fs [$canv yview]
6209 set ymax [lindex [$canv cget -scrollregion] 3]
6210 if {$ymax eq {} || $ymax == 0 || $numcommits == 0} return
6211 set f0 [lindex $fs 0]
6212 set f1 [lindex $fs 1]
6213 set y0 [expr {int($f0 * $ymax)}]
6214 set y1 [expr {int($f1 * $ymax)}]
6216 if {[info exists targetid]} {
6217 if {[commitinview $targetid $curview]} {
6218 set r [rowofcommit $targetid]
6219 if {$r != $targetrow} {
6220 # Fix up the scrollregion and change the scrolling position
6221 # now that our target row has moved.
6222 set diff [expr {($r - $targetrow) * $linespc}]
6225 set ymax [lindex [$canv cget -scrollregion] 3]
6228 set f0 [expr {$y0 / $ymax}]
6229 set f1 [expr {$y1 / $ymax}]
6230 allcanvs yview moveto $f0
6231 $cscroll set $f0 $f1
6232 set need_redisplay 1
6239 set row [expr {int(($y0 - 3) / $linespc) - 1}]
6240 set endrow [expr {int(($y1 - 3) / $linespc) + 1}]
6241 if {$endrow >= $vrowmod($curview)} {
6242 update_arcrows $curview
6244 if {$selectedline ne {} &&
6245 $row <= $selectedline && $selectedline <= $endrow} {
6246 set targetrow $selectedline
6247 } elseif {[info exists targetid]} {
6248 set targetrow [expr {int(($row + $endrow) / 2)}]
6250 if {[info exists targetrow]} {
6251 if {$targetrow >= $numcommits} {
6252 set targetrow [expr {$numcommits - 1}]
6254 set targetid [commitonrow $targetrow]
6256 drawcommits $row $endrow
6259 proc clear_display {} {
6260 global iddrawn linesegs need_redisplay nrows_drawn
6261 global vhighlights fhighlights nhighlights rhighlights
6262 global linehtag linentag linedtag boldids boldnameids
6265 catch {unset iddrawn}
6266 catch {unset linesegs}
6267 catch {unset linehtag}
6268 catch {unset linentag}
6269 catch {unset linedtag}
6272 catch {unset vhighlights}
6273 catch {unset fhighlights}
6274 catch {unset nhighlights}
6275 catch {unset rhighlights}
6276 set need_redisplay 0
6280 proc findcrossings {id} {
6281 global rowidlist parentlist numcommits displayorder
6285 foreach {s e} [rowranges $id] {
6286 if {$e >= $numcommits} {
6287 set e [expr {$numcommits - 1}]
6289 if {$e <= $s} continue
6290 for {set row $e} {[incr row -1] >= $s} {} {
6291 set x [lsearch -exact [lindex $rowidlist $row] $id]
6293 set olds [lindex $parentlist $row]
6294 set kid [lindex $displayorder $row]
6295 set kidx [lsearch -exact [lindex $rowidlist $row] $kid]
6296 if {$kidx < 0} continue
6297 set nextrow [lindex $rowidlist [expr {$row + 1}]]
6299 set px [lsearch -exact $nextrow $p]
6300 if {$px < 0} continue
6301 if {($kidx < $x && $x < $px) || ($px < $x && $x < $kidx)} {
6302 if {[lsearch -exact $ccross $p] >= 0} continue
6303 if {$x == $px + ($kidx < $px? -1: 1)} {
6305 } elseif {[lsearch -exact $cross $p] < 0} {
6312 return [concat $ccross {{}} $cross]
6315 proc assigncolor {id} {
6316 global colormap colors nextcolor
6317 global parents children children curview
6319 if {[info exists colormap($id)]} return
6320 set ncolors [llength $colors]
6321 if {[info exists children($curview,$id)]} {
6322 set kids $children($curview,$id)
6326 if {[llength $kids] == 1} {
6327 set child [lindex $kids 0]
6328 if {[info exists colormap($child)]
6329 && [llength $parents($curview,$child)] == 1} {
6330 set colormap($id) $colormap($child)
6336 foreach x [findcrossings $id] {
6338 # delimiter between corner crossings and other crossings
6339 if {[llength $badcolors] >= $ncolors - 1} break
6340 set origbad $badcolors
6342 if {[info exists colormap($x)]
6343 && [lsearch -exact $badcolors $colormap($x)] < 0} {
6344 lappend badcolors $colormap($x)
6347 if {[llength $badcolors] >= $ncolors} {
6348 set badcolors $origbad
6350 set origbad $badcolors
6351 if {[llength $badcolors] < $ncolors - 1} {
6352 foreach child $kids {
6353 if {[info exists colormap($child)]
6354 && [lsearch -exact $badcolors $colormap($child)] < 0} {
6355 lappend badcolors $colormap($child)
6357 foreach p $parents($curview,$child) {
6358 if {[info exists colormap($p)]
6359 && [lsearch -exact $badcolors $colormap($p)] < 0} {
6360 lappend badcolors $colormap($p)
6364 if {[llength $badcolors] >= $ncolors} {
6365 set badcolors $origbad
6368 for {set i 0} {$i <= $ncolors} {incr i} {
6369 set c [lindex $colors $nextcolor]
6370 if {[incr nextcolor] >= $ncolors} {
6373 if {[lsearch -exact $badcolors $c]} break
6375 set colormap($id) $c
6378 proc bindline {t id} {
6381 $canv bind $t <Enter> "lineenter %x %y $id"
6382 $canv bind $t <Motion> "linemotion %x %y $id"
6383 $canv bind $t <Leave> "lineleave $id"
6384 $canv bind $t <Button-1> "lineclick %x %y $id 1"
6387 proc drawtags {id x xt y1} {
6388 global idtags idheads idotherrefs mainhead
6389 global linespc lthickness
6390 global canv rowtextx curview fgcolor bgcolor ctxbut
6391 global headbgcolor headfgcolor headoutlinecolor remotebgcolor
6392 global tagbgcolor tagfgcolor tagoutlinecolor
6398 if {[info exists idtags($id)]} {
6399 set marks $idtags($id)
6400 set ntags [llength $marks]
6402 if {[info exists idheads($id)]} {
6403 set marks [concat $marks $idheads($id)]
6404 set nheads [llength $idheads($id)]
6406 if {[info exists idotherrefs($id)]} {
6407 set marks [concat $marks $idotherrefs($id)]
6413 set delta [expr {int(0.5 * ($linespc - $lthickness))}]
6414 set yt [expr {$y1 - 0.5 * $linespc}]
6415 set yb [expr {$yt + $linespc - 1}]
6419 foreach tag $marks {
6421 if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} {
6422 set wid [font measure mainfontbold $tag]
6424 set wid [font measure mainfont $tag]
6428 set xt [expr {$xt + $delta + $wid + $lthickness + $linespc}]
6430 set t [$canv create line $x $y1 [lindex $xvals end] $y1 \
6431 -width $lthickness -fill $reflinecolor -tags tag.$id]
6433 foreach tag $marks x $xvals wid $wvals {
6434 set tag_quoted [string map {% %%} $tag]
6435 set xl [expr {$x + $delta}]
6436 set xr [expr {$x + $delta + $wid + $lthickness}]
6438 if {[incr ntags -1] >= 0} {
6440 set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
6441 $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
6442 -width 1 -outline $tagoutlinecolor -fill $tagbgcolor \
6444 $canv bind $t <1> [list showtag $tag_quoted 1]
6445 set rowtextx([rowofcommit $id]) [expr {$xr + $linespc}]
6447 # draw a head or other ref
6448 if {[incr nheads -1] >= 0} {
6449 set col $headbgcolor
6450 if {$tag eq $mainhead} {
6451 set font mainfontbold
6456 set xl [expr {$xl - $delta/2}]
6457 $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
6458 -width 1 -outline black -fill $col -tags tag.$id
6459 if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
6460 set rwid [font measure mainfont $remoteprefix]
6461 set xi [expr {$x + 1}]
6462 set yti [expr {$yt + 1}]
6463 set xri [expr {$x + $rwid}]
6464 $canv create polygon $xi $yti $xri $yti $xri $yb $xi $yb \
6465 -width 0 -fill $remotebgcolor -tags tag.$id
6468 set t [$canv create text $xl $y1 -anchor w -text $tag -fill $headfgcolor \
6469 -font $font -tags [list tag.$id text]]
6471 $canv bind $t <1> [list showtag $tag_quoted 1]
6472 } elseif {$nheads >= 0} {
6473 $canv bind $t $ctxbut [list headmenu %X %Y $id $tag_quoted]
6479 proc drawnotesign {xt y} {
6480 global linespc canv fgcolor
6482 set orad [expr {$linespc / 3}]
6483 set t [$canv create rectangle [expr {$xt - $orad}] [expr {$y - $orad}] \
6484 [expr {$xt + $orad - 1}] [expr {$y + $orad - 1}] \
6485 -fill yellow -outline $fgcolor -width 1 -tags circle]
6486 set xt [expr {$xt + $orad * 3}]
6490 proc xcoord {i level ln} {
6491 global canvx0 xspc1 xspc2
6493 set x [expr {$canvx0 + $i * $xspc1($ln)}]
6494 if {$i > 0 && $i == $level} {
6495 set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}]
6496 } elseif {$i > $level} {
6497 set x [expr {$x + $xspc2 - $xspc1($ln)}]
6502 proc show_status {msg} {
6506 $canv create text 3 3 -anchor nw -text $msg -font mainfont \
6507 -tags text -fill $fgcolor
6510 # Don't change the text pane cursor if it is currently the hand cursor,
6511 # showing that we are over a sha1 ID link.
6512 proc settextcursor {c} {
6513 global ctext curtextcursor
6515 if {[$ctext cget -cursor] == $curtextcursor} {
6516 $ctext config -cursor $c
6518 set curtextcursor $c
6521 proc nowbusy {what {name {}}} {
6522 global isbusy busyname statusw
6524 if {[array names isbusy] eq {}} {
6525 . config -cursor watch
6529 set busyname($what) $name
6531 $statusw conf -text $name
6535 proc notbusy {what} {
6536 global isbusy maincursor textcursor busyname statusw
6540 if {$busyname($what) ne {} &&
6541 [$statusw cget -text] eq $busyname($what)} {
6542 $statusw conf -text {}
6545 if {[array names isbusy] eq {}} {
6546 . config -cursor $maincursor
6547 settextcursor $textcursor
6551 proc findmatches {f} {
6552 global findtype findstring
6553 if {$findtype == [mc "Regexp"]} {
6554 set matches [regexp -indices -all -inline $findstring $f]
6557 if {$findtype == [mc "IgnCase"]} {
6558 set f [string tolower $f]
6559 set fs [string tolower $fs]
6563 set l [string length $fs]
6564 while {[set j [string first $fs $f $i]] >= 0} {
6565 lappend matches [list $j [expr {$j+$l-1}]]
6566 set i [expr {$j + $l}]
6572 proc dofind {{dirn 1} {wrap 1}} {
6573 global findstring findstartline findcurline selectedline numcommits
6574 global gdttype filehighlight fh_serial find_dirn findallowwrap
6576 if {[info exists find_dirn]} {
6577 if {$find_dirn == $dirn} return
6581 if {$findstring eq {} || $numcommits == 0} return
6582 if {$selectedline eq {}} {
6583 set findstartline [lindex [visiblerows] [expr {$dirn < 0}]]
6585 set findstartline $selectedline
6587 set findcurline $findstartline
6588 nowbusy finding [mc "Searching"]
6589 if {$gdttype ne [mc "containing:"] && ![info exists filehighlight]} {
6590 after cancel do_file_hl $fh_serial
6591 do_file_hl $fh_serial
6594 set findallowwrap $wrap
6598 proc stopfinding {} {
6599 global find_dirn findcurline fprogcoord
6601 if {[info exists find_dirn]} {
6612 global commitdata commitinfo numcommits findpattern findloc
6613 global findstartline findcurline findallowwrap
6614 global find_dirn gdttype fhighlights fprogcoord
6615 global curview varcorder vrownum varccommits vrowmod
6617 if {![info exists find_dirn]} {
6620 set fldtypes [list [mc "Headline"] [mc "Author"] "" [mc "Committer"] "" [mc "Comments"]]
6623 if {$find_dirn > 0} {
6625 if {$l >= $numcommits} {
6628 if {$l <= $findstartline} {
6629 set lim [expr {$findstartline + 1}]
6632 set moretodo $findallowwrap
6639 if {$l >= $findstartline} {
6640 set lim [expr {$findstartline - 1}]
6643 set moretodo $findallowwrap
6646 set n [expr {($lim - $l) * $find_dirn}]
6651 if {$l + ($find_dirn > 0? $n: 1) > $vrowmod($curview)} {
6652 update_arcrows $curview
6656 set ai [bsearch $vrownum($curview) $l]
6657 set a [lindex $varcorder($curview) $ai]
6658 set arow [lindex $vrownum($curview) $ai]
6659 set ids [lindex $varccommits($curview,$a)]
6660 set arowend [expr {$arow + [llength $ids]}]
6661 if {$gdttype eq [mc "containing:"]} {
6662 for {} {$n > 0} {incr n -1; incr l $find_dirn} {
6663 if {$l < $arow || $l >= $arowend} {
6665 set a [lindex $varcorder($curview) $ai]
6666 set arow [lindex $vrownum($curview) $ai]
6667 set ids [lindex $varccommits($curview,$a)]
6668 set arowend [expr {$arow + [llength $ids]}]
6670 set id [lindex $ids [expr {$l - $arow}]]
6671 # shouldn't happen unless git log doesn't give all the commits...
6672 if {![info exists commitdata($id)] ||
6673 ![doesmatch $commitdata($id)]} {
6676 if {![info exists commitinfo($id)]} {
6679 set info $commitinfo($id)
6680 foreach f $info ty $fldtypes {
6681 if {$ty eq ""} continue
6682 if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
6691 for {} {$n > 0} {incr n -1; incr l $find_dirn} {
6692 if {$l < $arow || $l >= $arowend} {
6694 set a [lindex $varcorder($curview) $ai]
6695 set arow [lindex $vrownum($curview) $ai]
6696 set ids [lindex $varccommits($curview,$a)]
6697 set arowend [expr {$arow + [llength $ids]}]
6699 set id [lindex $ids [expr {$l - $arow}]]
6700 if {![info exists fhighlights($id)]} {
6701 # this sets fhighlights($id) to -1
6702 askfilehighlight $l $id
6704 if {$fhighlights($id) > 0} {
6708 if {$fhighlights($id) < 0} {
6711 set findcurline [expr {$l - $find_dirn}]
6716 if {$found || ($domore && !$moretodo)} {
6732 set findcurline [expr {$l - $find_dirn}]
6734 set n [expr {($findcurline - $findstartline) * $find_dirn - 1}]
6738 set fprogcoord [expr {$n * 1.0 / $numcommits}]
6743 proc findselectline {l} {
6744 global findloc commentend ctext findcurline markingmatches gdttype
6746 set markingmatches [expr {$gdttype eq [mc "containing:"]}]
6749 if {$markingmatches &&
6750 ($findloc eq [mc "All fields"] || $findloc eq [mc "Comments"])} {
6751 # highlight the matches in the comments
6752 set f [$ctext get 1.0 $commentend]
6753 set matches [findmatches $f]
6754 foreach match $matches {
6755 set start [lindex $match 0]
6756 set end [expr {[lindex $match 1] + 1}]
6757 $ctext tag add found "1.0 + $start c" "1.0 + $end c"
6763 # mark the bits of a headline or author that match a find string
6764 proc markmatches {canv l str tag matches font row} {
6767 set bbox [$canv bbox $tag]
6768 set x0 [lindex $bbox 0]
6769 set y0 [lindex $bbox 1]
6770 set y1 [lindex $bbox 3]
6771 foreach match $matches {
6772 set start [lindex $match 0]
6773 set end [lindex $match 1]
6774 if {$start > $end} continue
6775 set xoff [font measure $font [string range $str 0 [expr {$start-1}]]]
6776 set xlen [font measure $font [string range $str 0 [expr {$end}]]]
6777 set t [$canv create rect [expr {$x0+$xoff}] $y0 \
6778 [expr {$x0+$xlen+2}] $y1 \
6779 -outline {} -tags [list match$l matches] -fill yellow]
6781 if {$row == $selectedline} {
6782 $canv raise $t secsel
6787 proc unmarkmatches {} {
6788 global markingmatches
6790 allcanvs delete matches
6791 set markingmatches 0
6795 proc selcanvline {w x y} {
6796 global canv canvy0 ctext linespc
6798 set ymax [lindex [$canv cget -scrollregion] 3]
6799 if {$ymax == {}} return
6800 set yfrac [lindex [$canv yview] 0]
6801 set y [expr {$y + $yfrac * $ymax}]
6802 set l [expr {int(($y - $canvy0) / $linespc + 0.5)}]
6807 set xmax [lindex [$canv cget -scrollregion] 2]
6808 set xleft [expr {[lindex [$canv xview] 0] * $xmax}]
6809 if {![info exists rowtextx($l)] || $xleft + $x < $rowtextx($l)} return
6815 proc commit_descriptor {p} {
6817 if {![info exists commitinfo($p)]} {
6821 if {[llength $commitinfo($p)] > 1} {
6822 set l [lindex $commitinfo($p) 0]
6827 # append some text to the ctext widget, and make any SHA1 ID
6828 # that we know about be a clickable link.
6829 proc appendwithlinks {text tags} {
6830 global ctext linknum curview
6832 set start [$ctext index "end - 1c"]
6833 $ctext insert end $text $tags
6834 set links [regexp -indices -all -inline {(?:\m|-g)[0-9a-f]{6,40}\M} $text]
6838 set linkid [string range $text $s $e]
6840 $ctext tag delete link$linknum
6841 $ctext tag add link$linknum "$start + $s c" "$start + $e c"
6842 setlink $linkid link$linknum
6847 proc setlink {id lk} {
6848 global curview ctext pendinglinks
6851 if {[string range $id 0 1] eq "-g"} {
6852 set id [string range $id 2 end]
6856 if {[string length $id] < 40} {
6857 set matches [longid $id]
6858 if {[llength $matches] > 0} {
6859 if {[llength $matches] > 1} return
6861 set id [lindex $matches 0]
6864 set known [commitinview $id $curview]
6867 $ctext tag conf $lk -foreground $linkfgcolor -underline 1
6868 $ctext tag bind $lk <1> [list selbyid $id]
6869 $ctext tag bind $lk <Enter> {linkcursor %W 1}
6870 $ctext tag bind $lk <Leave> {linkcursor %W -1}
6872 lappend pendinglinks($id) $lk
6873 interestedin $id {makelink %P}
6877 proc appendshortlink {id {pre {}} {post {}}} {
6878 global ctext linknum
6880 $ctext insert end $pre
6881 $ctext tag delete link$linknum
6882 $ctext insert end [string range $id 0 7] link$linknum
6883 $ctext insert end $post
6884 setlink $id link$linknum
6888 proc makelink {id} {
6891 if {![info exists pendinglinks($id)]} return
6892 foreach lk $pendinglinks($id) {
6895 unset pendinglinks($id)
6898 proc linkcursor {w inc} {
6899 global linkentercount curtextcursor
6901 if {[incr linkentercount $inc] > 0} {
6902 $w configure -cursor hand2
6904 $w configure -cursor $curtextcursor
6905 if {$linkentercount < 0} {
6906 set linkentercount 0
6911 proc viewnextline {dir} {
6915 set ymax [lindex [$canv cget -scrollregion] 3]
6916 set wnow [$canv yview]
6917 set wtop [expr {[lindex $wnow 0] * $ymax}]
6918 set newtop [expr {$wtop + $dir * $linespc}]
6921 } elseif {$newtop > $ymax} {
6924 allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
6927 # add a list of tag or branch names at position pos
6928 # returns the number of names inserted
6929 proc appendrefs {pos ids var} {
6930 global ctext linknum curview $var maxrefs mainheadid
6932 if {[catch {$ctext index $pos}]} {
6935 $ctext conf -state normal
6936 $ctext delete $pos "$pos lineend"
6939 foreach tag [set $var\($id\)] {
6940 lappend tags [list $tag $id]
6945 set tags [lsort -index 0 -decreasing $tags]
6948 if {[llength $tags] > $maxrefs} {
6949 # If we are displaying heads, and there are too many,
6950 # see if there are some important heads to display.
6951 # Currently this means "master" and the current head.
6953 if {$var eq "idheads"} {
6956 set hname [lindex $ti 0]
6957 set id [lindex $ti 1]
6958 if {($hname eq "master" || $id eq $mainheadid) &&
6959 [llength $itags] < $maxrefs} {
6968 set str [mc "and many more"]
6973 $ctext insert $pos "$str ([llength $tags])"
6974 set nutags [llength $tags]
6979 set id [lindex $ti 1]
6982 $ctext tag delete $lk
6983 $ctext insert $pos $sep
6984 $ctext insert $pos [lindex $ti 0] $lk
6988 $ctext tag add wwrap "$pos linestart" "$pos lineend"
6989 $ctext conf -state disabled
6990 return [expr {[llength $tags] + $nutags}]
6993 # called when we have finished computing the nearby tags
6994 proc dispneartags {delay} {
6995 global selectedline currentid showneartags tagphase
6997 if {$selectedline eq {} || !$showneartags} return
6998 after cancel dispnexttag
7000 after 200 dispnexttag
7003 after idle dispnexttag
7008 proc dispnexttag {} {
7009 global selectedline currentid showneartags tagphase ctext
7011 if {$selectedline eq {} || !$showneartags} return
7012 switch -- $tagphase {
7014 set dtags [desctags $currentid]
7016 appendrefs precedes $dtags idtags
7020 set atags [anctags $currentid]
7022 appendrefs follows $atags idtags
7026 set dheads [descheads $currentid]
7027 if {$dheads ne {}} {
7028 if {[appendrefs branch $dheads idheads] > 1
7029 && [$ctext get "branch -3c"] eq "h"} {
7030 # turn "Branch" into "Branches"
7031 $ctext conf -state normal
7032 $ctext insert "branch -2c" "es"
7033 $ctext conf -state disabled
7038 if {[incr tagphase] <= 2} {
7039 after idle dispnexttag
7043 proc make_secsel {id} {
7044 global linehtag linentag linedtag canv canv2 canv3
7046 if {![info exists linehtag($id)]} return
7048 set t [eval $canv create rect [$canv bbox $linehtag($id)] -outline {{}} \
7049 -tags secsel -fill [$canv cget -selectbackground]]
7051 $canv2 delete secsel
7052 set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] -outline {{}} \
7053 -tags secsel -fill [$canv2 cget -selectbackground]]
7055 $canv3 delete secsel
7056 set t [eval $canv3 create rect [$canv3 bbox $linedtag($id)] -outline {{}} \
7057 -tags secsel -fill [$canv3 cget -selectbackground]]
7061 proc make_idmark {id} {
7062 global linehtag canv fgcolor
7064 if {![info exists linehtag($id)]} return
7066 set t [eval $canv create rect [$canv bbox $linehtag($id)] \
7067 -tags markid -outline $fgcolor]
7071 proc selectline {l isnew {desired_loc {}}} {
7072 global canv ctext commitinfo selectedline
7073 global canvy0 linespc parents children curview
7074 global currentid sha1entry
7075 global commentend idtags linknum
7076 global mergemax numcommits pending_select
7077 global cmitmode showneartags allcommits
7078 global targetrow targetid lastscrollrows
7079 global autoselect autosellen jump_to_here
7081 catch {unset pending_select}
7086 if {$l < 0 || $l >= $numcommits} return
7087 set id [commitonrow $l]
7092 if {$lastscrollrows < $numcommits} {
7096 set y [expr {$canvy0 + $l * $linespc}]
7097 set ymax [lindex [$canv cget -scrollregion] 3]
7098 set ytop [expr {$y - $linespc - 1}]
7099 set ybot [expr {$y + $linespc + 1}]
7100 set wnow [$canv yview]
7101 set wtop [expr {[lindex $wnow 0] * $ymax}]
7102 set wbot [expr {[lindex $wnow 1] * $ymax}]
7103 set wh [expr {$wbot - $wtop}]
7105 if {$ytop < $wtop} {
7106 if {$ybot < $wtop} {
7107 set newtop [expr {$y - $wh / 2.0}]
7110 if {$newtop > $wtop - $linespc} {
7111 set newtop [expr {$wtop - $linespc}]
7114 } elseif {$ybot > $wbot} {
7115 if {$ytop > $wbot} {
7116 set newtop [expr {$y - $wh / 2.0}]
7118 set newtop [expr {$ybot - $wh}]
7119 if {$newtop < $wtop + $linespc} {
7120 set newtop [expr {$wtop + $linespc}]
7124 if {$newtop != $wtop} {
7128 allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
7135 addtohistory [list selbyid $id 0] savecmitpos
7138 $sha1entry delete 0 end
7139 $sha1entry insert 0 $id
7141 $sha1entry selection range 0 $autosellen
7145 $ctext conf -state normal
7148 if {![info exists commitinfo($id)]} {
7151 set info $commitinfo($id)
7152 set date [formatdate [lindex $info 2]]
7153 $ctext insert end "[mc "Author"]: [lindex $info 1] $date\n"
7154 set date [formatdate [lindex $info 4]]
7155 $ctext insert end "[mc "Committer"]: [lindex $info 3] $date\n"
7156 if {[info exists idtags($id)]} {
7157 $ctext insert end [mc "Tags:"]
7158 foreach tag $idtags($id) {
7159 $ctext insert end " $tag"
7161 $ctext insert end "\n"
7165 set olds $parents($curview,$id)
7166 if {[llength $olds] > 1} {
7169 if {$np >= $mergemax} {
7174 $ctext insert end "[mc "Parent"]: " $tag
7175 appendwithlinks [commit_descriptor $p] {}
7180 append headers "[mc "Parent"]: [commit_descriptor $p]"
7184 foreach c $children($curview,$id) {
7185 append headers "[mc "Child"]: [commit_descriptor $c]"
7188 # make anything that looks like a SHA1 ID be a clickable link
7189 appendwithlinks $headers {}
7190 if {$showneartags} {
7191 if {![info exists allcommits]} {
7194 $ctext insert end "[mc "Branch"]: "
7195 $ctext mark set branch "end -1c"
7196 $ctext mark gravity branch left
7197 $ctext insert end "\n[mc "Follows"]: "
7198 $ctext mark set follows "end -1c"
7199 $ctext mark gravity follows left
7200 $ctext insert end "\n[mc "Precedes"]: "
7201 $ctext mark set precedes "end -1c"
7202 $ctext mark gravity precedes left
7203 $ctext insert end "\n"
7206 $ctext insert end "\n"
7207 set comment [lindex $info 5]
7208 if {[string first "\r" $comment] >= 0} {
7209 set comment [string map {"\r" "\n "} $comment]
7211 appendwithlinks $comment {comment}
7213 $ctext tag remove found 1.0 end
7214 $ctext conf -state disabled
7215 set commentend [$ctext index "end - 1c"]
7217 set jump_to_here $desired_loc
7218 init_flist [mc "Comments"]
7219 if {$cmitmode eq "tree"} {
7221 } elseif {[llength $olds] <= 1} {
7228 proc selfirstline {} {
7233 proc sellastline {} {
7236 set l [expr {$numcommits - 1}]
7240 proc selnextline {dir} {
7243 if {$selectedline eq {}} return
7244 set l [expr {$selectedline + $dir}]
7249 proc selnextpage {dir} {
7250 global canv linespc selectedline numcommits
7252 set lpp [expr {([winfo height $canv] - 2) / $linespc}]
7256 allcanvs yview scroll [expr {$dir * $lpp}] units
7258 if {$selectedline eq {}} return
7259 set l [expr {$selectedline + $dir * $lpp}]
7262 } elseif {$l >= $numcommits} {
7263 set l [expr $numcommits - 1]
7269 proc unselectline {} {
7270 global selectedline currentid
7273 catch {unset currentid}
7274 allcanvs delete secsel
7278 proc reselectline {} {
7281 if {$selectedline ne {}} {
7282 selectline $selectedline 0
7286 proc addtohistory {cmd {saveproc {}}} {
7287 global history historyindex curview
7291 set elt [list $curview $cmd $saveproc {}]
7292 if {$historyindex > 0
7293 && [lindex $history [expr {$historyindex - 1}]] == $elt} {
7297 if {$historyindex < [llength $history]} {
7298 set history [lreplace $history $historyindex end $elt]
7300 lappend history $elt
7303 if {$historyindex > 1} {
7304 .tf.bar.leftbut conf -state normal
7306 .tf.bar.leftbut conf -state disabled
7308 .tf.bar.rightbut conf -state disabled
7311 # save the scrolling position of the diff display pane
7312 proc save_position {} {
7313 global historyindex history
7315 if {$historyindex < 1} return
7316 set hi [expr {$historyindex - 1}]
7317 set fn [lindex $history $hi 2]
7319 lset history $hi 3 [eval $fn]
7323 proc unset_posvars {} {
7326 if {[info exists last_posvars]} {
7327 foreach {var val} $last_posvars {
7336 global curview last_posvars
7338 set view [lindex $elt 0]
7339 set cmd [lindex $elt 1]
7340 set pv [lindex $elt 3]
7341 if {$curview != $view} {
7345 foreach {var val} $pv {
7349 set last_posvars $pv
7354 global history historyindex
7357 if {$historyindex > 1} {
7359 incr historyindex -1
7360 godo [lindex $history [expr {$historyindex - 1}]]
7361 .tf.bar.rightbut conf -state normal
7363 if {$historyindex <= 1} {
7364 .tf.bar.leftbut conf -state disabled
7369 global history historyindex
7372 if {$historyindex < [llength $history]} {
7374 set cmd [lindex $history $historyindex]
7377 .tf.bar.leftbut conf -state normal
7379 if {$historyindex >= [llength $history]} {
7380 .tf.bar.rightbut conf -state disabled
7385 global treefilelist treeidlist diffids diffmergeid treepending
7386 global nullid nullid2
7389 catch {unset diffmergeid}
7390 if {![info exists treefilelist($id)]} {
7391 if {![info exists treepending]} {
7392 if {$id eq $nullid} {
7393 set cmd [list | git ls-files]
7394 } elseif {$id eq $nullid2} {
7395 set cmd [list | git ls-files --stage -t]
7397 set cmd [list | git ls-tree -r $id]
7399 if {[catch {set gtf [open $cmd r]}]} {
7403 set treefilelist($id) {}
7404 set treeidlist($id) {}
7405 fconfigure $gtf -blocking 0 -encoding binary
7406 filerun $gtf [list gettreeline $gtf $id]
7413 proc gettreeline {gtf id} {
7414 global treefilelist treeidlist treepending cmitmode diffids nullid nullid2
7417 while {[incr nl] <= 1000 && [gets $gtf line] >= 0} {
7418 if {$diffids eq $nullid} {
7421 set i [string first "\t" $line]
7422 if {$i < 0} continue
7423 set fname [string range $line [expr {$i+1}] end]
7424 set line [string range $line 0 [expr {$i-1}]]
7425 if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue
7426 set sha1 [lindex $line 2]
7427 lappend treeidlist($id) $sha1
7429 if {[string index $fname 0] eq "\""} {
7430 set fname [lindex $fname 0]
7432 set fname [encoding convertfrom $fname]
7433 lappend treefilelist($id) $fname
7436 return [expr {$nl >= 1000? 2: 1}]
7440 if {$cmitmode ne "tree"} {
7441 if {![info exists diffmergeid]} {
7442 gettreediffs $diffids
7444 } elseif {$id ne $diffids} {
7453 global treefilelist treeidlist diffids nullid nullid2
7454 global ctext_file_names ctext_file_lines
7455 global ctext commentend
7457 set i [lsearch -exact $treefilelist($diffids) $f]
7459 puts "oops, $f not in list for id $diffids"
7462 if {$diffids eq $nullid} {
7463 if {[catch {set bf [open $f r]} err]} {
7464 puts "oops, can't read $f: $err"
7468 set blob [lindex $treeidlist($diffids) $i]
7469 if {[catch {set bf [open [concat | git cat-file blob $blob] r]} err]} {
7470 puts "oops, error reading blob $blob: $err"
7474 fconfigure $bf -blocking 0 -encoding [get_path_encoding $f]
7475 filerun $bf [list getblobline $bf $diffids]
7476 $ctext config -state normal
7477 clear_ctext $commentend
7478 lappend ctext_file_names $f
7479 lappend ctext_file_lines [lindex [split $commentend "."] 0]
7480 $ctext insert end "\n"
7481 $ctext insert end "$f\n" filesep
7482 $ctext config -state disabled
7483 $ctext yview $commentend
7487 proc getblobline {bf id} {
7488 global diffids cmitmode ctext
7490 if {$id ne $diffids || $cmitmode ne "tree"} {
7494 $ctext config -state normal
7496 while {[incr nl] <= 1000 && [gets $bf line] >= 0} {
7497 $ctext insert end "$line\n"
7500 global jump_to_here ctext_file_names commentend
7502 # delete last newline
7503 $ctext delete "end - 2c" "end - 1c"
7505 if {$jump_to_here ne {} &&
7506 [lindex $jump_to_here 0] eq [lindex $ctext_file_names 0]} {
7507 set lnum [expr {[lindex $jump_to_here 1] +
7508 [lindex [split $commentend .] 0]}]
7509 mark_ctext_line $lnum
7511 $ctext config -state disabled
7514 $ctext config -state disabled
7515 return [expr {$nl >= 1000? 2: 1}]
7518 proc mark_ctext_line {lnum} {
7519 global ctext markbgcolor
7521 $ctext tag delete omark
7522 $ctext tag add omark $lnum.0 "$lnum.0 + 1 line"
7523 $ctext tag conf omark -background $markbgcolor
7527 proc mergediff {id} {
7529 global diffids treediffs
7530 global parents curview
7534 set treediffs($id) {}
7535 set np [llength $parents($curview,$id)]
7540 proc startdiff {ids} {
7541 global treediffs diffids treepending diffmergeid nullid nullid2
7545 catch {unset diffmergeid}
7546 if {![info exists treediffs($ids)] ||
7547 [lsearch -exact $ids $nullid] >= 0 ||
7548 [lsearch -exact $ids $nullid2] >= 0} {
7549 if {![info exists treepending]} {
7557 # If the filename (name) is under any of the passed filter paths
7558 # then return true to include the file in the listing.
7559 proc path_filter {filter name} {
7560 set worktree [gitworktree]
7562 set fq_p [file normalize $p]
7563 set fq_n [file normalize [file join $worktree $name]]
7564 if {[string match [file normalize $fq_p]* $fq_n]} {
7571 proc addtocflist {ids} {
7574 add_flist $treediffs($ids)
7578 proc diffcmd {ids flags} {
7579 global log_showroot nullid nullid2
7581 set i [lsearch -exact $ids $nullid]
7582 set j [lsearch -exact $ids $nullid2]
7584 if {[llength $ids] > 1 && $j < 0} {
7585 # comparing working directory with some specific revision
7586 set cmd [concat | git diff-index $flags]
7588 lappend cmd -R [lindex $ids 1]
7590 lappend cmd [lindex $ids 0]
7593 # comparing working directory with index
7594 set cmd [concat | git diff-files $flags]
7599 } elseif {$j >= 0} {
7600 set cmd [concat | git diff-index --cached $flags]
7601 if {[llength $ids] > 1} {
7602 # comparing index with specific revision
7604 lappend cmd -R [lindex $ids 1]
7606 lappend cmd [lindex $ids 0]
7609 # comparing index with HEAD
7613 if {$log_showroot} {
7614 lappend flags --root
7616 set cmd [concat | git diff-tree -r $flags $ids]
7621 proc gettreediffs {ids} {
7622 global treediff treepending limitdiffs vfilelimit curview
7624 set cmd [diffcmd $ids {--no-commit-id}]
7625 if {$limitdiffs && $vfilelimit($curview) ne {}} {
7626 set cmd [concat $cmd -- $vfilelimit($curview)]
7628 if {[catch {set gdtf [open $cmd r]}]} return
7630 set treepending $ids
7632 fconfigure $gdtf -blocking 0 -encoding binary
7633 filerun $gdtf [list gettreediffline $gdtf $ids]
7636 proc gettreediffline {gdtf ids} {
7637 global treediff treediffs treepending diffids diffmergeid
7638 global cmitmode vfilelimit curview limitdiffs perfile_attrs
7643 if {$perfile_attrs} {
7644 # cache_gitattr is slow, and even slower on win32 where we
7645 # have to invoke it for only about 30 paths at a time
7647 if {[tk windowingsystem] == "win32"} {
7651 while {[incr nr] <= $max && [gets $gdtf line] >= 0} {
7652 set i [string first "\t" $line]
7654 set file [string range $line [expr {$i+1}] end]
7655 if {[string index $file 0] eq "\""} {
7656 set file [lindex $file 0]
7658 set file [encoding convertfrom $file]
7659 if {$file ne [lindex $treediff end]} {
7660 lappend treediff $file
7661 lappend sublist $file
7665 if {$perfile_attrs} {
7666 cache_gitattr encoding $sublist
7669 return [expr {$nr >= $max? 2: 1}]
7672 set treediffs($ids) $treediff
7674 if {$cmitmode eq "tree" && [llength $diffids] == 1} {
7676 } elseif {$ids != $diffids} {
7677 if {![info exists diffmergeid]} {
7678 gettreediffs $diffids
7686 # empty string or positive integer
7687 proc diffcontextvalidate {v} {
7688 return [regexp {^(|[1-9][0-9]*)$} $v]
7691 proc diffcontextchange {n1 n2 op} {
7692 global diffcontextstring diffcontext
7694 if {[string is integer -strict $diffcontextstring]} {
7695 if {$diffcontextstring >= 0} {
7696 set diffcontext $diffcontextstring
7702 proc changeignorespace {} {
7706 proc changeworddiff {name ix op} {
7710 proc getblobdiffs {ids} {
7711 global blobdifffd diffids env
7712 global diffinhdr treediffs
7716 global limitdiffs vfilelimit curview
7717 global diffencoding targetline diffnparents
7718 global git_version currdiffsubmod
7721 if {[package vcompare $git_version "1.6.1"] >= 0} {
7722 set textconv "--textconv"
7725 if {[package vcompare $git_version "1.6.6"] >= 0} {
7726 set submodule "--submodule"
7728 set cmd [diffcmd $ids "-p $textconv $submodule -C --cc --no-commit-id -U$diffcontext"]
7732 if {$worddiff ne [mc "Line diff"]} {
7733 append cmd " --word-diff=porcelain"
7735 if {$limitdiffs && $vfilelimit($curview) ne {}} {
7736 set cmd [concat $cmd -- $vfilelimit($curview)]
7738 if {[catch {set bdf [open $cmd r]} err]} {
7739 error_popup [mc "Error getting diffs: %s" $err]
7745 set diffencoding [get_path_encoding {}]
7746 fconfigure $bdf -blocking 0 -encoding binary -eofchar {}
7747 set blobdifffd($ids) $bdf
7748 set currdiffsubmod ""
7749 filerun $bdf [list getblobdiffline $bdf $diffids]
7752 proc savecmitpos {} {
7753 global ctext cmitmode
7755 if {$cmitmode eq "tree"} {
7758 return [list target_scrollpos [$ctext index @0,0]]
7761 proc savectextpos {} {
7764 return [list target_scrollpos [$ctext index @0,0]]
7767 proc maybe_scroll_ctext {ateof} {
7768 global ctext target_scrollpos
7770 if {![info exists target_scrollpos]} return
7772 set nlines [expr {[winfo height $ctext]
7773 / [font metrics textfont -linespace]}]
7774 if {[$ctext compare "$target_scrollpos + $nlines lines" <= end]} return
7776 $ctext yview $target_scrollpos
7777 unset target_scrollpos
7780 proc setinlist {var i val} {
7783 while {[llength [set $var]] < $i} {
7786 if {[llength [set $var]] == $i} {
7793 proc makediffhdr {fname ids} {
7794 global ctext curdiffstart treediffs diffencoding
7795 global ctext_file_names jump_to_here targetline diffline
7797 set fname [encoding convertfrom $fname]
7798 set diffencoding [get_path_encoding $fname]
7799 set i [lsearch -exact $treediffs($ids) $fname]
7801 setinlist difffilestart $i $curdiffstart
7803 lset ctext_file_names end $fname
7804 set l [expr {(78 - [string length $fname]) / 2}]
7805 set pad [string range "----------------------------------------" 1 $l]
7806 $ctext insert $curdiffstart "$pad $fname $pad" filesep
7808 if {$jump_to_here ne {} && [lindex $jump_to_here 0] eq $fname} {
7809 set targetline [lindex $jump_to_here 1]
7814 proc getblobdiffline {bdf ids} {
7815 global diffids blobdifffd ctext curdiffstart
7816 global diffnexthead diffnextnote difffilestart
7817 global ctext_file_names ctext_file_lines
7818 global diffinhdr treediffs mergemax diffnparents
7819 global diffencoding jump_to_here targetline diffline currdiffsubmod
7823 $ctext conf -state normal
7824 while {[incr nr] <= 1000 && [gets $bdf line] >= 0} {
7825 if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
7829 if {![string compare -length 5 "diff " $line]} {
7830 if {![regexp {^diff (--cc|--git) } $line m type]} {
7831 set line [encoding convertfrom $line]
7832 $ctext insert end "$line\n" hunksep
7835 # start of a new file
7837 $ctext insert end "\n"
7838 set curdiffstart [$ctext index "end - 1c"]
7839 lappend ctext_file_names ""
7840 lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
7841 $ctext insert end "\n" filesep
7843 if {$type eq "--cc"} {
7844 # start of a new file in a merge diff
7845 set fname [string range $line 10 end]
7846 if {[lsearch -exact $treediffs($ids) $fname] < 0} {
7847 lappend treediffs($ids) $fname
7848 add_flist [list $fname]
7852 set line [string range $line 11 end]
7853 # If the name hasn't changed the length will be odd,
7854 # the middle char will be a space, and the two bits either
7855 # side will be a/name and b/name, or "a/name" and "b/name".
7856 # If the name has changed we'll get "rename from" and
7857 # "rename to" or "copy from" and "copy to" lines following
7858 # this, and we'll use them to get the filenames.
7859 # This complexity is necessary because spaces in the
7860 # filename(s) don't get escaped.
7861 set l [string length $line]
7862 set i [expr {$l / 2}]
7863 if {!(($l & 1) && [string index $line $i] eq " " &&
7864 [string range $line 2 [expr {$i - 1}]] eq \
7865 [string range $line [expr {$i + 3}] end])} {
7868 # unescape if quoted and chop off the a/ from the front
7869 if {[string index $line 0] eq "\""} {
7870 set fname [string range [lindex $line 0] 2 end]
7872 set fname [string range $line 2 [expr {$i - 1}]]
7875 makediffhdr $fname $ids
7877 } elseif {![string compare -length 16 "* Unmerged path " $line]} {
7878 set fname [encoding convertfrom [string range $line 16 end]]
7879 $ctext insert end "\n"
7880 set curdiffstart [$ctext index "end - 1c"]
7881 lappend ctext_file_names $fname
7882 lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
7883 $ctext insert end "$line\n" filesep
7884 set i [lsearch -exact $treediffs($ids) $fname]
7886 setinlist difffilestart $i $curdiffstart
7889 } elseif {![string compare -length 2 "@@" $line]} {
7890 regexp {^@@+} $line ats
7891 set line [encoding convertfrom $diffencoding $line]
7892 $ctext insert end "$line\n" hunksep
7893 if {[regexp { \+(\d+),\d+ @@} $line m nl]} {
7896 set diffnparents [expr {[string length $ats] - 1}]
7899 } elseif {![string compare -length 10 "Submodule " $line]} {
7900 # start of a new submodule
7901 if {[regexp -indices "\[0-9a-f\]+\\.\\." $line nameend]} {
7902 set fname [string range $line 10 [expr [lindex $nameend 0] - 2]]
7904 set fname [string range $line 10 [expr [string first "contains " $line] - 2]]
7906 if {$currdiffsubmod != $fname} {
7907 $ctext insert end "\n"; # Add newline after commit message
7909 set curdiffstart [$ctext index "end - 1c"]
7910 lappend ctext_file_names ""
7911 if {$currdiffsubmod != $fname} {
7912 lappend ctext_file_lines $fname
7913 makediffhdr $fname $ids
7914 set currdiffsubmod $fname
7915 $ctext insert end "\n$line\n" filesep
7917 $ctext insert end "$line\n" filesep
7919 } elseif {![string compare -length 3 " >" $line]} {
7920 set $currdiffsubmod ""
7921 set line [encoding convertfrom $diffencoding $line]
7922 $ctext insert end "$line\n" dresult
7923 } elseif {![string compare -length 3 " <" $line]} {
7924 set $currdiffsubmod ""
7925 set line [encoding convertfrom $diffencoding $line]
7926 $ctext insert end "$line\n" d0
7927 } elseif {$diffinhdr} {
7928 if {![string compare -length 12 "rename from " $line]} {
7929 set fname [string range $line [expr 6 + [string first " from " $line] ] end]
7930 if {[string index $fname 0] eq "\""} {
7931 set fname [lindex $fname 0]
7933 set fname [encoding convertfrom $fname]
7934 set i [lsearch -exact $treediffs($ids) $fname]
7936 setinlist difffilestart $i $curdiffstart
7938 } elseif {![string compare -length 10 $line "rename to "] ||
7939 ![string compare -length 8 $line "copy to "]} {
7940 set fname [string range $line [expr 4 + [string first " to " $line] ] end]
7941 if {[string index $fname 0] eq "\""} {
7942 set fname [lindex $fname 0]
7944 makediffhdr $fname $ids
7945 } elseif {[string compare -length 3 $line "---"] == 0} {
7948 } elseif {[string compare -length 3 $line "+++"] == 0} {
7952 $ctext insert end "$line\n" filesep
7955 set line [string map {\x1A ^Z} \
7956 [encoding convertfrom $diffencoding $line]]
7957 # parse the prefix - one ' ', '-' or '+' for each parent
7958 set prefix [string range $line 0 [expr {$diffnparents - 1}]]
7959 set tag [expr {$diffnparents > 1? "m": "d"}]
7960 set dowords [expr {$worddiff ne [mc "Line diff"] && $diffnparents == 1}]
7961 set words_pre_markup ""
7962 set words_post_markup ""
7963 if {[string trim $prefix " -+"] eq {}} {
7964 # prefix only has " ", "-" and "+" in it: normal diff line
7965 set num [string first "-" $prefix]
7967 set line [string range $line 1 end]
7970 # removed line, first parent with line is $num
7971 if {$num >= $mergemax} {
7974 if {$dowords && $worddiff eq [mc "Markup words"]} {
7975 $ctext insert end "\[-$line-\]" $tag$num
7977 $ctext insert end "$line" $tag$num
7980 $ctext insert end "\n" $tag$num
7984 if {[string first "+" $prefix] >= 0} {
7986 lappend tags ${tag}result
7987 if {$diffnparents > 1} {
7988 set num [string first " " $prefix]
7990 if {$num >= $mergemax} {
7996 set words_pre_markup "{+"
7997 set words_post_markup "+}"
7999 if {$targetline ne {}} {
8000 if {$diffline == $targetline} {
8001 set seehere [$ctext index "end - 1 chars"]
8007 if {$dowords && $worddiff eq [mc "Markup words"]} {
8008 $ctext insert end "$words_pre_markup$line$words_post_markup" $tags
8010 $ctext insert end "$line" $tags
8013 $ctext insert end "\n" $tags
8016 } elseif {$dowords && $prefix eq "~"} {
8017 $ctext insert end "\n" {}
8019 # "\ No newline at end of file",
8020 # or something else we don't recognize
8021 $ctext insert end "$line\n" hunksep
8025 if {[info exists seehere]} {
8026 mark_ctext_line [lindex [split $seehere .] 0]
8028 maybe_scroll_ctext [eof $bdf]
8029 $ctext conf -state disabled
8034 return [expr {$nr >= 1000? 2: 1}]
8037 proc changediffdisp {} {
8038 global ctext diffelide
8040 $ctext tag conf d0 -elide [lindex $diffelide 0]
8041 $ctext tag conf dresult -elide [lindex $diffelide 1]
8044 proc highlightfile {cline} {
8045 global cflist cflist_top
8047 if {![info exists cflist_top]} return
8049 $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend"
8050 $cflist tag add highlight $cline.0 "$cline.0 lineend"
8051 $cflist see $cline.0
8052 set cflist_top $cline
8055 proc highlightfile_for_scrollpos {topidx} {
8056 global cmitmode difffilestart
8058 if {$cmitmode eq "tree"} return
8059 if {![info exists difffilestart]} return
8061 set top [lindex [split $topidx .] 0]
8062 if {$difffilestart eq {} || $top < [lindex $difffilestart 0]} {
8065 highlightfile [expr {[bsearch $difffilestart $top] + 2}]
8070 global difffilestart ctext cmitmode
8072 if {$cmitmode eq "tree"} return
8074 set here [$ctext index @0,0]
8075 foreach loc $difffilestart {
8076 if {[$ctext compare $loc >= $here]} {
8086 global difffilestart ctext cmitmode
8088 if {$cmitmode eq "tree"} return
8089 set here [$ctext index @0,0]
8090 foreach loc $difffilestart {
8091 if {[$ctext compare $loc > $here]} {
8098 proc clear_ctext {{first 1.0}} {
8099 global ctext smarktop smarkbot
8100 global ctext_file_names ctext_file_lines
8103 set l [lindex [split $first .] 0]
8104 if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} {
8107 if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} {
8110 $ctext delete $first end
8111 if {$first eq "1.0"} {
8112 catch {unset pendinglinks}
8114 set ctext_file_names {}
8115 set ctext_file_lines {}
8118 proc settabs {{firstab {}}} {
8119 global firsttabstop tabstop ctext have_tk85
8121 if {$firstab ne {} && $have_tk85} {
8122 set firsttabstop $firstab
8124 set w [font measure textfont "0"]
8125 if {$firsttabstop != 0} {
8126 $ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \
8127 [expr {($firsttabstop + 2 * $tabstop) * $w}]]
8128 } elseif {$have_tk85 || $tabstop != 8} {
8129 $ctext conf -tabs [expr {$tabstop * $w}]
8131 $ctext conf -tabs {}
8135 proc incrsearch {name ix op} {
8136 global ctext searchstring searchdirn
8138 if {[catch {$ctext index anchor}]} {
8139 # no anchor set, use start of selection, or of visible area
8140 set sel [$ctext tag ranges sel]
8142 $ctext mark set anchor [lindex $sel 0]
8143 } elseif {$searchdirn eq "-forwards"} {
8144 $ctext mark set anchor @0,0
8146 $ctext mark set anchor @0,[winfo height $ctext]
8149 if {$searchstring ne {}} {
8150 set here [$ctext search -count mlen $searchdirn -- $searchstring anchor]
8153 set mend "$here + $mlen c"
8154 $ctext tag remove sel 1.0 end
8155 $ctext tag add sel $here $mend
8156 suppress_highlighting_file_for_current_scrollpos
8157 highlightfile_for_scrollpos $here
8160 rehighlight_search_results
8164 global sstring ctext searchstring searchdirn
8167 $sstring icursor end
8168 set searchdirn -forwards
8169 if {$searchstring ne {}} {
8170 set sel [$ctext tag ranges sel]
8172 set start "[lindex $sel 0] + 1c"
8173 } elseif {[catch {set start [$ctext index anchor]}]} {
8176 set match [$ctext search -count mlen -- $searchstring $start]
8177 $ctext tag remove sel 1.0 end
8183 suppress_highlighting_file_for_current_scrollpos
8184 highlightfile_for_scrollpos $match
8185 set mend "$match + $mlen c"
8186 $ctext tag add sel $match $mend
8187 $ctext mark unset anchor
8188 rehighlight_search_results
8192 proc dosearchback {} {
8193 global sstring ctext searchstring searchdirn
8196 $sstring icursor end
8197 set searchdirn -backwards
8198 if {$searchstring ne {}} {
8199 set sel [$ctext tag ranges sel]
8201 set start [lindex $sel 0]
8202 } elseif {[catch {set start [$ctext index anchor]}]} {
8203 set start @0,[winfo height $ctext]
8205 set match [$ctext search -backwards -count ml -- $searchstring $start]
8206 $ctext tag remove sel 1.0 end
8212 suppress_highlighting_file_for_current_scrollpos
8213 highlightfile_for_scrollpos $match
8214 set mend "$match + $ml c"
8215 $ctext tag add sel $match $mend
8216 $ctext mark unset anchor
8217 rehighlight_search_results
8221 proc rehighlight_search_results {} {
8222 global ctext searchstring
8224 $ctext tag remove found 1.0 end
8225 $ctext tag remove currentsearchhit 1.0 end
8227 if {$searchstring ne {}} {
8232 proc searchmark {first last} {
8233 global ctext searchstring
8235 set sel [$ctext tag ranges sel]
8239 set match [$ctext search -count mlen -- $searchstring $mend $last.end]
8240 if {$match eq {}} break
8241 set mend "$match + $mlen c"
8242 if {$sel ne {} && [$ctext compare $match == [lindex $sel 0]]} {
8243 $ctext tag add currentsearchhit $match $mend
8245 $ctext tag add found $match $mend
8250 proc searchmarkvisible {doall} {
8251 global ctext smarktop smarkbot
8253 set topline [lindex [split [$ctext index @0,0] .] 0]
8254 set botline [lindex [split [$ctext index @0,[winfo height $ctext]] .] 0]
8255 if {$doall || $botline < $smarktop || $topline > $smarkbot} {
8256 # no overlap with previous
8257 searchmark $topline $botline
8258 set smarktop $topline
8259 set smarkbot $botline
8261 if {$topline < $smarktop} {
8262 searchmark $topline [expr {$smarktop-1}]
8263 set smarktop $topline
8265 if {$botline > $smarkbot} {
8266 searchmark [expr {$smarkbot+1}] $botline
8267 set smarkbot $botline
8272 proc suppress_highlighting_file_for_current_scrollpos {} {
8273 global ctext suppress_highlighting_file_for_this_scrollpos
8275 set suppress_highlighting_file_for_this_scrollpos [$ctext index @0,0]
8278 proc scrolltext {f0 f1} {
8279 global searchstring cmitmode ctext
8280 global suppress_highlighting_file_for_this_scrollpos
8282 set topidx [$ctext index @0,0]
8283 if {![info exists suppress_highlighting_file_for_this_scrollpos]
8284 || $topidx ne $suppress_highlighting_file_for_this_scrollpos} {
8285 highlightfile_for_scrollpos $topidx
8288 catch {unset suppress_highlighting_file_for_this_scrollpos}
8290 .bleft.bottom.sb set $f0 $f1
8291 if {$searchstring ne {}} {
8297 global linespc charspc canvx0 canvy0
8298 global xspc1 xspc2 lthickness
8300 set linespc [font metrics mainfont -linespace]
8301 set charspc [font measure mainfont "m"]
8302 set canvy0 [expr {int(3 + 0.5 * $linespc)}]
8303 set canvx0 [expr {int(3 + 0.5 * $linespc)}]
8304 set lthickness [expr {int($linespc / 9) + 1}]
8305 set xspc1(0) $linespc
8313 set ymax [lindex [$canv cget -scrollregion] 3]
8314 if {$ymax eq {} || $ymax == 0} return
8315 set span [$canv yview]
8318 allcanvs yview moveto [lindex $span 0]
8320 if {$selectedline ne {}} {
8321 selectline $selectedline 0
8322 allcanvs yview moveto [lindex $span 0]
8326 proc parsefont {f n} {
8329 set fontattr($f,family) [lindex $n 0]
8331 if {$s eq {} || $s == 0} {
8334 set s [expr {int(-$s / [winfo fpixels . 1p] + 0.5)}]
8336 set fontattr($f,size) $s
8337 set fontattr($f,weight) normal
8338 set fontattr($f,slant) roman
8339 foreach style [lrange $n 2 end] {
8342 "bold" {set fontattr($f,weight) $style}
8344 "italic" {set fontattr($f,slant) $style}
8349 proc fontflags {f {isbold 0}} {
8352 return [list -family $fontattr($f,family) -size $fontattr($f,size) \
8353 -weight [expr {$isbold? "bold": $fontattr($f,weight)}] \
8354 -slant $fontattr($f,slant)]
8360 set n [list $fontattr($f,family) $fontattr($f,size)]
8361 if {$fontattr($f,weight) eq "bold"} {
8364 if {$fontattr($f,slant) eq "italic"} {
8370 proc incrfont {inc} {
8371 global mainfont textfont ctext canv cflist showrefstop
8372 global stopped entries fontattr
8375 set s $fontattr(mainfont,size)
8380 set fontattr(mainfont,size) $s
8381 font config mainfont -size $s
8382 font config mainfontbold -size $s
8383 set mainfont [fontname mainfont]
8384 set s $fontattr(textfont,size)
8389 set fontattr(textfont,size) $s
8390 font config textfont -size $s
8391 font config textfontbold -size $s
8392 set textfont [fontname textfont]
8399 global sha1entry sha1string
8400 if {[string length $sha1string] == 40} {
8401 $sha1entry delete 0 end
8405 proc sha1change {n1 n2 op} {
8406 global sha1string currentid sha1but
8407 if {$sha1string == {}
8408 || ([info exists currentid] && $sha1string == $currentid)} {
8413 if {[$sha1but cget -state] == $state} return
8414 if {$state == "normal"} {
8415 $sha1but conf -state normal -relief raised -text "[mc "Goto:"] "
8417 $sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] "
8421 proc gotocommit {} {
8422 global sha1string tagids headids curview varcid
8424 if {$sha1string == {}
8425 || ([info exists currentid] && $sha1string == $currentid)} return
8426 if {[info exists tagids($sha1string)]} {
8427 set id $tagids($sha1string)
8428 } elseif {[info exists headids($sha1string)]} {
8429 set id $headids($sha1string)
8431 set id [string tolower $sha1string]
8432 if {[regexp {^[0-9a-f]{4,39}$} $id]} {
8433 set matches [longid $id]
8434 if {$matches ne {}} {
8435 if {[llength $matches] > 1} {
8436 error_popup [mc "Short SHA1 id %s is ambiguous" $id]
8439 set id [lindex $matches 0]
8442 if {[catch {set id [exec git rev-parse --verify $sha1string]}]} {
8443 error_popup [mc "Revision %s is not known" $sha1string]
8448 if {[commitinview $id $curview]} {
8449 selectline [rowofcommit $id] 1
8452 if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
8453 set msg [mc "SHA1 id %s is not known" $sha1string]
8455 set msg [mc "Revision %s is not in the current view" $sha1string]
8460 proc lineenter {x y id} {
8461 global hoverx hovery hoverid hovertimer
8462 global commitinfo canv
8464 if {![info exists commitinfo($id)] && ![getcommit $id]} return
8468 if {[info exists hovertimer]} {
8469 after cancel $hovertimer
8471 set hovertimer [after 500 linehover]
8475 proc linemotion {x y id} {
8476 global hoverx hovery hoverid hovertimer
8478 if {[info exists hoverid] && $id == $hoverid} {
8481 if {[info exists hovertimer]} {
8482 after cancel $hovertimer
8484 set hovertimer [after 500 linehover]
8488 proc lineleave {id} {
8489 global hoverid hovertimer canv
8491 if {[info exists hoverid] && $id == $hoverid} {
8493 if {[info exists hovertimer]} {
8494 after cancel $hovertimer
8502 global hoverx hovery hoverid hovertimer
8503 global canv linespc lthickness
8504 global linehoverbgcolor linehoverfgcolor linehoveroutlinecolor
8508 set text [lindex $commitinfo($hoverid) 0]
8509 set ymax [lindex [$canv cget -scrollregion] 3]
8510 if {$ymax == {}} return
8511 set yfrac [lindex [$canv yview] 0]
8512 set x [expr {$hoverx + 2 * $linespc}]
8513 set y [expr {$hovery + $yfrac * $ymax - $linespc / 2}]
8514 set x0 [expr {$x - 2 * $lthickness}]
8515 set y0 [expr {$y - 2 * $lthickness}]
8516 set x1 [expr {$x + [font measure mainfont $text] + 2 * $lthickness}]
8517 set y1 [expr {$y + $linespc + 2 * $lthickness}]
8518 set t [$canv create rectangle $x0 $y0 $x1 $y1 \
8519 -fill $linehoverbgcolor -outline $linehoveroutlinecolor \
8520 -width 1 -tags hover]
8522 set t [$canv create text $x $y -anchor nw -text $text -tags hover \
8523 -font mainfont -fill $linehoverfgcolor]
8527 proc clickisonarrow {id y} {
8530 set ranges [rowranges $id]
8531 set thresh [expr {2 * $lthickness + 6}]
8532 set n [expr {[llength $ranges] - 1}]
8533 for {set i 1} {$i < $n} {incr i} {
8534 set row [lindex $ranges $i]
8535 if {abs([yc $row] - $y) < $thresh} {
8542 proc arrowjump {id n y} {
8545 # 1 <-> 2, 3 <-> 4, etc...
8546 set n [expr {(($n - 1) ^ 1) + 1}]
8547 set row [lindex [rowranges $id] $n]
8549 set ymax [lindex [$canv cget -scrollregion] 3]
8550 if {$ymax eq {} || $ymax <= 0} return
8551 set view [$canv yview]
8552 set yspan [expr {[lindex $view 1] - [lindex $view 0]}]
8553 set yfrac [expr {$yt / $ymax - $yspan / 2}]
8557 allcanvs yview moveto $yfrac
8560 proc lineclick {x y id isnew} {
8561 global ctext commitinfo children canv thickerline curview
8563 if {![info exists commitinfo($id)] && ![getcommit $id]} return
8568 # draw this line thicker than normal
8572 set ymax [lindex [$canv cget -scrollregion] 3]
8573 if {$ymax eq {}} return
8574 set yfrac [lindex [$canv yview] 0]
8575 set y [expr {$y + $yfrac * $ymax}]
8577 set dirn [clickisonarrow $id $y]
8579 arrowjump $id $dirn $y
8584 addtohistory [list lineclick $x $y $id 0] savectextpos
8586 # fill the details pane with info about this line
8587 $ctext conf -state normal
8590 $ctext insert end "[mc "Parent"]:\t"
8591 $ctext insert end $id link0
8593 set info $commitinfo($id)
8594 $ctext insert end "\n\t[lindex $info 0]\n"
8595 $ctext insert end "\t[mc "Author"]:\t[lindex $info 1]\n"
8596 set date [formatdate [lindex $info 2]]
8597 $ctext insert end "\t[mc "Date"]:\t$date\n"
8598 set kids $children($curview,$id)
8600 $ctext insert end "\n[mc "Children"]:"
8602 foreach child $kids {
8604 if {![info exists commitinfo($child)] && ![getcommit $child]} continue
8605 set info $commitinfo($child)
8606 $ctext insert end "\n\t"
8607 $ctext insert end $child link$i
8608 setlink $child link$i
8609 $ctext insert end "\n\t[lindex $info 0]"
8610 $ctext insert end "\n\t[mc "Author"]:\t[lindex $info 1]"
8611 set date [formatdate [lindex $info 2]]
8612 $ctext insert end "\n\t[mc "Date"]:\t$date\n"
8615 maybe_scroll_ctext 1
8616 $ctext conf -state disabled
8620 proc normalline {} {
8622 if {[info exists thickerline]} {
8629 proc selbyid {id {isnew 1}} {
8631 if {[commitinview $id $curview]} {
8632 selectline [rowofcommit $id] $isnew
8638 if {![info exists startmstime]} {
8639 set startmstime [clock clicks -milliseconds]
8641 return [format "%.3f" [expr {([clock click -milliseconds] - $startmstime) / 1000.0}]]
8644 proc rowmenu {x y id} {
8645 global rowctxmenu selectedline rowmenuid curview
8646 global nullid nullid2 fakerowmenu mainhead markedid
8650 if {$selectedline eq {} || [rowofcommit $id] eq $selectedline} {
8655 if {[info exists markedid] && $markedid ne $id} {
8660 if {$id ne $nullid && $id ne $nullid2} {
8661 set menu $rowctxmenu
8662 if {$mainhead ne {}} {
8663 $menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead] -state normal
8665 $menu entryconfigure 7 -label [mc "Detached head: can't reset" $mainhead] -state disabled
8667 $menu entryconfigure 9 -state $mstate
8668 $menu entryconfigure 10 -state $mstate
8669 $menu entryconfigure 11 -state $mstate
8671 set menu $fakerowmenu
8673 $menu entryconfigure [mca "Diff this -> selected"] -state $state
8674 $menu entryconfigure [mca "Diff selected -> this"] -state $state
8675 $menu entryconfigure [mca "Make patch"] -state $state
8676 $menu entryconfigure [mca "Diff this -> marked commit"] -state $mstate
8677 $menu entryconfigure [mca "Diff marked commit -> this"] -state $mstate
8678 tk_popup $menu $x $y
8682 global rowmenuid markedid canv
8684 set markedid $rowmenuid
8685 make_idmark $markedid
8691 if {[info exists markedid]} {
8696 proc replace_by_kids {l r} {
8697 global curview children
8699 set id [commitonrow $r]
8700 set l [lreplace $l 0 0]
8701 foreach kid $children($curview,$id) {
8702 lappend l [rowofcommit $kid]
8704 return [lsort -integer -decreasing -unique $l]
8707 proc find_common_desc {} {
8708 global markedid rowmenuid curview children
8710 if {![info exists markedid]} return
8711 if {![commitinview $markedid $curview] ||
8712 ![commitinview $rowmenuid $curview]} return
8713 #set t1 [clock clicks -milliseconds]
8714 set l1 [list [rowofcommit $markedid]]
8715 set l2 [list [rowofcommit $rowmenuid]]
8717 set r1 [lindex $l1 0]
8718 set r2 [lindex $l2 0]
8719 if {$r1 eq {} || $r2 eq {}} break
8725 set l1 [replace_by_kids $l1 $r1]
8727 set l2 [replace_by_kids $l2 $r2]
8730 #set t2 [clock clicks -milliseconds]
8731 #puts "took [expr {$t2-$t1}]ms"
8734 proc compare_commits {} {
8735 global markedid rowmenuid curview children
8737 if {![info exists markedid]} return
8738 if {![commitinview $markedid $curview]} return
8739 addtohistory [list do_cmp_commits $markedid $rowmenuid]
8740 do_cmp_commits $markedid $rowmenuid
8743 proc getpatchid {id} {
8746 if {![info exists patchids($id)]} {
8747 set cmd [diffcmd [list $id] {-p --root}]
8748 # trim off the initial "|"
8749 set cmd [lrange $cmd 1 end]
8751 set x [eval exec $cmd | git patch-id]
8752 set patchids($id) [lindex $x 0]
8754 set patchids($id) "error"
8757 return $patchids($id)
8760 proc do_cmp_commits {a b} {
8761 global ctext curview parents children patchids commitinfo
8763 $ctext conf -state normal
8766 for {set i 0} {$i < 100} {incr i} {
8769 if {[llength $parents($curview,$a)] > 1} {
8770 appendshortlink $a [mc "Skipping merge commit "] "\n"
8773 set patcha [getpatchid $a]
8775 if {[llength $parents($curview,$b)] > 1} {
8776 appendshortlink $b [mc "Skipping merge commit "] "\n"
8779 set patchb [getpatchid $b]
8781 if {!$skipa && !$skipb} {
8782 set heada [lindex $commitinfo($a) 0]
8783 set headb [lindex $commitinfo($b) 0]
8784 if {$patcha eq "error"} {
8785 appendshortlink $a [mc "Error getting patch ID for "] \
8786 [mc " - stopping\n"]
8789 if {$patchb eq "error"} {
8790 appendshortlink $b [mc "Error getting patch ID for "] \
8791 [mc " - stopping\n"]
8794 if {$patcha eq $patchb} {
8795 if {$heada eq $headb} {
8796 appendshortlink $a [mc "Commit "]
8797 appendshortlink $b " == " " $heada\n"
8799 appendshortlink $a [mc "Commit "] " $heada\n"
8800 appendshortlink $b [mc " is the same patch as\n "] \
8806 $ctext insert end "\n"
8807 appendshortlink $a [mc "Commit "] " $heada\n"
8808 appendshortlink $b [mc " differs from\n "] \
8810 $ctext insert end [mc "Diff of commits:\n\n"]
8811 $ctext conf -state disabled
8818 set kids [real_children $curview,$a]
8819 if {[llength $kids] != 1} {
8820 $ctext insert end "\n"
8821 appendshortlink $a [mc "Commit "] \
8822 [mc " has %s children - stopping\n" [llength $kids]]
8825 set a [lindex $kids 0]
8828 set kids [real_children $curview,$b]
8829 if {[llength $kids] != 1} {
8830 appendshortlink $b [mc "Commit "] \
8831 [mc " has %s children - stopping\n" [llength $kids]]
8834 set b [lindex $kids 0]
8837 $ctext conf -state disabled
8840 proc diffcommits {a b} {
8841 global diffcontext diffids blobdifffd diffinhdr currdiffsubmod
8843 set tmpdir [gitknewtmpdir]
8844 set fna [file join $tmpdir "commit-[string range $a 0 7]"]
8845 set fnb [file join $tmpdir "commit-[string range $b 0 7]"]
8847 exec git diff-tree -p --pretty $a >$fna
8848 exec git diff-tree -p --pretty $b >$fnb
8850 error_popup [mc "Error writing commit to file: %s" $err]
8854 set fd [open "| diff -U$diffcontext $fna $fnb" r]
8856 error_popup [mc "Error diffing commits: %s" $err]
8859 set diffids [list commits $a $b]
8860 set blobdifffd($diffids) $fd
8862 set currdiffsubmod ""
8863 filerun $fd [list getblobdiffline $fd $diffids]
8866 proc diffvssel {dirn} {
8867 global rowmenuid selectedline
8869 if {$selectedline eq {}} return
8871 set oldid [commitonrow $selectedline]
8872 set newid $rowmenuid
8874 set oldid $rowmenuid
8875 set newid [commitonrow $selectedline]
8877 addtohistory [list doseldiff $oldid $newid] savectextpos
8878 doseldiff $oldid $newid
8881 proc diffvsmark {dirn} {
8882 global rowmenuid markedid
8884 if {![info exists markedid]} return
8887 set newid $rowmenuid
8889 set oldid $rowmenuid
8892 addtohistory [list doseldiff $oldid $newid] savectextpos
8893 doseldiff $oldid $newid
8896 proc doseldiff {oldid newid} {
8900 $ctext conf -state normal
8902 init_flist [mc "Top"]
8903 $ctext insert end "[mc "From"] "
8904 $ctext insert end $oldid link0
8905 setlink $oldid link0
8906 $ctext insert end "\n "
8907 $ctext insert end [lindex $commitinfo($oldid) 0]
8908 $ctext insert end "\n\n[mc "To"] "
8909 $ctext insert end $newid link1
8910 setlink $newid link1
8911 $ctext insert end "\n "
8912 $ctext insert end [lindex $commitinfo($newid) 0]
8913 $ctext insert end "\n"
8914 $ctext conf -state disabled
8915 $ctext tag remove found 1.0 end
8916 startdiff [list $oldid $newid]
8920 global rowmenuid currentid commitinfo patchtop patchnum NS
8922 if {![info exists currentid]} return
8923 set oldid $currentid
8924 set oldhead [lindex $commitinfo($oldid) 0]
8925 set newid $rowmenuid
8926 set newhead [lindex $commitinfo($newid) 0]
8929 catch {destroy $top}
8931 make_transient $top .
8932 ${NS}::label $top.title -text [mc "Generate patch"]
8933 grid $top.title - -pady 10
8934 ${NS}::label $top.from -text [mc "From:"]
8935 ${NS}::entry $top.fromsha1 -width 40
8936 $top.fromsha1 insert 0 $oldid
8937 $top.fromsha1 conf -state readonly
8938 grid $top.from $top.fromsha1 -sticky w
8939 ${NS}::entry $top.fromhead -width 60
8940 $top.fromhead insert 0 $oldhead
8941 $top.fromhead conf -state readonly
8942 grid x $top.fromhead -sticky w
8943 ${NS}::label $top.to -text [mc "To:"]
8944 ${NS}::entry $top.tosha1 -width 40
8945 $top.tosha1 insert 0 $newid
8946 $top.tosha1 conf -state readonly
8947 grid $top.to $top.tosha1 -sticky w
8948 ${NS}::entry $top.tohead -width 60
8949 $top.tohead insert 0 $newhead
8950 $top.tohead conf -state readonly
8951 grid x $top.tohead -sticky w
8952 ${NS}::button $top.rev -text [mc "Reverse"] -command mkpatchrev
8953 grid $top.rev x -pady 10 -padx 5
8954 ${NS}::label $top.flab -text [mc "Output file:"]
8955 ${NS}::entry $top.fname -width 60
8956 $top.fname insert 0 [file normalize "patch$patchnum.patch"]
8958 grid $top.flab $top.fname -sticky w
8959 ${NS}::frame $top.buts
8960 ${NS}::button $top.buts.gen -text [mc "Generate"] -command mkpatchgo
8961 ${NS}::button $top.buts.can -text [mc "Cancel"] -command mkpatchcan
8962 bind $top <Key-Return> mkpatchgo
8963 bind $top <Key-Escape> mkpatchcan
8964 grid $top.buts.gen $top.buts.can
8965 grid columnconfigure $top.buts 0 -weight 1 -uniform a
8966 grid columnconfigure $top.buts 1 -weight 1 -uniform a
8967 grid $top.buts - -pady 10 -sticky ew
8971 proc mkpatchrev {} {
8974 set oldid [$patchtop.fromsha1 get]
8975 set oldhead [$patchtop.fromhead get]
8976 set newid [$patchtop.tosha1 get]
8977 set newhead [$patchtop.tohead get]
8978 foreach e [list fromsha1 fromhead tosha1 tohead] \
8979 v [list $newid $newhead $oldid $oldhead] {
8980 $patchtop.$e conf -state normal
8981 $patchtop.$e delete 0 end
8982 $patchtop.$e insert 0 $v
8983 $patchtop.$e conf -state readonly
8988 global patchtop nullid nullid2
8990 set oldid [$patchtop.fromsha1 get]
8991 set newid [$patchtop.tosha1 get]
8992 set fname [$patchtop.fname get]
8993 set cmd [diffcmd [list $oldid $newid] -p]
8994 # trim off the initial "|"
8995 set cmd [lrange $cmd 1 end]
8996 lappend cmd >$fname &
8997 if {[catch {eval exec $cmd} err]} {
8998 error_popup "[mc "Error creating patch:"] $err" $patchtop
9000 catch {destroy $patchtop}
9004 proc mkpatchcan {} {
9007 catch {destroy $patchtop}
9012 global rowmenuid mktagtop commitinfo NS
9016 catch {destroy $top}
9018 make_transient $top .
9019 ${NS}::label $top.title -text [mc "Create tag"]
9020 grid $top.title - -pady 10
9021 ${NS}::label $top.id -text [mc "ID:"]
9022 ${NS}::entry $top.sha1 -width 40
9023 $top.sha1 insert 0 $rowmenuid
9024 $top.sha1 conf -state readonly
9025 grid $top.id $top.sha1 -sticky w
9026 ${NS}::entry $top.head -width 60
9027 $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
9028 $top.head conf -state readonly
9029 grid x $top.head -sticky w
9030 ${NS}::label $top.tlab -text [mc "Tag name:"]
9031 ${NS}::entry $top.tag -width 60
9032 grid $top.tlab $top.tag -sticky w
9033 ${NS}::label $top.op -text [mc "Tag message is optional"]
9034 grid $top.op -columnspan 2 -sticky we
9035 ${NS}::label $top.mlab -text [mc "Tag message:"]
9036 ${NS}::entry $top.msg -width 60
9037 grid $top.mlab $top.msg -sticky w
9038 ${NS}::frame $top.buts
9039 ${NS}::button $top.buts.gen -text [mc "Create"] -command mktaggo
9040 ${NS}::button $top.buts.can -text [mc "Cancel"] -command mktagcan
9041 bind $top <Key-Return> mktaggo
9042 bind $top <Key-Escape> mktagcan
9043 grid $top.buts.gen $top.buts.can
9044 grid columnconfigure $top.buts 0 -weight 1 -uniform a
9045 grid columnconfigure $top.buts 1 -weight 1 -uniform a
9046 grid $top.buts - -pady 10 -sticky ew
9051 global mktagtop env tagids idtags
9053 set id [$mktagtop.sha1 get]
9054 set tag [$mktagtop.tag get]
9055 set msg [$mktagtop.msg get]
9057 error_popup [mc "No tag name specified"] $mktagtop
9060 if {[info exists tagids($tag)]} {
9061 error_popup [mc "Tag \"%s\" already exists" $tag] $mktagtop
9066 exec git tag -a -m $msg $tag $id
9068 exec git tag $tag $id
9071 error_popup "[mc "Error creating tag:"] $err" $mktagtop
9075 set tagids($tag) $id
9076 lappend idtags($id) $tag
9084 proc redrawtags {id} {
9085 global canv linehtag idpos currentid curview cmitlisted markedid
9086 global canvxmax iddrawn circleitem mainheadid circlecolors
9087 global mainheadcirclecolor
9089 if {![commitinview $id $curview]} return
9090 if {![info exists iddrawn($id)]} return
9091 set row [rowofcommit $id]
9092 if {$id eq $mainheadid} {
9093 set ofill $mainheadcirclecolor
9095 set ofill [lindex $circlecolors $cmitlisted($curview,$id)]
9097 $canv itemconf $circleitem($row) -fill $ofill
9098 $canv delete tag.$id
9099 set xt [eval drawtags $id $idpos($id)]
9100 $canv coords $linehtag($id) $xt [lindex $idpos($id) 2]
9101 set text [$canv itemcget $linehtag($id) -text]
9102 set font [$canv itemcget $linehtag($id) -font]
9103 set xr [expr {$xt + [font measure $font $text]}]
9104 if {$xr > $canvxmax} {
9108 if {[info exists currentid] && $currentid == $id} {
9111 if {[info exists markedid] && $markedid eq $id} {
9119 catch {destroy $mktagtop}
9124 if {![domktag]} return
9128 proc writecommit {} {
9129 global rowmenuid wrcomtop commitinfo wrcomcmd NS
9131 set top .writecommit
9133 catch {destroy $top}
9135 make_transient $top .
9136 ${NS}::label $top.title -text [mc "Write commit to file"]
9137 grid $top.title - -pady 10
9138 ${NS}::label $top.id -text [mc "ID:"]
9139 ${NS}::entry $top.sha1 -width 40
9140 $top.sha1 insert 0 $rowmenuid
9141 $top.sha1 conf -state readonly
9142 grid $top.id $top.sha1 -sticky w
9143 ${NS}::entry $top.head -width 60
9144 $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
9145 $top.head conf -state readonly
9146 grid x $top.head -sticky w
9147 ${NS}::label $top.clab -text [mc "Command:"]
9148 ${NS}::entry $top.cmd -width 60 -textvariable wrcomcmd
9149 grid $top.clab $top.cmd -sticky w -pady 10
9150 ${NS}::label $top.flab -text [mc "Output file:"]
9151 ${NS}::entry $top.fname -width 60
9152 $top.fname insert 0 [file normalize "commit-[string range $rowmenuid 0 6]"]
9153 grid $top.flab $top.fname -sticky w
9154 ${NS}::frame $top.buts
9155 ${NS}::button $top.buts.gen -text [mc "Write"] -command wrcomgo
9156 ${NS}::button $top.buts.can -text [mc "Cancel"] -command wrcomcan
9157 bind $top <Key-Return> wrcomgo
9158 bind $top <Key-Escape> wrcomcan
9159 grid $top.buts.gen $top.buts.can
9160 grid columnconfigure $top.buts 0 -weight 1 -uniform a
9161 grid columnconfigure $top.buts 1 -weight 1 -uniform a
9162 grid $top.buts - -pady 10 -sticky ew
9169 set id [$wrcomtop.sha1 get]
9170 set cmd "echo $id | [$wrcomtop.cmd get]"
9171 set fname [$wrcomtop.fname get]
9172 if {[catch {exec sh -c $cmd >$fname &} err]} {
9173 error_popup "[mc "Error writing commit:"] $err" $wrcomtop
9175 catch {destroy $wrcomtop}
9182 catch {destroy $wrcomtop}
9187 global rowmenuid mkbrtop NS
9190 catch {destroy $top}
9192 make_transient $top .
9193 ${NS}::label $top.title -text [mc "Create new branch"]
9194 grid $top.title - -pady 10
9195 ${NS}::label $top.id -text [mc "ID:"]
9196 ${NS}::entry $top.sha1 -width 40
9197 $top.sha1 insert 0 $rowmenuid
9198 $top.sha1 conf -state readonly
9199 grid $top.id $top.sha1 -sticky w
9200 ${NS}::label $top.nlab -text [mc "Name:"]
9201 ${NS}::entry $top.name -width 40
9202 grid $top.nlab $top.name -sticky w
9203 ${NS}::frame $top.buts
9204 ${NS}::button $top.buts.go -text [mc "Create"] -command [list mkbrgo $top]
9205 ${NS}::button $top.buts.can -text [mc "Cancel"] -command "catch {destroy $top}"
9206 bind $top <Key-Return> [list mkbrgo $top]
9207 bind $top <Key-Escape> "catch {destroy $top}"
9208 grid $top.buts.go $top.buts.can
9209 grid columnconfigure $top.buts 0 -weight 1 -uniform a
9210 grid columnconfigure $top.buts 1 -weight 1 -uniform a
9211 grid $top.buts - -pady 10 -sticky ew
9216 global headids idheads
9218 set name [$top.name get]
9219 set id [$top.sha1 get]
9223 error_popup [mc "Please specify a name for the new branch"] $top
9226 if {[info exists headids($name)]} {
9227 if {![confirm_popup [mc \
9228 "Branch '%s' already exists. Overwrite?" $name] $top]} {
9231 set old_id $headids($name)
9234 catch {destroy $top}
9235 lappend cmdargs $name $id
9239 eval exec git branch $cmdargs
9245 if {$old_id ne {}} {
9251 set headids($name) $id
9252 lappend idheads($id) $name
9261 proc exec_citool {tool_args {baseid {}}} {
9262 global commitinfo env
9264 set save_env [array get env GIT_AUTHOR_*]
9266 if {$baseid ne {}} {
9267 if {![info exists commitinfo($baseid)]} {
9270 set author [lindex $commitinfo($baseid) 1]
9271 set date [lindex $commitinfo($baseid) 2]
9272 if {[regexp {^\s*(\S.*\S|\S)\s*<(.*)>\s*$} \
9273 $author author name email]
9275 set env(GIT_AUTHOR_NAME) $name
9276 set env(GIT_AUTHOR_EMAIL) $email
9277 set env(GIT_AUTHOR_DATE) $date
9281 eval exec git citool $tool_args &
9283 array unset env GIT_AUTHOR_*
9284 array set env $save_env
9287 proc cherrypick {} {
9288 global rowmenuid curview
9289 global mainhead mainheadid
9292 set oldhead [exec git rev-parse HEAD]
9293 set dheads [descheads $rowmenuid]
9294 if {$dheads ne {} && [lsearch -exact $dheads $oldhead] >= 0} {
9295 set ok [confirm_popup [mc "Commit %s is already\
9296 included in branch %s -- really re-apply it?" \
9297 [string range $rowmenuid 0 7] $mainhead]]
9300 nowbusy cherrypick [mc "Cherry-picking"]
9302 # Unfortunately git-cherry-pick writes stuff to stderr even when
9303 # no error occurs, and exec takes that as an indication of error...
9304 if {[catch {exec sh -c "git cherry-pick -r $rowmenuid 2>&1"} err]} {
9307 {Entry '(.*)' (would be overwritten by merge|not uptodate)} \
9309 error_popup [mc "Cherry-pick failed because of local changes\
9310 to file '%s'.\nPlease commit, reset or stash\
9311 your changes and try again." $fname]
9312 } elseif {[regexp -line \
9313 {^(CONFLICT \(.*\):|Automatic cherry-pick failed|error: could not apply)} \
9315 if {[confirm_popup [mc "Cherry-pick failed because of merge\
9316 conflict.\nDo you wish to run git citool to\
9318 # Force citool to read MERGE_MSG
9319 file delete [file join $gitdir "GITGUI_MSG"]
9320 exec_citool {} $rowmenuid
9328 set newhead [exec git rev-parse HEAD]
9329 if {$newhead eq $oldhead} {
9331 error_popup [mc "No changes committed"]
9334 addnewchild $newhead $oldhead
9335 if {[commitinview $oldhead $curview]} {
9336 # XXX this isn't right if we have a path limit...
9337 insertrow $newhead $oldhead $curview
9338 if {$mainhead ne {}} {
9339 movehead $newhead $mainhead
9340 movedhead $newhead $mainhead
9342 set mainheadid $newhead
9351 global rowmenuid curview
9352 global mainhead mainheadid
9355 set oldhead [exec git rev-parse HEAD]
9356 set dheads [descheads $rowmenuid]
9357 if { $dheads eq {} || [lsearch -exact $dheads $oldhead] == -1 } {
9358 set ok [confirm_popup [mc "Commit %s is not\
9359 included in branch %s -- really revert it?" \
9360 [string range $rowmenuid 0 7] $mainhead]]
9363 nowbusy revert [mc "Reverting"]
9366 if [catch {exec git revert --no-edit $rowmenuid} err] {
9368 if [regexp {files would be overwritten by merge:(\n(( |\t)+[^\n]+\n)+)}\
9370 regsub {\n( |\t)+} $files "\n" files
9371 error_popup [mc "Revert failed because of local changes to\
9372 the following files:%s Please commit, reset or stash \
9373 your changes and try again." $files]
9374 } elseif [regexp {error: could not revert} $err] {
9375 if [confirm_popup [mc "Revert failed because of merge conflict.\n\
9376 Do you wish to run git citool to resolve it?"]] {
9377 # Force citool to read MERGE_MSG
9378 file delete [file join $gitdir "GITGUI_MSG"]
9379 exec_citool {} $rowmenuid
9381 } else { error_popup $err }
9386 set newhead [exec git rev-parse HEAD]
9387 if { $newhead eq $oldhead } {
9389 error_popup [mc "No changes committed"]
9393 addnewchild $newhead $oldhead
9395 if [commitinview $oldhead $curview] {
9396 # XXX this isn't right if we have a path limit...
9397 insertrow $newhead $oldhead $curview
9398 if {$mainhead ne {}} {
9399 movehead $newhead $mainhead
9400 movedhead $newhead $mainhead
9402 set mainheadid $newhead
9412 global mainhead rowmenuid confirm_ok resettype NS
9415 set w ".confirmreset"
9418 wm title $w [mc "Confirm reset"]
9419 ${NS}::label $w.m -text \
9420 [mc "Reset branch %s to %s?" $mainhead [string range $rowmenuid 0 7]]
9421 pack $w.m -side top -fill x -padx 20 -pady 20
9422 ${NS}::labelframe $w.f -text [mc "Reset type:"]
9424 ${NS}::radiobutton $w.f.soft -value soft -variable resettype \
9425 -text [mc "Soft: Leave working tree and index untouched"]
9426 grid $w.f.soft -sticky w
9427 ${NS}::radiobutton $w.f.mixed -value mixed -variable resettype \
9428 -text [mc "Mixed: Leave working tree untouched, reset index"]
9429 grid $w.f.mixed -sticky w
9430 ${NS}::radiobutton $w.f.hard -value hard -variable resettype \
9431 -text [mc "Hard: Reset working tree and index\n(discard ALL local changes)"]
9432 grid $w.f.hard -sticky w
9433 pack $w.f -side top -fill x -padx 4
9434 ${NS}::button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w"
9435 pack $w.ok -side left -fill x -padx 20 -pady 20
9436 ${NS}::button $w.cancel -text [mc Cancel] -command "destroy $w"
9437 bind $w <Key-Escape> [list destroy $w]
9438 pack $w.cancel -side right -fill x -padx 20 -pady 20
9439 bind $w <Visibility> "grab $w; focus $w"
9441 if {!$confirm_ok} return
9442 if {[catch {set fd [open \
9443 [list | git reset --$resettype $rowmenuid 2>@1] r]} err]} {
9447 filerun $fd [list readresetstat $fd]
9448 nowbusy reset [mc "Resetting"]
9453 proc readresetstat {fd} {
9454 global mainhead mainheadid showlocalchanges rprogcoord
9456 if {[gets $fd line] >= 0} {
9457 if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
9458 set rprogcoord [expr {1.0 * $m / $n}]
9466 if {[catch {close $fd} err]} {
9469 set oldhead $mainheadid
9470 set newhead [exec git rev-parse HEAD]
9471 if {$newhead ne $oldhead} {
9472 movehead $newhead $mainhead
9473 movedhead $newhead $mainhead
9474 set mainheadid $newhead
9478 if {$showlocalchanges} {
9484 # context menu for a head
9485 proc headmenu {x y id head} {
9486 global headmenuid headmenuhead headctxmenu mainhead
9490 set headmenuhead $head
9492 if {[string match "remotes/*" $head]} {
9495 if {$head eq $mainhead} {
9498 $headctxmenu entryconfigure 0 -state $state
9499 $headctxmenu entryconfigure 1 -state $state
9500 tk_popup $headctxmenu $x $y
9504 global headmenuid headmenuhead headids
9505 global showlocalchanges
9507 # check the tree is clean first??
9508 nowbusy checkout [mc "Checking out"]
9512 set fd [open [list | git checkout $headmenuhead 2>@1] r]
9516 if {$showlocalchanges} {
9520 filerun $fd [list readcheckoutstat $fd $headmenuhead $headmenuid]
9524 proc readcheckoutstat {fd newhead newheadid} {
9525 global mainhead mainheadid headids showlocalchanges progresscoords
9526 global viewmainheadid curview
9528 if {[gets $fd line] >= 0} {
9529 if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
9530 set progresscoords [list 0 [expr {1.0 * $m / $n}]]
9535 set progresscoords {0 0}
9538 if {[catch {close $fd} err]} {
9541 set oldmainid $mainheadid
9542 set mainhead $newhead
9543 set mainheadid $newheadid
9544 set viewmainheadid($curview) $newheadid
9545 redrawtags $oldmainid
9546 redrawtags $newheadid
9548 if {$showlocalchanges} {
9554 global headmenuid headmenuhead mainhead
9557 set head $headmenuhead
9559 # this check shouldn't be needed any more...
9560 if {$head eq $mainhead} {
9561 error_popup [mc "Cannot delete the currently checked-out branch"]
9564 set dheads [descheads $id]
9565 if {[llength $dheads] == 1 && $idheads($dheads) eq $head} {
9566 # the stuff on this branch isn't on any other branch
9567 if {![confirm_popup [mc "The commits on branch %s aren't on any other\
9568 branch.\nReally delete branch %s?" $head $head]]} return
9572 if {[catch {exec git branch -D $head} err]} {
9577 removehead $id $head
9578 removedhead $id $head
9585 # Display a list of tags and heads
9587 global showrefstop bgcolor fgcolor selectbgcolor NS
9588 global bglist fglist reflistfilter reflist maincursor
9591 set showrefstop $top
9592 if {[winfo exists $top]} {
9598 wm title $top [mc "Tags and heads: %s" [file tail [pwd]]]
9599 make_transient $top .
9600 text $top.list -background $bgcolor -foreground $fgcolor \
9601 -selectbackground $selectbgcolor -font mainfont \
9602 -xscrollcommand "$top.xsb set" -yscrollcommand "$top.ysb set" \
9603 -width 30 -height 20 -cursor $maincursor \
9604 -spacing1 1 -spacing3 1 -state disabled
9605 $top.list tag configure highlight -background $selectbgcolor
9606 lappend bglist $top.list
9607 lappend fglist $top.list
9608 ${NS}::scrollbar $top.ysb -command "$top.list yview" -orient vertical
9609 ${NS}::scrollbar $top.xsb -command "$top.list xview" -orient horizontal
9610 grid $top.list $top.ysb -sticky nsew
9611 grid $top.xsb x -sticky ew
9613 ${NS}::label $top.f.l -text "[mc "Filter"]: "
9614 ${NS}::entry $top.f.e -width 20 -textvariable reflistfilter
9615 set reflistfilter "*"
9616 trace add variable reflistfilter write reflistfilter_change
9617 pack $top.f.e -side right -fill x -expand 1
9618 pack $top.f.l -side left
9619 grid $top.f - -sticky ew -pady 2
9620 ${NS}::button $top.close -command [list destroy $top] -text [mc "Close"]
9621 bind $top <Key-Escape> [list destroy $top]
9623 grid columnconfigure $top 0 -weight 1
9624 grid rowconfigure $top 0 -weight 1
9625 bind $top.list <1> {break}
9626 bind $top.list <B1-Motion> {break}
9627 bind $top.list <ButtonRelease-1> {sel_reflist %W %x %y; break}
9632 proc sel_reflist {w x y} {
9633 global showrefstop reflist headids tagids otherrefids
9635 if {![winfo exists $showrefstop]} return
9636 set l [lindex [split [$w index "@$x,$y"] "."] 0]
9637 set ref [lindex $reflist [expr {$l-1}]]
9638 set n [lindex $ref 0]
9639 switch -- [lindex $ref 1] {
9640 "H" {selbyid $headids($n)}
9641 "T" {selbyid $tagids($n)}
9642 "o" {selbyid $otherrefids($n)}
9644 $showrefstop.list tag add highlight $l.0 "$l.0 lineend"
9647 proc unsel_reflist {} {
9650 if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
9651 $showrefstop.list tag remove highlight 0.0 end
9654 proc reflistfilter_change {n1 n2 op} {
9655 global reflistfilter
9657 after cancel refill_reflist
9658 after 200 refill_reflist
9661 proc refill_reflist {} {
9662 global reflist reflistfilter showrefstop headids tagids otherrefids
9665 if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
9667 foreach n [array names headids] {
9668 if {[string match $reflistfilter $n]} {
9669 if {[commitinview $headids($n) $curview]} {
9670 lappend refs [list $n H]
9672 interestedin $headids($n) {run refill_reflist}
9676 foreach n [array names tagids] {
9677 if {[string match $reflistfilter $n]} {
9678 if {[commitinview $tagids($n) $curview]} {
9679 lappend refs [list $n T]
9681 interestedin $tagids($n) {run refill_reflist}
9685 foreach n [array names otherrefids] {
9686 if {[string match $reflistfilter $n]} {
9687 if {[commitinview $otherrefids($n) $curview]} {
9688 lappend refs [list $n o]
9690 interestedin $otherrefids($n) {run refill_reflist}
9694 set refs [lsort -index 0 $refs]
9695 if {$refs eq $reflist} return
9697 # Update the contents of $showrefstop.list according to the
9698 # differences between $reflist (old) and $refs (new)
9699 $showrefstop.list conf -state normal
9700 $showrefstop.list insert end "\n"
9703 while {$i < [llength $reflist] || $j < [llength $refs]} {
9704 if {$i < [llength $reflist]} {
9705 if {$j < [llength $refs]} {
9706 set cmp [string compare [lindex $reflist $i 0] \
9707 [lindex $refs $j 0]]
9709 set cmp [string compare [lindex $reflist $i 1] \
9710 [lindex $refs $j 1]]
9720 $showrefstop.list delete "[expr {$j+1}].0" "[expr {$j+2}].0"
9728 set l [expr {$j + 1}]
9729 $showrefstop.list image create $l.0 -align baseline \
9730 -image reficon-[lindex $refs $j 1] -padx 2
9731 $showrefstop.list insert $l.1 "[lindex $refs $j 0]\n"
9737 # delete last newline
9738 $showrefstop.list delete end-2c end-1c
9739 $showrefstop.list conf -state disabled
9742 # Stuff for finding nearby tags
9743 proc getallcommits {} {
9744 global allcommits nextarc seeds allccache allcwait cachedarcs allcupdate
9745 global idheads idtags idotherrefs allparents tagobjid
9748 if {![info exists allcommits]} {
9754 set allccache [file join $gitdir "gitk.cache"]
9756 set f [open $allccache r]
9765 set cmd [list | git rev-list --parents]
9766 set allcupdate [expr {$seeds ne {}}]
9770 set refs [concat [array names idheads] [array names idtags] \
9771 [array names idotherrefs]]
9774 foreach name [array names tagobjid] {
9775 lappend tagobjs $tagobjid($name)
9777 foreach id [lsort -unique $refs] {
9778 if {![info exists allparents($id)] &&
9779 [lsearch -exact $tagobjs $id] < 0} {
9790 set fd [open [concat $cmd $ids] r]
9791 fconfigure $fd -blocking 0
9794 filerun $fd [list getallclines $fd]
9800 # Since most commits have 1 parent and 1 child, we group strings of
9801 # such commits into "arcs" joining branch/merge points (BMPs), which
9802 # are commits that either don't have 1 parent or don't have 1 child.
9804 # arcnos(id) - incoming arcs for BMP, arc we're on for other nodes
9805 # arcout(id) - outgoing arcs for BMP
9806 # arcids(a) - list of IDs on arc including end but not start
9807 # arcstart(a) - BMP ID at start of arc
9808 # arcend(a) - BMP ID at end of arc
9809 # growing(a) - arc a is still growing
9810 # arctags(a) - IDs out of arcids (excluding end) that have tags
9811 # archeads(a) - IDs out of arcids (excluding end) that have heads
9812 # The start of an arc is at the descendent end, so "incoming" means
9813 # coming from descendents, and "outgoing" means going towards ancestors.
9815 proc getallclines {fd} {
9816 global allparents allchildren idtags idheads nextarc
9817 global arcnos arcids arctags arcout arcend arcstart archeads growing
9818 global seeds allcommits cachedarcs allcupdate
9821 while {[incr nid] <= 1000 && [gets $fd line] >= 0} {
9822 set id [lindex $line 0]
9823 if {[info exists allparents($id)]} {
9828 set olds [lrange $line 1 end]
9829 set allparents($id) $olds
9830 if {![info exists allchildren($id)]} {
9831 set allchildren($id) {}
9836 if {[llength $olds] == 1 && [llength $a] == 1} {
9837 lappend arcids($a) $id
9838 if {[info exists idtags($id)]} {
9839 lappend arctags($a) $id
9841 if {[info exists idheads($id)]} {
9842 lappend archeads($a) $id
9844 if {[info exists allparents($olds)]} {
9845 # seen parent already
9846 if {![info exists arcout($olds)]} {
9849 lappend arcids($a) $olds
9850 set arcend($a) $olds
9853 lappend allchildren($olds) $id
9854 lappend arcnos($olds) $a
9858 foreach a $arcnos($id) {
9859 lappend arcids($a) $id
9866 lappend allchildren($p) $id
9867 set a [incr nextarc]
9868 set arcstart($a) $id
9875 if {[info exists allparents($p)]} {
9876 # seen it already, may need to make a new branch
9877 if {![info exists arcout($p)]} {
9880 lappend arcids($a) $p
9884 lappend arcnos($p) $a
9889 global cached_dheads cached_dtags cached_atags
9890 catch {unset cached_dheads}
9891 catch {unset cached_dtags}
9892 catch {unset cached_atags}
9895 return [expr {$nid >= 1000? 2: 1}]
9899 fconfigure $fd -blocking 1
9902 # got an error reading the list of commits
9903 # if we were updating, try rereading the whole thing again
9909 error_popup "[mc "Error reading commit topology information;\
9910 branch and preceding/following tag information\
9911 will be incomplete."]\n($err)"
9914 if {[incr allcommits -1] == 0} {
9924 proc recalcarc {a} {
9925 global arctags archeads arcids idtags idheads
9929 foreach id [lrange $arcids($a) 0 end-1] {
9930 if {[info exists idtags($id)]} {
9933 if {[info exists idheads($id)]} {
9938 set archeads($a) $ah
9942 global arcnos arcids nextarc arctags archeads idtags idheads
9943 global arcstart arcend arcout allparents growing
9946 if {[llength $a] != 1} {
9947 puts "oops splitarc called but [llength $a] arcs already"
9951 set i [lsearch -exact $arcids($a) $p]
9953 puts "oops splitarc $p not in arc $a"
9956 set na [incr nextarc]
9957 if {[info exists arcend($a)]} {
9958 set arcend($na) $arcend($a)
9960 set l [lindex $allparents([lindex $arcids($a) end]) 0]
9961 set j [lsearch -exact $arcnos($l) $a]
9962 set arcnos($l) [lreplace $arcnos($l) $j $j $na]
9964 set tail [lrange $arcids($a) [expr {$i+1}] end]
9965 set arcids($a) [lrange $arcids($a) 0 $i]
9967 set arcstart($na) $p
9969 set arcids($na) $tail
9970 if {[info exists growing($a)]} {
9976 if {[llength $arcnos($id)] == 1} {
9979 set j [lsearch -exact $arcnos($id) $a]
9980 set arcnos($id) [lreplace $arcnos($id) $j $j $na]
9984 # reconstruct tags and heads lists
9985 if {$arctags($a) ne {} || $archeads($a) ne {}} {
9990 set archeads($na) {}
9994 # Update things for a new commit added that is a child of one
9995 # existing commit. Used when cherry-picking.
9996 proc addnewchild {id p} {
9997 global allparents allchildren idtags nextarc
9998 global arcnos arcids arctags arcout arcend arcstart archeads growing
9999 global seeds allcommits
10001 if {![info exists allcommits] || ![info exists arcnos($p)]} return
10002 set allparents($id) [list $p]
10003 set allchildren($id) {}
10006 lappend allchildren($p) $id
10007 set a [incr nextarc]
10008 set arcstart($a) $id
10009 set archeads($a) {}
10011 set arcids($a) [list $p]
10013 if {![info exists arcout($p)]} {
10016 lappend arcnos($p) $a
10017 set arcout($id) [list $a]
10020 # This implements a cache for the topology information.
10021 # The cache saves, for each arc, the start and end of the arc,
10022 # the ids on the arc, and the outgoing arcs from the end.
10023 proc readcache {f} {
10024 global arcnos arcids arcout arcstart arcend arctags archeads nextarc
10025 global idtags idheads allparents cachedarcs possible_seeds seeds growing
10029 set lim $cachedarcs
10030 if {$lim - $a > 500} {
10031 set lim [expr {$a + 500}]
10035 # finish reading the cache and setting up arctags, etc.
10037 if {$line ne "1"} {error "bad final version"}
10039 foreach id [array names idtags] {
10040 if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 &&
10041 [llength $allparents($id)] == 1} {
10042 set a [lindex $arcnos($id) 0]
10043 if {$arctags($a) eq {}} {
10048 foreach id [array names idheads] {
10049 if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 &&
10050 [llength $allparents($id)] == 1} {
10051 set a [lindex $arcnos($id) 0]
10052 if {$archeads($a) eq {}} {
10057 foreach id [lsort -unique $possible_seeds] {
10058 if {$arcnos($id) eq {}} {
10064 while {[incr a] <= $lim} {
10066 if {[llength $line] != 3} {error "bad line"}
10067 set s [lindex $line 0]
10068 set arcstart($a) $s
10069 lappend arcout($s) $a
10070 if {![info exists arcnos($s)]} {
10071 lappend possible_seeds $s
10074 set e [lindex $line 1]
10079 if {![info exists arcout($e)]} {
10083 set arcids($a) [lindex $line 2]
10084 foreach id $arcids($a) {
10085 lappend allparents($s) $id
10087 lappend arcnos($id) $a
10089 if {![info exists allparents($s)]} {
10090 set allparents($s) {}
10093 set archeads($a) {}
10095 set nextarc [expr {$a - 1}]
10107 proc getcache {f} {
10108 global nextarc cachedarcs possible_seeds
10112 if {[llength $line] != 2 || [lindex $line 0] ne "1"} {error "bad version"}
10113 # make sure it's an integer
10114 set cachedarcs [expr {int([lindex $line 1])}]
10115 if {$cachedarcs < 0} {error "bad number of arcs"}
10117 set possible_seeds {}
10125 proc dropcache {err} {
10126 global allcwait nextarc cachedarcs seeds
10128 #puts "dropping cache ($err)"
10129 foreach v {arcnos arcout arcids arcstart arcend growing \
10130 arctags archeads allparents allchildren} {
10141 proc writecache {f} {
10142 global cachearc cachedarcs allccache
10143 global arcstart arcend arcnos arcids arcout
10146 set lim $cachedarcs
10147 if {$lim - $a > 1000} {
10148 set lim [expr {$a + 1000}]
10151 while {[incr a] <= $lim} {
10152 if {[info exists arcend($a)]} {
10153 puts $f [list $arcstart($a) $arcend($a) $arcids($a)]
10155 puts $f [list $arcstart($a) {} $arcids($a)]
10160 catch {file delete $allccache}
10161 #puts "writing cache failed ($err)"
10164 set cachearc [expr {$a - 1}]
10165 if {$a > $cachedarcs} {
10173 proc savecache {} {
10174 global nextarc cachedarcs cachearc allccache
10176 if {$nextarc == $cachedarcs} return
10178 set cachedarcs $nextarc
10180 set f [open $allccache w]
10181 puts $f [list 1 $cachedarcs]
10186 # Returns 1 if a is an ancestor of b, -1 if b is an ancestor of a,
10187 # or 0 if neither is true.
10188 proc anc_or_desc {a b} {
10189 global arcout arcstart arcend arcnos cached_isanc
10191 if {$arcnos($a) eq $arcnos($b)} {
10192 # Both are on the same arc(s); either both are the same BMP,
10193 # or if one is not a BMP, the other is also not a BMP or is
10194 # the BMP at end of the arc (and it only has 1 incoming arc).
10195 # Or both can be BMPs with no incoming arcs.
10196 if {$a eq $b || $arcnos($a) eq {}} {
10199 # assert {[llength $arcnos($a)] == 1}
10200 set arc [lindex $arcnos($a) 0]
10201 set i [lsearch -exact $arcids($arc) $a]
10202 set j [lsearch -exact $arcids($arc) $b]
10203 if {$i < 0 || $i > $j} {
10210 if {![info exists arcout($a)]} {
10211 set arc [lindex $arcnos($a) 0]
10212 if {[info exists arcend($arc)]} {
10213 set aend $arcend($arc)
10217 set a $arcstart($arc)
10221 if {![info exists arcout($b)]} {
10222 set arc [lindex $arcnos($b) 0]
10223 if {[info exists arcend($arc)]} {
10224 set bend $arcend($arc)
10228 set b $arcstart($arc)
10238 if {[info exists cached_isanc($a,$bend)]} {
10239 if {$cached_isanc($a,$bend)} {
10243 if {[info exists cached_isanc($b,$aend)]} {
10244 if {$cached_isanc($b,$aend)} {
10247 if {[info exists cached_isanc($a,$bend)]} {
10252 set todo [list $a $b]
10255 for {set i 0} {$i < [llength $todo]} {incr i} {
10256 set x [lindex $todo $i]
10257 if {$anc($x) eq {}} {
10260 foreach arc $arcnos($x) {
10261 set xd $arcstart($arc)
10262 if {$xd eq $bend} {
10263 set cached_isanc($a,$bend) 1
10264 set cached_isanc($b,$aend) 0
10266 } elseif {$xd eq $aend} {
10267 set cached_isanc($b,$aend) 1
10268 set cached_isanc($a,$bend) 0
10271 if {![info exists anc($xd)]} {
10272 set anc($xd) $anc($x)
10274 } elseif {$anc($xd) ne $anc($x)} {
10279 set cached_isanc($a,$bend) 0
10280 set cached_isanc($b,$aend) 0
10284 # This identifies whether $desc has an ancestor that is
10285 # a growing tip of the graph and which is not an ancestor of $anc
10286 # and returns 0 if so and 1 if not.
10287 # If we subsequently discover a tag on such a growing tip, and that
10288 # turns out to be a descendent of $anc (which it could, since we
10289 # don't necessarily see children before parents), then $desc
10290 # isn't a good choice to display as a descendent tag of
10291 # $anc (since it is the descendent of another tag which is
10292 # a descendent of $anc). Similarly, $anc isn't a good choice to
10293 # display as a ancestor tag of $desc.
10295 proc is_certain {desc anc} {
10296 global arcnos arcout arcstart arcend growing problems
10299 if {[llength $arcnos($anc)] == 1} {
10300 # tags on the same arc are certain
10301 if {$arcnos($desc) eq $arcnos($anc)} {
10304 if {![info exists arcout($anc)]} {
10305 # if $anc is partway along an arc, use the start of the arc instead
10306 set a [lindex $arcnos($anc) 0]
10307 set anc $arcstart($a)
10310 if {[llength $arcnos($desc)] > 1 || [info exists arcout($desc)]} {
10313 set a [lindex $arcnos($desc) 0]
10319 set anclist [list $x]
10323 for {set i 0} {$i < [llength $anclist] && ($nnh > 0 || $ngrowanc > 0)} {incr i} {
10324 set x [lindex $anclist $i]
10329 foreach a $arcout($x) {
10330 if {[info exists growing($a)]} {
10331 if {![info exists growanc($x)] && $dl($x)} {
10337 if {[info exists dl($y)]} {
10341 if {![info exists done($y)]} {
10344 if {[info exists growanc($x)]} {
10348 for {set k 0} {$k < [llength $xl]} {incr k} {
10349 set z [lindex $xl $k]
10350 foreach c $arcout($z) {
10351 if {[info exists arcend($c)]} {
10353 if {[info exists dl($v)] && $dl($v)} {
10355 if {![info exists done($v)]} {
10358 if {[info exists growanc($v)]} {
10368 } elseif {$y eq $anc || !$dl($x)} {
10379 foreach x [array names growanc] {
10388 proc validate_arctags {a} {
10389 global arctags idtags
10392 set na $arctags($a)
10393 foreach id $arctags($a) {
10395 if {![info exists idtags($id)]} {
10396 set na [lreplace $na $i $i]
10400 set arctags($a) $na
10403 proc validate_archeads {a} {
10404 global archeads idheads
10407 set na $archeads($a)
10408 foreach id $archeads($a) {
10410 if {![info exists idheads($id)]} {
10411 set na [lreplace $na $i $i]
10415 set archeads($a) $na
10418 # Return the list of IDs that have tags that are descendents of id,
10419 # ignoring IDs that are descendents of IDs already reported.
10420 proc desctags {id} {
10421 global arcnos arcstart arcids arctags idtags allparents
10422 global growing cached_dtags
10424 if {![info exists allparents($id)]} {
10427 set t1 [clock clicks -milliseconds]
10429 if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
10430 # part-way along an arc; check that arc first
10431 set a [lindex $arcnos($id) 0]
10432 if {$arctags($a) ne {}} {
10433 validate_arctags $a
10434 set i [lsearch -exact $arcids($a) $id]
10436 foreach t $arctags($a) {
10437 set j [lsearch -exact $arcids($a) $t]
10438 if {$j >= $i} break
10445 set id $arcstart($a)
10446 if {[info exists idtags($id)]} {
10450 if {[info exists cached_dtags($id)]} {
10451 return $cached_dtags($id)
10455 set todo [list $id]
10458 for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} {
10459 set id [lindex $todo $i]
10461 set ta [info exists hastaggedancestor($id)]
10465 # ignore tags on starting node
10466 if {!$ta && $i > 0} {
10467 if {[info exists idtags($id)]} {
10468 set tagloc($id) $id
10470 } elseif {[info exists cached_dtags($id)]} {
10471 set tagloc($id) $cached_dtags($id)
10475 foreach a $arcnos($id) {
10476 set d $arcstart($a)
10477 if {!$ta && $arctags($a) ne {}} {
10478 validate_arctags $a
10479 if {$arctags($a) ne {}} {
10480 lappend tagloc($id) [lindex $arctags($a) end]
10483 if {$ta || $arctags($a) ne {}} {
10484 set tomark [list $d]
10485 for {set j 0} {$j < [llength $tomark]} {incr j} {
10486 set dd [lindex $tomark $j]
10487 if {![info exists hastaggedancestor($dd)]} {
10488 if {[info exists done($dd)]} {
10489 foreach b $arcnos($dd) {
10490 lappend tomark $arcstart($b)
10492 if {[info exists tagloc($dd)]} {
10495 } elseif {[info exists queued($dd)]} {
10498 set hastaggedancestor($dd) 1
10502 if {![info exists queued($d)]} {
10505 if {![info exists hastaggedancestor($d)]} {
10512 foreach id [array names tagloc] {
10513 if {![info exists hastaggedancestor($id)]} {
10514 foreach t $tagloc($id) {
10515 if {[lsearch -exact $tags $t] < 0} {
10521 set t2 [clock clicks -milliseconds]
10524 # remove tags that are descendents of other tags
10525 for {set i 0} {$i < [llength $tags]} {incr i} {
10526 set a [lindex $tags $i]
10527 for {set j 0} {$j < $i} {incr j} {
10528 set b [lindex $tags $j]
10529 set r [anc_or_desc $a $b]
10531 set tags [lreplace $tags $j $j]
10534 } elseif {$r == -1} {
10535 set tags [lreplace $tags $i $i]
10542 if {[array names growing] ne {}} {
10543 # graph isn't finished, need to check if any tag could get
10544 # eclipsed by another tag coming later. Simply ignore any
10545 # tags that could later get eclipsed.
10548 if {[is_certain $t $origid]} {
10552 if {$tags eq $ctags} {
10553 set cached_dtags($origid) $tags
10558 set cached_dtags($origid) $tags
10560 set t3 [clock clicks -milliseconds]
10561 if {0 && $t3 - $t1 >= 100} {
10562 puts "iterating descendents ($loopix/[llength $todo] nodes) took\
10563 [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left"
10568 proc anctags {id} {
10569 global arcnos arcids arcout arcend arctags idtags allparents
10570 global growing cached_atags
10572 if {![info exists allparents($id)]} {
10575 set t1 [clock clicks -milliseconds]
10577 if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
10578 # part-way along an arc; check that arc first
10579 set a [lindex $arcnos($id) 0]
10580 if {$arctags($a) ne {}} {
10581 validate_arctags $a
10582 set i [lsearch -exact $arcids($a) $id]
10583 foreach t $arctags($a) {
10584 set j [lsearch -exact $arcids($a) $t]
10590 if {![info exists arcend($a)]} {
10594 if {[info exists idtags($id)]} {
10598 if {[info exists cached_atags($id)]} {
10599 return $cached_atags($id)
10603 set todo [list $id]
10607 for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} {
10608 set id [lindex $todo $i]
10610 set td [info exists hastaggeddescendent($id)]
10614 # ignore tags on starting node
10615 if {!$td && $i > 0} {
10616 if {[info exists idtags($id)]} {
10617 set tagloc($id) $id
10619 } elseif {[info exists cached_atags($id)]} {
10620 set tagloc($id) $cached_atags($id)
10624 foreach a $arcout($id) {
10625 if {!$td && $arctags($a) ne {}} {
10626 validate_arctags $a
10627 if {$arctags($a) ne {}} {
10628 lappend tagloc($id) [lindex $arctags($a) 0]
10631 if {![info exists arcend($a)]} continue
10633 if {$td || $arctags($a) ne {}} {
10634 set tomark [list $d]
10635 for {set j 0} {$j < [llength $tomark]} {incr j} {
10636 set dd [lindex $tomark $j]
10637 if {![info exists hastaggeddescendent($dd)]} {
10638 if {[info exists done($dd)]} {
10639 foreach b $arcout($dd) {
10640 if {[info exists arcend($b)]} {
10641 lappend tomark $arcend($b)
10644 if {[info exists tagloc($dd)]} {
10647 } elseif {[info exists queued($dd)]} {
10650 set hastaggeddescendent($dd) 1
10654 if {![info exists queued($d)]} {
10657 if {![info exists hastaggeddescendent($d)]} {
10663 set t2 [clock clicks -milliseconds]
10666 foreach id [array names tagloc] {
10667 if {![info exists hastaggeddescendent($id)]} {
10668 foreach t $tagloc($id) {
10669 if {[lsearch -exact $tags $t] < 0} {
10676 # remove tags that are ancestors of other tags
10677 for {set i 0} {$i < [llength $tags]} {incr i} {
10678 set a [lindex $tags $i]
10679 for {set j 0} {$j < $i} {incr j} {
10680 set b [lindex $tags $j]
10681 set r [anc_or_desc $a $b]
10683 set tags [lreplace $tags $j $j]
10686 } elseif {$r == 1} {
10687 set tags [lreplace $tags $i $i]
10694 if {[array names growing] ne {}} {
10695 # graph isn't finished, need to check if any tag could get
10696 # eclipsed by another tag coming later. Simply ignore any
10697 # tags that could later get eclipsed.
10700 if {[is_certain $origid $t]} {
10704 if {$tags eq $ctags} {
10705 set cached_atags($origid) $tags
10710 set cached_atags($origid) $tags
10712 set t3 [clock clicks -milliseconds]
10713 if {0 && $t3 - $t1 >= 100} {
10714 puts "iterating ancestors ($loopix/[llength $todo] nodes) took\
10715 [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left"
10720 # Return the list of IDs that have heads that are descendents of id,
10721 # including id itself if it has a head.
10722 proc descheads {id} {
10723 global arcnos arcstart arcids archeads idheads cached_dheads
10724 global allparents arcout
10726 if {![info exists allparents($id)]} {
10730 if {![info exists arcout($id)]} {
10731 # part-way along an arc; check it first
10732 set a [lindex $arcnos($id) 0]
10733 if {$archeads($a) ne {}} {
10734 validate_archeads $a
10735 set i [lsearch -exact $arcids($a) $id]
10736 foreach t $archeads($a) {
10737 set j [lsearch -exact $arcids($a) $t]
10742 set id $arcstart($a)
10745 set todo [list $id]
10748 for {set i 0} {$i < [llength $todo]} {incr i} {
10749 set id [lindex $todo $i]
10750 if {[info exists cached_dheads($id)]} {
10751 set ret [concat $ret $cached_dheads($id)]
10753 if {[info exists idheads($id)]} {
10756 foreach a $arcnos($id) {
10757 if {$archeads($a) ne {}} {
10758 validate_archeads $a
10759 if {$archeads($a) ne {}} {
10760 set ret [concat $ret $archeads($a)]
10763 set d $arcstart($a)
10764 if {![info exists seen($d)]} {
10771 set ret [lsort -unique $ret]
10772 set cached_dheads($origid) $ret
10773 return [concat $ret $aret]
10776 proc addedtag {id} {
10777 global arcnos arcout cached_dtags cached_atags
10779 if {![info exists arcnos($id)]} return
10780 if {![info exists arcout($id)]} {
10781 recalcarc [lindex $arcnos($id) 0]
10783 catch {unset cached_dtags}
10784 catch {unset cached_atags}
10787 proc addedhead {hid head} {
10788 global arcnos arcout cached_dheads
10790 if {![info exists arcnos($hid)]} return
10791 if {![info exists arcout($hid)]} {
10792 recalcarc [lindex $arcnos($hid) 0]
10794 catch {unset cached_dheads}
10797 proc removedhead {hid head} {
10798 global cached_dheads
10800 catch {unset cached_dheads}
10803 proc movedhead {hid head} {
10804 global arcnos arcout cached_dheads
10806 if {![info exists arcnos($hid)]} return
10807 if {![info exists arcout($hid)]} {
10808 recalcarc [lindex $arcnos($hid) 0]
10810 catch {unset cached_dheads}
10813 proc changedrefs {} {
10814 global cached_dheads cached_dtags cached_atags cached_tagcontent
10815 global arctags archeads arcnos arcout idheads idtags
10817 foreach id [concat [array names idheads] [array names idtags]] {
10818 if {[info exists arcnos($id)] && ![info exists arcout($id)]} {
10819 set a [lindex $arcnos($id) 0]
10820 if {![info exists donearc($a)]} {
10826 catch {unset cached_tagcontent}
10827 catch {unset cached_dtags}
10828 catch {unset cached_atags}
10829 catch {unset cached_dheads}
10832 proc rereadrefs {} {
10833 global idtags idheads idotherrefs mainheadid
10835 set refids [concat [array names idtags] \
10836 [array names idheads] [array names idotherrefs]]
10837 foreach id $refids {
10838 if {![info exists ref($id)]} {
10839 set ref($id) [listrefs $id]
10842 set oldmainhead $mainheadid
10845 set refids [lsort -unique [concat $refids [array names idtags] \
10846 [array names idheads] [array names idotherrefs]]]
10847 foreach id $refids {
10848 set v [listrefs $id]
10849 if {![info exists ref($id)] || $ref($id) != $v} {
10853 if {$oldmainhead ne $mainheadid} {
10854 redrawtags $oldmainhead
10855 redrawtags $mainheadid
10860 proc listrefs {id} {
10861 global idtags idheads idotherrefs
10864 if {[info exists idtags($id)]} {
10868 if {[info exists idheads($id)]} {
10869 set y $idheads($id)
10872 if {[info exists idotherrefs($id)]} {
10873 set z $idotherrefs($id)
10875 return [list $x $y $z]
10878 proc showtag {tag isnew} {
10879 global ctext cached_tagcontent tagids linknum tagobjid
10882 addtohistory [list showtag $tag 0] savectextpos
10884 $ctext conf -state normal
10888 if {![info exists cached_tagcontent($tag)]} {
10890 set cached_tagcontent($tag) [exec git cat-file -p $tag]
10893 if {[info exists cached_tagcontent($tag)]} {
10894 set text $cached_tagcontent($tag)
10896 set text "[mc "Tag"]: $tag\n[mc "Id"]: $tagids($tag)"
10898 appendwithlinks $text {}
10899 maybe_scroll_ctext 1
10900 $ctext conf -state disabled
10912 if {[info exists gitktmpdir]} {
10913 catch {file delete -force $gitktmpdir}
10917 proc mkfontdisp {font top which} {
10918 global fontattr fontpref $font NS use_ttk
10920 set fontpref($font) [set $font]
10921 ${NS}::button $top.${font}but -text $which \
10922 -command [list choosefont $font $which]
10923 ${NS}::label $top.$font -relief flat -font $font \
10924 -text $fontattr($font,family) -justify left
10925 grid x $top.${font}but $top.$font -sticky w
10928 proc choosefont {font which} {
10929 global fontparam fontlist fonttop fontattr
10932 set fontparam(which) $which
10933 set fontparam(font) $font
10934 set fontparam(family) [font actual $font -family]
10935 set fontparam(size) $fontattr($font,size)
10936 set fontparam(weight) $fontattr($font,weight)
10937 set fontparam(slant) $fontattr($font,slant)
10940 if {![winfo exists $top]} {
10942 eval font config sample [font actual $font]
10944 make_transient $top $prefstop
10945 wm title $top [mc "Gitk font chooser"]
10946 ${NS}::label $top.l -textvariable fontparam(which)
10947 pack $top.l -side top
10948 set fontlist [lsort [font families]]
10949 ${NS}::frame $top.f
10950 listbox $top.f.fam -listvariable fontlist \
10951 -yscrollcommand [list $top.f.sb set]
10952 bind $top.f.fam <<ListboxSelect>> selfontfam
10953 ${NS}::scrollbar $top.f.sb -command [list $top.f.fam yview]
10954 pack $top.f.sb -side right -fill y
10955 pack $top.f.fam -side left -fill both -expand 1
10956 pack $top.f -side top -fill both -expand 1
10957 ${NS}::frame $top.g
10958 spinbox $top.g.size -from 4 -to 40 -width 4 \
10959 -textvariable fontparam(size) \
10960 -validatecommand {string is integer -strict %s}
10961 checkbutton $top.g.bold -padx 5 \
10962 -font {{Times New Roman} 12 bold} -text [mc "B"] -indicatoron 0 \
10963 -variable fontparam(weight) -onvalue bold -offvalue normal
10964 checkbutton $top.g.ital -padx 5 \
10965 -font {{Times New Roman} 12 italic} -text [mc "I"] -indicatoron 0 \
10966 -variable fontparam(slant) -onvalue italic -offvalue roman
10967 pack $top.g.size $top.g.bold $top.g.ital -side left
10968 pack $top.g -side top
10969 canvas $top.c -width 150 -height 50 -border 2 -relief sunk \
10971 $top.c create text 100 25 -anchor center -text $which -font sample \
10972 -fill black -tags text
10973 bind $top.c <Configure> [list centertext $top.c]
10974 pack $top.c -side top -fill x
10975 ${NS}::frame $top.buts
10976 ${NS}::button $top.buts.ok -text [mc "OK"] -command fontok -default active
10977 ${NS}::button $top.buts.can -text [mc "Cancel"] -command fontcan -default normal
10978 bind $top <Key-Return> fontok
10979 bind $top <Key-Escape> fontcan
10980 grid $top.buts.ok $top.buts.can
10981 grid columnconfigure $top.buts 0 -weight 1 -uniform a
10982 grid columnconfigure $top.buts 1 -weight 1 -uniform a
10983 pack $top.buts -side bottom -fill x
10984 trace add variable fontparam write chg_fontparam
10987 $top.c itemconf text -text $which
10989 set i [lsearch -exact $fontlist $fontparam(family)]
10991 $top.f.fam selection set $i
10996 proc centertext {w} {
10997 $w coords text [expr {[winfo width $w] / 2}] [expr {[winfo height $w] / 2}]
11001 global fontparam fontpref prefstop
11003 set f $fontparam(font)
11004 set fontpref($f) [list $fontparam(family) $fontparam(size)]
11005 if {$fontparam(weight) eq "bold"} {
11006 lappend fontpref($f) "bold"
11008 if {$fontparam(slant) eq "italic"} {
11009 lappend fontpref($f) "italic"
11011 set w $prefstop.notebook.fonts.$f
11012 $w conf -text $fontparam(family) -font $fontpref($f)
11018 global fonttop fontparam
11020 if {[info exists fonttop]} {
11021 catch {destroy $fonttop}
11022 catch {font delete sample}
11028 if {[package vsatisfies [package provide Tk] 8.6]} {
11029 # In Tk 8.6 we have a native font chooser dialog. Overwrite the above
11030 # function to make use of it.
11031 proc choosefont {font which} {
11032 tk fontchooser configure -title $which -font $font \
11033 -command [list on_choosefont $font $which]
11034 tk fontchooser show
11036 proc on_choosefont {font which newfont} {
11038 puts stderr "$font $newfont"
11039 array set f [font actual $newfont]
11040 set fontparam(which) $which
11041 set fontparam(font) $font
11042 set fontparam(family) $f(-family)
11043 set fontparam(size) $f(-size)
11044 set fontparam(weight) $f(-weight)
11045 set fontparam(slant) $f(-slant)
11050 proc selfontfam {} {
11051 global fonttop fontparam
11053 set i [$fonttop.f.fam curselection]
11055 set fontparam(family) [$fonttop.f.fam get $i]
11059 proc chg_fontparam {v sub op} {
11062 font config sample -$sub $fontparam($sub)
11065 # Create a property sheet tab page
11066 proc create_prefs_page {w} {
11068 set parent [join [lrange [split $w .] 0 end-1] .]
11069 if {[winfo class $parent] eq "TNotebook"} {
11072 ${NS}::labelframe $w
11076 proc prefspage_general {notebook} {
11077 global NS maxwidth maxgraphpct showneartags showlocalchanges
11078 global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs
11079 global hideremotes want_ttk have_ttk maxrefs
11081 set page [create_prefs_page $notebook.general]
11083 ${NS}::label $page.ldisp -text [mc "Commit list display options"]
11084 grid $page.ldisp - -sticky w -pady 10
11085 ${NS}::label $page.spacer -text " "
11086 ${NS}::label $page.maxwidthl -text [mc "Maximum graph width (lines)"]
11087 spinbox $page.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
11088 grid $page.spacer $page.maxwidthl $page.maxwidth -sticky w
11089 ${NS}::label $page.maxpctl -text [mc "Maximum graph width (% of pane)"]
11090 spinbox $page.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
11091 grid x $page.maxpctl $page.maxpct -sticky w
11092 ${NS}::checkbutton $page.showlocal -text [mc "Show local changes"] \
11093 -variable showlocalchanges
11094 grid x $page.showlocal -sticky w
11095 ${NS}::checkbutton $page.autoselect -text [mc "Auto-select SHA1 (length)"] \
11096 -variable autoselect
11097 spinbox $page.autosellen -from 1 -to 40 -width 4 -textvariable autosellen
11098 grid x $page.autoselect $page.autosellen -sticky w
11099 ${NS}::checkbutton $page.hideremotes -text [mc "Hide remote refs"] \
11100 -variable hideremotes
11101 grid x $page.hideremotes -sticky w
11103 ${NS}::label $page.ddisp -text [mc "Diff display options"]
11104 grid $page.ddisp - -sticky w -pady 10
11105 ${NS}::label $page.tabstopl -text [mc "Tab spacing"]
11106 spinbox $page.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
11107 grid x $page.tabstopl $page.tabstop -sticky w
11108 ${NS}::checkbutton $page.ntag -text [mc "Display nearby tags/heads"] \
11109 -variable showneartags
11110 grid x $page.ntag -sticky w
11111 ${NS}::label $page.maxrefsl -text [mc "Maximum # tags/heads to show"]
11112 spinbox $page.maxrefs -from 1 -to 1000 -width 4 -textvariable maxrefs
11113 grid x $page.maxrefsl $page.maxrefs -sticky w
11114 ${NS}::checkbutton $page.ldiff -text [mc "Limit diffs to listed paths"] \
11115 -variable limitdiffs
11116 grid x $page.ldiff -sticky w
11117 ${NS}::checkbutton $page.lattr -text [mc "Support per-file encodings"] \
11118 -variable perfile_attrs
11119 grid x $page.lattr -sticky w
11121 ${NS}::entry $page.extdifft -textvariable extdifftool
11122 ${NS}::frame $page.extdifff
11123 ${NS}::label $page.extdifff.l -text [mc "External diff tool" ]
11124 ${NS}::button $page.extdifff.b -text [mc "Choose..."] -command choose_extdiff
11125 pack $page.extdifff.l $page.extdifff.b -side left
11126 pack configure $page.extdifff.l -padx 10
11127 grid x $page.extdifff $page.extdifft -sticky ew
11129 ${NS}::label $page.lgen -text [mc "General options"]
11130 grid $page.lgen - -sticky w -pady 10
11131 ${NS}::checkbutton $page.want_ttk -variable want_ttk \
11132 -text [mc "Use themed widgets"]
11134 ${NS}::label $page.ttk_note -text [mc "(change requires restart)"]
11136 ${NS}::label $page.ttk_note -text [mc "(currently unavailable)"]
11138 grid x $page.want_ttk $page.ttk_note -sticky w
11142 proc prefspage_colors {notebook} {
11143 global NS uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
11145 set page [create_prefs_page $notebook.colors]
11147 ${NS}::label $page.cdisp -text [mc "Colors: press to choose"]
11148 grid $page.cdisp - -sticky w -pady 10
11149 label $page.ui -padx 40 -relief sunk -background $uicolor
11150 ${NS}::button $page.uibut -text [mc "Interface"] \
11151 -command [list choosecolor uicolor {} $page.ui [mc "interface"] setui]
11152 grid x $page.uibut $page.ui -sticky w
11153 label $page.bg -padx 40 -relief sunk -background $bgcolor
11154 ${NS}::button $page.bgbut -text [mc "Background"] \
11155 -command [list choosecolor bgcolor {} $page.bg [mc "background"] setbg]
11156 grid x $page.bgbut $page.bg -sticky w
11157 label $page.fg -padx 40 -relief sunk -background $fgcolor
11158 ${NS}::button $page.fgbut -text [mc "Foreground"] \
11159 -command [list choosecolor fgcolor {} $page.fg [mc "foreground"] setfg]
11160 grid x $page.fgbut $page.fg -sticky w
11161 label $page.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]
11162 ${NS}::button $page.diffoldbut -text [mc "Diff: old lines"] \
11163 -command [list choosecolor diffcolors 0 $page.diffold [mc "diff old lines"] \
11164 [list $ctext tag conf d0 -foreground]]
11165 grid x $page.diffoldbut $page.diffold -sticky w
11166 label $page.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1]
11167 ${NS}::button $page.diffnewbut -text [mc "Diff: new lines"] \
11168 -command [list choosecolor diffcolors 1 $page.diffnew [mc "diff new lines"] \
11169 [list $ctext tag conf dresult -foreground]]
11170 grid x $page.diffnewbut $page.diffnew -sticky w
11171 label $page.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2]
11172 ${NS}::button $page.hunksepbut -text [mc "Diff: hunk header"] \
11173 -command [list choosecolor diffcolors 2 $page.hunksep \
11174 [mc "diff hunk header"] \
11175 [list $ctext tag conf hunksep -foreground]]
11176 grid x $page.hunksepbut $page.hunksep -sticky w
11177 label $page.markbgsep -padx 40 -relief sunk -background $markbgcolor
11178 ${NS}::button $page.markbgbut -text [mc "Marked line bg"] \
11179 -command [list choosecolor markbgcolor {} $page.markbgsep \
11180 [mc "marked line background"] \
11181 [list $ctext tag conf omark -background]]
11182 grid x $page.markbgbut $page.markbgsep -sticky w
11183 label $page.selbgsep -padx 40 -relief sunk -background $selectbgcolor
11184 ${NS}::button $page.selbgbut -text [mc "Select bg"] \
11185 -command [list choosecolor selectbgcolor {} $page.selbgsep [mc "background"] setselbg]
11186 grid x $page.selbgbut $page.selbgsep -sticky w
11190 proc prefspage_fonts {notebook} {
11192 set page [create_prefs_page $notebook.fonts]
11193 ${NS}::label $page.cfont -text [mc "Fonts: press to choose"]
11194 grid $page.cfont - -sticky w -pady 10
11195 mkfontdisp mainfont $page [mc "Main font"]
11196 mkfontdisp textfont $page [mc "Diff display font"]
11197 mkfontdisp uifont $page [mc "User interface font"]
11202 global maxwidth maxgraphpct use_ttk NS
11203 global oldprefs prefstop showneartags showlocalchanges
11204 global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
11205 global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs
11206 global hideremotes want_ttk have_ttk
11210 if {[winfo exists $top]} {
11214 foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
11215 limitdiffs tabstop perfile_attrs hideremotes want_ttk} {
11216 set oldprefs($v) [set $v]
11219 wm title $top [mc "Gitk preferences"]
11220 make_transient $top .
11222 if {[set use_notebook [expr {$use_ttk && [info command ::ttk::notebook] ne ""}]]} {
11223 set notebook [ttk::notebook $top.notebook]
11225 set notebook [${NS}::frame $top.notebook -borderwidth 0 -relief flat]
11228 lappend pages [prefspage_general $notebook] [mc "General"]
11229 lappend pages [prefspage_colors $notebook] [mc "Colors"]
11230 lappend pages [prefspage_fonts $notebook] [mc "Fonts"]
11232 foreach {page title} $pages {
11233 if {$use_notebook} {
11234 $notebook add $page -text $title
11236 set btn [${NS}::button $notebook.b_[string map {. X} $page] \
11237 -text $title -command [list raise $page]]
11238 $page configure -text $title
11239 grid $btn -row 0 -column [incr col] -sticky w
11240 grid $page -row 1 -column 0 -sticky news -columnspan 100
11244 if {!$use_notebook} {
11245 grid columnconfigure $notebook 0 -weight 1
11246 grid rowconfigure $notebook 1 -weight 1
11247 raise [lindex $pages 0]
11250 grid $notebook -sticky news -padx 2 -pady 2
11251 grid rowconfigure $top 0 -weight 1
11252 grid columnconfigure $top 0 -weight 1
11254 ${NS}::frame $top.buts
11255 ${NS}::button $top.buts.ok -text [mc "OK"] -command prefsok -default active
11256 ${NS}::button $top.buts.can -text [mc "Cancel"] -command prefscan -default normal
11257 bind $top <Key-Return> prefsok
11258 bind $top <Key-Escape> prefscan
11259 grid $top.buts.ok $top.buts.can
11260 grid columnconfigure $top.buts 0 -weight 1 -uniform a
11261 grid columnconfigure $top.buts 1 -weight 1 -uniform a
11262 grid $top.buts - - -pady 10 -sticky ew
11263 grid columnconfigure $top 2 -weight 1
11264 bind $top <Visibility> [list focus $top.buts.ok]
11267 proc choose_extdiff {} {
11270 set prog [tk_getOpenFile -title [mc "External diff tool"] -multiple false]
11272 set extdifftool $prog
11276 proc choosecolor {v vi w x cmd} {
11279 set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \
11280 -title [mc "Gitk: choose color for %s" $x]]
11281 if {$c eq {}} return
11282 $w conf -background $c
11287 proc setselbg {c} {
11288 global bglist cflist
11289 foreach w $bglist {
11290 $w configure -selectbackground $c
11292 $cflist tag configure highlight \
11293 -background [$cflist cget -selectbackground]
11294 allcanvs itemconf secsel -fill $c
11297 # This sets the background color and the color scheme for the whole UI.
11298 # For some reason, tk_setPalette chooses a nasty dark red for selectColor
11299 # if we don't specify one ourselves, which makes the checkbuttons and
11300 # radiobuttons look bad. This chooses white for selectColor if the
11301 # background color is light, or black if it is dark.
11303 if {[tk windowingsystem] eq "win32"} { return }
11304 set bg [winfo rgb . $c]
11306 if {[lindex $bg 0] + 1.5 * [lindex $bg 1] + 0.5 * [lindex $bg 2] > 100000} {
11309 tk_setPalette background $c selectColor $selc
11315 foreach w $bglist {
11316 $w conf -background $c
11323 foreach w $fglist {
11324 $w conf -foreground $c
11326 allcanvs itemconf text -fill $c
11327 $canv itemconf circle -outline $c
11328 $canv itemconf markid -outline $c
11332 global oldprefs prefstop
11334 foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
11335 limitdiffs tabstop perfile_attrs hideremotes want_ttk} {
11337 set $v $oldprefs($v)
11339 catch {destroy $prefstop}
11345 global maxwidth maxgraphpct
11346 global oldprefs prefstop showneartags showlocalchanges
11347 global fontpref mainfont textfont uifont
11348 global limitdiffs treediffs perfile_attrs
11351 catch {destroy $prefstop}
11355 if {$mainfont ne $fontpref(mainfont)} {
11356 set mainfont $fontpref(mainfont)
11357 parsefont mainfont $mainfont
11358 eval font configure mainfont [fontflags mainfont]
11359 eval font configure mainfontbold [fontflags mainfont 1]
11363 if {$textfont ne $fontpref(textfont)} {
11364 set textfont $fontpref(textfont)
11365 parsefont textfont $textfont
11366 eval font configure textfont [fontflags textfont]
11367 eval font configure textfontbold [fontflags textfont 1]
11369 if {$uifont ne $fontpref(uifont)} {
11370 set uifont $fontpref(uifont)
11371 parsefont uifont $uifont
11372 eval font configure uifont [fontflags uifont]
11375 if {$showlocalchanges != $oldprefs(showlocalchanges)} {
11376 if {$showlocalchanges} {
11382 if {$limitdiffs != $oldprefs(limitdiffs) ||
11383 ($perfile_attrs && !$oldprefs(perfile_attrs))} {
11384 # treediffs elements are limited by path;
11385 # won't have encodings cached if perfile_attrs was just turned on
11386 catch {unset treediffs}
11388 if {$fontchanged || $maxwidth != $oldprefs(maxwidth)
11389 || $maxgraphpct != $oldprefs(maxgraphpct)} {
11391 } elseif {$showneartags != $oldprefs(showneartags) ||
11392 $limitdiffs != $oldprefs(limitdiffs)} {
11395 if {$hideremotes != $oldprefs(hideremotes)} {
11400 proc formatdate {d} {
11401 global datetimeformat
11403 set d [clock format [lindex $d 0] -format $datetimeformat]
11408 # This list of encoding names and aliases is distilled from
11409 # http://www.iana.org/assignments/character-sets.
11410 # Not all of them are supported by Tcl.
11411 set encoding_aliases {
11412 { ANSI_X3.4-1968 iso-ir-6 ANSI_X3.4-1986 ISO_646.irv:1991 ASCII
11413 ISO646-US US-ASCII us IBM367 cp367 csASCII }
11414 { ISO-10646-UTF-1 csISO10646UTF1 }
11415 { ISO_646.basic:1983 ref csISO646basic1983 }
11416 { INVARIANT csINVARIANT }
11417 { ISO_646.irv:1983 iso-ir-2 irv csISO2IntlRefVersion }
11418 { BS_4730 iso-ir-4 ISO646-GB gb uk csISO4UnitedKingdom }
11419 { NATS-SEFI iso-ir-8-1 csNATSSEFI }
11420 { NATS-SEFI-ADD iso-ir-8-2 csNATSSEFIADD }
11421 { NATS-DANO iso-ir-9-1 csNATSDANO }
11422 { NATS-DANO-ADD iso-ir-9-2 csNATSDANOADD }
11423 { SEN_850200_B iso-ir-10 FI ISO646-FI ISO646-SE se csISO10Swedish }
11424 { SEN_850200_C iso-ir-11 ISO646-SE2 se2 csISO11SwedishForNames }
11425 { KS_C_5601-1987 iso-ir-149 KS_C_5601-1989 KSC_5601 korean csKSC56011987 }
11426 { ISO-2022-KR csISO2022KR }
11428 { ISO-2022-JP csISO2022JP }
11429 { ISO-2022-JP-2 csISO2022JP2 }
11430 { JIS_C6220-1969-jp JIS_C6220-1969 iso-ir-13 katakana x0201-7
11431 csISO13JISC6220jp }
11432 { JIS_C6220-1969-ro iso-ir-14 jp ISO646-JP csISO14JISC6220ro }
11433 { IT iso-ir-15 ISO646-IT csISO15Italian }
11434 { PT iso-ir-16 ISO646-PT csISO16Portuguese }
11435 { ES iso-ir-17 ISO646-ES csISO17Spanish }
11436 { greek7-old iso-ir-18 csISO18Greek7Old }
11437 { latin-greek iso-ir-19 csISO19LatinGreek }
11438 { DIN_66003 iso-ir-21 de ISO646-DE csISO21German }
11439 { NF_Z_62-010_(1973) iso-ir-25 ISO646-FR1 csISO25French }
11440 { Latin-greek-1 iso-ir-27 csISO27LatinGreek1 }
11441 { ISO_5427 iso-ir-37 csISO5427Cyrillic }
11442 { JIS_C6226-1978 iso-ir-42 csISO42JISC62261978 }
11443 { BS_viewdata iso-ir-47 csISO47BSViewdata }
11444 { INIS iso-ir-49 csISO49INIS }
11445 { INIS-8 iso-ir-50 csISO50INIS8 }
11446 { INIS-cyrillic iso-ir-51 csISO51INISCyrillic }
11447 { ISO_5427:1981 iso-ir-54 ISO5427Cyrillic1981 }
11448 { ISO_5428:1980 iso-ir-55 csISO5428Greek }
11449 { GB_1988-80 iso-ir-57 cn ISO646-CN csISO57GB1988 }
11450 { GB_2312-80 iso-ir-58 chinese csISO58GB231280 }
11451 { NS_4551-1 iso-ir-60 ISO646-NO no csISO60DanishNorwegian
11452 csISO60Norwegian1 }
11453 { NS_4551-2 ISO646-NO2 iso-ir-61 no2 csISO61Norwegian2 }
11454 { NF_Z_62-010 iso-ir-69 ISO646-FR fr csISO69French }
11455 { videotex-suppl iso-ir-70 csISO70VideotexSupp1 }
11456 { PT2 iso-ir-84 ISO646-PT2 csISO84Portuguese2 }
11457 { ES2 iso-ir-85 ISO646-ES2 csISO85Spanish2 }
11458 { MSZ_7795.3 iso-ir-86 ISO646-HU hu csISO86Hungarian }
11459 { JIS_C6226-1983 iso-ir-87 x0208 JIS_X0208-1983 csISO87JISX0208 }
11460 { greek7 iso-ir-88 csISO88Greek7 }
11461 { ASMO_449 ISO_9036 arabic7 iso-ir-89 csISO89ASMO449 }
11462 { iso-ir-90 csISO90 }
11463 { JIS_C6229-1984-a iso-ir-91 jp-ocr-a csISO91JISC62291984a }
11464 { JIS_C6229-1984-b iso-ir-92 ISO646-JP-OCR-B jp-ocr-b
11465 csISO92JISC62991984b }
11466 { JIS_C6229-1984-b-add iso-ir-93 jp-ocr-b-add csISO93JIS62291984badd }
11467 { JIS_C6229-1984-hand iso-ir-94 jp-ocr-hand csISO94JIS62291984hand }
11468 { JIS_C6229-1984-hand-add iso-ir-95 jp-ocr-hand-add
11469 csISO95JIS62291984handadd }
11470 { JIS_C6229-1984-kana iso-ir-96 csISO96JISC62291984kana }
11471 { ISO_2033-1983 iso-ir-98 e13b csISO2033 }
11472 { ANSI_X3.110-1983 iso-ir-99 CSA_T500-1983 NAPLPS csISO99NAPLPS }
11473 { ISO_8859-1:1987 iso-ir-100 ISO_8859-1 ISO-8859-1 latin1 l1 IBM819
11474 CP819 csISOLatin1 }
11475 { ISO_8859-2:1987 iso-ir-101 ISO_8859-2 ISO-8859-2 latin2 l2 csISOLatin2 }
11476 { T.61-7bit iso-ir-102 csISO102T617bit }
11477 { T.61-8bit T.61 iso-ir-103 csISO103T618bit }
11478 { ISO_8859-3:1988 iso-ir-109 ISO_8859-3 ISO-8859-3 latin3 l3 csISOLatin3 }
11479 { ISO_8859-4:1988 iso-ir-110 ISO_8859-4 ISO-8859-4 latin4 l4 csISOLatin4 }
11480 { ECMA-cyrillic iso-ir-111 KOI8-E csISO111ECMACyrillic }
11481 { CSA_Z243.4-1985-1 iso-ir-121 ISO646-CA csa7-1 ca csISO121Canadian1 }
11482 { CSA_Z243.4-1985-2 iso-ir-122 ISO646-CA2 csa7-2 csISO122Canadian2 }
11483 { CSA_Z243.4-1985-gr iso-ir-123 csISO123CSAZ24341985gr }
11484 { ISO_8859-6:1987 iso-ir-127 ISO_8859-6 ISO-8859-6 ECMA-114 ASMO-708
11485 arabic csISOLatinArabic }
11486 { ISO_8859-6-E csISO88596E ISO-8859-6-E }
11487 { ISO_8859-6-I csISO88596I ISO-8859-6-I }
11488 { ISO_8859-7:1987 iso-ir-126 ISO_8859-7 ISO-8859-7 ELOT_928 ECMA-118
11489 greek greek8 csISOLatinGreek }
11490 { T.101-G2 iso-ir-128 csISO128T101G2 }
11491 { ISO_8859-8:1988 iso-ir-138 ISO_8859-8 ISO-8859-8 hebrew
11493 { ISO_8859-8-E csISO88598E ISO-8859-8-E }
11494 { ISO_8859-8-I csISO88598I ISO-8859-8-I }
11495 { CSN_369103 iso-ir-139 csISO139CSN369103 }
11496 { JUS_I.B1.002 iso-ir-141 ISO646-YU js yu csISO141JUSIB1002 }
11497 { ISO_6937-2-add iso-ir-142 csISOTextComm }
11498 { IEC_P27-1 iso-ir-143 csISO143IECP271 }
11499 { ISO_8859-5:1988 iso-ir-144 ISO_8859-5 ISO-8859-5 cyrillic
11500 csISOLatinCyrillic }
11501 { JUS_I.B1.003-serb iso-ir-146 serbian csISO146Serbian }
11502 { JUS_I.B1.003-mac macedonian iso-ir-147 csISO147Macedonian }
11503 { ISO_8859-9:1989 iso-ir-148 ISO_8859-9 ISO-8859-9 latin5 l5 csISOLatin5 }
11504 { greek-ccitt iso-ir-150 csISO150 csISO150GreekCCITT }
11505 { NC_NC00-10:81 cuba iso-ir-151 ISO646-CU csISO151Cuba }
11506 { ISO_6937-2-25 iso-ir-152 csISO6937Add }
11507 { GOST_19768-74 ST_SEV_358-88 iso-ir-153 csISO153GOST1976874 }
11508 { ISO_8859-supp iso-ir-154 latin1-2-5 csISO8859Supp }
11509 { ISO_10367-box iso-ir-155 csISO10367Box }
11510 { ISO-8859-10 iso-ir-157 l6 ISO_8859-10:1992 csISOLatin6 latin6 }
11511 { latin-lap lap iso-ir-158 csISO158Lap }
11512 { JIS_X0212-1990 x0212 iso-ir-159 csISO159JISX02121990 }
11513 { DS_2089 DS2089 ISO646-DK dk csISO646Danish }
11516 { JIS_X0201 X0201 csHalfWidthKatakana }
11517 { KSC5636 ISO646-KR csKSC5636 }
11518 { ISO-10646-UCS-2 csUnicode }
11519 { ISO-10646-UCS-4 csUCS4 }
11520 { DEC-MCS dec csDECMCS }
11521 { hp-roman8 roman8 r8 csHPRoman8 }
11522 { macintosh mac csMacintosh }
11523 { IBM037 cp037 ebcdic-cp-us ebcdic-cp-ca ebcdic-cp-wt ebcdic-cp-nl
11525 { IBM038 EBCDIC-INT cp038 csIBM038 }
11526 { IBM273 CP273 csIBM273 }
11527 { IBM274 EBCDIC-BE CP274 csIBM274 }
11528 { IBM275 EBCDIC-BR cp275 csIBM275 }
11529 { IBM277 EBCDIC-CP-DK EBCDIC-CP-NO csIBM277 }
11530 { IBM278 CP278 ebcdic-cp-fi ebcdic-cp-se csIBM278 }
11531 { IBM280 CP280 ebcdic-cp-it csIBM280 }
11532 { IBM281 EBCDIC-JP-E cp281 csIBM281 }
11533 { IBM284 CP284 ebcdic-cp-es csIBM284 }
11534 { IBM285 CP285 ebcdic-cp-gb csIBM285 }
11535 { IBM290 cp290 EBCDIC-JP-kana csIBM290 }
11536 { IBM297 cp297 ebcdic-cp-fr csIBM297 }
11537 { IBM420 cp420 ebcdic-cp-ar1 csIBM420 }
11538 { IBM423 cp423 ebcdic-cp-gr csIBM423 }
11539 { IBM424 cp424 ebcdic-cp-he csIBM424 }
11540 { IBM437 cp437 437 csPC8CodePage437 }
11541 { IBM500 CP500 ebcdic-cp-be ebcdic-cp-ch csIBM500 }
11542 { IBM775 cp775 csPC775Baltic }
11543 { IBM850 cp850 850 csPC850Multilingual }
11544 { IBM851 cp851 851 csIBM851 }
11545 { IBM852 cp852 852 csPCp852 }
11546 { IBM855 cp855 855 csIBM855 }
11547 { IBM857 cp857 857 csIBM857 }
11548 { IBM860 cp860 860 csIBM860 }
11549 { IBM861 cp861 861 cp-is csIBM861 }
11550 { IBM862 cp862 862 csPC862LatinHebrew }
11551 { IBM863 cp863 863 csIBM863 }
11552 { IBM864 cp864 csIBM864 }
11553 { IBM865 cp865 865 csIBM865 }
11554 { IBM866 cp866 866 csIBM866 }
11555 { IBM868 CP868 cp-ar csIBM868 }
11556 { IBM869 cp869 869 cp-gr csIBM869 }
11557 { IBM870 CP870 ebcdic-cp-roece ebcdic-cp-yu csIBM870 }
11558 { IBM871 CP871 ebcdic-cp-is csIBM871 }
11559 { IBM880 cp880 EBCDIC-Cyrillic csIBM880 }
11560 { IBM891 cp891 csIBM891 }
11561 { IBM903 cp903 csIBM903 }
11562 { IBM904 cp904 904 csIBBM904 }
11563 { IBM905 CP905 ebcdic-cp-tr csIBM905 }
11564 { IBM918 CP918 ebcdic-cp-ar2 csIBM918 }
11565 { IBM1026 CP1026 csIBM1026 }
11566 { EBCDIC-AT-DE csIBMEBCDICATDE }
11567 { EBCDIC-AT-DE-A csEBCDICATDEA }
11568 { EBCDIC-CA-FR csEBCDICCAFR }
11569 { EBCDIC-DK-NO csEBCDICDKNO }
11570 { EBCDIC-DK-NO-A csEBCDICDKNOA }
11571 { EBCDIC-FI-SE csEBCDICFISE }
11572 { EBCDIC-FI-SE-A csEBCDICFISEA }
11573 { EBCDIC-FR csEBCDICFR }
11574 { EBCDIC-IT csEBCDICIT }
11575 { EBCDIC-PT csEBCDICPT }
11576 { EBCDIC-ES csEBCDICES }
11577 { EBCDIC-ES-A csEBCDICESA }
11578 { EBCDIC-ES-S csEBCDICESS }
11579 { EBCDIC-UK csEBCDICUK }
11580 { EBCDIC-US csEBCDICUS }
11581 { UNKNOWN-8BIT csUnknown8BiT }
11582 { MNEMONIC csMnemonic }
11584 { VISCII csVISCII }
11587 { IBM00858 CCSID00858 CP00858 PC-Multilingual-850+euro }
11588 { IBM00924 CCSID00924 CP00924 ebcdic-Latin9--euro }
11589 { IBM01140 CCSID01140 CP01140 ebcdic-us-37+euro }
11590 { IBM01141 CCSID01141 CP01141 ebcdic-de-273+euro }
11591 { IBM01142 CCSID01142 CP01142 ebcdic-dk-277+euro ebcdic-no-277+euro }
11592 { IBM01143 CCSID01143 CP01143 ebcdic-fi-278+euro ebcdic-se-278+euro }
11593 { IBM01144 CCSID01144 CP01144 ebcdic-it-280+euro }
11594 { IBM01145 CCSID01145 CP01145 ebcdic-es-284+euro }
11595 { IBM01146 CCSID01146 CP01146 ebcdic-gb-285+euro }
11596 { IBM01147 CCSID01147 CP01147 ebcdic-fr-297+euro }
11597 { IBM01148 CCSID01148 CP01148 ebcdic-international-500+euro }
11598 { IBM01149 CCSID01149 CP01149 ebcdic-is-871+euro }
11599 { IBM1047 IBM-1047 }
11600 { PTCP154 csPTCP154 PT154 CP154 Cyrillic-Asian }
11601 { Amiga-1251 Ami1251 Amiga1251 Ami-1251 }
11602 { UNICODE-1-1 csUnicode11 }
11603 { CESU-8 csCESU-8 }
11604 { BOCU-1 csBOCU-1 }
11605 { UNICODE-1-1-UTF-7 csUnicode11UTF7 }
11606 { ISO-8859-14 iso-ir-199 ISO_8859-14:1998 ISO_8859-14 latin8 iso-celtic
11608 { ISO-8859-15 ISO_8859-15 Latin-9 }
11609 { ISO-8859-16 iso-ir-226 ISO_8859-16:2001 ISO_8859-16 latin10 l10 }
11610 { GBK CP936 MS936 windows-936 }
11611 { JIS_Encoding csJISEncoding }
11612 { Shift_JIS MS_Kanji csShiftJIS ShiftJIS Shift-JIS }
11613 { Extended_UNIX_Code_Packed_Format_for_Japanese csEUCPkdFmtJapanese
11615 { Extended_UNIX_Code_Fixed_Width_for_Japanese csEUCFixWidJapanese }
11616 { ISO-10646-UCS-Basic csUnicodeASCII }
11617 { ISO-10646-Unicode-Latin1 csUnicodeLatin1 ISO-10646 }
11618 { ISO-Unicode-IBM-1261 csUnicodeIBM1261 }
11619 { ISO-Unicode-IBM-1268 csUnicodeIBM1268 }
11620 { ISO-Unicode-IBM-1276 csUnicodeIBM1276 }
11621 { ISO-Unicode-IBM-1264 csUnicodeIBM1264 }
11622 { ISO-Unicode-IBM-1265 csUnicodeIBM1265 }
11623 { ISO-8859-1-Windows-3.0-Latin-1 csWindows30Latin1 }
11624 { ISO-8859-1-Windows-3.1-Latin-1 csWindows31Latin1 }
11625 { ISO-8859-2-Windows-Latin-2 csWindows31Latin2 }
11626 { ISO-8859-9-Windows-Latin-5 csWindows31Latin5 }
11627 { Adobe-Standard-Encoding csAdobeStandardEncoding }
11628 { Ventura-US csVenturaUS }
11629 { Ventura-International csVenturaInternational }
11630 { PC8-Danish-Norwegian csPC8DanishNorwegian }
11631 { PC8-Turkish csPC8Turkish }
11632 { IBM-Symbols csIBMSymbols }
11633 { IBM-Thai csIBMThai }
11634 { HP-Legal csHPLegal }
11635 { HP-Pi-font csHPPiFont }
11636 { HP-Math8 csHPMath8 }
11637 { Adobe-Symbol-Encoding csHPPSMath }
11638 { HP-DeskTop csHPDesktop }
11639 { Ventura-Math csVenturaMath }
11640 { Microsoft-Publishing csMicrosoftPublishing }
11641 { Windows-31J csWindows31J }
11642 { GB2312 csGB2312 }
11646 proc tcl_encoding {enc} {
11647 global encoding_aliases tcl_encoding_cache
11648 if {[info exists tcl_encoding_cache($enc)]} {
11649 return $tcl_encoding_cache($enc)
11651 set names [encoding names]
11652 set lcnames [string tolower $names]
11653 set enc [string tolower $enc]
11654 set i [lsearch -exact $lcnames $enc]
11656 # look for "isonnn" instead of "iso-nnn" or "iso_nnn"
11657 if {[regsub {^(iso|cp|ibm|jis)[-_]} $enc {\1} encx]} {
11658 set i [lsearch -exact $lcnames $encx]
11662 foreach l $encoding_aliases {
11663 set ll [string tolower $l]
11664 if {[lsearch -exact $ll $enc] < 0} continue
11665 # look through the aliases for one that tcl knows about
11667 set i [lsearch -exact $lcnames $e]
11669 if {[regsub {^(iso|cp|ibm|jis)[-_]} $e {\1} ex]} {
11670 set i [lsearch -exact $lcnames $ex]
11680 set tclenc [lindex $names $i]
11682 set tcl_encoding_cache($enc) $tclenc
11686 proc gitattr {path attr default} {
11687 global path_attr_cache
11688 if {[info exists path_attr_cache($attr,$path)]} {
11689 set r $path_attr_cache($attr,$path)
11691 set r "unspecified"
11692 if {![catch {set line [exec git check-attr $attr -- $path]}]} {
11693 regexp "(.*): $attr: (.*)" $line m f r
11695 set path_attr_cache($attr,$path) $r
11697 if {$r eq "unspecified"} {
11703 proc cache_gitattr {attr pathlist} {
11704 global path_attr_cache
11706 foreach path $pathlist {
11707 if {![info exists path_attr_cache($attr,$path)]} {
11708 lappend newlist $path
11712 if {[tk windowingsystem] == "win32"} {
11713 # windows has a 32k limit on the arguments to a command...
11716 while {$newlist ne {}} {
11717 set head [lrange $newlist 0 [expr {$lim - 1}]]
11718 set newlist [lrange $newlist $lim end]
11719 if {![catch {set rlist [eval exec git check-attr $attr -- $head]}]} {
11720 foreach row [split $rlist "\n"] {
11721 if {[regexp "(.*): $attr: (.*)" $row m path value]} {
11722 if {[string index $path 0] eq "\""} {
11723 set path [encoding convertfrom [lindex $path 0]]
11725 set path_attr_cache($attr,$path) $value
11732 proc get_path_encoding {path} {
11733 global gui_encoding perfile_attrs
11734 set tcl_enc $gui_encoding
11735 if {$path ne {} && $perfile_attrs} {
11736 set enc2 [tcl_encoding [gitattr $path encoding $tcl_enc]]
11744 # First check that Tcl/Tk is recent enough
11745 if {[catch {package require Tk 8.4} err]} {
11746 show_error {} . "Sorry, gitk cannot run with this version of Tcl/Tk.\n\
11747 Gitk requires at least Tcl/Tk 8.4." list
11751 # Unset GIT_TRACE var if set
11752 if { [info exists ::env(GIT_TRACE)] } {
11753 unset ::env(GIT_TRACE)
11757 set wrcomcmd "git diff-tree --stdin -p --pretty"
11761 set gitencoding [exec git config --get i18n.commitencoding]
11764 set gitencoding [exec git config --get i18n.logoutputencoding]
11766 if {$gitencoding == ""} {
11767 set gitencoding "utf-8"
11769 set tclencoding [tcl_encoding $gitencoding]
11770 if {$tclencoding == {}} {
11771 puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
11774 set gui_encoding [encoding system]
11776 set enc [exec git config --get gui.encoding]
11778 set tclenc [tcl_encoding $enc]
11779 if {$tclenc ne {}} {
11780 set gui_encoding $tclenc
11782 puts stderr "Warning: encoding $enc is not supported by Tcl/Tk"
11787 set log_showroot true
11789 set log_showroot [exec git config --bool --get log.showroot]
11792 if {[tk windowingsystem] eq "aqua"} {
11793 set mainfont {{Lucida Grande} 9}
11794 set textfont {Monaco 9}
11795 set uifont {{Lucida Grande} 9 bold}
11796 } elseif {![catch {::tk::pkgconfig get fontsystem} xft] && $xft eq "xft"} {
11798 set mainfont {sans 9}
11799 set textfont {monospace 9}
11800 set uifont {sans 9 bold}
11802 set mainfont {Helvetica 9}
11803 set textfont {Courier 9}
11804 set uifont {Helvetica 9 bold}
11807 set findmergefiles 0
11815 set cmitmode "patch"
11816 set wrapcomment "none"
11821 set showlocalchanges 1
11823 set datetimeformat "%Y-%m-%d %H:%M:%S"
11826 set perfile_attrs 0
11829 if {[tk windowingsystem] eq "aqua"} {
11830 set extdifftool "opendiff"
11832 set extdifftool "meld"
11835 set colors {green red blue magenta darkgrey brown orange}
11836 if {[tk windowingsystem] eq "win32"} {
11837 set uicolor SystemButtonFace
11838 set uifgcolor SystemButtonText
11839 set uifgdisabledcolor SystemDisabledText
11840 set bgcolor SystemWindow
11841 set fgcolor SystemWindowText
11842 set selectbgcolor SystemHighlight
11845 set uifgcolor black
11846 set uifgdisabledcolor "#999"
11849 set selectbgcolor gray85
11851 set diffcolors {red "#00a000" blue}
11853 set mergecolors {red blue green purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
11856 set markbgcolor "#e0e0ff"
11858 set headbgcolor green
11859 set headfgcolor black
11860 set headoutlinecolor black
11861 set remotebgcolor #ffddaa
11862 set tagbgcolor yellow
11863 set tagfgcolor black
11864 set tagoutlinecolor black
11865 set reflinecolor black
11866 set filesepbgcolor #aaaaaa
11867 set filesepfgcolor black
11868 set linehoverbgcolor #ffff80
11869 set linehoverfgcolor black
11870 set linehoveroutlinecolor black
11871 set mainheadcirclecolor yellow
11872 set workingfilescirclecolor red
11873 set indexcirclecolor green
11874 set circlecolors {white blue gray blue blue}
11875 set linkfgcolor blue
11876 set circleoutlinecolor $fgcolor
11877 set foundbgcolor yellow
11878 set currentsearchhitbgcolor orange
11880 # button for popping up context menus
11881 if {[tk windowingsystem] eq "aqua"} {
11882 set ctxbut <Button-2>
11884 set ctxbut <Button-3>
11887 ## For msgcat loading, first locate the installation location.
11888 if { [info exists ::env(GITK_MSGSDIR)] } {
11889 ## Msgsdir was manually set in the environment.
11890 set gitk_msgsdir $::env(GITK_MSGSDIR)
11892 ## Let's guess the prefix from argv0.
11893 set gitk_prefix [file dirname [file dirname [file normalize $argv0]]]
11894 set gitk_libdir [file join $gitk_prefix share gitk lib]
11895 set gitk_msgsdir [file join $gitk_libdir msgs]
11899 ## Internationalization (i18n) through msgcat and gettext. See
11900 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
11901 package require msgcat
11902 namespace import ::msgcat::mc
11903 ## And eventually load the actual message catalog
11904 ::msgcat::mcload $gitk_msgsdir
11906 catch {source ~/.gitk}
11908 parsefont mainfont $mainfont
11909 eval font create mainfont [fontflags mainfont]
11910 eval font create mainfontbold [fontflags mainfont 1]
11912 parsefont textfont $textfont
11913 eval font create textfont [fontflags textfont]
11914 eval font create textfontbold [fontflags textfont 1]
11916 parsefont uifont $uifont
11917 eval font create uifont [fontflags uifont]
11923 # check that we can find a .git directory somewhere...
11924 if {[catch {set gitdir [exec git rev-parse --git-dir]}]} {
11925 show_error {} . [mc "Cannot find a git repository here."]
11930 set selectheadid {}
11933 set cmdline_files {}
11935 set revtreeargscmd {}
11936 foreach arg $argv {
11937 switch -glob -- $arg {
11940 set cmdline_files [lrange $argv [expr {$i + 1}] end]
11943 "--select-commit=*" {
11944 set selecthead [string range $arg 16 end]
11947 set revtreeargscmd [string range $arg 10 end]
11950 lappend revtreeargs $arg
11956 if {$selecthead eq "HEAD"} {
11960 if {$i >= [llength $argv] && $revtreeargs ne {}} {
11961 # no -- on command line, but some arguments (other than --argscmd)
11963 set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs]
11964 set cmdline_files [split $f "\n"]
11965 set n [llength $cmdline_files]
11966 set revtreeargs [lrange $revtreeargs 0 end-$n]
11967 # Unfortunately git rev-parse doesn't produce an error when
11968 # something is both a revision and a filename. To be consistent
11969 # with git log and git rev-list, check revtreeargs for filenames.
11970 foreach arg $revtreeargs {
11971 if {[file exists $arg]} {
11972 show_error {} . [mc "Ambiguous argument '%s': both revision\
11973 and filename" $arg]
11978 # unfortunately we get both stdout and stderr in $err,
11979 # so look for "fatal:".
11980 set i [string first "fatal:" $err]
11982 set err [string range $err [expr {$i + 6}] end]
11984 show_error {} . "[mc "Bad arguments to gitk:"]\n$err"
11989 set nullid "0000000000000000000000000000000000000000"
11990 set nullid2 "0000000000000000000000000000000000000001"
11991 set nullfile "/dev/null"
11993 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
11994 if {![info exists have_ttk]} {
11995 set have_ttk [llength [info commands ::ttk::style]]
11997 set use_ttk [expr {$have_ttk && $want_ttk}]
11998 set NS [expr {$use_ttk ? "ttk" : ""}]
12000 regexp {^git version ([\d.]*\d)} [exec git version] _ git_version
12003 if {[package vcompare $git_version "1.6.6.2"] >= 0} {
12004 set show_notes "--show-notes"
12014 set highlight_paths {}
12016 set searchdirn -forwards
12019 set diffelide {0 0}
12020 set markingmatches 0
12021 set linkentercount 0
12022 set need_redisplay 0
12029 set selectedhlview [mc "None"]
12030 set highlight_related [mc "None"]
12031 set highlight_files {}
12032 set viewfiles(0) {}
12035 set viewargscmd(0) {}
12037 set selectedline {}
12045 set hasworktree [hasworktree]
12047 if {[expr {[exec git rev-parse --is-inside-work-tree] == "true"}]} {
12048 set cdup [exec git rev-parse --show-cdup]
12050 set worktree [exec git rev-parse --show-toplevel]
12054 image create photo gitlogo -width 16 -height 16
12056 image create photo gitlogominus -width 4 -height 2
12057 gitlogominus put #C00000 -to 0 0 4 2
12058 gitlogo copy gitlogominus -to 1 5
12059 gitlogo copy gitlogominus -to 6 5
12060 gitlogo copy gitlogominus -to 11 5
12061 image delete gitlogominus
12063 image create photo gitlogoplus -width 4 -height 4
12064 gitlogoplus put #008000 -to 1 0 3 4
12065 gitlogoplus put #008000 -to 0 1 4 3
12066 gitlogo copy gitlogoplus -to 1 9
12067 gitlogo copy gitlogoplus -to 6 9
12068 gitlogo copy gitlogoplus -to 11 9
12069 image delete gitlogoplus
12071 image create photo gitlogo32 -width 32 -height 32
12072 gitlogo32 copy gitlogo -zoom 2 2
12074 wm iconphoto . -default gitlogo gitlogo32
12076 # wait for the window to become visible
12077 tkwait visibility .
12078 wm title . "$appname: [reponame]"
12082 if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} {
12083 # create a view for the files/dirs specified on the command line
12087 set viewname(1) [mc "Command line"]
12088 set viewfiles(1) $cmdline_files
12089 set viewargs(1) $revtreeargs
12090 set viewargscmd(1) $revtreeargscmd
12094 .bar.view entryconf [mca "Edit view..."] -state normal
12095 .bar.view entryconf [mca "Delete view"] -state normal
12098 if {[info exists permviews]} {
12099 foreach v $permviews {
12102 set viewname($n) [lindex $v 0]
12103 set viewfiles($n) [lindex $v 1]
12104 set viewargs($n) [lindex $v 2]
12105 set viewargscmd($n) [lindex $v 3]
12111 if {[tk windowingsystem] eq "win32"} {
12119 # indent-tabs-mode: t