Revert "git-gui: set GIT_DIR and GIT_WORK_TREE after setup"
[git/dscho.git] / git-gui / git-gui.sh
blob76981e563d9b1b480b9491d57738e7a2a24a8f17
1 #!/bin/sh
2 # Tcl ignores the next line -*- tcl -*- \
3 if test "z$*" = zversion \
4 || test "z$*" = z--version; \
5 then \
6 echo 'git-gui version @@GITGUI_VERSION@@'; \
7 exit; \
8 fi; \
9 argv0=$0; \
10 exec wish "$argv0" -- "$@"
12 set appvers {@@GITGUI_VERSION@@}
13 set copyright [encoding convertfrom utf-8 {
14 Copyright © 2006, 2007 Shawn Pearce, et. al.
16 This program is free software; you can redistribute it and/or modify
17 it under the terms of the GNU General Public License as published by
18 the Free Software Foundation; either version 2 of the License, or
19 (at your option) any later version.
21 This program is distributed in the hope that it will be useful,
22 but WITHOUT ANY WARRANTY; without even the implied warranty of
23 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24 GNU General Public License for more details.
26 You should have received a copy of the GNU General Public License
27 along with this program; if not, write to the Free Software
28 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}]
30 ######################################################################
32 ## Tcl/Tk sanity check
34 if {[catch {package require Tcl 8.4} err]
35 || [catch {package require Tk 8.4} err]
36 } {
37 catch {wm withdraw .}
38 tk_messageBox \
39 -icon error \
40 -type ok \
41 -title "git-gui: fatal error" \
42 -message $err
43 exit 1
46 catch {rename send {}} ; # What an evil concept...
48 ######################################################################
50 ## locate our library
52 set oguilib {@@GITGUI_LIBDIR@@}
53 set oguirel {@@GITGUI_RELATIVE@@}
54 if {$oguirel eq {1}} {
55 set oguilib [file dirname [file normalize $argv0]]
56 if {[file tail $oguilib] eq {git-core}} {
57 set oguilib [file dirname $oguilib]
59 set oguilib [file dirname $oguilib]
60 set oguilib [file join $oguilib share git-gui lib]
61 set oguimsg [file join $oguilib msgs]
62 } elseif {[string match @@* $oguirel]} {
63 set oguilib [file join [file dirname [file normalize $argv0]] lib]
64 set oguimsg [file join [file dirname [file normalize $argv0]] po]
65 } else {
66 set oguimsg [file join $oguilib msgs]
68 unset oguirel
70 ######################################################################
72 ## enable verbose loading?
74 if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
75 unset _verbose
76 rename auto_load real__auto_load
77 proc auto_load {name args} {
78 puts stderr "auto_load $name"
79 return [uplevel 1 real__auto_load $name $args]
81 rename source real__source
82 proc source {name} {
83 puts stderr "source $name"
84 uplevel 1 real__source $name
88 ######################################################################
90 ## Internationalization (i18n) through msgcat and gettext. See
91 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
93 package require msgcat
95 proc _mc_trim {fmt} {
96 set cmk [string first @@ $fmt]
97 if {$cmk > 0} {
98 return [string range $fmt 0 [expr {$cmk - 1}]]
100 return $fmt
103 proc mc {en_fmt args} {
104 set fmt [_mc_trim [::msgcat::mc $en_fmt]]
105 if {[catch {set msg [eval [list format $fmt] $args]} err]} {
106 set msg [eval [list format [_mc_trim $en_fmt]] $args]
108 return $msg
111 proc strcat {args} {
112 return [join $args {}]
115 ::msgcat::mcload $oguimsg
116 unset oguimsg
118 ######################################################################
120 ## read only globals
122 set _appname {Git Gui}
123 set _gitdir {}
124 set _gitworktree {}
125 set _isbare {}
126 set _gitexec {}
127 set _githtmldir {}
128 set _reponame {}
129 set _iscygwin {}
130 set _search_path {}
132 set _trace [lsearch -exact $argv --trace]
133 if {$_trace >= 0} {
134 set argv [lreplace $argv $_trace $_trace]
135 set _trace 1
136 } else {
137 set _trace 0
140 proc appname {} {
141 global _appname
142 return $_appname
145 proc gitdir {args} {
146 global _gitdir
147 if {$args eq {}} {
148 return $_gitdir
150 return [eval [list file join $_gitdir] $args]
153 proc gitexec {args} {
154 global _gitexec
155 if {$_gitexec eq {}} {
156 if {[catch {set _gitexec [git --exec-path]} err]} {
157 error "Git not installed?\n\n$err"
159 if {[is_Cygwin]} {
160 set _gitexec [exec cygpath \
161 --windows \
162 --absolute \
163 $_gitexec]
164 } else {
165 set _gitexec [file normalize $_gitexec]
168 if {$args eq {}} {
169 return $_gitexec
171 return [eval [list file join $_gitexec] $args]
174 proc githtmldir {args} {
175 global _githtmldir
176 if {$_githtmldir eq {}} {
177 if {[catch {set _githtmldir [git --html-path]}]} {
178 # Git not installed or option not yet supported
179 return {}
181 if {[is_Cygwin]} {
182 set _githtmldir [exec cygpath \
183 --windows \
184 --absolute \
185 $_githtmldir]
186 } else {
187 set _githtmldir [file normalize $_githtmldir]
190 if {$args eq {}} {
191 return $_githtmldir
193 return [eval [list file join $_githtmldir] $args]
196 proc reponame {} {
197 return $::_reponame
200 proc is_MacOSX {} {
201 if {[tk windowingsystem] eq {aqua}} {
202 return 1
204 return 0
207 proc is_Windows {} {
208 if {$::tcl_platform(platform) eq {windows}} {
209 return 1
211 return 0
214 proc is_Cygwin {} {
215 global _iscygwin
216 if {$_iscygwin eq {}} {
217 if {$::tcl_platform(platform) eq {windows}} {
218 if {[catch {set p [exec cygpath --windir]} err]} {
219 set _iscygwin 0
220 } else {
221 set _iscygwin 1
223 } else {
224 set _iscygwin 0
227 return $_iscygwin
230 proc is_enabled {option} {
231 global enabled_options
232 if {[catch {set on $enabled_options($option)}]} {return 0}
233 return $on
236 proc enable_option {option} {
237 global enabled_options
238 set enabled_options($option) 1
241 proc disable_option {option} {
242 global enabled_options
243 set enabled_options($option) 0
246 ######################################################################
248 ## config
250 proc is_many_config {name} {
251 switch -glob -- $name {
252 gui.recentrepo -
253 remote.*.fetch -
254 remote.*.push
255 {return 1}
257 {return 0}
261 proc is_config_true {name} {
262 global repo_config
263 if {[catch {set v $repo_config($name)}]} {
264 return 0
265 } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
266 return 1
267 } else {
268 return 0
272 proc is_config_false {name} {
273 global repo_config
274 if {[catch {set v $repo_config($name)}]} {
275 return 0
276 } elseif {$v eq {false} || $v eq {0} || $v eq {no}} {
277 return 1
278 } else {
279 return 0
283 proc get_config {name} {
284 global repo_config
285 if {[catch {set v $repo_config($name)}]} {
286 return {}
287 } else {
288 return $v
292 proc is_bare {} {
293 global _isbare
294 global _gitdir
295 global _gitworktree
297 if {$_isbare eq {}} {
298 if {[catch {
299 set _bare [git rev-parse --is-bare-repository]
300 switch -- $_bare {
301 true { set _isbare 1 }
302 false { set _isbare 0}
303 default { throw }
305 }]} {
306 if {[is_config_true core.bare]
307 || ($_gitworktree eq {}
308 && [lindex [file split $_gitdir] end] ne {.git})} {
309 set _isbare 1
310 } else {
311 set _isbare 0
315 return $_isbare
318 ######################################################################
320 ## handy utils
322 proc _trace_exec {cmd} {
323 if {!$::_trace} return
324 set d {}
325 foreach v $cmd {
326 if {$d ne {}} {
327 append d { }
329 if {[regexp {[ \t\r\n'"$?*]} $v]} {
330 set v [sq $v]
332 append d $v
334 puts stderr $d
337 #'" fix poor old emacs font-lock mode
339 proc _git_cmd {name} {
340 global _git_cmd_path
342 if {[catch {set v $_git_cmd_path($name)}]} {
343 switch -- $name {
344 version -
345 --version -
346 --exec-path { return [list $::_git $name] }
349 set p [gitexec git-$name$::_search_exe]
350 if {[file exists $p]} {
351 set v [list $p]
352 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
353 # Try to determine what sort of magic will make
354 # git-$name go and do its thing, because native
355 # Tcl on Windows doesn't know it.
357 set p [gitexec git-$name]
358 set f [open $p r]
359 set s [gets $f]
360 close $f
362 switch -glob -- [lindex $s 0] {
363 #!*sh { set i sh }
364 #!*perl { set i perl }
365 #!*python { set i python }
366 default { error "git-$name is not supported: $s" }
369 upvar #0 _$i interp
370 if {![info exists interp]} {
371 set interp [_which $i]
373 if {$interp eq {}} {
374 error "git-$name requires $i (not in PATH)"
376 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
377 } else {
378 # Assume it is builtin to git somehow and we
379 # aren't actually able to see a file for it.
381 set v [list $::_git $name]
383 set _git_cmd_path($name) $v
385 return $v
388 proc _which {what args} {
389 global env _search_exe _search_path
391 if {$_search_path eq {}} {
392 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
393 set _search_path [split [exec cygpath \
394 --windows \
395 --path \
396 --absolute \
397 $env(PATH)] {;}]
398 set _search_exe .exe
399 } elseif {[is_Windows]} {
400 set gitguidir [file dirname [info script]]
401 regsub -all ";" $gitguidir "\\;" gitguidir
402 set env(PATH) "$gitguidir;$env(PATH)"
403 set _search_path [split $env(PATH) {;}]
404 set _search_exe .exe
405 } else {
406 set _search_path [split $env(PATH) :]
407 set _search_exe {}
411 if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
412 set suffix {}
413 } else {
414 set suffix $_search_exe
417 foreach p $_search_path {
418 set p [file join $p $what$suffix]
419 if {[file exists $p]} {
420 return [file normalize $p]
423 return {}
426 proc _lappend_nice {cmd_var} {
427 global _nice
428 upvar $cmd_var cmd
430 if {![info exists _nice]} {
431 set _nice [_which nice]
432 if {[catch {exec $_nice git version}]} {
433 set _nice {}
436 if {$_nice ne {}} {
437 lappend cmd $_nice
441 proc git {args} {
442 set opt [list]
444 while {1} {
445 switch -- [lindex $args 0] {
446 --nice {
447 _lappend_nice opt
450 default {
451 break
456 set args [lrange $args 1 end]
459 set cmdp [_git_cmd [lindex $args 0]]
460 set args [lrange $args 1 end]
462 _trace_exec [concat $opt $cmdp $args]
463 set result [eval exec $opt $cmdp $args]
464 if {$::_trace} {
465 puts stderr "< $result"
467 return $result
470 proc _open_stdout_stderr {cmd} {
471 _trace_exec $cmd
472 if {[catch {
473 set fd [open [concat [list | ] $cmd] r]
474 } err]} {
475 if { [lindex $cmd end] eq {2>@1}
476 && $err eq {can not find channel named "1"}
478 # Older versions of Tcl 8.4 don't have this 2>@1 IO
479 # redirect operator. Fallback to |& cat for those.
480 # The command was not actually started, so its safe
481 # to try to start it a second time.
483 set fd [open [concat \
484 [list | ] \
485 [lrange $cmd 0 end-1] \
486 [list |& cat] \
487 ] r]
488 } else {
489 error $err
492 fconfigure $fd -eofchar {}
493 return $fd
496 proc git_read {args} {
497 set opt [list]
499 while {1} {
500 switch -- [lindex $args 0] {
501 --nice {
502 _lappend_nice opt
505 --stderr {
506 lappend args 2>@1
509 default {
510 break
515 set args [lrange $args 1 end]
518 set cmdp [_git_cmd [lindex $args 0]]
519 set args [lrange $args 1 end]
521 return [_open_stdout_stderr [concat $opt $cmdp $args]]
524 proc git_write {args} {
525 set opt [list]
527 while {1} {
528 switch -- [lindex $args 0] {
529 --nice {
530 _lappend_nice opt
533 default {
534 break
539 set args [lrange $args 1 end]
542 set cmdp [_git_cmd [lindex $args 0]]
543 set args [lrange $args 1 end]
545 _trace_exec [concat $opt $cmdp $args]
546 return [open [concat [list | ] $opt $cmdp $args] w]
549 proc githook_read {hook_name args} {
550 set pchook [gitdir hooks $hook_name]
551 lappend args 2>@1
553 # On Windows [file executable] might lie so we need to ask
554 # the shell if the hook is executable. Yes that's annoying.
556 if {[is_Windows]} {
557 upvar #0 _sh interp
558 if {![info exists interp]} {
559 set interp [_which sh]
561 if {$interp eq {}} {
562 error "hook execution requires sh (not in PATH)"
565 set scr {if test -x "$1";then exec "$@";fi}
566 set sh_c [list $interp -c $scr $interp $pchook]
567 return [_open_stdout_stderr [concat $sh_c $args]]
570 if {[file executable $pchook]} {
571 return [_open_stdout_stderr [concat [list $pchook] $args]]
574 return {}
577 proc kill_file_process {fd} {
578 set process [pid $fd]
580 catch {
581 if {[is_Windows]} {
582 # Use a Cygwin-specific flag to allow killing
583 # native Windows processes
584 exec kill -f $process
585 } else {
586 exec kill $process
591 proc gitattr {path attr default} {
592 if {[catch {set r [git check-attr $attr -- $path]}]} {
593 set r unspecified
594 } else {
595 set r [join [lrange [split $r :] 2 end] :]
596 regsub {^ } $r {} r
598 if {$r eq {unspecified}} {
599 return $default
601 return $r
604 proc sq {value} {
605 regsub -all ' $value "'\\''" value
606 return "'$value'"
609 proc load_current_branch {} {
610 global current_branch is_detached
612 set fd [open [gitdir HEAD] r]
613 if {[gets $fd ref] < 1} {
614 set ref {}
616 close $fd
618 set pfx {ref: refs/heads/}
619 set len [string length $pfx]
620 if {[string equal -length $len $pfx $ref]} {
621 # We're on a branch. It might not exist. But
622 # HEAD looks good enough to be a branch.
624 set current_branch [string range $ref $len end]
625 set is_detached 0
626 } else {
627 # Assume this is a detached head.
629 set current_branch HEAD
630 set is_detached 1
634 auto_load tk_optionMenu
635 rename tk_optionMenu real__tkOptionMenu
636 proc tk_optionMenu {w varName args} {
637 set m [eval real__tkOptionMenu $w $varName $args]
638 $m configure -font font_ui
639 $w configure -font font_ui
640 return $m
643 proc rmsel_tag {text} {
644 $text tag conf sel \
645 -background [$text cget -background] \
646 -foreground [$text cget -foreground] \
647 -borderwidth 0
648 $text tag conf in_sel -background lightgray
649 bind $text <Motion> break
650 return $text
653 wm withdraw .
654 set root_exists 0
655 bind . <Visibility> {
656 bind . <Visibility> {}
657 set root_exists 1
660 if {[is_Windows]} {
661 wm iconbitmap . -default $oguilib/git-gui.ico
662 set ::tk::AlwaysShowSelection 1
664 # Spoof an X11 display for SSH
665 if {![info exists env(DISPLAY)]} {
666 set env(DISPLAY) :9999
668 } else {
669 catch {
670 image create photo gitlogo -width 16 -height 16
672 gitlogo put #33CC33 -to 7 0 9 2
673 gitlogo put #33CC33 -to 4 2 12 4
674 gitlogo put #33CC33 -to 7 4 9 6
675 gitlogo put #CC3333 -to 4 6 12 8
676 gitlogo put gray26 -to 4 9 6 10
677 gitlogo put gray26 -to 3 10 6 12
678 gitlogo put gray26 -to 8 9 13 11
679 gitlogo put gray26 -to 8 11 10 12
680 gitlogo put gray26 -to 11 11 13 14
681 gitlogo put gray26 -to 3 12 5 14
682 gitlogo put gray26 -to 5 13
683 gitlogo put gray26 -to 10 13
684 gitlogo put gray26 -to 4 14 12 15
685 gitlogo put gray26 -to 5 15 11 16
686 gitlogo redither
688 wm iconphoto . -default gitlogo
692 ######################################################################
694 ## config defaults
696 set cursor_ptr arrow
697 font create font_ui
698 if {[lsearch -exact [font names] TkDefaultFont] != -1} {
699 eval [linsert [font actual TkDefaultFont] 0 font configure font_ui]
700 eval [linsert [font actual TkFixedFont] 0 font create font_diff]
701 } else {
702 font create font_diff -family Courier -size 10
703 catch {
704 label .dummy
705 eval font configure font_ui [font actual [.dummy cget -font]]
706 destroy .dummy
710 font create font_uiitalic
711 font create font_uibold
712 font create font_diffbold
713 font create font_diffitalic
715 foreach class {Button Checkbutton Entry Label
716 Labelframe Listbox Message
717 Radiobutton Spinbox Text} {
718 option add *$class.font font_ui
720 if {![is_MacOSX]} {
721 option add *Menu.font font_ui
722 option add *Entry.borderWidth 1 startupFile
723 option add *Entry.relief sunken startupFile
724 option add *RadioButton.anchor w startupFile
726 unset class
728 if {[is_Windows] || [is_MacOSX]} {
729 option add *Menu.tearOff 0
732 if {[is_MacOSX]} {
733 set M1B M1
734 set M1T Cmd
735 } else {
736 set M1B Control
737 set M1T Ctrl
740 proc bind_button3 {w cmd} {
741 bind $w <Any-Button-3> $cmd
742 if {[is_MacOSX]} {
743 # Mac OS X sends Button-2 on right click through three-button mouse,
744 # or through trackpad right-clicking (two-finger touch + click).
745 bind $w <Any-Button-2> $cmd
746 bind $w <Control-Button-1> $cmd
750 proc apply_config {} {
751 global repo_config font_descs
753 foreach option $font_descs {
754 set name [lindex $option 0]
755 set font [lindex $option 1]
756 if {[catch {
757 set need_weight 1
758 foreach {cn cv} $repo_config(gui.$name) {
759 if {$cn eq {-weight}} {
760 set need_weight 0
762 font configure $font $cn $cv
764 if {$need_weight} {
765 font configure $font -weight normal
767 } err]} {
768 error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
770 foreach {cn cv} [font configure $font] {
771 font configure ${font}bold $cn $cv
772 font configure ${font}italic $cn $cv
774 font configure ${font}bold -weight bold
775 font configure ${font}italic -slant italic
778 global use_ttk NS
779 set use_ttk 0
780 set NS {}
781 if {$repo_config(gui.usettk)} {
782 set use_ttk [package vsatisfies [package provide Tk] 8.5]
783 if {$use_ttk} {
784 set NS ttk
785 bind [winfo class .] <<ThemeChanged>> [list InitTheme]
786 pave_toplevel .
791 set default_config(branch.autosetupmerge) true
792 set default_config(merge.tool) {}
793 set default_config(mergetool.keepbackup) true
794 set default_config(merge.diffstat) true
795 set default_config(merge.summary) false
796 set default_config(merge.verbosity) 2
797 set default_config(user.name) {}
798 set default_config(user.email) {}
800 set default_config(gui.encoding) [encoding system]
801 set default_config(gui.matchtrackingbranch) false
802 set default_config(gui.textconv) true
803 set default_config(gui.pruneduringfetch) false
804 set default_config(gui.trustmtime) false
805 set default_config(gui.fastcopyblame) false
806 set default_config(gui.copyblamethreshold) 40
807 set default_config(gui.blamehistoryctx) 7
808 set default_config(gui.diffcontext) 5
809 set default_config(gui.commitmsgwidth) 75
810 set default_config(gui.newbranchtemplate) {}
811 set default_config(gui.spellingdictionary) {}
812 set default_config(gui.fontui) [font configure font_ui]
813 set default_config(gui.fontdiff) [font configure font_diff]
814 # TODO: this option should be added to the git-config documentation
815 set default_config(gui.maxfilesdisplayed) 5000
816 set default_config(gui.usettk) 1
817 set font_descs {
818 {fontui font_ui {mc "Main Font"}}
819 {fontdiff font_diff {mc "Diff/Console Font"}}
822 ######################################################################
824 ## find git
826 set _git [_which git]
827 if {$_git eq {}} {
828 catch {wm withdraw .}
829 tk_messageBox \
830 -icon error \
831 -type ok \
832 -title [mc "git-gui: fatal error"] \
833 -message [mc "Cannot find git in PATH."]
834 exit 1
837 ######################################################################
839 ## version check
841 if {[catch {set _git_version [git --version]} err]} {
842 catch {wm withdraw .}
843 tk_messageBox \
844 -icon error \
845 -type ok \
846 -title [mc "git-gui: fatal error"] \
847 -message "Cannot determine Git version:
849 $err
851 [appname] requires Git 1.5.0 or later."
852 exit 1
854 if {![regsub {^git version } $_git_version {} _git_version]} {
855 catch {wm withdraw .}
856 tk_messageBox \
857 -icon error \
858 -type ok \
859 -title [mc "git-gui: fatal error"] \
860 -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
861 exit 1
864 set _real_git_version $_git_version
865 regsub -- {[\-\.]dirty$} $_git_version {} _git_version
866 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
867 regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
868 regsub {\.GIT$} $_git_version {} _git_version
869 regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
871 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
872 catch {wm withdraw .}
873 if {[tk_messageBox \
874 -icon warning \
875 -type yesno \
876 -default no \
877 -title "[appname]: warning" \
878 -message [mc "Git version cannot be determined.
880 %s claims it is version '%s'.
882 %s requires at least Git 1.5.0 or later.
884 Assume '%s' is version 1.5.0?
885 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
886 set _git_version 1.5.0
887 } else {
888 exit 1
891 unset _real_git_version
893 proc git-version {args} {
894 global _git_version
896 switch [llength $args] {
898 return $_git_version
902 set op [lindex $args 0]
903 set vr [lindex $args 1]
904 set cm [package vcompare $_git_version $vr]
905 return [expr $cm $op 0]
909 set type [lindex $args 0]
910 set name [lindex $args 1]
911 set parm [lindex $args 2]
912 set body [lindex $args 3]
914 if {($type ne {proc} && $type ne {method})} {
915 error "Invalid arguments to git-version"
917 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
918 error "Last arm of $type $name must be default"
921 foreach {op vr cb} [lrange $body 0 end-2] {
922 if {[git-version $op $vr]} {
923 return [uplevel [list $type $name $parm $cb]]
927 return [uplevel [list $type $name $parm [lindex $body end]]]
930 default {
931 error "git-version >= x"
937 if {[git-version < 1.5]} {
938 catch {wm withdraw .}
939 tk_messageBox \
940 -icon error \
941 -type ok \
942 -title [mc "git-gui: fatal error"] \
943 -message "[appname] requires Git 1.5.0 or later.
945 You are using [git-version]:
947 [git --version]"
948 exit 1
951 ######################################################################
953 ## configure our library
955 set idx [file join $oguilib tclIndex]
956 if {[catch {set fd [open $idx r]} err]} {
957 catch {wm withdraw .}
958 tk_messageBox \
959 -icon error \
960 -type ok \
961 -title [mc "git-gui: fatal error"] \
962 -message $err
963 exit 1
965 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
966 set idx [list]
967 while {[gets $fd n] >= 0} {
968 if {$n ne {} && ![string match #* $n]} {
969 lappend idx $n
972 } else {
973 set idx {}
975 close $fd
977 if {$idx ne {}} {
978 set loaded [list]
979 foreach p $idx {
980 if {[lsearch -exact $loaded $p] >= 0} continue
981 source [file join $oguilib $p]
982 lappend loaded $p
984 unset loaded p
985 } else {
986 set auto_path [concat [list $oguilib] $auto_path]
988 unset -nocomplain idx fd
990 ######################################################################
992 ## config file parsing
994 git-version proc _parse_config {arr_name args} {
995 >= 1.5.3 {
996 upvar $arr_name arr
997 array unset arr
998 set buf {}
999 catch {
1000 set fd_rc [eval \
1001 [list git_read config] \
1002 $args \
1003 [list --null --list]]
1004 fconfigure $fd_rc -translation binary
1005 set buf [read $fd_rc]
1006 close $fd_rc
1008 foreach line [split $buf "\0"] {
1009 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
1010 if {[is_many_config $name]} {
1011 lappend arr($name) $value
1012 } else {
1013 set arr($name) $value
1018 default {
1019 upvar $arr_name arr
1020 array unset arr
1021 catch {
1022 set fd_rc [eval [list git_read config --list] $args]
1023 while {[gets $fd_rc line] >= 0} {
1024 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
1025 if {[is_many_config $name]} {
1026 lappend arr($name) $value
1027 } else {
1028 set arr($name) $value
1032 close $fd_rc
1037 proc load_config {include_global} {
1038 global repo_config global_config system_config default_config
1040 if {$include_global} {
1041 _parse_config system_config --system
1042 _parse_config global_config --global
1044 _parse_config repo_config
1046 foreach name [array names default_config] {
1047 if {[catch {set v $system_config($name)}]} {
1048 set system_config($name) $default_config($name)
1051 foreach name [array names system_config] {
1052 if {[catch {set v $global_config($name)}]} {
1053 set global_config($name) $system_config($name)
1055 if {[catch {set v $repo_config($name)}]} {
1056 set repo_config($name) $system_config($name)
1061 ######################################################################
1063 ## feature option selection
1065 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1066 unset _junk
1067 } else {
1068 set subcommand gui
1070 if {$subcommand eq {gui.sh}} {
1071 set subcommand gui
1073 if {$subcommand eq {gui} && [llength $argv] > 0} {
1074 set subcommand [lindex $argv 0]
1075 set argv [lrange $argv 1 end]
1078 enable_option multicommit
1079 enable_option branch
1080 enable_option transport
1081 disable_option bare
1083 switch -- $subcommand {
1084 browser -
1085 blame {
1086 enable_option bare
1088 disable_option multicommit
1089 disable_option branch
1090 disable_option transport
1092 citool {
1093 enable_option singlecommit
1094 enable_option retcode
1096 disable_option multicommit
1097 disable_option branch
1098 disable_option transport
1100 while {[llength $argv] > 0} {
1101 set a [lindex $argv 0]
1102 switch -- $a {
1103 --amend {
1104 enable_option initialamend
1106 --nocommit {
1107 enable_option nocommit
1108 enable_option nocommitmsg
1110 --commitmsg {
1111 disable_option nocommitmsg
1113 default {
1114 break
1118 set argv [lrange $argv 1 end]
1123 ######################################################################
1125 ## execution environment
1127 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1129 # Suggest our implementation of askpass, if none is set
1130 if {![info exists env(SSH_ASKPASS)]} {
1131 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1134 ######################################################################
1136 ## repository setup
1138 set picked 0
1139 if {[catch {
1140 set _gitdir $env(GIT_DIR)
1141 set _prefix {}
1143 && [catch {
1144 # beware that from the .git dir this sets _gitdir to .
1145 # and _prefix to the empty string
1146 set _gitdir [git rev-parse --git-dir]
1147 set _prefix [git rev-parse --show-prefix]
1148 } err]} {
1149 load_config 1
1150 apply_config
1151 choose_repository::pick
1152 set picked 1
1155 # we expand the _gitdir when it's just a single dot (i.e. when we're being
1156 # run from the .git dir itself) lest the routines to find the worktree
1157 # get confused
1158 if {$_gitdir eq "."} {
1159 set _gitdir [pwd]
1162 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1163 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1165 if {![file isdirectory $_gitdir]} {
1166 catch {wm withdraw .}
1167 error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
1168 exit 1
1170 # _gitdir exists, so try loading the config
1171 load_config 0
1172 apply_config
1173 # try to set work tree from environment, falling back to core.worktree
1174 if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
1175 set _gitworktree [get_config core.worktree]
1176 if {$_gitworktree eq ""} {
1177 set _gitworktree [file dirname [file normalize $_gitdir]]
1180 if {$_prefix ne {}} {
1181 if {$_gitworktree eq {}} {
1182 regsub -all {[^/]+/} $_prefix ../ cdup
1183 } else {
1184 set cdup $_gitworktree
1186 if {[catch {cd $cdup} err]} {
1187 catch {wm withdraw .}
1188 error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
1189 exit 1
1191 set _gitworktree [pwd]
1192 unset cdup
1193 } elseif {![is_enabled bare]} {
1194 if {[is_bare]} {
1195 catch {wm withdraw .}
1196 error_popup [strcat [mc "Cannot use bare repository:"] "\n\n$_gitdir"]
1197 exit 1
1199 if {$_gitworktree eq {}} {
1200 set _gitworktree [file dirname $_gitdir]
1202 if {[catch {cd $_gitworktree} err]} {
1203 catch {wm withdraw .}
1204 error_popup [strcat [mc "No working directory"] " $_gitworktree:\n\n$err"]
1205 exit 1
1207 set _gitworktree [pwd]
1209 set _reponame [file split [file normalize $_gitdir]]
1210 if {[lindex $_reponame end] eq {.git}} {
1211 set _reponame [lindex $_reponame end-1]
1212 } else {
1213 set _reponame [lindex $_reponame end]
1216 ######################################################################
1218 ## global init
1220 set current_diff_path {}
1221 set current_diff_side {}
1222 set diff_actions [list]
1224 set HEAD {}
1225 set PARENT {}
1226 set MERGE_HEAD [list]
1227 set commit_type {}
1228 set empty_tree {}
1229 set current_branch {}
1230 set is_detached 0
1231 set current_diff_path {}
1232 set is_3way_diff 0
1233 set is_submodule_diff 0
1234 set is_conflict_diff 0
1235 set selected_commit_type new
1236 set diff_empty_count 0
1238 set nullid "0000000000000000000000000000000000000000"
1239 set nullid2 "0000000000000000000000000000000000000001"
1241 ######################################################################
1243 ## task management
1245 set rescan_active 0
1246 set diff_active 0
1247 set last_clicked {}
1249 set disable_on_lock [list]
1250 set index_lock_type none
1252 proc lock_index {type} {
1253 global index_lock_type disable_on_lock
1255 if {$index_lock_type eq {none}} {
1256 set index_lock_type $type
1257 foreach w $disable_on_lock {
1258 uplevel #0 $w disabled
1260 return 1
1261 } elseif {$index_lock_type eq "begin-$type"} {
1262 set index_lock_type $type
1263 return 1
1265 return 0
1268 proc unlock_index {} {
1269 global index_lock_type disable_on_lock
1271 set index_lock_type none
1272 foreach w $disable_on_lock {
1273 uplevel #0 $w normal
1277 ######################################################################
1279 ## status
1281 proc repository_state {ctvar hdvar mhvar} {
1282 global current_branch
1283 upvar $ctvar ct $hdvar hd $mhvar mh
1285 set mh [list]
1287 load_current_branch
1288 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1289 set hd {}
1290 set ct initial
1291 return
1294 set merge_head [gitdir MERGE_HEAD]
1295 if {[file exists $merge_head]} {
1296 set ct merge
1297 set fd_mh [open $merge_head r]
1298 while {[gets $fd_mh line] >= 0} {
1299 lappend mh $line
1301 close $fd_mh
1302 return
1305 set ct normal
1308 proc PARENT {} {
1309 global PARENT empty_tree
1311 set p [lindex $PARENT 0]
1312 if {$p ne {}} {
1313 return $p
1315 if {$empty_tree eq {}} {
1316 set empty_tree [git mktree << {}]
1318 return $empty_tree
1321 proc force_amend {} {
1322 global selected_commit_type
1323 global HEAD PARENT MERGE_HEAD commit_type
1325 repository_state newType newHEAD newMERGE_HEAD
1326 set HEAD $newHEAD
1327 set PARENT $newHEAD
1328 set MERGE_HEAD $newMERGE_HEAD
1329 set commit_type $newType
1331 set selected_commit_type amend
1332 do_select_commit_type
1335 proc rescan {after {honor_trustmtime 1}} {
1336 global HEAD PARENT MERGE_HEAD commit_type
1337 global ui_index ui_workdir ui_comm
1338 global rescan_active file_states
1339 global repo_config
1341 if {$rescan_active > 0 || ![lock_index read]} return
1343 repository_state newType newHEAD newMERGE_HEAD
1344 if {[string match amend* $commit_type]
1345 && $newType eq {normal}
1346 && $newHEAD eq $HEAD} {
1347 } else {
1348 set HEAD $newHEAD
1349 set PARENT $newHEAD
1350 set MERGE_HEAD $newMERGE_HEAD
1351 set commit_type $newType
1354 array unset file_states
1356 if {!$::GITGUI_BCK_exists &&
1357 (![$ui_comm edit modified]
1358 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1359 if {[string match amend* $commit_type]} {
1360 } elseif {[load_message GITGUI_MSG]} {
1361 } elseif {[run_prepare_commit_msg_hook]} {
1362 } elseif {[load_message MERGE_MSG]} {
1363 } elseif {[load_message SQUASH_MSG]} {
1365 $ui_comm edit reset
1366 $ui_comm edit modified false
1369 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1370 rescan_stage2 {} $after
1371 } else {
1372 set rescan_active 1
1373 ui_status [mc "Refreshing file status..."]
1374 set fd_rf [git_read update-index \
1375 -q \
1376 --unmerged \
1377 --ignore-missing \
1378 --refresh \
1380 fconfigure $fd_rf -blocking 0 -translation binary
1381 fileevent $fd_rf readable \
1382 [list rescan_stage2 $fd_rf $after]
1386 if {[is_Cygwin]} {
1387 set is_git_info_exclude {}
1388 proc have_info_exclude {} {
1389 global is_git_info_exclude
1391 if {$is_git_info_exclude eq {}} {
1392 if {[catch {exec test -f [gitdir info exclude]}]} {
1393 set is_git_info_exclude 0
1394 } else {
1395 set is_git_info_exclude 1
1398 return $is_git_info_exclude
1400 } else {
1401 proc have_info_exclude {} {
1402 return [file readable [gitdir info exclude]]
1406 proc rescan_stage2 {fd after} {
1407 global rescan_active buf_rdi buf_rdf buf_rlo
1409 if {$fd ne {}} {
1410 read $fd
1411 if {![eof $fd]} return
1412 close $fd
1415 set ls_others [list --exclude-per-directory=.gitignore]
1416 if {[have_info_exclude]} {
1417 lappend ls_others "--exclude-from=[gitdir info exclude]"
1419 set user_exclude [get_config core.excludesfile]
1420 if {$user_exclude ne {} && [file readable $user_exclude]} {
1421 lappend ls_others "--exclude-from=$user_exclude"
1424 set buf_rdi {}
1425 set buf_rdf {}
1426 set buf_rlo {}
1428 set rescan_active 3
1429 ui_status [mc "Scanning for modified files ..."]
1430 set fd_di [git_read diff-index --cached -z [PARENT]]
1431 set fd_df [git_read diff-files -z]
1432 set fd_lo [eval git_read ls-files --others -z $ls_others]
1434 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1435 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1436 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1437 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1438 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1439 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1442 proc load_message {file} {
1443 global ui_comm
1445 set f [gitdir $file]
1446 if {[file isfile $f]} {
1447 if {[catch {set fd [open $f r]}]} {
1448 return 0
1450 fconfigure $fd -eofchar {}
1451 set content [string trim [read $fd]]
1452 close $fd
1453 regsub -all -line {[ \r\t]+$} $content {} content
1454 $ui_comm delete 0.0 end
1455 $ui_comm insert end $content
1456 return 1
1458 return 0
1461 proc run_prepare_commit_msg_hook {} {
1462 global pch_error
1464 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1465 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1466 # empty file but existant file.
1468 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1470 if {[file isfile [gitdir MERGE_MSG]]} {
1471 set pcm_source "merge"
1472 set fd_mm [open [gitdir MERGE_MSG] r]
1473 puts -nonewline $fd_pcm [read $fd_mm]
1474 close $fd_mm
1475 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1476 set pcm_source "squash"
1477 set fd_sm [open [gitdir SQUASH_MSG] r]
1478 puts -nonewline $fd_pcm [read $fd_sm]
1479 close $fd_sm
1480 } else {
1481 set pcm_source ""
1484 close $fd_pcm
1486 set fd_ph [githook_read prepare-commit-msg \
1487 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1488 if {$fd_ph eq {}} {
1489 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1490 return 0;
1493 ui_status [mc "Calling prepare-commit-msg hook..."]
1494 set pch_error {}
1496 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1497 fileevent $fd_ph readable \
1498 [list prepare_commit_msg_hook_wait $fd_ph]
1500 return 1;
1503 proc prepare_commit_msg_hook_wait {fd_ph} {
1504 global pch_error
1506 append pch_error [read $fd_ph]
1507 fconfigure $fd_ph -blocking 1
1508 if {[eof $fd_ph]} {
1509 if {[catch {close $fd_ph}]} {
1510 ui_status [mc "Commit declined by prepare-commit-msg hook."]
1511 hook_failed_popup prepare-commit-msg $pch_error
1512 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1513 exit 1
1514 } else {
1515 load_message PREPARE_COMMIT_MSG
1517 set pch_error {}
1518 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1519 return
1521 fconfigure $fd_ph -blocking 0
1522 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1525 proc read_diff_index {fd after} {
1526 global buf_rdi
1528 append buf_rdi [read $fd]
1529 set c 0
1530 set n [string length $buf_rdi]
1531 while {$c < $n} {
1532 set z1 [string first "\0" $buf_rdi $c]
1533 if {$z1 == -1} break
1534 incr z1
1535 set z2 [string first "\0" $buf_rdi $z1]
1536 if {$z2 == -1} break
1538 incr c
1539 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1540 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1541 merge_state \
1542 [encoding convertfrom $p] \
1543 [lindex $i 4]? \
1544 [list [lindex $i 0] [lindex $i 2]] \
1545 [list]
1546 set c $z2
1547 incr c
1549 if {$c < $n} {
1550 set buf_rdi [string range $buf_rdi $c end]
1551 } else {
1552 set buf_rdi {}
1555 rescan_done $fd buf_rdi $after
1558 proc read_diff_files {fd after} {
1559 global buf_rdf
1561 append buf_rdf [read $fd]
1562 set c 0
1563 set n [string length $buf_rdf]
1564 while {$c < $n} {
1565 set z1 [string first "\0" $buf_rdf $c]
1566 if {$z1 == -1} break
1567 incr z1
1568 set z2 [string first "\0" $buf_rdf $z1]
1569 if {$z2 == -1} break
1571 incr c
1572 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1573 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1574 merge_state \
1575 [encoding convertfrom $p] \
1576 ?[lindex $i 4] \
1577 [list] \
1578 [list [lindex $i 0] [lindex $i 2]]
1579 set c $z2
1580 incr c
1582 if {$c < $n} {
1583 set buf_rdf [string range $buf_rdf $c end]
1584 } else {
1585 set buf_rdf {}
1588 rescan_done $fd buf_rdf $after
1591 proc read_ls_others {fd after} {
1592 global buf_rlo
1594 append buf_rlo [read $fd]
1595 set pck [split $buf_rlo "\0"]
1596 set buf_rlo [lindex $pck end]
1597 foreach p [lrange $pck 0 end-1] {
1598 set p [encoding convertfrom $p]
1599 if {[string index $p end] eq {/}} {
1600 set p [string range $p 0 end-1]
1602 merge_state $p ?O
1604 rescan_done $fd buf_rlo $after
1607 proc rescan_done {fd buf after} {
1608 global rescan_active current_diff_path
1609 global file_states repo_config
1610 upvar $buf to_clear
1612 if {![eof $fd]} return
1613 set to_clear {}
1614 close $fd
1615 if {[incr rescan_active -1] > 0} return
1617 prune_selection
1618 unlock_index
1619 display_all_files
1620 if {$current_diff_path ne {}} { reshow_diff $after }
1621 if {$current_diff_path eq {}} { select_first_diff $after }
1624 proc prune_selection {} {
1625 global file_states selected_paths
1627 foreach path [array names selected_paths] {
1628 if {[catch {set still_here $file_states($path)}]} {
1629 unset selected_paths($path)
1634 ######################################################################
1636 ## ui helpers
1638 proc mapicon {w state path} {
1639 global all_icons
1641 if {[catch {set r $all_icons($state$w)}]} {
1642 puts "error: no icon for $w state={$state} $path"
1643 return file_plain
1645 return $r
1648 proc mapdesc {state path} {
1649 global all_descs
1651 if {[catch {set r $all_descs($state)}]} {
1652 puts "error: no desc for state={$state} $path"
1653 return $state
1655 return $r
1658 proc ui_status {msg} {
1659 global main_status
1660 if {[info exists main_status]} {
1661 $main_status show $msg
1665 proc ui_ready {{test {}}} {
1666 global main_status
1667 if {[info exists main_status]} {
1668 $main_status show [mc "Ready."] $test
1672 proc escape_path {path} {
1673 regsub -all {\\} $path "\\\\" path
1674 regsub -all "\n" $path "\\n" path
1675 return $path
1678 proc short_path {path} {
1679 return [escape_path [lindex [file split $path] end]]
1682 set next_icon_id 0
1683 set null_sha1 [string repeat 0 40]
1685 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1686 global file_states next_icon_id null_sha1
1688 set s0 [string index $new_state 0]
1689 set s1 [string index $new_state 1]
1691 if {[catch {set info $file_states($path)}]} {
1692 set state __
1693 set icon n[incr next_icon_id]
1694 } else {
1695 set state [lindex $info 0]
1696 set icon [lindex $info 1]
1697 if {$head_info eq {}} {set head_info [lindex $info 2]}
1698 if {$index_info eq {}} {set index_info [lindex $info 3]}
1701 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1702 elseif {$s0 eq {_}} {set s0 _}
1704 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1705 elseif {$s1 eq {_}} {set s1 _}
1707 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1708 set head_info [list 0 $null_sha1]
1709 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1710 && $head_info eq {}} {
1711 set head_info $index_info
1712 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1713 set index_info $head_info
1714 set head_info {}
1717 set file_states($path) [list $s0$s1 $icon \
1718 $head_info $index_info \
1720 return $state
1723 proc display_file_helper {w path icon_name old_m new_m} {
1724 global file_lists
1726 if {$new_m eq {_}} {
1727 set lno [lsearch -sorted -exact $file_lists($w) $path]
1728 if {$lno >= 0} {
1729 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1730 incr lno
1731 $w conf -state normal
1732 $w delete $lno.0 [expr {$lno + 1}].0
1733 $w conf -state disabled
1735 } elseif {$old_m eq {_} && $new_m ne {_}} {
1736 lappend file_lists($w) $path
1737 set file_lists($w) [lsort -unique $file_lists($w)]
1738 set lno [lsearch -sorted -exact $file_lists($w) $path]
1739 incr lno
1740 $w conf -state normal
1741 $w image create $lno.0 \
1742 -align center -padx 5 -pady 1 \
1743 -name $icon_name \
1744 -image [mapicon $w $new_m $path]
1745 $w insert $lno.1 "[escape_path $path]\n"
1746 $w conf -state disabled
1747 } elseif {$old_m ne $new_m} {
1748 $w conf -state normal
1749 $w image conf $icon_name -image [mapicon $w $new_m $path]
1750 $w conf -state disabled
1754 proc display_file {path state} {
1755 global file_states selected_paths
1756 global ui_index ui_workdir
1758 set old_m [merge_state $path $state]
1759 set s $file_states($path)
1760 set new_m [lindex $s 0]
1761 set icon_name [lindex $s 1]
1763 set o [string index $old_m 0]
1764 set n [string index $new_m 0]
1765 if {$o eq {U}} {
1766 set o _
1768 if {$n eq {U}} {
1769 set n _
1771 display_file_helper $ui_index $path $icon_name $o $n
1773 if {[string index $old_m 0] eq {U}} {
1774 set o U
1775 } else {
1776 set o [string index $old_m 1]
1778 if {[string index $new_m 0] eq {U}} {
1779 set n U
1780 } else {
1781 set n [string index $new_m 1]
1783 display_file_helper $ui_workdir $path $icon_name $o $n
1785 if {$new_m eq {__}} {
1786 unset file_states($path)
1787 catch {unset selected_paths($path)}
1791 proc display_all_files_helper {w path icon_name m} {
1792 global file_lists
1794 lappend file_lists($w) $path
1795 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1796 $w image create end \
1797 -align center -padx 5 -pady 1 \
1798 -name $icon_name \
1799 -image [mapicon $w $m $path]
1800 $w insert end "[escape_path $path]\n"
1803 set files_warning 0
1804 proc display_all_files {} {
1805 global ui_index ui_workdir
1806 global file_states file_lists
1807 global last_clicked
1808 global files_warning
1810 $ui_index conf -state normal
1811 $ui_workdir conf -state normal
1813 $ui_index delete 0.0 end
1814 $ui_workdir delete 0.0 end
1815 set last_clicked {}
1817 set file_lists($ui_index) [list]
1818 set file_lists($ui_workdir) [list]
1820 set to_display [lsort [array names file_states]]
1821 set display_limit [get_config gui.maxfilesdisplayed]
1822 if {[llength $to_display] > $display_limit} {
1823 if {!$files_warning} {
1824 # do not repeatedly warn:
1825 set files_warning 1
1826 info_popup [mc "Displaying only %s of %s files." \
1827 $display_limit [llength $to_display]]
1829 set to_display [lrange $to_display 0 [expr {$display_limit-1}]]
1831 foreach path $to_display {
1832 set s $file_states($path)
1833 set m [lindex $s 0]
1834 set icon_name [lindex $s 1]
1836 set s [string index $m 0]
1837 if {$s ne {U} && $s ne {_}} {
1838 display_all_files_helper $ui_index $path \
1839 $icon_name $s
1842 if {[string index $m 0] eq {U}} {
1843 set s U
1844 } else {
1845 set s [string index $m 1]
1847 if {$s ne {_}} {
1848 display_all_files_helper $ui_workdir $path \
1849 $icon_name $s
1853 $ui_index conf -state disabled
1854 $ui_workdir conf -state disabled
1857 ######################################################################
1859 ## icons
1861 set filemask {
1862 #define mask_width 14
1863 #define mask_height 15
1864 static unsigned char mask_bits[] = {
1865 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1866 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1867 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1870 image create bitmap file_plain -background white -foreground black -data {
1871 #define plain_width 14
1872 #define plain_height 15
1873 static unsigned char plain_bits[] = {
1874 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1875 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1876 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1877 } -maskdata $filemask
1879 image create bitmap file_mod -background white -foreground blue -data {
1880 #define mod_width 14
1881 #define mod_height 15
1882 static unsigned char mod_bits[] = {
1883 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1884 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1885 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1886 } -maskdata $filemask
1888 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1889 #define file_fulltick_width 14
1890 #define file_fulltick_height 15
1891 static unsigned char file_fulltick_bits[] = {
1892 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1893 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1894 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1895 } -maskdata $filemask
1897 image create bitmap file_question -background white -foreground black -data {
1898 #define file_question_width 14
1899 #define file_question_height 15
1900 static unsigned char file_question_bits[] = {
1901 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1902 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1903 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1904 } -maskdata $filemask
1906 image create bitmap file_removed -background white -foreground red -data {
1907 #define file_removed_width 14
1908 #define file_removed_height 15
1909 static unsigned char file_removed_bits[] = {
1910 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1911 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1912 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1913 } -maskdata $filemask
1915 image create bitmap file_merge -background white -foreground blue -data {
1916 #define file_merge_width 14
1917 #define file_merge_height 15
1918 static unsigned char file_merge_bits[] = {
1919 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1920 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1921 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1922 } -maskdata $filemask
1924 image create bitmap file_statechange -background white -foreground green -data {
1925 #define file_merge_width 14
1926 #define file_merge_height 15
1927 static unsigned char file_statechange_bits[] = {
1928 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
1929 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
1930 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1931 } -maskdata $filemask
1933 set ui_index .vpane.files.index.list
1934 set ui_workdir .vpane.files.workdir.list
1936 set all_icons(_$ui_index) file_plain
1937 set all_icons(A$ui_index) file_plain
1938 set all_icons(M$ui_index) file_fulltick
1939 set all_icons(D$ui_index) file_removed
1940 set all_icons(U$ui_index) file_merge
1941 set all_icons(T$ui_index) file_statechange
1943 set all_icons(_$ui_workdir) file_plain
1944 set all_icons(M$ui_workdir) file_mod
1945 set all_icons(D$ui_workdir) file_question
1946 set all_icons(U$ui_workdir) file_merge
1947 set all_icons(O$ui_workdir) file_plain
1948 set all_icons(T$ui_workdir) file_statechange
1950 set max_status_desc 0
1951 foreach i {
1952 {__ {mc "Unmodified"}}
1954 {_M {mc "Modified, not staged"}}
1955 {M_ {mc "Staged for commit"}}
1956 {MM {mc "Portions staged for commit"}}
1957 {MD {mc "Staged for commit, missing"}}
1959 {_T {mc "File type changed, not staged"}}
1960 {T_ {mc "File type changed, staged"}}
1962 {_O {mc "Untracked, not staged"}}
1963 {A_ {mc "Staged for commit"}}
1964 {AM {mc "Portions staged for commit"}}
1965 {AD {mc "Staged for commit, missing"}}
1967 {_D {mc "Missing"}}
1968 {D_ {mc "Staged for removal"}}
1969 {DO {mc "Staged for removal, still present"}}
1971 {_U {mc "Requires merge resolution"}}
1972 {U_ {mc "Requires merge resolution"}}
1973 {UU {mc "Requires merge resolution"}}
1974 {UM {mc "Requires merge resolution"}}
1975 {UD {mc "Requires merge resolution"}}
1976 {UT {mc "Requires merge resolution"}}
1978 set text [eval [lindex $i 1]]
1979 if {$max_status_desc < [string length $text]} {
1980 set max_status_desc [string length $text]
1982 set all_descs([lindex $i 0]) $text
1984 unset i
1986 ######################################################################
1988 ## util
1990 proc scrollbar2many {list mode args} {
1991 foreach w $list {eval $w $mode $args}
1994 proc many2scrollbar {list mode sb top bottom} {
1995 $sb set $top $bottom
1996 foreach w $list {$w $mode moveto $top}
1999 proc incr_font_size {font {amt 1}} {
2000 set sz [font configure $font -size]
2001 incr sz $amt
2002 font configure $font -size $sz
2003 font configure ${font}bold -size $sz
2004 font configure ${font}italic -size $sz
2007 ######################################################################
2009 ## ui commands
2011 set starting_gitk_msg [mc "Starting gitk... please wait..."]
2013 proc do_gitk {revs {is_submodule false}} {
2014 global current_diff_path file_states current_diff_side ui_index
2015 global _gitworktree
2017 # -- Always start gitk through whatever we were loaded with. This
2018 # lets us bypass using shell process on Windows systems.
2020 set exe [_which gitk -script]
2021 set cmd [list [info nameofexecutable] $exe]
2022 if {$exe eq {}} {
2023 error_popup [mc "Couldn't find gitk in PATH"]
2024 } else {
2025 global env
2027 if {[info exists env(GIT_DIR)]} {
2028 set old_GIT_DIR $env(GIT_DIR)
2029 } else {
2030 set old_GIT_DIR {}
2033 set pwd [pwd]
2035 if {!$is_submodule} {
2036 if {![is_bare]} {
2037 cd $_gitworktree
2039 set env(GIT_DIR) [file normalize [gitdir]]
2040 } else {
2041 cd $current_diff_path
2042 if {$revs eq {--}} {
2043 set s $file_states($current_diff_path)
2044 set old_sha1 {}
2045 set new_sha1 {}
2046 switch -glob -- [lindex $s 0] {
2047 M_ { set old_sha1 [lindex [lindex $s 2] 1] }
2048 _M { set old_sha1 [lindex [lindex $s 3] 1] }
2049 MM {
2050 if {$current_diff_side eq $ui_index} {
2051 set old_sha1 [lindex [lindex $s 2] 1]
2052 set new_sha1 [lindex [lindex $s 3] 1]
2053 } else {
2054 set old_sha1 [lindex [lindex $s 3] 1]
2058 set revs $old_sha1...$new_sha1
2060 if {[info exists env(GIT_DIR)]} {
2061 unset env(GIT_DIR)
2064 eval exec $cmd $revs "--" "--" &
2066 if {$old_GIT_DIR ne {}} {
2067 set env(GIT_DIR) $old_GIT_DIR
2069 cd $pwd
2071 ui_status $::starting_gitk_msg
2072 after 10000 {
2073 ui_ready $starting_gitk_msg
2078 proc do_git_gui {} {
2079 global current_diff_path
2081 # -- Always start git gui through whatever we were loaded with. This
2082 # lets us bypass using shell process on Windows systems.
2084 set exe [list [_which git]]
2085 if {$exe eq {}} {
2086 error_popup [mc "Couldn't find git gui in PATH"]
2087 } else {
2088 global env
2090 if {[info exists env(GIT_DIR)]} {
2091 set old_GIT_DIR $env(GIT_DIR)
2092 unset env(GIT_DIR)
2093 } else {
2094 set old_GIT_DIR {}
2097 set pwd [pwd]
2098 cd $current_diff_path
2100 eval exec $exe gui &
2102 if {$old_GIT_DIR ne {}} {
2103 set env(GIT_DIR) $old_GIT_DIR
2105 cd $pwd
2107 ui_status $::starting_gitk_msg
2108 after 10000 {
2109 ui_ready $starting_gitk_msg
2114 proc do_explore {} {
2115 global _gitworktree
2116 set explorer {}
2117 if {[is_Cygwin] || [is_Windows]} {
2118 set explorer "explorer.exe"
2119 } elseif {[is_MacOSX]} {
2120 set explorer "open"
2121 } else {
2122 # freedesktop.org-conforming system is our best shot
2123 set explorer "xdg-open"
2125 eval exec $explorer [list [file nativename $_gitworktree]] &
2128 set is_quitting 0
2129 set ret_code 1
2131 proc terminate_me {win} {
2132 global ret_code
2133 if {$win ne {.}} return
2134 exit $ret_code
2137 proc do_quit {{rc {1}}} {
2138 global ui_comm is_quitting repo_config commit_type
2139 global GITGUI_BCK_exists GITGUI_BCK_i
2140 global ui_comm_spell
2141 global ret_code use_ttk
2143 if {$is_quitting} return
2144 set is_quitting 1
2146 if {[winfo exists $ui_comm]} {
2147 # -- Stash our current commit buffer.
2149 set save [gitdir GITGUI_MSG]
2150 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
2151 file rename -force [gitdir GITGUI_BCK] $save
2152 set GITGUI_BCK_exists 0
2153 } else {
2154 set msg [string trim [$ui_comm get 0.0 end]]
2155 regsub -all -line {[ \r\t]+$} $msg {} msg
2156 if {(![string match amend* $commit_type]
2157 || [$ui_comm edit modified])
2158 && $msg ne {}} {
2159 catch {
2160 set fd [open $save w]
2161 puts -nonewline $fd $msg
2162 close $fd
2164 } else {
2165 catch {file delete $save}
2169 # -- Cancel our spellchecker if its running.
2171 if {[info exists ui_comm_spell]} {
2172 $ui_comm_spell stop
2175 # -- Remove our editor backup, its not needed.
2177 after cancel $GITGUI_BCK_i
2178 if {$GITGUI_BCK_exists} {
2179 catch {file delete [gitdir GITGUI_BCK]}
2182 # -- Stash our current window geometry into this repository.
2184 set cfg_wmstate [wm state .]
2185 if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} {
2186 set rc_wmstate {}
2188 if {$cfg_wmstate ne $rc_wmstate} {
2189 catch {git config gui.wmstate $cfg_wmstate}
2191 if {$cfg_wmstate eq {zoomed}} {
2192 # on Windows wm geometry will lie about window
2193 # position (but not size) when window is zoomed
2194 # restore the window before querying wm geometry
2195 wm state . normal
2197 set cfg_geometry [list]
2198 lappend cfg_geometry [wm geometry .]
2199 if {$use_ttk} {
2200 lappend cfg_geometry [.vpane sashpos 0]
2201 lappend cfg_geometry [.vpane.files sashpos 0]
2202 } else {
2203 lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
2204 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
2206 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2207 set rc_geometry {}
2209 if {$cfg_geometry ne $rc_geometry} {
2210 catch {git config gui.geometry $cfg_geometry}
2214 set ret_code $rc
2216 # Briefly enable send again, working around Tk bug
2217 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2218 tk appname [appname]
2220 destroy .
2223 proc do_rescan {} {
2224 rescan ui_ready
2227 proc ui_do_rescan {} {
2228 rescan {force_first_diff ui_ready}
2231 proc do_commit {} {
2232 commit_tree
2235 proc next_diff {{after {}}} {
2236 global next_diff_p next_diff_w next_diff_i
2237 show_diff $next_diff_p $next_diff_w {} {} $after
2240 proc find_anchor_pos {lst name} {
2241 set lid [lsearch -sorted -exact $lst $name]
2243 if {$lid == -1} {
2244 set lid 0
2245 foreach lname $lst {
2246 if {$lname >= $name} break
2247 incr lid
2251 return $lid
2254 proc find_file_from {flist idx delta path mmask} {
2255 global file_states
2257 set len [llength $flist]
2258 while {$idx >= 0 && $idx < $len} {
2259 set name [lindex $flist $idx]
2261 if {$name ne $path && [info exists file_states($name)]} {
2262 set state [lindex $file_states($name) 0]
2264 if {$mmask eq {} || [regexp $mmask $state]} {
2265 return $idx
2269 incr idx $delta
2272 return {}
2275 proc find_next_diff {w path {lno {}} {mmask {}}} {
2276 global next_diff_p next_diff_w next_diff_i
2277 global file_lists ui_index ui_workdir
2279 set flist $file_lists($w)
2280 if {$lno eq {}} {
2281 set lno [find_anchor_pos $flist $path]
2282 } else {
2283 incr lno -1
2286 if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} {
2287 if {$w eq $ui_index} {
2288 set mmask "^$mmask"
2289 } else {
2290 set mmask "$mmask\$"
2294 set idx [find_file_from $flist $lno 1 $path $mmask]
2295 if {$idx eq {}} {
2296 incr lno -1
2297 set idx [find_file_from $flist $lno -1 $path $mmask]
2300 if {$idx ne {}} {
2301 set next_diff_w $w
2302 set next_diff_p [lindex $flist $idx]
2303 set next_diff_i [expr {$idx+1}]
2304 return 1
2305 } else {
2306 return 0
2310 proc next_diff_after_action {w path {lno {}} {mmask {}}} {
2311 global current_diff_path
2313 if {$path ne $current_diff_path} {
2314 return {}
2315 } elseif {[find_next_diff $w $path $lno $mmask]} {
2316 return {next_diff;}
2317 } else {
2318 return {reshow_diff;}
2322 proc select_first_diff {after} {
2323 global ui_workdir
2325 if {[find_next_diff $ui_workdir {} 1 {^_?U}] ||
2326 [find_next_diff $ui_workdir {} 1 {[^O]$}]} {
2327 next_diff $after
2328 } else {
2329 uplevel #0 $after
2333 proc force_first_diff {after} {
2334 global ui_workdir current_diff_path file_states
2336 if {[info exists file_states($current_diff_path)]} {
2337 set state [lindex $file_states($current_diff_path) 0]
2338 } else {
2339 set state {OO}
2342 set reselect 0
2343 if {[string first {U} $state] >= 0} {
2344 # Already a conflict, do nothing
2345 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} {
2346 set reselect 1
2347 } elseif {[string index $state 1] ne {O}} {
2348 # Already a diff & no conflicts, do nothing
2349 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} {
2350 set reselect 1
2353 if {$reselect} {
2354 next_diff $after
2355 } else {
2356 uplevel #0 $after
2360 proc toggle_or_diff {w x y} {
2361 global file_states file_lists current_diff_path ui_index ui_workdir
2362 global last_clicked selected_paths
2364 set pos [split [$w index @$x,$y] .]
2365 set lno [lindex $pos 0]
2366 set col [lindex $pos 1]
2367 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2368 if {$path eq {}} {
2369 set last_clicked {}
2370 return
2373 set last_clicked [list $w $lno]
2374 array unset selected_paths
2375 $ui_index tag remove in_sel 0.0 end
2376 $ui_workdir tag remove in_sel 0.0 end
2378 # Determine the state of the file
2379 if {[info exists file_states($path)]} {
2380 set state [lindex $file_states($path) 0]
2381 } else {
2382 set state {__}
2385 # Restage the file, or simply show the diff
2386 if {$col == 0 && $y > 1} {
2387 # Conflicts need special handling
2388 if {[string first {U} $state] >= 0} {
2389 # $w must always be $ui_workdir, but...
2390 if {$w ne $ui_workdir} { set lno {} }
2391 merge_stage_workdir $path $lno
2392 return
2395 if {[string index $state 1] eq {O}} {
2396 set mmask {}
2397 } else {
2398 set mmask {[^O]}
2401 set after [next_diff_after_action $w $path $lno $mmask]
2403 if {$w eq $ui_index} {
2404 update_indexinfo \
2405 "Unstaging [short_path $path] from commit" \
2406 [list $path] \
2407 [concat $after [list ui_ready]]
2408 } elseif {$w eq $ui_workdir} {
2409 update_index \
2410 "Adding [short_path $path]" \
2411 [list $path] \
2412 [concat $after [list ui_ready]]
2414 } else {
2415 show_diff $path $w $lno
2419 proc add_one_to_selection {w x y} {
2420 global file_lists last_clicked selected_paths
2422 set lno [lindex [split [$w index @$x,$y] .] 0]
2423 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2424 if {$path eq {}} {
2425 set last_clicked {}
2426 return
2429 if {$last_clicked ne {}
2430 && [lindex $last_clicked 0] ne $w} {
2431 array unset selected_paths
2432 [lindex $last_clicked 0] tag remove in_sel 0.0 end
2435 set last_clicked [list $w $lno]
2436 if {[catch {set in_sel $selected_paths($path)}]} {
2437 set in_sel 0
2439 if {$in_sel} {
2440 unset selected_paths($path)
2441 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2442 } else {
2443 set selected_paths($path) 1
2444 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2448 proc add_range_to_selection {w x y} {
2449 global file_lists last_clicked selected_paths
2451 if {[lindex $last_clicked 0] ne $w} {
2452 toggle_or_diff $w $x $y
2453 return
2456 set lno [lindex [split [$w index @$x,$y] .] 0]
2457 set lc [lindex $last_clicked 1]
2458 if {$lc < $lno} {
2459 set begin $lc
2460 set end $lno
2461 } else {
2462 set begin $lno
2463 set end $lc
2466 foreach path [lrange $file_lists($w) \
2467 [expr {$begin - 1}] \
2468 [expr {$end - 1}]] {
2469 set selected_paths($path) 1
2471 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2474 proc show_more_context {} {
2475 global repo_config
2476 if {$repo_config(gui.diffcontext) < 99} {
2477 incr repo_config(gui.diffcontext)
2478 reshow_diff
2482 proc show_less_context {} {
2483 global repo_config
2484 if {$repo_config(gui.diffcontext) > 1} {
2485 incr repo_config(gui.diffcontext) -1
2486 reshow_diff
2490 ######################################################################
2492 ## ui construction
2494 set ui_comm {}
2496 # -- Menu Bar
2498 menu .mbar -tearoff 0
2499 if {[is_MacOSX]} {
2500 # -- Apple Menu (Mac OS X only)
2502 .mbar add cascade -label Apple -menu .mbar.apple
2503 menu .mbar.apple
2505 .mbar add cascade -label [mc Repository] -menu .mbar.repository
2506 .mbar add cascade -label [mc Edit] -menu .mbar.edit
2507 if {[is_enabled branch]} {
2508 .mbar add cascade -label [mc Branch] -menu .mbar.branch
2510 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2511 .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
2513 if {[is_enabled transport]} {
2514 .mbar add cascade -label [mc Merge] -menu .mbar.merge
2515 .mbar add cascade -label [mc Remote] -menu .mbar.remote
2517 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2518 .mbar add cascade -label [mc Tools] -menu .mbar.tools
2521 # -- Repository Menu
2523 menu .mbar.repository
2525 if {![is_bare]} {
2526 .mbar.repository add command \
2527 -label [mc "Explore Working Copy"] \
2528 -command {do_explore}
2529 .mbar.repository add separator
2532 .mbar.repository add command \
2533 -label [mc "Browse Current Branch's Files"] \
2534 -command {browser::new $current_branch}
2535 set ui_browse_current [.mbar.repository index last]
2536 .mbar.repository add command \
2537 -label [mc "Browse Branch Files..."] \
2538 -command browser_open::dialog
2539 .mbar.repository add separator
2541 .mbar.repository add command \
2542 -label [mc "Visualize Current Branch's History"] \
2543 -command {do_gitk $current_branch}
2544 set ui_visualize_current [.mbar.repository index last]
2545 .mbar.repository add command \
2546 -label [mc "Visualize All Branch History"] \
2547 -command {do_gitk --all}
2548 .mbar.repository add separator
2550 proc current_branch_write {args} {
2551 global current_branch
2552 .mbar.repository entryconf $::ui_browse_current \
2553 -label [mc "Browse %s's Files" $current_branch]
2554 .mbar.repository entryconf $::ui_visualize_current \
2555 -label [mc "Visualize %s's History" $current_branch]
2557 trace add variable current_branch write current_branch_write
2559 if {[is_enabled multicommit]} {
2560 .mbar.repository add command -label [mc "Database Statistics"] \
2561 -command do_stats
2563 .mbar.repository add command -label [mc "Compress Database"] \
2564 -command do_gc
2566 .mbar.repository add command -label [mc "Verify Database"] \
2567 -command do_fsck_objects
2569 .mbar.repository add separator
2571 if {[is_Cygwin]} {
2572 .mbar.repository add command \
2573 -label [mc "Create Desktop Icon"] \
2574 -command do_cygwin_shortcut
2575 } elseif {[is_Windows]} {
2576 .mbar.repository add command \
2577 -label [mc "Create Desktop Icon"] \
2578 -command do_windows_shortcut
2579 } elseif {[is_MacOSX]} {
2580 .mbar.repository add command \
2581 -label [mc "Create Desktop Icon"] \
2582 -command do_macosx_app
2586 if {[is_MacOSX]} {
2587 proc ::tk::mac::Quit {args} { do_quit }
2588 } else {
2589 .mbar.repository add command -label [mc Quit] \
2590 -command do_quit \
2591 -accelerator $M1T-Q
2594 # -- Edit Menu
2596 menu .mbar.edit
2597 .mbar.edit add command -label [mc Undo] \
2598 -command {catch {[focus] edit undo}} \
2599 -accelerator $M1T-Z
2600 .mbar.edit add command -label [mc Redo] \
2601 -command {catch {[focus] edit redo}} \
2602 -accelerator $M1T-Y
2603 .mbar.edit add separator
2604 .mbar.edit add command -label [mc Cut] \
2605 -command {catch {tk_textCut [focus]}} \
2606 -accelerator $M1T-X
2607 .mbar.edit add command -label [mc Copy] \
2608 -command {catch {tk_textCopy [focus]}} \
2609 -accelerator $M1T-C
2610 .mbar.edit add command -label [mc Paste] \
2611 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2612 -accelerator $M1T-V
2613 .mbar.edit add command -label [mc Delete] \
2614 -command {catch {[focus] delete sel.first sel.last}} \
2615 -accelerator Del
2616 .mbar.edit add separator
2617 .mbar.edit add command -label [mc "Select All"] \
2618 -command {catch {[focus] tag add sel 0.0 end}} \
2619 -accelerator $M1T-A
2621 # -- Branch Menu
2623 if {[is_enabled branch]} {
2624 menu .mbar.branch
2626 .mbar.branch add command -label [mc "Create..."] \
2627 -command branch_create::dialog \
2628 -accelerator $M1T-N
2629 lappend disable_on_lock [list .mbar.branch entryconf \
2630 [.mbar.branch index last] -state]
2632 .mbar.branch add command -label [mc "Checkout..."] \
2633 -command branch_checkout::dialog \
2634 -accelerator $M1T-O
2635 lappend disable_on_lock [list .mbar.branch entryconf \
2636 [.mbar.branch index last] -state]
2638 .mbar.branch add command -label [mc "Rename..."] \
2639 -command branch_rename::dialog
2640 lappend disable_on_lock [list .mbar.branch entryconf \
2641 [.mbar.branch index last] -state]
2643 .mbar.branch add command -label [mc "Delete..."] \
2644 -command branch_delete::dialog
2645 lappend disable_on_lock [list .mbar.branch entryconf \
2646 [.mbar.branch index last] -state]
2648 .mbar.branch add command -label [mc "Reset..."] \
2649 -command merge::reset_hard
2650 lappend disable_on_lock [list .mbar.branch entryconf \
2651 [.mbar.branch index last] -state]
2654 # -- Commit Menu
2656 proc commit_btn_caption {} {
2657 if {[is_enabled nocommit]} {
2658 return [mc "Done"]
2659 } else {
2660 return [mc Commit@@verb]
2664 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2665 menu .mbar.commit
2667 if {![is_enabled nocommit]} {
2668 .mbar.commit add radiobutton \
2669 -label [mc "New Commit"] \
2670 -command do_select_commit_type \
2671 -variable selected_commit_type \
2672 -value new
2673 lappend disable_on_lock \
2674 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2676 .mbar.commit add radiobutton \
2677 -label [mc "Amend Last Commit"] \
2678 -command do_select_commit_type \
2679 -variable selected_commit_type \
2680 -value amend
2681 lappend disable_on_lock \
2682 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2684 .mbar.commit add separator
2687 .mbar.commit add command -label [mc Rescan] \
2688 -command ui_do_rescan \
2689 -accelerator F5
2690 lappend disable_on_lock \
2691 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2693 .mbar.commit add command -label [mc "Stage To Commit"] \
2694 -command do_add_selection \
2695 -accelerator $M1T-T
2696 lappend disable_on_lock \
2697 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2699 .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
2700 -command do_add_all \
2701 -accelerator $M1T-I
2702 lappend disable_on_lock \
2703 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2705 .mbar.commit add command -label [mc "Unstage From Commit"] \
2706 -command do_unstage_selection \
2707 -accelerator $M1T-U
2708 lappend disable_on_lock \
2709 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2711 .mbar.commit add command -label [mc "Revert Changes"] \
2712 -command do_revert_selection \
2713 -accelerator $M1T-J
2714 lappend disable_on_lock \
2715 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2717 .mbar.commit add separator
2719 .mbar.commit add command -label [mc "Show Less Context"] \
2720 -command show_less_context \
2721 -accelerator $M1T-\-
2723 .mbar.commit add command -label [mc "Show More Context"] \
2724 -command show_more_context \
2725 -accelerator $M1T-=
2727 .mbar.commit add separator
2729 if {![is_enabled nocommitmsg]} {
2730 .mbar.commit add command -label [mc "Sign Off"] \
2731 -command do_signoff \
2732 -accelerator $M1T-S
2735 .mbar.commit add command -label [commit_btn_caption] \
2736 -command do_commit \
2737 -accelerator $M1T-Return
2738 lappend disable_on_lock \
2739 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2742 # -- Merge Menu
2744 if {[is_enabled branch]} {
2745 menu .mbar.merge
2746 .mbar.merge add command -label [mc "Local Merge..."] \
2747 -command merge::dialog \
2748 -accelerator $M1T-M
2749 lappend disable_on_lock \
2750 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2751 .mbar.merge add command -label [mc "Abort Merge..."] \
2752 -command merge::reset_hard
2753 lappend disable_on_lock \
2754 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2757 # -- Transport Menu
2759 if {[is_enabled transport]} {
2760 menu .mbar.remote
2762 .mbar.remote add command \
2763 -label [mc "Add..."] \
2764 -command remote_add::dialog \
2765 -accelerator $M1T-A
2766 .mbar.remote add command \
2767 -label [mc "Push..."] \
2768 -command do_push_anywhere \
2769 -accelerator $M1T-P
2770 .mbar.remote add command \
2771 -label [mc "Delete Branch..."] \
2772 -command remote_branch_delete::dialog
2775 if {[is_MacOSX]} {
2776 proc ::tk::mac::ShowPreferences {} {do_options}
2777 } else {
2778 # -- Edit Menu
2780 .mbar.edit add separator
2781 .mbar.edit add command -label [mc "Options..."] \
2782 -command do_options
2785 # -- Tools Menu
2787 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2788 set tools_menubar .mbar.tools
2789 menu $tools_menubar
2790 $tools_menubar add separator
2791 $tools_menubar add command -label [mc "Add..."] -command tools_add::dialog
2792 $tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog
2793 set tools_tailcnt 3
2794 if {[array names repo_config guitool.*.cmd] ne {}} {
2795 tools_populate_all
2799 # -- Help Menu
2801 .mbar add cascade -label [mc Help] -menu .mbar.help
2802 menu .mbar.help
2804 if {[is_MacOSX]} {
2805 .mbar.apple add command -label [mc "About %s" [appname]] \
2806 -command do_about
2807 .mbar.apple add separator
2808 } else {
2809 .mbar.help add command -label [mc "About %s" [appname]] \
2810 -command do_about
2812 . configure -menu .mbar
2814 set doc_path [githtmldir]
2815 if {$doc_path ne {}} {
2816 set doc_path [file join $doc_path index.html]
2818 if {[is_Cygwin]} {
2819 set doc_path [exec cygpath --mixed $doc_path]
2823 if {[file isfile $doc_path]} {
2824 set doc_url "file:$doc_path"
2825 } else {
2826 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
2829 proc start_browser {url} {
2830 git "web--browse" $url
2833 .mbar.help add command -label [mc "Online Documentation"] \
2834 -command [list start_browser $doc_url]
2836 .mbar.help add command -label [mc "Show SSH Key"] \
2837 -command do_ssh_key
2839 unset doc_path doc_url
2841 # -- Standard bindings
2843 wm protocol . WM_DELETE_WINDOW do_quit
2844 bind all <$M1B-Key-q> do_quit
2845 bind all <$M1B-Key-Q> do_quit
2846 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2847 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
2849 set subcommand_args {}
2850 proc usage {} {
2851 puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
2852 exit 1
2855 proc normalize_relpath {path} {
2856 set elements {}
2857 foreach item [file split $path] {
2858 if {$item eq {.}} continue
2859 if {$item eq {..} && [llength $elements] > 0
2860 && [lindex $elements end] ne {..}} {
2861 set elements [lrange $elements 0 end-1]
2862 continue
2864 lappend elements $item
2866 return [eval file join $elements]
2869 # -- Not a normal commit type invocation? Do that instead!
2871 switch -- $subcommand {
2872 browser -
2873 blame {
2874 if {$subcommand eq "blame"} {
2875 set subcommand_args {[--line=<num>] rev? path}
2876 } else {
2877 set subcommand_args {rev? path}
2879 if {$argv eq {}} usage
2880 set head {}
2881 set path {}
2882 set jump_spec {}
2883 set is_path 0
2884 foreach a $argv {
2885 if {$is_path || [file exists $_prefix$a]} {
2886 if {$path ne {}} usage
2887 set path [normalize_relpath $_prefix$a]
2888 break
2889 } elseif {$a eq {--}} {
2890 if {$path ne {}} {
2891 if {$head ne {}} usage
2892 set head $path
2893 set path {}
2895 set is_path 1
2896 } elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
2897 if {$jump_spec ne {} || $head ne {}} usage
2898 set jump_spec [list $lnum]
2899 } elseif {$head eq {}} {
2900 if {$head ne {}} usage
2901 set head $a
2902 set is_path 1
2903 } else {
2904 usage
2907 unset is_path
2909 if {$head ne {} && $path eq {}} {
2910 set path [normalize_relpath $_prefix$head]
2911 set head {}
2914 if {$head eq {}} {
2915 load_current_branch
2916 } else {
2917 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
2918 if {[catch {
2919 set head [git rev-parse --verify $head]
2920 } err]} {
2921 puts stderr $err
2922 exit 1
2925 set current_branch $head
2928 wm deiconify .
2929 switch -- $subcommand {
2930 browser {
2931 if {$jump_spec ne {}} usage
2932 if {$head eq {}} {
2933 if {$path ne {} && [file isdirectory $path]} {
2934 set head $current_branch
2935 } else {
2936 set head $path
2937 set path {}
2940 browser::new $head $path
2942 blame {
2943 if {$head eq {} && ![file exists $path]} {
2944 puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
2945 exit 1
2947 blame::new $head $path $jump_spec
2950 return
2952 citool -
2953 gui {
2954 if {[llength $argv] != 0} {
2955 puts -nonewline stderr "usage: $argv0"
2956 if {$subcommand ne {gui}
2957 && [file tail $argv0] ne "git-$subcommand"} {
2958 puts -nonewline stderr " $subcommand"
2960 puts stderr {}
2961 exit 1
2963 # fall through to setup UI for commits
2965 default {
2966 puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
2967 exit 1
2971 # -- Branch Control
2973 ${NS}::frame .branch
2974 if {!$use_ttk} {.branch configure -borderwidth 1 -relief sunken}
2975 ${NS}::label .branch.l1 \
2976 -text [mc "Current Branch:"] \
2977 -anchor w \
2978 -justify left
2979 ${NS}::label .branch.cb \
2980 -textvariable current_branch \
2981 -anchor w \
2982 -justify left
2983 pack .branch.l1 -side left
2984 pack .branch.cb -side left -fill x
2985 pack .branch -side top -fill x
2987 # -- Main Window Layout
2989 ${NS}::panedwindow .vpane -orient horizontal
2990 ${NS}::panedwindow .vpane.files -orient vertical
2991 if {$use_ttk} {
2992 .vpane add .vpane.files
2993 } else {
2994 .vpane add .vpane.files -sticky nsew -height 100 -width 200
2996 pack .vpane -anchor n -side top -fill both -expand 1
2998 # -- Index File List
3000 ${NS}::frame .vpane.files.index -height 100 -width 200
3001 tlabel .vpane.files.index.title \
3002 -text [mc "Staged Changes (Will Commit)"] \
3003 -background lightgreen -foreground black
3004 text $ui_index -background white -foreground black \
3005 -borderwidth 0 \
3006 -width 20 -height 10 \
3007 -wrap none \
3008 -cursor $cursor_ptr \
3009 -xscrollcommand {.vpane.files.index.sx set} \
3010 -yscrollcommand {.vpane.files.index.sy set} \
3011 -state disabled
3012 ${NS}::scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
3013 ${NS}::scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
3014 pack .vpane.files.index.title -side top -fill x
3015 pack .vpane.files.index.sx -side bottom -fill x
3016 pack .vpane.files.index.sy -side right -fill y
3017 pack $ui_index -side left -fill both -expand 1
3019 # -- Working Directory File List
3021 ${NS}::frame .vpane.files.workdir -height 100 -width 200
3022 tlabel .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
3023 -background lightsalmon -foreground black
3024 text $ui_workdir -background white -foreground black \
3025 -borderwidth 0 \
3026 -width 20 -height 10 \
3027 -wrap none \
3028 -cursor $cursor_ptr \
3029 -xscrollcommand {.vpane.files.workdir.sx set} \
3030 -yscrollcommand {.vpane.files.workdir.sy set} \
3031 -state disabled
3032 ${NS}::scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
3033 ${NS}::scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
3034 pack .vpane.files.workdir.title -side top -fill x
3035 pack .vpane.files.workdir.sx -side bottom -fill x
3036 pack .vpane.files.workdir.sy -side right -fill y
3037 pack $ui_workdir -side left -fill both -expand 1
3039 .vpane.files add .vpane.files.workdir
3040 .vpane.files add .vpane.files.index
3041 if {!$use_ttk} {
3042 .vpane.files paneconfigure .vpane.files.workdir -sticky news
3043 .vpane.files paneconfigure .vpane.files.index -sticky news
3046 foreach i [list $ui_index $ui_workdir] {
3047 rmsel_tag $i
3048 $i tag conf in_diff -background [$i tag cget in_sel -background]
3050 unset i
3052 # -- Diff and Commit Area
3054 ${NS}::frame .vpane.lower -height 300 -width 400
3055 ${NS}::frame .vpane.lower.commarea
3056 ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1
3057 pack .vpane.lower.diff -fill both -expand 1
3058 pack .vpane.lower.commarea -side bottom -fill x
3059 .vpane add .vpane.lower
3060 if {!$use_ttk} {.vpane paneconfigure .vpane.lower -sticky nsew}
3062 # -- Commit Area Buttons
3064 ${NS}::frame .vpane.lower.commarea.buttons
3065 ${NS}::label .vpane.lower.commarea.buttons.l -text {} \
3066 -anchor w \
3067 -justify left
3068 pack .vpane.lower.commarea.buttons.l -side top -fill x
3069 pack .vpane.lower.commarea.buttons -side left -fill y
3071 ${NS}::button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
3072 -command ui_do_rescan
3073 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3074 lappend disable_on_lock \
3075 {.vpane.lower.commarea.buttons.rescan conf -state}
3077 ${NS}::button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
3078 -command do_add_all
3079 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3080 lappend disable_on_lock \
3081 {.vpane.lower.commarea.buttons.incall conf -state}
3083 if {![is_enabled nocommitmsg]} {
3084 ${NS}::button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
3085 -command do_signoff
3086 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3089 ${NS}::button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
3090 -command do_commit
3091 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3092 lappend disable_on_lock \
3093 {.vpane.lower.commarea.buttons.commit conf -state}
3095 if {![is_enabled nocommit]} {
3096 ${NS}::button .vpane.lower.commarea.buttons.push -text [mc Push] \
3097 -command do_push_anywhere
3098 pack .vpane.lower.commarea.buttons.push -side top -fill x
3101 # -- Commit Message Buffer
3103 ${NS}::frame .vpane.lower.commarea.buffer
3104 ${NS}::frame .vpane.lower.commarea.buffer.header
3105 set ui_comm .vpane.lower.commarea.buffer.t
3106 set ui_coml .vpane.lower.commarea.buffer.header.l
3108 if {![is_enabled nocommit]} {
3109 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \
3110 -text [mc "New Commit"] \
3111 -command do_select_commit_type \
3112 -variable selected_commit_type \
3113 -value new
3114 lappend disable_on_lock \
3115 [list .vpane.lower.commarea.buffer.header.new conf -state]
3116 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \
3117 -text [mc "Amend Last Commit"] \
3118 -command do_select_commit_type \
3119 -variable selected_commit_type \
3120 -value amend
3121 lappend disable_on_lock \
3122 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3125 ${NS}::label $ui_coml \
3126 -anchor w \
3127 -justify left
3128 proc trace_commit_type {varname args} {
3129 global ui_coml commit_type
3130 switch -glob -- $commit_type {
3131 initial {set txt [mc "Initial Commit Message:"]}
3132 amend {set txt [mc "Amended Commit Message:"]}
3133 amend-initial {set txt [mc "Amended Initial Commit Message:"]}
3134 amend-merge {set txt [mc "Amended Merge Commit Message:"]}
3135 merge {set txt [mc "Merge Commit Message:"]}
3136 * {set txt [mc "Commit Message:"]}
3138 $ui_coml conf -text $txt
3140 trace add variable commit_type write trace_commit_type
3141 pack $ui_coml -side left -fill x
3143 if {![is_enabled nocommit]} {
3144 pack .vpane.lower.commarea.buffer.header.amend -side right
3145 pack .vpane.lower.commarea.buffer.header.new -side right
3148 text $ui_comm -background white -foreground black \
3149 -borderwidth 1 \
3150 -undo true \
3151 -maxundo 20 \
3152 -autoseparators true \
3153 -relief sunken \
3154 -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
3155 -font font_diff \
3156 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3157 ${NS}::scrollbar .vpane.lower.commarea.buffer.sby \
3158 -command [list $ui_comm yview]
3159 pack .vpane.lower.commarea.buffer.header -side top -fill x
3160 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3161 pack $ui_comm -side left -fill y
3162 pack .vpane.lower.commarea.buffer -side left -fill y
3164 # -- Commit Message Buffer Context Menu
3166 set ctxm .vpane.lower.commarea.buffer.ctxm
3167 menu $ctxm -tearoff 0
3168 $ctxm add command \
3169 -label [mc Cut] \
3170 -command {tk_textCut $ui_comm}
3171 $ctxm add command \
3172 -label [mc Copy] \
3173 -command {tk_textCopy $ui_comm}
3174 $ctxm add command \
3175 -label [mc Paste] \
3176 -command {tk_textPaste $ui_comm}
3177 $ctxm add command \
3178 -label [mc Delete] \
3179 -command {catch {$ui_comm delete sel.first sel.last}}
3180 $ctxm add separator
3181 $ctxm add command \
3182 -label [mc "Select All"] \
3183 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
3184 $ctxm add command \
3185 -label [mc "Copy All"] \
3186 -command {
3187 $ui_comm tag add sel 0.0 end
3188 tk_textCopy $ui_comm
3189 $ui_comm tag remove sel 0.0 end
3191 $ctxm add separator
3192 $ctxm add command \
3193 -label [mc "Sign Off"] \
3194 -command do_signoff
3195 set ui_comm_ctxm $ctxm
3197 # -- Diff Header
3199 proc trace_current_diff_path {varname args} {
3200 global current_diff_path diff_actions file_states
3201 if {$current_diff_path eq {}} {
3202 set s {}
3203 set f {}
3204 set p {}
3205 set o disabled
3206 } else {
3207 set p $current_diff_path
3208 set s [mapdesc [lindex $file_states($p) 0] $p]
3209 set f [mc "File:"]
3210 set p [escape_path $p]
3211 set o normal
3214 .vpane.lower.diff.header.status configure -text $s
3215 .vpane.lower.diff.header.file configure -text $f
3216 .vpane.lower.diff.header.path configure -text $p
3217 foreach w $diff_actions {
3218 uplevel #0 $w $o
3221 trace add variable current_diff_path write trace_current_diff_path
3223 gold_frame .vpane.lower.diff.header
3224 tlabel .vpane.lower.diff.header.status \
3225 -background gold \
3226 -foreground black \
3227 -width $max_status_desc \
3228 -anchor w \
3229 -justify left
3230 tlabel .vpane.lower.diff.header.file \
3231 -background gold \
3232 -foreground black \
3233 -anchor w \
3234 -justify left
3235 tlabel .vpane.lower.diff.header.path \
3236 -background gold \
3237 -foreground black \
3238 -anchor w \
3239 -justify left
3240 pack .vpane.lower.diff.header.status -side left
3241 pack .vpane.lower.diff.header.file -side left
3242 pack .vpane.lower.diff.header.path -fill x
3243 set ctxm .vpane.lower.diff.header.ctxm
3244 menu $ctxm -tearoff 0
3245 $ctxm add command \
3246 -label [mc Copy] \
3247 -command {
3248 clipboard clear
3249 clipboard append \
3250 -format STRING \
3251 -type STRING \
3252 -- $current_diff_path
3254 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3255 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3257 # -- Diff Body
3259 ${NS}::frame .vpane.lower.diff.body
3260 set ui_diff .vpane.lower.diff.body.t
3261 text $ui_diff -background white -foreground black \
3262 -borderwidth 0 \
3263 -width 80 -height 5 -wrap none \
3264 -font font_diff \
3265 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3266 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3267 -state disabled
3268 ${NS}::scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3269 -command [list $ui_diff xview]
3270 ${NS}::scrollbar .vpane.lower.diff.body.sby -orient vertical \
3271 -command [list $ui_diff yview]
3272 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3273 pack .vpane.lower.diff.body.sby -side right -fill y
3274 pack $ui_diff -side left -fill both -expand 1
3275 pack .vpane.lower.diff.header -side top -fill x
3276 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3278 $ui_diff tag conf d_cr -elide true
3279 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
3280 $ui_diff tag conf d_+ -foreground {#00a000}
3281 $ui_diff tag conf d_- -foreground red
3283 $ui_diff tag conf d_++ -foreground {#00a000}
3284 $ui_diff tag conf d_-- -foreground red
3285 $ui_diff tag conf d_+s \
3286 -foreground {#00a000} \
3287 -background {#e2effa}
3288 $ui_diff tag conf d_-s \
3289 -foreground red \
3290 -background {#e2effa}
3291 $ui_diff tag conf d_s+ \
3292 -foreground {#00a000} \
3293 -background ivory1
3294 $ui_diff tag conf d_s- \
3295 -foreground red \
3296 -background ivory1
3298 $ui_diff tag conf d<<<<<<< \
3299 -foreground orange \
3300 -font font_diffbold
3301 $ui_diff tag conf d======= \
3302 -foreground orange \
3303 -font font_diffbold
3304 $ui_diff tag conf d>>>>>>> \
3305 -foreground orange \
3306 -font font_diffbold
3308 $ui_diff tag raise sel
3310 # -- Diff Body Context Menu
3313 proc create_common_diff_popup {ctxm} {
3314 $ctxm add command \
3315 -label [mc Refresh] \
3316 -command reshow_diff
3317 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3318 $ctxm add command \
3319 -label [mc Copy] \
3320 -command {tk_textCopy $ui_diff}
3321 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3322 $ctxm add command \
3323 -label [mc "Select All"] \
3324 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
3325 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3326 $ctxm add command \
3327 -label [mc "Copy All"] \
3328 -command {
3329 $ui_diff tag add sel 0.0 end
3330 tk_textCopy $ui_diff
3331 $ui_diff tag remove sel 0.0 end
3333 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3334 $ctxm add separator
3335 $ctxm add command \
3336 -label [mc "Decrease Font Size"] \
3337 -command {incr_font_size font_diff -1}
3338 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3339 $ctxm add command \
3340 -label [mc "Increase Font Size"] \
3341 -command {incr_font_size font_diff 1}
3342 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3343 $ctxm add separator
3344 set emenu $ctxm.enc
3345 menu $emenu
3346 build_encoding_menu $emenu [list force_diff_encoding]
3347 $ctxm add cascade \
3348 -label [mc "Encoding"] \
3349 -menu $emenu
3350 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3351 $ctxm add separator
3352 $ctxm add command -label [mc "Options..."] \
3353 -command do_options
3356 set ctxm .vpane.lower.diff.body.ctxm
3357 menu $ctxm -tearoff 0
3358 $ctxm add command \
3359 -label [mc "Apply/Reverse Hunk"] \
3360 -command {apply_hunk $cursorX $cursorY}
3361 set ui_diff_applyhunk [$ctxm index last]
3362 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
3363 $ctxm add command \
3364 -label [mc "Apply/Reverse Line"] \
3365 -command {apply_range_or_line $cursorX $cursorY; do_rescan}
3366 set ui_diff_applyline [$ctxm index last]
3367 lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
3368 $ctxm add separator
3369 $ctxm add command \
3370 -label [mc "Show Less Context"] \
3371 -command show_less_context
3372 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3373 $ctxm add command \
3374 -label [mc "Show More Context"] \
3375 -command show_more_context
3376 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3377 $ctxm add separator
3378 create_common_diff_popup $ctxm
3380 set ctxmmg .vpane.lower.diff.body.ctxmmg
3381 menu $ctxmmg -tearoff 0
3382 $ctxmmg add command \
3383 -label [mc "Run Merge Tool"] \
3384 -command {merge_resolve_tool}
3385 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3386 $ctxmmg add separator
3387 $ctxmmg add command \
3388 -label [mc "Use Remote Version"] \
3389 -command {merge_resolve_one 3}
3390 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3391 $ctxmmg add command \
3392 -label [mc "Use Local Version"] \
3393 -command {merge_resolve_one 2}
3394 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3395 $ctxmmg add command \
3396 -label [mc "Revert To Base"] \
3397 -command {merge_resolve_one 1}
3398 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3399 $ctxmmg add separator
3400 $ctxmmg add command \
3401 -label [mc "Show Less Context"] \
3402 -command show_less_context
3403 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3404 $ctxmmg add command \
3405 -label [mc "Show More Context"] \
3406 -command show_more_context
3407 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3408 $ctxmmg add separator
3409 create_common_diff_popup $ctxmmg
3411 set ctxmsm .vpane.lower.diff.body.ctxmsm
3412 menu $ctxmsm -tearoff 0
3413 $ctxmsm add command \
3414 -label [mc "Visualize These Changes In The Submodule"] \
3415 -command {do_gitk -- true}
3416 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3417 $ctxmsm add command \
3418 -label [mc "Visualize Current Branch History In The Submodule"] \
3419 -command {do_gitk {} true}
3420 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3421 $ctxmsm add command \
3422 -label [mc "Visualize All Branch History In The Submodule"] \
3423 -command {do_gitk --all true}
3424 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3425 $ctxmsm add separator
3426 $ctxmsm add command \
3427 -label [mc "Start git gui In The Submodule"] \
3428 -command {do_git_gui}
3429 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3430 $ctxmsm add separator
3431 create_common_diff_popup $ctxmsm
3433 proc has_textconv {path} {
3434 if {[is_config_false gui.textconv]} {
3435 return 0
3437 set filter [gitattr $path diff set]
3438 set textconv [get_config [join [list diff $filter textconv] .]]
3439 if {$filter ne {set} && $textconv ne {}} {
3440 return 1
3441 } else {
3442 return 0
3446 proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
3447 global current_diff_path file_states
3448 set ::cursorX $x
3449 set ::cursorY $y
3450 if {[info exists file_states($current_diff_path)]} {
3451 set state [lindex $file_states($current_diff_path) 0]
3452 } else {
3453 set state {__}
3455 if {[string first {U} $state] >= 0} {
3456 tk_popup $ctxmmg $X $Y
3457 } elseif {$::is_submodule_diff} {
3458 tk_popup $ctxmsm $X $Y
3459 } else {
3460 set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}]
3461 if {$::ui_index eq $::current_diff_side} {
3462 set l [mc "Unstage Hunk From Commit"]
3463 if {$has_range} {
3464 set t [mc "Unstage Lines From Commit"]
3465 } else {
3466 set t [mc "Unstage Line From Commit"]
3468 } else {
3469 set l [mc "Stage Hunk For Commit"]
3470 if {$has_range} {
3471 set t [mc "Stage Lines For Commit"]
3472 } else {
3473 set t [mc "Stage Line For Commit"]
3476 if {$::is_3way_diff
3477 || $current_diff_path eq {}
3478 || {__} eq $state
3479 || {_O} eq $state
3480 || {_T} eq $state
3481 || {T_} eq $state
3482 || [has_textconv $current_diff_path]} {
3483 set s disabled
3484 } else {
3485 set s normal
3487 $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
3488 $ctxm entryconf $::ui_diff_applyline -state $s -label $t
3489 tk_popup $ctxm $X $Y
3492 bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg $ctxmsm %x %y %X %Y]
3494 # -- Status Bar
3496 set main_status [::status_bar::new .status]
3497 pack .status -anchor w -side bottom -fill x
3498 $main_status show [mc "Initializing..."]
3500 # -- Load geometry
3502 proc on_ttk_pane_mapped {w pane pos} {
3503 bind $w <Map> {}
3504 after 0 [list after idle [list $w sashpos $pane $pos]]
3506 proc on_tk_pane_mapped {w pane x y} {
3507 bind $w <Map> {}
3508 after 0 [list after idle [list $w sash place $pane $x $y]]
3510 proc on_application_mapped {} {
3511 global repo_config use_ttk
3512 bind . <Map> {}
3513 set gm $repo_config(gui.geometry)
3514 if {$use_ttk} {
3515 bind .vpane <Map> \
3516 [list on_ttk_pane_mapped %W 0 [lindex $gm 1]]
3517 bind .vpane.files <Map> \
3518 [list on_ttk_pane_mapped %W 0 [lindex $gm 2]]
3519 } else {
3520 bind .vpane <Map> \
3521 [list on_tk_pane_mapped %W 0 \
3522 [lindex $gm 1] \
3523 [lindex [.vpane sash coord 0] 1]]
3524 bind .vpane.files <Map> \
3525 [list on_tk_pane_mapped %W 0 \
3526 [lindex [.vpane.files sash coord 0] 0] \
3527 [lindex $gm 2]]
3529 wm geometry . [lindex $gm 0]
3531 if {[info exists repo_config(gui.geometry)]} {
3532 bind . <Map> [list on_application_mapped]
3533 wm geometry . [lindex $repo_config(gui.geometry) 0]
3536 # -- Load window state
3538 if {[info exists repo_config(gui.wmstate)]} {
3539 catch {wm state . $repo_config(gui.wmstate)}
3542 # -- Key Bindings
3544 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3545 bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
3546 bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
3547 bind $ui_comm <$M1B-Key-u> {do_unstage_selection;break}
3548 bind $ui_comm <$M1B-Key-U> {do_unstage_selection;break}
3549 bind $ui_comm <$M1B-Key-j> {do_revert_selection;break}
3550 bind $ui_comm <$M1B-Key-J> {do_revert_selection;break}
3551 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3552 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3553 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3554 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3555 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3556 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3557 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3558 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3559 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3560 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3561 bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
3562 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
3563 bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
3564 bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
3565 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
3567 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3568 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3569 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3570 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3571 bind $ui_diff <$M1B-Key-v> {break}
3572 bind $ui_diff <$M1B-Key-V> {break}
3573 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3574 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3575 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3576 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3577 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3578 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3579 bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
3580 bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
3581 bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
3582 bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
3583 bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
3584 bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
3585 bind $ui_diff <Button-1> {focus %W}
3587 if {[is_enabled branch]} {
3588 bind . <$M1B-Key-n> branch_create::dialog
3589 bind . <$M1B-Key-N> branch_create::dialog
3590 bind . <$M1B-Key-o> branch_checkout::dialog
3591 bind . <$M1B-Key-O> branch_checkout::dialog
3592 bind . <$M1B-Key-m> merge::dialog
3593 bind . <$M1B-Key-M> merge::dialog
3595 if {[is_enabled transport]} {
3596 bind . <$M1B-Key-p> do_push_anywhere
3597 bind . <$M1B-Key-P> do_push_anywhere
3600 bind . <Key-F5> ui_do_rescan
3601 bind . <$M1B-Key-r> ui_do_rescan
3602 bind . <$M1B-Key-R> ui_do_rescan
3603 bind . <$M1B-Key-s> do_signoff
3604 bind . <$M1B-Key-S> do_signoff
3605 bind . <$M1B-Key-t> do_add_selection
3606 bind . <$M1B-Key-T> do_add_selection
3607 bind . <$M1B-Key-j> do_revert_selection
3608 bind . <$M1B-Key-J> do_revert_selection
3609 bind . <$M1B-Key-i> do_add_all
3610 bind . <$M1B-Key-I> do_add_all
3611 bind . <$M1B-Key-minus> {show_less_context;break}
3612 bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
3613 bind . <$M1B-Key-equal> {show_more_context;break}
3614 bind . <$M1B-Key-plus> {show_more_context;break}
3615 bind . <$M1B-Key-KP_Add> {show_more_context;break}
3616 bind . <$M1B-Key-Return> do_commit
3617 foreach i [list $ui_index $ui_workdir] {
3618 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3619 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3620 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3622 unset i
3624 set file_lists($ui_index) [list]
3625 set file_lists($ui_workdir) [list]
3627 wm title . "[appname] ([reponame]) [file normalize $_gitworktree]"
3628 focus -force $ui_comm
3630 # -- Warn the user about environmental problems. Cygwin's Tcl
3631 # does *not* pass its env array onto any processes it spawns.
3632 # This means that git processes get none of our environment.
3634 if {[is_Cygwin]} {
3635 set ignored_env 0
3636 set suggest_user {}
3637 set msg [mc "Possible environment issues exist.
3639 The following environment variables are probably
3640 going to be ignored by any Git subprocess run
3641 by %s:
3643 " [appname]]
3644 foreach name [array names env] {
3645 switch -regexp -- $name {
3646 {^GIT_INDEX_FILE$} -
3647 {^GIT_OBJECT_DIRECTORY$} -
3648 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3649 {^GIT_DIFF_OPTS$} -
3650 {^GIT_EXTERNAL_DIFF$} -
3651 {^GIT_PAGER$} -
3652 {^GIT_TRACE$} -
3653 {^GIT_CONFIG$} -
3654 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3655 append msg " - $name\n"
3656 incr ignored_env
3658 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3659 append msg " - $name\n"
3660 incr ignored_env
3661 set suggest_user $name
3665 if {$ignored_env > 0} {
3666 append msg [mc "
3667 This is due to a known issue with the
3668 Tcl binary distributed by Cygwin."]
3670 if {$suggest_user ne {}} {
3671 append msg [mc "
3673 A good replacement for %s
3674 is placing values for the user.name and
3675 user.email settings into your personal
3676 ~/.gitconfig file.
3677 " $suggest_user]
3679 warn_popup $msg
3681 unset ignored_env msg suggest_user name
3684 # -- Only initialize complex UI if we are going to stay running.
3686 if {[is_enabled transport]} {
3687 load_all_remotes
3689 set n [.mbar.remote index end]
3690 populate_remotes_menu
3691 set n [expr {[.mbar.remote index end] - $n}]
3692 if {$n > 0} {
3693 if {[.mbar.remote type 0] eq "tearoff"} { incr n }
3694 .mbar.remote insert $n separator
3696 unset n
3699 if {[winfo exists $ui_comm]} {
3700 set GITGUI_BCK_exists [load_message GITGUI_BCK]
3702 # -- If both our backup and message files exist use the
3703 # newer of the two files to initialize the buffer.
3705 if {$GITGUI_BCK_exists} {
3706 set m [gitdir GITGUI_MSG]
3707 if {[file isfile $m]} {
3708 if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
3709 catch {file delete [gitdir GITGUI_MSG]}
3710 } else {
3711 $ui_comm delete 0.0 end
3712 $ui_comm edit reset
3713 $ui_comm edit modified false
3714 catch {file delete [gitdir GITGUI_BCK]}
3715 set GITGUI_BCK_exists 0
3718 unset m
3721 proc backup_commit_buffer {} {
3722 global ui_comm GITGUI_BCK_exists
3724 set m [$ui_comm edit modified]
3725 if {$m || $GITGUI_BCK_exists} {
3726 set msg [string trim [$ui_comm get 0.0 end]]
3727 regsub -all -line {[ \r\t]+$} $msg {} msg
3729 if {$msg eq {}} {
3730 if {$GITGUI_BCK_exists} {
3731 catch {file delete [gitdir GITGUI_BCK]}
3732 set GITGUI_BCK_exists 0
3734 } elseif {$m} {
3735 catch {
3736 set fd [open [gitdir GITGUI_BCK] w]
3737 puts -nonewline $fd $msg
3738 close $fd
3739 set GITGUI_BCK_exists 1
3743 $ui_comm edit modified false
3746 set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
3749 backup_commit_buffer
3751 # -- If the user has aspell available we can drive it
3752 # in pipe mode to spellcheck the commit message.
3754 set spell_cmd [list |]
3755 set spell_dict [get_config gui.spellingdictionary]
3756 lappend spell_cmd aspell
3757 if {$spell_dict ne {}} {
3758 lappend spell_cmd --master=$spell_dict
3760 lappend spell_cmd --mode=none
3761 lappend spell_cmd --encoding=utf-8
3762 lappend spell_cmd pipe
3763 if {$spell_dict eq {none}
3764 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
3765 bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
3766 } else {
3767 set ui_comm_spell [spellcheck::init \
3768 $spell_fd \
3769 $ui_comm \
3770 $ui_comm_ctxm \
3773 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3776 lock_index begin-read
3777 if {![winfo ismapped .]} {
3778 wm deiconify .
3780 after 1 {
3781 if {[is_enabled initialamend]} {
3782 force_amend
3783 } else {
3784 do_rescan
3787 if {[is_enabled nocommitmsg]} {
3788 $ui_comm configure -state disabled -background gray
3791 if {[is_enabled multicommit]} {
3792 after 1000 hint_gc
3794 if {[is_enabled retcode]} {
3795 bind . <Destroy> {+terminate_me %W}
3797 if {$picked && [is_config_true gui.autoexplore]} {
3798 do_explore
3801 # Local variables:
3802 # mode: tcl
3803 # indent-tabs-mode: t
3804 # tab-width: 4
3805 # End: