git-gui: fix PATH environment for mingw development environment
[git/dscho.git] / git-gui / git-gui.sh
blob0e5cc89e6d1e7d8e7ca15a8004f4f4a7fec5ee99
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 [mc "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 get_config {name} {
273 global repo_config
274 if {[catch {set v $repo_config($name)}]} {
275 return {}
276 } else {
277 return $v
281 proc is_bare {} {
282 global _isbare
283 global _gitdir
284 global _gitworktree
286 if {$_isbare eq {}} {
287 if {[catch {
288 set _bare [git rev-parse --is-bare-repository]
289 switch -- $_bare {
290 true { set _isbare 1 }
291 false { set _isbare 0}
292 default { throw }
294 }]} {
295 if {[is_config_true core.bare]
296 || ($_gitworktree eq {}
297 && [lindex [file split $_gitdir] end] ne {.git})} {
298 set _isbare 1
299 } else {
300 set _isbare 0
304 return $_isbare
307 ######################################################################
309 ## handy utils
311 proc _trace_exec {cmd} {
312 if {!$::_trace} return
313 set d {}
314 foreach v $cmd {
315 if {$d ne {}} {
316 append d { }
318 if {[regexp {[ \t\r\n'"$?*]} $v]} {
319 set v [sq $v]
321 append d $v
323 puts stderr $d
326 proc _git_cmd {name} {
327 global _git_cmd_path
329 if {[catch {set v $_git_cmd_path($name)}]} {
330 switch -- $name {
331 version -
332 --version -
333 --exec-path { return [list $::_git $name] }
336 set p [gitexec git-$name$::_search_exe]
337 if {[file exists $p]} {
338 set v [list $p]
339 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
340 # Try to determine what sort of magic will make
341 # git-$name go and do its thing, because native
342 # Tcl on Windows doesn't know it.
344 set p [gitexec git-$name]
345 set f [open $p r]
346 set s [gets $f]
347 close $f
349 switch -glob -- [lindex $s 0] {
350 #!*sh { set i sh }
351 #!*perl { set i perl }
352 #!*python { set i python }
353 default { error "git-$name is not supported: $s" }
356 upvar #0 _$i interp
357 if {![info exists interp]} {
358 set interp [_which $i]
360 if {$interp eq {}} {
361 error "git-$name requires $i (not in PATH)"
363 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
364 } else {
365 # Assume it is builtin to git somehow and we
366 # aren't actually able to see a file for it.
368 set v [list $::_git $name]
370 set _git_cmd_path($name) $v
372 return $v
375 proc _which {what args} {
376 global env _search_exe _search_path
378 if {$_search_path eq {}} {
379 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
380 set _search_path [split [exec cygpath \
381 --windows \
382 --path \
383 --absolute \
384 $env(PATH)] {;}]
385 set _search_exe .exe
386 } elseif {[is_Windows]} {
387 set gitguidir [file dirname [info script]]
388 regsub -all ";" $gitguidir "\\;" gitguidir
389 set env(PATH) "$gitguidir;$env(PATH)"
390 set _search_path [split $env(PATH) {;}]
391 set _search_exe .exe
392 } else {
393 set _search_path [split $env(PATH) :]
394 set _search_exe {}
398 if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
399 set suffix {}
400 } else {
401 set suffix $_search_exe
404 foreach p $_search_path {
405 set p [file join $p $what$suffix]
406 if {[file exists $p]} {
407 return [file normalize $p]
410 return {}
413 proc _lappend_nice {cmd_var} {
414 global _nice
415 upvar $cmd_var cmd
417 if {![info exists _nice]} {
418 set _nice [_which nice]
419 if {[catch {exec $_nice git version}]} {
420 set _nice {}
423 if {$_nice ne {}} {
424 lappend cmd $_nice
428 proc git {args} {
429 set opt [list]
431 while {1} {
432 switch -- [lindex $args 0] {
433 --nice {
434 _lappend_nice opt
437 default {
438 break
443 set args [lrange $args 1 end]
446 set cmdp [_git_cmd [lindex $args 0]]
447 set args [lrange $args 1 end]
449 _trace_exec [concat $opt $cmdp $args]
450 set result [eval exec $opt $cmdp $args]
451 if {$::_trace} {
452 puts stderr "< $result"
454 return $result
457 proc _open_stdout_stderr {cmd} {
458 _trace_exec $cmd
459 if {[catch {
460 set fd [open [concat [list | ] $cmd] r]
461 } err]} {
462 if { [lindex $cmd end] eq {2>@1}
463 && $err eq {can not find channel named "1"}
465 # Older versions of Tcl 8.4 don't have this 2>@1 IO
466 # redirect operator. Fallback to |& cat for those.
467 # The command was not actually started, so its safe
468 # to try to start it a second time.
470 set fd [open [concat \
471 [list | ] \
472 [lrange $cmd 0 end-1] \
473 [list |& cat] \
474 ] r]
475 } else {
476 error $err
479 fconfigure $fd -eofchar {}
480 return $fd
483 proc git_read {args} {
484 set opt [list]
486 while {1} {
487 switch -- [lindex $args 0] {
488 --nice {
489 _lappend_nice opt
492 --stderr {
493 lappend args 2>@1
496 default {
497 break
502 set args [lrange $args 1 end]
505 set cmdp [_git_cmd [lindex $args 0]]
506 set args [lrange $args 1 end]
508 return [_open_stdout_stderr [concat $opt $cmdp $args]]
511 proc git_write {args} {
512 set opt [list]
514 while {1} {
515 switch -- [lindex $args 0] {
516 --nice {
517 _lappend_nice opt
520 default {
521 break
526 set args [lrange $args 1 end]
529 set cmdp [_git_cmd [lindex $args 0]]
530 set args [lrange $args 1 end]
532 _trace_exec [concat $opt $cmdp $args]
533 return [open [concat [list | ] $opt $cmdp $args] w]
536 proc githook_read {hook_name args} {
537 set pchook [gitdir hooks $hook_name]
538 lappend args 2>@1
540 # On Windows [file executable] might lie so we need to ask
541 # the shell if the hook is executable. Yes that's annoying.
543 if {[is_Windows]} {
544 upvar #0 _sh interp
545 if {![info exists interp]} {
546 set interp [_which sh]
548 if {$interp eq {}} {
549 error "hook execution requires sh (not in PATH)"
552 set scr {if test -x "$1";then exec "$@";fi}
553 set sh_c [list $interp -c $scr $interp $pchook]
554 return [_open_stdout_stderr [concat $sh_c $args]]
557 if {[file executable $pchook]} {
558 return [_open_stdout_stderr [concat [list $pchook] $args]]
561 return {}
564 proc kill_file_process {fd} {
565 set process [pid $fd]
567 catch {
568 if {[is_Windows]} {
569 # Use a Cygwin-specific flag to allow killing
570 # native Windows processes
571 exec kill -f $process
572 } else {
573 exec kill $process
578 proc gitattr {path attr default} {
579 if {[catch {set r [git check-attr $attr -- $path]}]} {
580 set r unspecified
581 } else {
582 set r [join [lrange [split $r :] 2 end] :]
583 regsub {^ } $r {} r
585 if {$r eq {unspecified}} {
586 return $default
588 return $r
591 proc sq {value} {
592 regsub -all ' $value "'\\''" value
593 return "'$value'"
596 proc load_current_branch {} {
597 global current_branch is_detached
599 set fd [open [gitdir HEAD] r]
600 if {[gets $fd ref] < 1} {
601 set ref {}
603 close $fd
605 set pfx {ref: refs/heads/}
606 set len [string length $pfx]
607 if {[string equal -length $len $pfx $ref]} {
608 # We're on a branch. It might not exist. But
609 # HEAD looks good enough to be a branch.
611 set current_branch [string range $ref $len end]
612 set is_detached 0
613 } else {
614 # Assume this is a detached head.
616 set current_branch HEAD
617 set is_detached 1
621 auto_load tk_optionMenu
622 rename tk_optionMenu real__tkOptionMenu
623 proc tk_optionMenu {w varName args} {
624 set m [eval real__tkOptionMenu $w $varName $args]
625 $m configure -font font_ui
626 $w configure -font font_ui
627 return $m
630 proc rmsel_tag {text} {
631 $text tag conf sel \
632 -background [$text cget -background] \
633 -foreground [$text cget -foreground] \
634 -borderwidth 0
635 $text tag conf in_sel -background lightgray
636 bind $text <Motion> break
637 return $text
640 set root_exists 0
641 bind . <Visibility> {
642 bind . <Visibility> {}
643 set root_exists 1
646 if {[is_Windows]} {
647 wm iconbitmap . -default $oguilib/git-gui.ico
648 set ::tk::AlwaysShowSelection 1
650 # Spoof an X11 display for SSH
651 if {![info exists env(DISPLAY)]} {
652 set env(DISPLAY) :9999
654 } else {
655 catch {
656 image create photo gitlogo -width 16 -height 16
658 gitlogo put #33CC33 -to 7 0 9 2
659 gitlogo put #33CC33 -to 4 2 12 4
660 gitlogo put #33CC33 -to 7 4 9 6
661 gitlogo put #CC3333 -to 4 6 12 8
662 gitlogo put gray26 -to 4 9 6 10
663 gitlogo put gray26 -to 3 10 6 12
664 gitlogo put gray26 -to 8 9 13 11
665 gitlogo put gray26 -to 8 11 10 12
666 gitlogo put gray26 -to 11 11 13 14
667 gitlogo put gray26 -to 3 12 5 14
668 gitlogo put gray26 -to 5 13
669 gitlogo put gray26 -to 10 13
670 gitlogo put gray26 -to 4 14 12 15
671 gitlogo put gray26 -to 5 15 11 16
672 gitlogo redither
674 wm iconphoto . -default gitlogo
678 ######################################################################
680 ## config defaults
682 set cursor_ptr arrow
683 font create font_ui
684 if {[lsearch -exact [font names] TkDefaultFont] != -1} {
685 eval [linsert [font actual TkDefaultFont] 0 font configure font_ui]
686 eval [linsert [font actual TkFixedFont] 0 font create font_diff]
687 } else {
688 font create font_diff -family Courier -size 10
689 catch {
690 label .dummy
691 eval font configure font_ui [font actual [.dummy cget -font]]
692 destroy .dummy
696 font create font_uiitalic
697 font create font_uibold
698 font create font_diffbold
699 font create font_diffitalic
701 foreach class {Button Checkbutton Entry Label
702 Labelframe Listbox Message
703 Radiobutton Spinbox Text} {
704 option add *$class.font font_ui
706 if {![is_MacOSX]} {
707 option add *Menu.font font_ui
708 option add *Entry.borderWidth 1 startupFile
709 option add *Entry.relief sunken startupFile
710 option add *RadioButton.anchor w startupFile
712 unset class
714 if {[is_Windows] || [is_MacOSX]} {
715 option add *Menu.tearOff 0
718 if {[is_MacOSX]} {
719 set M1B M1
720 set M1T Cmd
721 } else {
722 set M1B Control
723 set M1T Ctrl
726 proc bind_button3 {w cmd} {
727 bind $w <Any-Button-3> $cmd
728 if {[is_MacOSX]} {
729 # Mac OS X sends Button-2 on right click through three-button mouse,
730 # or through trackpad right-clicking (two-finger touch + click).
731 bind $w <Any-Button-2> $cmd
732 bind $w <Control-Button-1> $cmd
736 proc apply_config {} {
737 global repo_config font_descs
739 foreach option $font_descs {
740 set name [lindex $option 0]
741 set font [lindex $option 1]
742 if {[catch {
743 set need_weight 1
744 foreach {cn cv} $repo_config(gui.$name) {
745 if {$cn eq {-weight}} {
746 set need_weight 0
748 font configure $font $cn $cv
750 if {$need_weight} {
751 font configure $font -weight normal
753 } err]} {
754 error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
756 foreach {cn cv} [font configure $font] {
757 font configure ${font}bold $cn $cv
758 font configure ${font}italic $cn $cv
760 font configure ${font}bold -weight bold
761 font configure ${font}italic -slant italic
764 global use_ttk NS
765 set use_ttk 0
766 set NS {}
767 if {$repo_config(gui.usettk)} {
768 set use_ttk [package vsatisfies [package provide Tk] 8.5]
769 if {$use_ttk} {
770 set NS ttk
771 bind [winfo class .] <<ThemeChanged>> [list InitTheme]
772 pave_toplevel .
777 set default_config(branch.autosetupmerge) true
778 set default_config(merge.tool) {}
779 set default_config(mergetool.keepbackup) true
780 set default_config(merge.diffstat) true
781 set default_config(merge.summary) false
782 set default_config(merge.verbosity) 2
783 set default_config(user.name) {}
784 set default_config(user.email) {}
786 set default_config(gui.encoding) [encoding system]
787 set default_config(gui.matchtrackingbranch) false
788 set default_config(gui.pruneduringfetch) false
789 set default_config(gui.trustmtime) false
790 set default_config(gui.fastcopyblame) false
791 set default_config(gui.copyblamethreshold) 40
792 set default_config(gui.blamehistoryctx) 7
793 set default_config(gui.diffcontext) 5
794 set default_config(gui.commitmsgwidth) 75
795 set default_config(gui.newbranchtemplate) {}
796 set default_config(gui.spellingdictionary) {}
797 set default_config(gui.fontui) [font configure font_ui]
798 set default_config(gui.fontdiff) [font configure font_diff]
799 # TODO: this option should be added to the git-config documentation
800 set default_config(gui.maxfilesdisplayed) 5000
801 set default_config(gui.usettk) 1
802 set font_descs {
803 {fontui font_ui {mc "Main Font"}}
804 {fontdiff font_diff {mc "Diff/Console Font"}}
807 ######################################################################
809 ## find git
811 set _git [_which git]
812 if {$_git eq {}} {
813 catch {wm withdraw .}
814 tk_messageBox \
815 -icon error \
816 -type ok \
817 -title [mc "git-gui: fatal error"] \
818 -message [mc "Cannot find git in PATH."]
819 exit 1
822 ######################################################################
824 ## version check
826 if {[catch {set _git_version [git --version]} err]} {
827 catch {wm withdraw .}
828 tk_messageBox \
829 -icon error \
830 -type ok \
831 -title [mc "git-gui: fatal error"] \
832 -message "Cannot determine Git version:
834 $err
836 [appname] requires Git 1.5.0 or later."
837 exit 1
839 if {![regsub {^git version } $_git_version {} _git_version]} {
840 catch {wm withdraw .}
841 tk_messageBox \
842 -icon error \
843 -type ok \
844 -title [mc "git-gui: fatal error"] \
845 -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
846 exit 1
849 set _real_git_version $_git_version
850 regsub -- {[\-\.]dirty$} $_git_version {} _git_version
851 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
852 regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
853 regsub {\.GIT$} $_git_version {} _git_version
854 regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
856 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
857 catch {wm withdraw .}
858 if {[tk_messageBox \
859 -icon warning \
860 -type yesno \
861 -default no \
862 -title "[appname]: warning" \
863 -message [mc "Git version cannot be determined.
865 %s claims it is version '%s'.
867 %s requires at least Git 1.5.0 or later.
869 Assume '%s' is version 1.5.0?
870 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
871 set _git_version 1.5.0
872 } else {
873 exit 1
876 unset _real_git_version
878 proc git-version {args} {
879 global _git_version
881 switch [llength $args] {
883 return $_git_version
887 set op [lindex $args 0]
888 set vr [lindex $args 1]
889 set cm [package vcompare $_git_version $vr]
890 return [expr $cm $op 0]
894 set type [lindex $args 0]
895 set name [lindex $args 1]
896 set parm [lindex $args 2]
897 set body [lindex $args 3]
899 if {($type ne {proc} && $type ne {method})} {
900 error "Invalid arguments to git-version"
902 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
903 error "Last arm of $type $name must be default"
906 foreach {op vr cb} [lrange $body 0 end-2] {
907 if {[git-version $op $vr]} {
908 return [uplevel [list $type $name $parm $cb]]
912 return [uplevel [list $type $name $parm [lindex $body end]]]
915 default {
916 error "git-version >= x"
922 if {[git-version < 1.5]} {
923 catch {wm withdraw .}
924 tk_messageBox \
925 -icon error \
926 -type ok \
927 -title [mc "git-gui: fatal error"] \
928 -message "[appname] requires Git 1.5.0 or later.
930 You are using [git-version]:
932 [git --version]"
933 exit 1
936 ######################################################################
938 ## configure our library
940 set idx [file join $oguilib tclIndex]
941 if {[catch {set fd [open $idx r]} err]} {
942 catch {wm withdraw .}
943 tk_messageBox \
944 -icon error \
945 -type ok \
946 -title [mc "git-gui: fatal error"] \
947 -message $err
948 exit 1
950 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
951 set idx [list]
952 while {[gets $fd n] >= 0} {
953 if {$n ne {} && ![string match #* $n]} {
954 lappend idx $n
957 } else {
958 set idx {}
960 close $fd
962 if {$idx ne {}} {
963 set loaded [list]
964 foreach p $idx {
965 if {[lsearch -exact $loaded $p] >= 0} continue
966 source [file join $oguilib $p]
967 lappend loaded $p
969 unset loaded p
970 } else {
971 set auto_path [concat [list $oguilib] $auto_path]
973 unset -nocomplain idx fd
975 ######################################################################
977 ## config file parsing
979 git-version proc _parse_config {arr_name args} {
980 >= 1.5.3 {
981 upvar $arr_name arr
982 array unset arr
983 set buf {}
984 catch {
985 set fd_rc [eval \
986 [list git_read config] \
987 $args \
988 [list --null --list]]
989 fconfigure $fd_rc -translation binary
990 set buf [read $fd_rc]
991 close $fd_rc
993 foreach line [split $buf "\0"] {
994 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
995 if {[is_many_config $name]} {
996 lappend arr($name) $value
997 } else {
998 set arr($name) $value
1003 default {
1004 upvar $arr_name arr
1005 array unset arr
1006 catch {
1007 set fd_rc [eval [list git_read config --list] $args]
1008 while {[gets $fd_rc line] >= 0} {
1009 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
1010 if {[is_many_config $name]} {
1011 lappend arr($name) $value
1012 } else {
1013 set arr($name) $value
1017 close $fd_rc
1022 proc load_config {include_global} {
1023 global repo_config global_config system_config default_config
1025 if {$include_global} {
1026 _parse_config system_config --system
1027 _parse_config global_config --global
1029 _parse_config repo_config
1031 foreach name [array names default_config] {
1032 if {[catch {set v $system_config($name)}]} {
1033 set system_config($name) $default_config($name)
1036 foreach name [array names system_config] {
1037 if {[catch {set v $global_config($name)}]} {
1038 set global_config($name) $system_config($name)
1040 if {[catch {set v $repo_config($name)}]} {
1041 set repo_config($name) $system_config($name)
1046 ######################################################################
1048 ## feature option selection
1050 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1051 unset _junk
1052 } else {
1053 set subcommand gui
1055 if {$subcommand eq {gui.sh}} {
1056 set subcommand gui
1058 if {$subcommand eq {gui} && [llength $argv] > 0} {
1059 set subcommand [lindex $argv 0]
1060 set argv [lrange $argv 1 end]
1063 enable_option multicommit
1064 enable_option branch
1065 enable_option transport
1066 disable_option bare
1068 switch -- $subcommand {
1069 browser -
1070 blame {
1071 enable_option bare
1073 disable_option multicommit
1074 disable_option branch
1075 disable_option transport
1077 citool {
1078 enable_option singlecommit
1079 enable_option retcode
1081 disable_option multicommit
1082 disable_option branch
1083 disable_option transport
1085 while {[llength $argv] > 0} {
1086 set a [lindex $argv 0]
1087 switch -- $a {
1088 --amend {
1089 enable_option initialamend
1091 --nocommit {
1092 enable_option nocommit
1093 enable_option nocommitmsg
1095 --commitmsg {
1096 disable_option nocommitmsg
1098 default {
1099 break
1103 set argv [lrange $argv 1 end]
1108 ######################################################################
1110 ## execution environment
1112 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1114 # Suggest our implementation of askpass, if none is set
1115 if {![info exists env(SSH_ASKPASS)]} {
1116 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1119 ######################################################################
1121 ## repository setup
1123 set picked 0
1124 if {[catch {
1125 set _gitdir $env(GIT_DIR)
1126 set _prefix {}
1128 && [catch {
1129 # beware that from the .git dir this sets _gitdir to .
1130 # and _prefix to the empty string
1131 set _gitdir [git rev-parse --git-dir]
1132 set _prefix [git rev-parse --show-prefix]
1133 } err]} {
1134 load_config 1
1135 apply_config
1136 choose_repository::pick
1137 set picked 1
1140 # we expand the _gitdir when it's just a single dot (i.e. when we're being
1141 # run from the .git dir itself) lest the routines to find the worktree
1142 # get confused
1143 if {$_gitdir eq "."} {
1144 set _gitdir [pwd]
1147 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1148 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1150 if {![file isdirectory $_gitdir]} {
1151 catch {wm withdraw .}
1152 error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
1153 exit 1
1155 # _gitdir exists, so try loading the config
1156 load_config 0
1157 apply_config
1158 # try to set work tree from environment, falling back to core.worktree
1159 if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
1160 set _gitworktree [get_config core.worktree]
1161 if {$_gitworktree eq ""} {
1162 set _gitworktree [file dirname [file normalize $_gitdir]]
1165 if {$_prefix ne {}} {
1166 if {$_gitworktree eq {}} {
1167 regsub -all {[^/]+/} $_prefix ../ cdup
1168 } else {
1169 set cdup $_gitworktree
1171 if {[catch {cd $cdup} err]} {
1172 catch {wm withdraw .}
1173 error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
1174 exit 1
1176 set _gitworktree [pwd]
1177 unset cdup
1178 } elseif {![is_enabled bare]} {
1179 if {[is_bare]} {
1180 catch {wm withdraw .}
1181 error_popup [strcat [mc "Cannot use bare repository:"] "\n\n$_gitdir"]
1182 exit 1
1184 if {$_gitworktree eq {}} {
1185 set _gitworktree [file dirname $_gitdir]
1187 if {[catch {cd $_gitworktree} err]} {
1188 catch {wm withdraw .}
1189 error_popup [strcat [mc "No working directory"] " $_gitworktree:\n\n$err"]
1190 exit 1
1192 set _gitworktree [pwd]
1194 set _reponame [file split [file normalize $_gitdir]]
1195 if {[lindex $_reponame end] eq {.git}} {
1196 set _reponame [lindex $_reponame end-1]
1197 } else {
1198 set _reponame [lindex $_reponame end]
1201 ######################################################################
1203 ## global init
1205 set current_diff_path {}
1206 set current_diff_side {}
1207 set diff_actions [list]
1209 set HEAD {}
1210 set PARENT {}
1211 set MERGE_HEAD [list]
1212 set commit_type {}
1213 set empty_tree {}
1214 set current_branch {}
1215 set is_detached 0
1216 set current_diff_path {}
1217 set is_3way_diff 0
1218 set is_submodule_diff 0
1219 set is_conflict_diff 0
1220 set selected_commit_type new
1221 set diff_empty_count 0
1223 set nullid "0000000000000000000000000000000000000000"
1224 set nullid2 "0000000000000000000000000000000000000001"
1226 ######################################################################
1228 ## task management
1230 set rescan_active 0
1231 set diff_active 0
1232 set last_clicked {}
1234 set disable_on_lock [list]
1235 set index_lock_type none
1237 proc lock_index {type} {
1238 global index_lock_type disable_on_lock
1240 if {$index_lock_type eq {none}} {
1241 set index_lock_type $type
1242 foreach w $disable_on_lock {
1243 uplevel #0 $w disabled
1245 return 1
1246 } elseif {$index_lock_type eq "begin-$type"} {
1247 set index_lock_type $type
1248 return 1
1250 return 0
1253 proc unlock_index {} {
1254 global index_lock_type disable_on_lock
1256 set index_lock_type none
1257 foreach w $disable_on_lock {
1258 uplevel #0 $w normal
1262 ######################################################################
1264 ## status
1266 proc repository_state {ctvar hdvar mhvar} {
1267 global current_branch
1268 upvar $ctvar ct $hdvar hd $mhvar mh
1270 set mh [list]
1272 load_current_branch
1273 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1274 set hd {}
1275 set ct initial
1276 return
1279 set merge_head [gitdir MERGE_HEAD]
1280 if {[file exists $merge_head]} {
1281 set ct merge
1282 set fd_mh [open $merge_head r]
1283 while {[gets $fd_mh line] >= 0} {
1284 lappend mh $line
1286 close $fd_mh
1287 return
1290 set ct normal
1293 proc PARENT {} {
1294 global PARENT empty_tree
1296 set p [lindex $PARENT 0]
1297 if {$p ne {}} {
1298 return $p
1300 if {$empty_tree eq {}} {
1301 set empty_tree [git mktree << {}]
1303 return $empty_tree
1306 proc force_amend {} {
1307 global selected_commit_type
1308 global HEAD PARENT MERGE_HEAD commit_type
1310 repository_state newType newHEAD newMERGE_HEAD
1311 set HEAD $newHEAD
1312 set PARENT $newHEAD
1313 set MERGE_HEAD $newMERGE_HEAD
1314 set commit_type $newType
1316 set selected_commit_type amend
1317 do_select_commit_type
1320 proc rescan {after {honor_trustmtime 1}} {
1321 global HEAD PARENT MERGE_HEAD commit_type
1322 global ui_index ui_workdir ui_comm
1323 global rescan_active file_states
1324 global repo_config
1326 if {$rescan_active > 0 || ![lock_index read]} return
1328 repository_state newType newHEAD newMERGE_HEAD
1329 if {[string match amend* $commit_type]
1330 && $newType eq {normal}
1331 && $newHEAD eq $HEAD} {
1332 } else {
1333 set HEAD $newHEAD
1334 set PARENT $newHEAD
1335 set MERGE_HEAD $newMERGE_HEAD
1336 set commit_type $newType
1339 array unset file_states
1341 if {!$::GITGUI_BCK_exists &&
1342 (![$ui_comm edit modified]
1343 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1344 if {[string match amend* $commit_type]} {
1345 } elseif {[load_message GITGUI_MSG]} {
1346 } elseif {[run_prepare_commit_msg_hook]} {
1347 } elseif {[load_message MERGE_MSG]} {
1348 } elseif {[load_message SQUASH_MSG]} {
1350 $ui_comm edit reset
1351 $ui_comm edit modified false
1354 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1355 rescan_stage2 {} $after
1356 } else {
1357 set rescan_active 1
1358 ui_status [mc "Refreshing file status..."]
1359 set fd_rf [git_read update-index \
1360 -q \
1361 --unmerged \
1362 --ignore-missing \
1363 --refresh \
1365 fconfigure $fd_rf -blocking 0 -translation binary
1366 fileevent $fd_rf readable \
1367 [list rescan_stage2 $fd_rf $after]
1371 if {[is_Cygwin]} {
1372 set is_git_info_exclude {}
1373 proc have_info_exclude {} {
1374 global is_git_info_exclude
1376 if {$is_git_info_exclude eq {}} {
1377 if {[catch {exec test -f [gitdir info exclude]}]} {
1378 set is_git_info_exclude 0
1379 } else {
1380 set is_git_info_exclude 1
1383 return $is_git_info_exclude
1385 } else {
1386 proc have_info_exclude {} {
1387 return [file readable [gitdir info exclude]]
1391 proc rescan_stage2 {fd after} {
1392 global rescan_active buf_rdi buf_rdf buf_rlo
1394 if {$fd ne {}} {
1395 read $fd
1396 if {![eof $fd]} return
1397 close $fd
1400 set ls_others [list --exclude-per-directory=.gitignore]
1401 if {[have_info_exclude]} {
1402 lappend ls_others "--exclude-from=[gitdir info exclude]"
1404 set user_exclude [get_config core.excludesfile]
1405 if {$user_exclude ne {} && [file readable $user_exclude]} {
1406 lappend ls_others "--exclude-from=$user_exclude"
1409 set buf_rdi {}
1410 set buf_rdf {}
1411 set buf_rlo {}
1413 set rescan_active 3
1414 ui_status [mc "Scanning for modified files ..."]
1415 set fd_di [git_read diff-index --cached -z [PARENT]]
1416 set fd_df [git_read diff-files -z]
1417 set fd_lo [eval git_read ls-files --others -z $ls_others]
1419 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1420 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1421 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1422 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1423 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1424 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1427 proc load_message {file} {
1428 global ui_comm
1430 set f [gitdir $file]
1431 if {[file isfile $f]} {
1432 if {[catch {set fd [open $f r]}]} {
1433 return 0
1435 fconfigure $fd -eofchar {}
1436 set content [string trim [read $fd]]
1437 close $fd
1438 regsub -all -line {[ \r\t]+$} $content {} content
1439 $ui_comm delete 0.0 end
1440 $ui_comm insert end $content
1441 return 1
1443 return 0
1446 proc run_prepare_commit_msg_hook {} {
1447 global pch_error
1449 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1450 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1451 # empty file but existant file.
1453 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1455 if {[file isfile [gitdir MERGE_MSG]]} {
1456 set pcm_source "merge"
1457 set fd_mm [open [gitdir MERGE_MSG] r]
1458 puts -nonewline $fd_pcm [read $fd_mm]
1459 close $fd_mm
1460 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1461 set pcm_source "squash"
1462 set fd_sm [open [gitdir SQUASH_MSG] r]
1463 puts -nonewline $fd_pcm [read $fd_sm]
1464 close $fd_sm
1465 } else {
1466 set pcm_source ""
1469 close $fd_pcm
1471 set fd_ph [githook_read prepare-commit-msg \
1472 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1473 if {$fd_ph eq {}} {
1474 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1475 return 0;
1478 ui_status [mc "Calling prepare-commit-msg hook..."]
1479 set pch_error {}
1481 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1482 fileevent $fd_ph readable \
1483 [list prepare_commit_msg_hook_wait $fd_ph]
1485 return 1;
1488 proc prepare_commit_msg_hook_wait {fd_ph} {
1489 global pch_error
1491 append pch_error [read $fd_ph]
1492 fconfigure $fd_ph -blocking 1
1493 if {[eof $fd_ph]} {
1494 if {[catch {close $fd_ph}]} {
1495 ui_status [mc "Commit declined by prepare-commit-msg hook."]
1496 hook_failed_popup prepare-commit-msg $pch_error
1497 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1498 exit 1
1499 } else {
1500 load_message PREPARE_COMMIT_MSG
1502 set pch_error {}
1503 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1504 return
1506 fconfigure $fd_ph -blocking 0
1507 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1510 proc read_diff_index {fd after} {
1511 global buf_rdi
1513 append buf_rdi [read $fd]
1514 set c 0
1515 set n [string length $buf_rdi]
1516 while {$c < $n} {
1517 set z1 [string first "\0" $buf_rdi $c]
1518 if {$z1 == -1} break
1519 incr z1
1520 set z2 [string first "\0" $buf_rdi $z1]
1521 if {$z2 == -1} break
1523 incr c
1524 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1525 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1526 merge_state \
1527 [encoding convertfrom $p] \
1528 [lindex $i 4]? \
1529 [list [lindex $i 0] [lindex $i 2]] \
1530 [list]
1531 set c $z2
1532 incr c
1534 if {$c < $n} {
1535 set buf_rdi [string range $buf_rdi $c end]
1536 } else {
1537 set buf_rdi {}
1540 rescan_done $fd buf_rdi $after
1543 proc read_diff_files {fd after} {
1544 global buf_rdf
1546 append buf_rdf [read $fd]
1547 set c 0
1548 set n [string length $buf_rdf]
1549 while {$c < $n} {
1550 set z1 [string first "\0" $buf_rdf $c]
1551 if {$z1 == -1} break
1552 incr z1
1553 set z2 [string first "\0" $buf_rdf $z1]
1554 if {$z2 == -1} break
1556 incr c
1557 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1558 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1559 merge_state \
1560 [encoding convertfrom $p] \
1561 ?[lindex $i 4] \
1562 [list] \
1563 [list [lindex $i 0] [lindex $i 2]]
1564 set c $z2
1565 incr c
1567 if {$c < $n} {
1568 set buf_rdf [string range $buf_rdf $c end]
1569 } else {
1570 set buf_rdf {}
1573 rescan_done $fd buf_rdf $after
1576 proc read_ls_others {fd after} {
1577 global buf_rlo
1579 append buf_rlo [read $fd]
1580 set pck [split $buf_rlo "\0"]
1581 set buf_rlo [lindex $pck end]
1582 foreach p [lrange $pck 0 end-1] {
1583 set p [encoding convertfrom $p]
1584 if {[string index $p end] eq {/}} {
1585 set p [string range $p 0 end-1]
1587 merge_state $p ?O
1589 rescan_done $fd buf_rlo $after
1592 proc rescan_done {fd buf after} {
1593 global rescan_active current_diff_path
1594 global file_states repo_config
1595 upvar $buf to_clear
1597 if {![eof $fd]} return
1598 set to_clear {}
1599 close $fd
1600 if {[incr rescan_active -1] > 0} return
1602 prune_selection
1603 unlock_index
1604 display_all_files
1605 if {$current_diff_path ne {}} { reshow_diff $after }
1606 if {$current_diff_path eq {}} { select_first_diff $after }
1609 proc prune_selection {} {
1610 global file_states selected_paths
1612 foreach path [array names selected_paths] {
1613 if {[catch {set still_here $file_states($path)}]} {
1614 unset selected_paths($path)
1619 ######################################################################
1621 ## ui helpers
1623 proc mapicon {w state path} {
1624 global all_icons
1626 if {[catch {set r $all_icons($state$w)}]} {
1627 puts "error: no icon for $w state={$state} $path"
1628 return file_plain
1630 return $r
1633 proc mapdesc {state path} {
1634 global all_descs
1636 if {[catch {set r $all_descs($state)}]} {
1637 puts "error: no desc for state={$state} $path"
1638 return $state
1640 return $r
1643 proc ui_status {msg} {
1644 global main_status
1645 if {[info exists main_status]} {
1646 $main_status show $msg
1650 proc ui_ready {{test {}}} {
1651 global main_status
1652 if {[info exists main_status]} {
1653 $main_status show [mc "Ready."] $test
1657 proc escape_path {path} {
1658 regsub -all {\\} $path "\\\\" path
1659 regsub -all "\n" $path "\\n" path
1660 return $path
1663 proc short_path {path} {
1664 return [escape_path [lindex [file split $path] end]]
1667 set next_icon_id 0
1668 set null_sha1 [string repeat 0 40]
1670 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1671 global file_states next_icon_id null_sha1
1673 set s0 [string index $new_state 0]
1674 set s1 [string index $new_state 1]
1676 if {[catch {set info $file_states($path)}]} {
1677 set state __
1678 set icon n[incr next_icon_id]
1679 } else {
1680 set state [lindex $info 0]
1681 set icon [lindex $info 1]
1682 if {$head_info eq {}} {set head_info [lindex $info 2]}
1683 if {$index_info eq {}} {set index_info [lindex $info 3]}
1686 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1687 elseif {$s0 eq {_}} {set s0 _}
1689 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1690 elseif {$s1 eq {_}} {set s1 _}
1692 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1693 set head_info [list 0 $null_sha1]
1694 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1695 && $head_info eq {}} {
1696 set head_info $index_info
1697 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1698 set index_info $head_info
1699 set head_info {}
1702 set file_states($path) [list $s0$s1 $icon \
1703 $head_info $index_info \
1705 return $state
1708 proc display_file_helper {w path icon_name old_m new_m} {
1709 global file_lists
1711 if {$new_m eq {_}} {
1712 set lno [lsearch -sorted -exact $file_lists($w) $path]
1713 if {$lno >= 0} {
1714 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1715 incr lno
1716 $w conf -state normal
1717 $w delete $lno.0 [expr {$lno + 1}].0
1718 $w conf -state disabled
1720 } elseif {$old_m eq {_} && $new_m ne {_}} {
1721 lappend file_lists($w) $path
1722 set file_lists($w) [lsort -unique $file_lists($w)]
1723 set lno [lsearch -sorted -exact $file_lists($w) $path]
1724 incr lno
1725 $w conf -state normal
1726 $w image create $lno.0 \
1727 -align center -padx 5 -pady 1 \
1728 -name $icon_name \
1729 -image [mapicon $w $new_m $path]
1730 $w insert $lno.1 "[escape_path $path]\n"
1731 $w conf -state disabled
1732 } elseif {$old_m ne $new_m} {
1733 $w conf -state normal
1734 $w image conf $icon_name -image [mapicon $w $new_m $path]
1735 $w conf -state disabled
1739 proc display_file {path state} {
1740 global file_states selected_paths
1741 global ui_index ui_workdir
1743 set old_m [merge_state $path $state]
1744 set s $file_states($path)
1745 set new_m [lindex $s 0]
1746 set icon_name [lindex $s 1]
1748 set o [string index $old_m 0]
1749 set n [string index $new_m 0]
1750 if {$o eq {U}} {
1751 set o _
1753 if {$n eq {U}} {
1754 set n _
1756 display_file_helper $ui_index $path $icon_name $o $n
1758 if {[string index $old_m 0] eq {U}} {
1759 set o U
1760 } else {
1761 set o [string index $old_m 1]
1763 if {[string index $new_m 0] eq {U}} {
1764 set n U
1765 } else {
1766 set n [string index $new_m 1]
1768 display_file_helper $ui_workdir $path $icon_name $o $n
1770 if {$new_m eq {__}} {
1771 unset file_states($path)
1772 catch {unset selected_paths($path)}
1776 proc display_all_files_helper {w path icon_name m} {
1777 global file_lists
1779 lappend file_lists($w) $path
1780 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1781 $w image create end \
1782 -align center -padx 5 -pady 1 \
1783 -name $icon_name \
1784 -image [mapicon $w $m $path]
1785 $w insert end "[escape_path $path]\n"
1788 set files_warning 0
1789 proc display_all_files {} {
1790 global ui_index ui_workdir
1791 global file_states file_lists
1792 global last_clicked
1793 global files_warning
1795 $ui_index conf -state normal
1796 $ui_workdir conf -state normal
1798 $ui_index delete 0.0 end
1799 $ui_workdir delete 0.0 end
1800 set last_clicked {}
1802 set file_lists($ui_index) [list]
1803 set file_lists($ui_workdir) [list]
1805 set to_display [lsort [array names file_states]]
1806 set display_limit [get_config gui.maxfilesdisplayed]
1807 if {[llength $to_display] > $display_limit} {
1808 if {!$files_warning} {
1809 # do not repeatedly warn:
1810 set files_warning 1
1811 info_popup [mc "Displaying only %s of %s files." \
1812 $display_limit [llength $to_display]]
1814 set to_display [lrange $to_display 0 [expr {$display_limit-1}]]
1816 foreach path $to_display {
1817 set s $file_states($path)
1818 set m [lindex $s 0]
1819 set icon_name [lindex $s 1]
1821 set s [string index $m 0]
1822 if {$s ne {U} && $s ne {_}} {
1823 display_all_files_helper $ui_index $path \
1824 $icon_name $s
1827 if {[string index $m 0] eq {U}} {
1828 set s U
1829 } else {
1830 set s [string index $m 1]
1832 if {$s ne {_}} {
1833 display_all_files_helper $ui_workdir $path \
1834 $icon_name $s
1838 $ui_index conf -state disabled
1839 $ui_workdir conf -state disabled
1842 ######################################################################
1844 ## icons
1846 set filemask {
1847 #define mask_width 14
1848 #define mask_height 15
1849 static unsigned char mask_bits[] = {
1850 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1851 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1852 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1855 image create bitmap file_plain -background white -foreground black -data {
1856 #define plain_width 14
1857 #define plain_height 15
1858 static unsigned char plain_bits[] = {
1859 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1860 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1861 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1862 } -maskdata $filemask
1864 image create bitmap file_mod -background white -foreground blue -data {
1865 #define mod_width 14
1866 #define mod_height 15
1867 static unsigned char mod_bits[] = {
1868 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1869 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1870 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1871 } -maskdata $filemask
1873 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1874 #define file_fulltick_width 14
1875 #define file_fulltick_height 15
1876 static unsigned char file_fulltick_bits[] = {
1877 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1878 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1879 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1880 } -maskdata $filemask
1882 image create bitmap file_question -background white -foreground black -data {
1883 #define file_question_width 14
1884 #define file_question_height 15
1885 static unsigned char file_question_bits[] = {
1886 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1887 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1888 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1889 } -maskdata $filemask
1891 image create bitmap file_removed -background white -foreground red -data {
1892 #define file_removed_width 14
1893 #define file_removed_height 15
1894 static unsigned char file_removed_bits[] = {
1895 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1896 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1897 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1898 } -maskdata $filemask
1900 image create bitmap file_merge -background white -foreground blue -data {
1901 #define file_merge_width 14
1902 #define file_merge_height 15
1903 static unsigned char file_merge_bits[] = {
1904 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1905 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1906 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1907 } -maskdata $filemask
1909 image create bitmap file_statechange -background white -foreground green -data {
1910 #define file_merge_width 14
1911 #define file_merge_height 15
1912 static unsigned char file_statechange_bits[] = {
1913 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
1914 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
1915 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1916 } -maskdata $filemask
1918 set ui_index .vpane.files.index.list
1919 set ui_workdir .vpane.files.workdir.list
1921 set all_icons(_$ui_index) file_plain
1922 set all_icons(A$ui_index) file_plain
1923 set all_icons(M$ui_index) file_fulltick
1924 set all_icons(D$ui_index) file_removed
1925 set all_icons(U$ui_index) file_merge
1926 set all_icons(T$ui_index) file_statechange
1928 set all_icons(_$ui_workdir) file_plain
1929 set all_icons(M$ui_workdir) file_mod
1930 set all_icons(D$ui_workdir) file_question
1931 set all_icons(U$ui_workdir) file_merge
1932 set all_icons(O$ui_workdir) file_plain
1933 set all_icons(T$ui_workdir) file_statechange
1935 set max_status_desc 0
1936 foreach i {
1937 {__ {mc "Unmodified"}}
1939 {_M {mc "Modified, not staged"}}
1940 {M_ {mc "Staged for commit"}}
1941 {MM {mc "Portions staged for commit"}}
1942 {MD {mc "Staged for commit, missing"}}
1944 {_T {mc "File type changed, not staged"}}
1945 {T_ {mc "File type changed, staged"}}
1947 {_O {mc "Untracked, not staged"}}
1948 {A_ {mc "Staged for commit"}}
1949 {AM {mc "Portions staged for commit"}}
1950 {AD {mc "Staged for commit, missing"}}
1952 {_D {mc "Missing"}}
1953 {D_ {mc "Staged for removal"}}
1954 {DO {mc "Staged for removal, still present"}}
1956 {_U {mc "Requires merge resolution"}}
1957 {U_ {mc "Requires merge resolution"}}
1958 {UU {mc "Requires merge resolution"}}
1959 {UM {mc "Requires merge resolution"}}
1960 {UD {mc "Requires merge resolution"}}
1961 {UT {mc "Requires merge resolution"}}
1963 set text [eval [lindex $i 1]]
1964 if {$max_status_desc < [string length $text]} {
1965 set max_status_desc [string length $text]
1967 set all_descs([lindex $i 0]) $text
1969 unset i
1971 ######################################################################
1973 ## util
1975 proc scrollbar2many {list mode args} {
1976 foreach w $list {eval $w $mode $args}
1979 proc many2scrollbar {list mode sb top bottom} {
1980 $sb set $top $bottom
1981 foreach w $list {$w $mode moveto $top}
1984 proc incr_font_size {font {amt 1}} {
1985 set sz [font configure $font -size]
1986 incr sz $amt
1987 font configure $font -size $sz
1988 font configure ${font}bold -size $sz
1989 font configure ${font}italic -size $sz
1992 ######################################################################
1994 ## ui commands
1996 set starting_gitk_msg [mc "Starting gitk... please wait..."]
1998 proc do_gitk {revs {is_submodule false}} {
1999 global current_diff_path file_states current_diff_side ui_index
2000 global _gitworktree
2002 # -- Always start gitk through whatever we were loaded with. This
2003 # lets us bypass using shell process on Windows systems.
2005 set exe [_which gitk -script]
2006 set cmd [list [info nameofexecutable] $exe]
2007 if {$exe eq {}} {
2008 error_popup [mc "Couldn't find gitk in PATH"]
2009 } else {
2010 global env
2012 if {[info exists env(GIT_DIR)]} {
2013 set old_GIT_DIR $env(GIT_DIR)
2014 } else {
2015 set old_GIT_DIR {}
2018 set pwd [pwd]
2020 if {!$is_submodule} {
2021 if {![is_bare]} {
2022 cd $_gitworktree
2024 set env(GIT_DIR) [file normalize [gitdir]]
2025 } else {
2026 cd $current_diff_path
2027 if {$revs eq {--}} {
2028 set s $file_states($current_diff_path)
2029 set old_sha1 {}
2030 set new_sha1 {}
2031 switch -glob -- [lindex $s 0] {
2032 M_ { set old_sha1 [lindex [lindex $s 2] 1] }
2033 _M { set old_sha1 [lindex [lindex $s 3] 1] }
2034 MM {
2035 if {$current_diff_side eq $ui_index} {
2036 set old_sha1 [lindex [lindex $s 2] 1]
2037 set new_sha1 [lindex [lindex $s 3] 1]
2038 } else {
2039 set old_sha1 [lindex [lindex $s 3] 1]
2043 set revs $old_sha1...$new_sha1
2045 if {[info exists env(GIT_DIR)]} {
2046 unset env(GIT_DIR)
2049 eval exec $cmd $revs "--" "--" &
2051 if {$old_GIT_DIR ne {}} {
2052 set env(GIT_DIR) $old_GIT_DIR
2054 cd $pwd
2056 ui_status $::starting_gitk_msg
2057 after 10000 {
2058 ui_ready $starting_gitk_msg
2063 proc do_git_gui {} {
2064 global current_diff_path
2066 # -- Always start git gui through whatever we were loaded with. This
2067 # lets us bypass using shell process on Windows systems.
2069 set exe [list [_which git]]
2070 if {$exe eq {}} {
2071 error_popup [mc "Couldn't find git gui in PATH"]
2072 } else {
2073 global env
2075 if {[info exists env(GIT_DIR)]} {
2076 set old_GIT_DIR $env(GIT_DIR)
2077 unset env(GIT_DIR)
2078 } else {
2079 set old_GIT_DIR {}
2082 set pwd [pwd]
2083 cd $current_diff_path
2085 eval exec $exe gui &
2087 if {$old_GIT_DIR ne {}} {
2088 set env(GIT_DIR) $old_GIT_DIR
2090 cd $pwd
2092 ui_status $::starting_gitk_msg
2093 after 10000 {
2094 ui_ready $starting_gitk_msg
2099 proc do_explore {} {
2100 global _gitworktree
2101 set explorer {}
2102 if {[is_Cygwin] || [is_Windows]} {
2103 set explorer "explorer.exe"
2104 } elseif {[is_MacOSX]} {
2105 set explorer "open"
2106 } else {
2107 # freedesktop.org-conforming system is our best shot
2108 set explorer "xdg-open"
2110 eval exec $explorer [list [file nativename $_gitworktree]] &
2113 set is_quitting 0
2114 set ret_code 1
2116 proc terminate_me {win} {
2117 global ret_code
2118 if {$win ne {.}} return
2119 exit $ret_code
2122 proc do_quit {{rc {1}}} {
2123 global ui_comm is_quitting repo_config commit_type
2124 global GITGUI_BCK_exists GITGUI_BCK_i
2125 global ui_comm_spell
2126 global ret_code use_ttk
2128 if {$is_quitting} return
2129 set is_quitting 1
2131 if {[winfo exists $ui_comm]} {
2132 # -- Stash our current commit buffer.
2134 set save [gitdir GITGUI_MSG]
2135 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
2136 file rename -force [gitdir GITGUI_BCK] $save
2137 set GITGUI_BCK_exists 0
2138 } else {
2139 set msg [string trim [$ui_comm get 0.0 end]]
2140 regsub -all -line {[ \r\t]+$} $msg {} msg
2141 if {(![string match amend* $commit_type]
2142 || [$ui_comm edit modified])
2143 && $msg ne {}} {
2144 catch {
2145 set fd [open $save w]
2146 puts -nonewline $fd $msg
2147 close $fd
2149 } else {
2150 catch {file delete $save}
2154 # -- Cancel our spellchecker if its running.
2156 if {[info exists ui_comm_spell]} {
2157 $ui_comm_spell stop
2160 # -- Remove our editor backup, its not needed.
2162 after cancel $GITGUI_BCK_i
2163 if {$GITGUI_BCK_exists} {
2164 catch {file delete [gitdir GITGUI_BCK]}
2167 # -- Stash our current window geometry into this repository.
2169 set cfg_wmstate [wm state .]
2170 if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} {
2171 set rc_wmstate {}
2173 if {$cfg_wmstate ne $rc_wmstate} {
2174 catch {git config gui.wmstate $cfg_wmstate}
2176 if {$cfg_wmstate eq {zoomed}} {
2177 # on Windows wm geometry will lie about window
2178 # position (but not size) when window is zoomed
2179 # restore the window before querying wm geometry
2180 wm state . normal
2182 set cfg_geometry [list]
2183 lappend cfg_geometry [wm geometry .]
2184 if {$use_ttk} {
2185 lappend cfg_geometry [.vpane sashpos 0]
2186 lappend cfg_geometry [.vpane.files sashpos 0]
2187 } else {
2188 lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
2189 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
2191 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2192 set rc_geometry {}
2194 if {$cfg_geometry ne $rc_geometry} {
2195 catch {git config gui.geometry $cfg_geometry}
2199 set ret_code $rc
2201 # Briefly enable send again, working around Tk bug
2202 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2203 tk appname [appname]
2205 destroy .
2208 proc do_rescan {} {
2209 rescan ui_ready
2212 proc ui_do_rescan {} {
2213 rescan {force_first_diff ui_ready}
2216 proc do_commit {} {
2217 commit_tree
2220 proc next_diff {{after {}}} {
2221 global next_diff_p next_diff_w next_diff_i
2222 show_diff $next_diff_p $next_diff_w {} {} $after
2225 proc find_anchor_pos {lst name} {
2226 set lid [lsearch -sorted -exact $lst $name]
2228 if {$lid == -1} {
2229 set lid 0
2230 foreach lname $lst {
2231 if {$lname >= $name} break
2232 incr lid
2236 return $lid
2239 proc find_file_from {flist idx delta path mmask} {
2240 global file_states
2242 set len [llength $flist]
2243 while {$idx >= 0 && $idx < $len} {
2244 set name [lindex $flist $idx]
2246 if {$name ne $path && [info exists file_states($name)]} {
2247 set state [lindex $file_states($name) 0]
2249 if {$mmask eq {} || [regexp $mmask $state]} {
2250 return $idx
2254 incr idx $delta
2257 return {}
2260 proc find_next_diff {w path {lno {}} {mmask {}}} {
2261 global next_diff_p next_diff_w next_diff_i
2262 global file_lists ui_index ui_workdir
2264 set flist $file_lists($w)
2265 if {$lno eq {}} {
2266 set lno [find_anchor_pos $flist $path]
2267 } else {
2268 incr lno -1
2271 if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} {
2272 if {$w eq $ui_index} {
2273 set mmask "^$mmask"
2274 } else {
2275 set mmask "$mmask\$"
2279 set idx [find_file_from $flist $lno 1 $path $mmask]
2280 if {$idx eq {}} {
2281 incr lno -1
2282 set idx [find_file_from $flist $lno -1 $path $mmask]
2285 if {$idx ne {}} {
2286 set next_diff_w $w
2287 set next_diff_p [lindex $flist $idx]
2288 set next_diff_i [expr {$idx+1}]
2289 return 1
2290 } else {
2291 return 0
2295 proc next_diff_after_action {w path {lno {}} {mmask {}}} {
2296 global current_diff_path
2298 if {$path ne $current_diff_path} {
2299 return {}
2300 } elseif {[find_next_diff $w $path $lno $mmask]} {
2301 return {next_diff;}
2302 } else {
2303 return {reshow_diff;}
2307 proc select_first_diff {after} {
2308 global ui_workdir
2310 if {[find_next_diff $ui_workdir {} 1 {^_?U}] ||
2311 [find_next_diff $ui_workdir {} 1 {[^O]$}]} {
2312 next_diff $after
2313 } else {
2314 uplevel #0 $after
2318 proc force_first_diff {after} {
2319 global ui_workdir current_diff_path file_states
2321 if {[info exists file_states($current_diff_path)]} {
2322 set state [lindex $file_states($current_diff_path) 0]
2323 } else {
2324 set state {OO}
2327 set reselect 0
2328 if {[string first {U} $state] >= 0} {
2329 # Already a conflict, do nothing
2330 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} {
2331 set reselect 1
2332 } elseif {[string index $state 1] ne {O}} {
2333 # Already a diff & no conflicts, do nothing
2334 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} {
2335 set reselect 1
2338 if {$reselect} {
2339 next_diff $after
2340 } else {
2341 uplevel #0 $after
2345 proc toggle_or_diff {w x y} {
2346 global file_states file_lists current_diff_path ui_index ui_workdir
2347 global last_clicked selected_paths
2349 set pos [split [$w index @$x,$y] .]
2350 set lno [lindex $pos 0]
2351 set col [lindex $pos 1]
2352 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2353 if {$path eq {}} {
2354 set last_clicked {}
2355 return
2358 set last_clicked [list $w $lno]
2359 array unset selected_paths
2360 $ui_index tag remove in_sel 0.0 end
2361 $ui_workdir tag remove in_sel 0.0 end
2363 # Determine the state of the file
2364 if {[info exists file_states($path)]} {
2365 set state [lindex $file_states($path) 0]
2366 } else {
2367 set state {__}
2370 # Restage the file, or simply show the diff
2371 if {$col == 0 && $y > 1} {
2372 # Conflicts need special handling
2373 if {[string first {U} $state] >= 0} {
2374 # $w must always be $ui_workdir, but...
2375 if {$w ne $ui_workdir} { set lno {} }
2376 merge_stage_workdir $path $lno
2377 return
2380 if {[string index $state 1] eq {O}} {
2381 set mmask {}
2382 } else {
2383 set mmask {[^O]}
2386 set after [next_diff_after_action $w $path $lno $mmask]
2388 if {$w eq $ui_index} {
2389 update_indexinfo \
2390 "Unstaging [short_path $path] from commit" \
2391 [list $path] \
2392 [concat $after [list ui_ready]]
2393 } elseif {$w eq $ui_workdir} {
2394 update_index \
2395 "Adding [short_path $path]" \
2396 [list $path] \
2397 [concat $after [list ui_ready]]
2399 } else {
2400 show_diff $path $w $lno
2404 proc add_one_to_selection {w x y} {
2405 global file_lists last_clicked selected_paths
2407 set lno [lindex [split [$w index @$x,$y] .] 0]
2408 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2409 if {$path eq {}} {
2410 set last_clicked {}
2411 return
2414 if {$last_clicked ne {}
2415 && [lindex $last_clicked 0] ne $w} {
2416 array unset selected_paths
2417 [lindex $last_clicked 0] tag remove in_sel 0.0 end
2420 set last_clicked [list $w $lno]
2421 if {[catch {set in_sel $selected_paths($path)}]} {
2422 set in_sel 0
2424 if {$in_sel} {
2425 unset selected_paths($path)
2426 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2427 } else {
2428 set selected_paths($path) 1
2429 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2433 proc add_range_to_selection {w x y} {
2434 global file_lists last_clicked selected_paths
2436 if {[lindex $last_clicked 0] ne $w} {
2437 toggle_or_diff $w $x $y
2438 return
2441 set lno [lindex [split [$w index @$x,$y] .] 0]
2442 set lc [lindex $last_clicked 1]
2443 if {$lc < $lno} {
2444 set begin $lc
2445 set end $lno
2446 } else {
2447 set begin $lno
2448 set end $lc
2451 foreach path [lrange $file_lists($w) \
2452 [expr {$begin - 1}] \
2453 [expr {$end - 1}]] {
2454 set selected_paths($path) 1
2456 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2459 proc show_more_context {} {
2460 global repo_config
2461 if {$repo_config(gui.diffcontext) < 99} {
2462 incr repo_config(gui.diffcontext)
2463 reshow_diff
2467 proc show_less_context {} {
2468 global repo_config
2469 if {$repo_config(gui.diffcontext) > 1} {
2470 incr repo_config(gui.diffcontext) -1
2471 reshow_diff
2475 ######################################################################
2477 ## ui construction
2479 set ui_comm {}
2481 # -- Menu Bar
2483 menu .mbar -tearoff 0
2484 if {[is_MacOSX]} {
2485 # -- Apple Menu (Mac OS X only)
2487 .mbar add cascade -label Apple -menu .mbar.apple
2488 menu .mbar.apple
2490 .mbar add cascade -label [mc Repository] -menu .mbar.repository
2491 .mbar add cascade -label [mc Edit] -menu .mbar.edit
2492 if {[is_enabled branch]} {
2493 .mbar add cascade -label [mc Branch] -menu .mbar.branch
2495 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2496 .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
2498 if {[is_enabled transport]} {
2499 .mbar add cascade -label [mc Merge] -menu .mbar.merge
2500 .mbar add cascade -label [mc Remote] -menu .mbar.remote
2502 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2503 .mbar add cascade -label [mc Tools] -menu .mbar.tools
2506 # -- Repository Menu
2508 menu .mbar.repository
2510 if {![is_bare]} {
2511 .mbar.repository add command \
2512 -label [mc "Explore Working Copy"] \
2513 -command {do_explore}
2514 .mbar.repository add separator
2517 .mbar.repository add command \
2518 -label [mc "Browse Current Branch's Files"] \
2519 -command {browser::new $current_branch}
2520 set ui_browse_current [.mbar.repository index last]
2521 .mbar.repository add command \
2522 -label [mc "Browse Branch Files..."] \
2523 -command browser_open::dialog
2524 .mbar.repository add separator
2526 .mbar.repository add command \
2527 -label [mc "Visualize Current Branch's History"] \
2528 -command {do_gitk $current_branch}
2529 set ui_visualize_current [.mbar.repository index last]
2530 .mbar.repository add command \
2531 -label [mc "Visualize All Branch History"] \
2532 -command {do_gitk --all}
2533 .mbar.repository add separator
2535 proc current_branch_write {args} {
2536 global current_branch
2537 .mbar.repository entryconf $::ui_browse_current \
2538 -label [mc "Browse %s's Files" $current_branch]
2539 .mbar.repository entryconf $::ui_visualize_current \
2540 -label [mc "Visualize %s's History" $current_branch]
2542 trace add variable current_branch write current_branch_write
2544 if {[is_enabled multicommit]} {
2545 .mbar.repository add command -label [mc "Database Statistics"] \
2546 -command do_stats
2548 .mbar.repository add command -label [mc "Compress Database"] \
2549 -command do_gc
2551 .mbar.repository add command -label [mc "Verify Database"] \
2552 -command do_fsck_objects
2554 .mbar.repository add separator
2556 if {[is_Cygwin]} {
2557 .mbar.repository add command \
2558 -label [mc "Create Desktop Icon"] \
2559 -command do_cygwin_shortcut
2560 } elseif {[is_Windows]} {
2561 .mbar.repository add command \
2562 -label [mc "Create Desktop Icon"] \
2563 -command do_windows_shortcut
2564 } elseif {[is_MacOSX]} {
2565 .mbar.repository add command \
2566 -label [mc "Create Desktop Icon"] \
2567 -command do_macosx_app
2571 if {[is_MacOSX]} {
2572 proc ::tk::mac::Quit {args} { do_quit }
2573 } else {
2574 .mbar.repository add command -label [mc Quit] \
2575 -command do_quit \
2576 -accelerator $M1T-Q
2579 # -- Edit Menu
2581 menu .mbar.edit
2582 .mbar.edit add command -label [mc Undo] \
2583 -command {catch {[focus] edit undo}} \
2584 -accelerator $M1T-Z
2585 .mbar.edit add command -label [mc Redo] \
2586 -command {catch {[focus] edit redo}} \
2587 -accelerator $M1T-Y
2588 .mbar.edit add separator
2589 .mbar.edit add command -label [mc Cut] \
2590 -command {catch {tk_textCut [focus]}} \
2591 -accelerator $M1T-X
2592 .mbar.edit add command -label [mc Copy] \
2593 -command {catch {tk_textCopy [focus]}} \
2594 -accelerator $M1T-C
2595 .mbar.edit add command -label [mc Paste] \
2596 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2597 -accelerator $M1T-V
2598 .mbar.edit add command -label [mc Delete] \
2599 -command {catch {[focus] delete sel.first sel.last}} \
2600 -accelerator Del
2601 .mbar.edit add separator
2602 .mbar.edit add command -label [mc "Select All"] \
2603 -command {catch {[focus] tag add sel 0.0 end}} \
2604 -accelerator $M1T-A
2606 # -- Branch Menu
2608 if {[is_enabled branch]} {
2609 menu .mbar.branch
2611 .mbar.branch add command -label [mc "Create..."] \
2612 -command branch_create::dialog \
2613 -accelerator $M1T-N
2614 lappend disable_on_lock [list .mbar.branch entryconf \
2615 [.mbar.branch index last] -state]
2617 .mbar.branch add command -label [mc "Checkout..."] \
2618 -command branch_checkout::dialog \
2619 -accelerator $M1T-O
2620 lappend disable_on_lock [list .mbar.branch entryconf \
2621 [.mbar.branch index last] -state]
2623 .mbar.branch add command -label [mc "Rename..."] \
2624 -command branch_rename::dialog
2625 lappend disable_on_lock [list .mbar.branch entryconf \
2626 [.mbar.branch index last] -state]
2628 .mbar.branch add command -label [mc "Delete..."] \
2629 -command branch_delete::dialog
2630 lappend disable_on_lock [list .mbar.branch entryconf \
2631 [.mbar.branch index last] -state]
2633 .mbar.branch add command -label [mc "Reset..."] \
2634 -command merge::reset_hard
2635 lappend disable_on_lock [list .mbar.branch entryconf \
2636 [.mbar.branch index last] -state]
2639 # -- Commit Menu
2641 proc commit_btn_caption {} {
2642 if {[is_enabled nocommit]} {
2643 return [mc "Done"]
2644 } else {
2645 return [mc Commit@@verb]
2649 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2650 menu .mbar.commit
2652 if {![is_enabled nocommit]} {
2653 .mbar.commit add radiobutton \
2654 -label [mc "New Commit"] \
2655 -command do_select_commit_type \
2656 -variable selected_commit_type \
2657 -value new
2658 lappend disable_on_lock \
2659 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2661 .mbar.commit add radiobutton \
2662 -label [mc "Amend Last Commit"] \
2663 -command do_select_commit_type \
2664 -variable selected_commit_type \
2665 -value amend
2666 lappend disable_on_lock \
2667 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2669 .mbar.commit add separator
2672 .mbar.commit add command -label [mc Rescan] \
2673 -command ui_do_rescan \
2674 -accelerator F5
2675 lappend disable_on_lock \
2676 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2678 .mbar.commit add command -label [mc "Stage To Commit"] \
2679 -command do_add_selection \
2680 -accelerator $M1T-T
2681 lappend disable_on_lock \
2682 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2684 .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
2685 -command do_add_all \
2686 -accelerator $M1T-I
2687 lappend disable_on_lock \
2688 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2690 .mbar.commit add command -label [mc "Unstage From Commit"] \
2691 -command do_unstage_selection \
2692 -accelerator $M1T-U
2693 lappend disable_on_lock \
2694 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2696 .mbar.commit add command -label [mc "Revert Changes"] \
2697 -command do_revert_selection \
2698 -accelerator $M1T-J
2699 lappend disable_on_lock \
2700 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2702 .mbar.commit add separator
2704 .mbar.commit add command -label [mc "Show Less Context"] \
2705 -command show_less_context \
2706 -accelerator $M1T-\-
2708 .mbar.commit add command -label [mc "Show More Context"] \
2709 -command show_more_context \
2710 -accelerator $M1T-=
2712 .mbar.commit add separator
2714 if {![is_enabled nocommitmsg]} {
2715 .mbar.commit add command -label [mc "Sign Off"] \
2716 -command do_signoff \
2717 -accelerator $M1T-S
2720 .mbar.commit add command -label [commit_btn_caption] \
2721 -command do_commit \
2722 -accelerator $M1T-Return
2723 lappend disable_on_lock \
2724 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2727 # -- Merge Menu
2729 if {[is_enabled branch]} {
2730 menu .mbar.merge
2731 .mbar.merge add command -label [mc "Local Merge..."] \
2732 -command merge::dialog \
2733 -accelerator $M1T-M
2734 lappend disable_on_lock \
2735 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2736 .mbar.merge add command -label [mc "Abort Merge..."] \
2737 -command merge::reset_hard
2738 lappend disable_on_lock \
2739 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2742 # -- Transport Menu
2744 if {[is_enabled transport]} {
2745 menu .mbar.remote
2747 .mbar.remote add command \
2748 -label [mc "Add..."] \
2749 -command remote_add::dialog \
2750 -accelerator $M1T-A
2751 .mbar.remote add command \
2752 -label [mc "Push..."] \
2753 -command do_push_anywhere \
2754 -accelerator $M1T-P
2755 .mbar.remote add command \
2756 -label [mc "Delete Branch..."] \
2757 -command remote_branch_delete::dialog
2760 if {[is_MacOSX]} {
2761 proc ::tk::mac::ShowPreferences {} {do_options}
2762 } else {
2763 # -- Edit Menu
2765 .mbar.edit add separator
2766 .mbar.edit add command -label [mc "Options..."] \
2767 -command do_options
2770 # -- Tools Menu
2772 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2773 set tools_menubar .mbar.tools
2774 menu $tools_menubar
2775 $tools_menubar add separator
2776 $tools_menubar add command -label [mc "Add..."] -command tools_add::dialog
2777 $tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog
2778 set tools_tailcnt 3
2779 if {[array names repo_config guitool.*.cmd] ne {}} {
2780 tools_populate_all
2784 # -- Help Menu
2786 .mbar add cascade -label [mc Help] -menu .mbar.help
2787 menu .mbar.help
2789 if {[is_MacOSX]} {
2790 .mbar.apple add command -label [mc "About %s" [appname]] \
2791 -command do_about
2792 .mbar.apple add separator
2793 } else {
2794 .mbar.help add command -label [mc "About %s" [appname]] \
2795 -command do_about
2797 . configure -menu .mbar
2799 set doc_path [githtmldir]
2800 if {$doc_path ne {}} {
2801 set doc_path [file join $doc_path index.html]
2803 if {[is_Cygwin]} {
2804 set doc_path [exec cygpath --mixed $doc_path]
2808 if {[file isfile $doc_path]} {
2809 set doc_url "file:$doc_path"
2810 } else {
2811 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
2814 proc start_browser {url} {
2815 git "web--browse" $url
2818 .mbar.help add command -label [mc "Online Documentation"] \
2819 -command [list start_browser $doc_url]
2821 .mbar.help add command -label [mc "Show SSH Key"] \
2822 -command do_ssh_key
2824 unset doc_path doc_url
2826 # -- Standard bindings
2828 wm protocol . WM_DELETE_WINDOW do_quit
2829 bind all <$M1B-Key-q> do_quit
2830 bind all <$M1B-Key-Q> do_quit
2831 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2832 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
2834 set subcommand_args {}
2835 proc usage {} {
2836 puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
2837 exit 1
2840 proc normalize_relpath {path} {
2841 set elements {}
2842 foreach item [file split $path] {
2843 if {$item eq {.}} continue
2844 if {$item eq {..} && [llength $elements] > 0
2845 && [lindex $elements end] ne {..}} {
2846 set elements [lrange $elements 0 end-1]
2847 continue
2849 lappend elements $item
2851 return [eval file join $elements]
2854 # -- Not a normal commit type invocation? Do that instead!
2856 switch -- $subcommand {
2857 browser -
2858 blame {
2859 if {$subcommand eq "blame"} {
2860 set subcommand_args {[--line=<num>] rev? path}
2861 } else {
2862 set subcommand_args {rev? path}
2864 if {$argv eq {}} usage
2865 set head {}
2866 set path {}
2867 set jump_spec {}
2868 set is_path 0
2869 foreach a $argv {
2870 if {$is_path || [file exists $_prefix$a]} {
2871 if {$path ne {}} usage
2872 set path [normalize_relpath $_prefix$a]
2873 break
2874 } elseif {$a eq {--}} {
2875 if {$path ne {}} {
2876 if {$head ne {}} usage
2877 set head $path
2878 set path {}
2880 set is_path 1
2881 } elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
2882 if {$jump_spec ne {} || $head ne {}} usage
2883 set jump_spec [list $lnum]
2884 } elseif {$head eq {}} {
2885 if {$head ne {}} usage
2886 set head $a
2887 set is_path 1
2888 } else {
2889 usage
2892 unset is_path
2894 if {$head ne {} && $path eq {}} {
2895 set path [normalize_relpath $_prefix$head]
2896 set head {}
2899 if {$head eq {}} {
2900 load_current_branch
2901 } else {
2902 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
2903 if {[catch {
2904 set head [git rev-parse --verify $head]
2905 } err]} {
2906 puts stderr $err
2907 exit 1
2910 set current_branch $head
2913 switch -- $subcommand {
2914 browser {
2915 if {$jump_spec ne {}} usage
2916 if {$head eq {}} {
2917 if {$path ne {} && [file isdirectory $path]} {
2918 set head $current_branch
2919 } else {
2920 set head $path
2921 set path {}
2924 browser::new $head $path
2926 blame {
2927 if {$head eq {} && ![file exists $path]} {
2928 puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
2929 exit 1
2931 blame::new $head $path $jump_spec
2934 return
2936 citool -
2937 gui {
2938 if {[llength $argv] != 0} {
2939 puts -nonewline stderr "usage: $argv0"
2940 if {$subcommand ne {gui}
2941 && [file tail $argv0] ne "git-$subcommand"} {
2942 puts -nonewline stderr " $subcommand"
2944 puts stderr {}
2945 exit 1
2947 # fall through to setup UI for commits
2949 default {
2950 puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
2951 exit 1
2955 # -- Branch Control
2957 ${NS}::frame .branch
2958 if {!$use_ttk} {.branch configure -borderwidth 1 -relief sunken}
2959 ${NS}::label .branch.l1 \
2960 -text [mc "Current Branch:"] \
2961 -anchor w \
2962 -justify left
2963 ${NS}::label .branch.cb \
2964 -textvariable current_branch \
2965 -anchor w \
2966 -justify left
2967 pack .branch.l1 -side left
2968 pack .branch.cb -side left -fill x
2969 pack .branch -side top -fill x
2971 # -- Main Window Layout
2973 ${NS}::panedwindow .vpane -orient horizontal
2974 ${NS}::panedwindow .vpane.files -orient vertical
2975 if {$use_ttk} {
2976 .vpane add .vpane.files
2977 } else {
2978 .vpane add .vpane.files -sticky nsew -height 100 -width 200
2980 pack .vpane -anchor n -side top -fill both -expand 1
2982 # -- Index File List
2984 ${NS}::frame .vpane.files.index -height 100 -width 200
2985 tlabel .vpane.files.index.title \
2986 -text [mc "Staged Changes (Will Commit)"] \
2987 -background lightgreen -foreground black
2988 text $ui_index -background white -foreground black \
2989 -borderwidth 0 \
2990 -width 20 -height 10 \
2991 -wrap none \
2992 -cursor $cursor_ptr \
2993 -xscrollcommand {.vpane.files.index.sx set} \
2994 -yscrollcommand {.vpane.files.index.sy set} \
2995 -state disabled
2996 ${NS}::scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
2997 ${NS}::scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
2998 pack .vpane.files.index.title -side top -fill x
2999 pack .vpane.files.index.sx -side bottom -fill x
3000 pack .vpane.files.index.sy -side right -fill y
3001 pack $ui_index -side left -fill both -expand 1
3003 # -- Working Directory File List
3005 ${NS}::frame .vpane.files.workdir -height 100 -width 200
3006 tlabel .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
3007 -background lightsalmon -foreground black
3008 text $ui_workdir -background white -foreground black \
3009 -borderwidth 0 \
3010 -width 20 -height 10 \
3011 -wrap none \
3012 -cursor $cursor_ptr \
3013 -xscrollcommand {.vpane.files.workdir.sx set} \
3014 -yscrollcommand {.vpane.files.workdir.sy set} \
3015 -state disabled
3016 ${NS}::scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
3017 ${NS}::scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
3018 pack .vpane.files.workdir.title -side top -fill x
3019 pack .vpane.files.workdir.sx -side bottom -fill x
3020 pack .vpane.files.workdir.sy -side right -fill y
3021 pack $ui_workdir -side left -fill both -expand 1
3023 .vpane.files add .vpane.files.workdir
3024 .vpane.files add .vpane.files.index
3025 if {!$use_ttk} {
3026 .vpane.files paneconfigure .vpane.files.workdir -sticky news
3027 .vpane.files paneconfigure .vpane.files.index -sticky news
3030 foreach i [list $ui_index $ui_workdir] {
3031 rmsel_tag $i
3032 $i tag conf in_diff -background [$i tag cget in_sel -background]
3034 unset i
3036 # -- Diff and Commit Area
3038 ${NS}::frame .vpane.lower -height 300 -width 400
3039 ${NS}::frame .vpane.lower.commarea
3040 ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1
3041 pack .vpane.lower.diff -fill both -expand 1
3042 pack .vpane.lower.commarea -side bottom -fill x
3043 .vpane add .vpane.lower
3044 if {!$use_ttk} {.vpane paneconfigure .vpane.lower -sticky nsew}
3046 # -- Commit Area Buttons
3048 ${NS}::frame .vpane.lower.commarea.buttons
3049 ${NS}::label .vpane.lower.commarea.buttons.l -text {} \
3050 -anchor w \
3051 -justify left
3052 pack .vpane.lower.commarea.buttons.l -side top -fill x
3053 pack .vpane.lower.commarea.buttons -side left -fill y
3055 ${NS}::button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
3056 -command ui_do_rescan
3057 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3058 lappend disable_on_lock \
3059 {.vpane.lower.commarea.buttons.rescan conf -state}
3061 ${NS}::button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
3062 -command do_add_all
3063 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3064 lappend disable_on_lock \
3065 {.vpane.lower.commarea.buttons.incall conf -state}
3067 if {![is_enabled nocommitmsg]} {
3068 ${NS}::button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
3069 -command do_signoff
3070 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3073 ${NS}::button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
3074 -command do_commit
3075 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3076 lappend disable_on_lock \
3077 {.vpane.lower.commarea.buttons.commit conf -state}
3079 if {![is_enabled nocommit]} {
3080 ${NS}::button .vpane.lower.commarea.buttons.push -text [mc Push] \
3081 -command do_push_anywhere
3082 pack .vpane.lower.commarea.buttons.push -side top -fill x
3085 # -- Commit Message Buffer
3087 ${NS}::frame .vpane.lower.commarea.buffer
3088 ${NS}::frame .vpane.lower.commarea.buffer.header
3089 set ui_comm .vpane.lower.commarea.buffer.t
3090 set ui_coml .vpane.lower.commarea.buffer.header.l
3092 if {![is_enabled nocommit]} {
3093 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \
3094 -text [mc "New Commit"] \
3095 -command do_select_commit_type \
3096 -variable selected_commit_type \
3097 -value new
3098 lappend disable_on_lock \
3099 [list .vpane.lower.commarea.buffer.header.new conf -state]
3100 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \
3101 -text [mc "Amend Last Commit"] \
3102 -command do_select_commit_type \
3103 -variable selected_commit_type \
3104 -value amend
3105 lappend disable_on_lock \
3106 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3109 ${NS}::label $ui_coml \
3110 -anchor w \
3111 -justify left
3112 proc trace_commit_type {varname args} {
3113 global ui_coml commit_type
3114 switch -glob -- $commit_type {
3115 initial {set txt [mc "Initial Commit Message:"]}
3116 amend {set txt [mc "Amended Commit Message:"]}
3117 amend-initial {set txt [mc "Amended Initial Commit Message:"]}
3118 amend-merge {set txt [mc "Amended Merge Commit Message:"]}
3119 merge {set txt [mc "Merge Commit Message:"]}
3120 * {set txt [mc "Commit Message:"]}
3122 $ui_coml conf -text $txt
3124 trace add variable commit_type write trace_commit_type
3125 pack $ui_coml -side left -fill x
3127 if {![is_enabled nocommit]} {
3128 pack .vpane.lower.commarea.buffer.header.amend -side right
3129 pack .vpane.lower.commarea.buffer.header.new -side right
3132 text $ui_comm -background white -foreground black \
3133 -borderwidth 1 \
3134 -undo true \
3135 -maxundo 20 \
3136 -autoseparators true \
3137 -relief sunken \
3138 -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
3139 -font font_diff \
3140 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3141 ${NS}::scrollbar .vpane.lower.commarea.buffer.sby \
3142 -command [list $ui_comm yview]
3143 pack .vpane.lower.commarea.buffer.header -side top -fill x
3144 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3145 pack $ui_comm -side left -fill y
3146 pack .vpane.lower.commarea.buffer -side left -fill y
3148 # -- Commit Message Buffer Context Menu
3150 set ctxm .vpane.lower.commarea.buffer.ctxm
3151 menu $ctxm -tearoff 0
3152 $ctxm add command \
3153 -label [mc Cut] \
3154 -command {tk_textCut $ui_comm}
3155 $ctxm add command \
3156 -label [mc Copy] \
3157 -command {tk_textCopy $ui_comm}
3158 $ctxm add command \
3159 -label [mc Paste] \
3160 -command {tk_textPaste $ui_comm}
3161 $ctxm add command \
3162 -label [mc Delete] \
3163 -command {catch {$ui_comm delete sel.first sel.last}}
3164 $ctxm add separator
3165 $ctxm add command \
3166 -label [mc "Select All"] \
3167 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
3168 $ctxm add command \
3169 -label [mc "Copy All"] \
3170 -command {
3171 $ui_comm tag add sel 0.0 end
3172 tk_textCopy $ui_comm
3173 $ui_comm tag remove sel 0.0 end
3175 $ctxm add separator
3176 $ctxm add command \
3177 -label [mc "Sign Off"] \
3178 -command do_signoff
3179 set ui_comm_ctxm $ctxm
3181 # -- Diff Header
3183 proc trace_current_diff_path {varname args} {
3184 global current_diff_path diff_actions file_states
3185 if {$current_diff_path eq {}} {
3186 set s {}
3187 set f {}
3188 set p {}
3189 set o disabled
3190 } else {
3191 set p $current_diff_path
3192 set s [mapdesc [lindex $file_states($p) 0] $p]
3193 set f [mc "File:"]
3194 set p [escape_path $p]
3195 set o normal
3198 .vpane.lower.diff.header.status configure -text $s
3199 .vpane.lower.diff.header.file configure -text $f
3200 .vpane.lower.diff.header.path configure -text $p
3201 foreach w $diff_actions {
3202 uplevel #0 $w $o
3205 trace add variable current_diff_path write trace_current_diff_path
3207 gold_frame .vpane.lower.diff.header
3208 tlabel .vpane.lower.diff.header.status \
3209 -background gold \
3210 -foreground black \
3211 -width $max_status_desc \
3212 -anchor w \
3213 -justify left
3214 tlabel .vpane.lower.diff.header.file \
3215 -background gold \
3216 -foreground black \
3217 -anchor w \
3218 -justify left
3219 tlabel .vpane.lower.diff.header.path \
3220 -background gold \
3221 -foreground black \
3222 -anchor w \
3223 -justify left
3224 pack .vpane.lower.diff.header.status -side left
3225 pack .vpane.lower.diff.header.file -side left
3226 pack .vpane.lower.diff.header.path -fill x
3227 set ctxm .vpane.lower.diff.header.ctxm
3228 menu $ctxm -tearoff 0
3229 $ctxm add command \
3230 -label [mc Copy] \
3231 -command {
3232 clipboard clear
3233 clipboard append \
3234 -format STRING \
3235 -type STRING \
3236 -- $current_diff_path
3238 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3239 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3241 # -- Diff Body
3243 ${NS}::frame .vpane.lower.diff.body
3244 set ui_diff .vpane.lower.diff.body.t
3245 text $ui_diff -background white -foreground black \
3246 -borderwidth 0 \
3247 -width 80 -height 5 -wrap none \
3248 -font font_diff \
3249 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3250 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3251 -state disabled
3252 ${NS}::scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3253 -command [list $ui_diff xview]
3254 ${NS}::scrollbar .vpane.lower.diff.body.sby -orient vertical \
3255 -command [list $ui_diff yview]
3256 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3257 pack .vpane.lower.diff.body.sby -side right -fill y
3258 pack $ui_diff -side left -fill both -expand 1
3259 pack .vpane.lower.diff.header -side top -fill x
3260 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3262 $ui_diff tag conf d_cr -elide true
3263 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
3264 $ui_diff tag conf d_+ -foreground {#00a000}
3265 $ui_diff tag conf d_- -foreground red
3267 $ui_diff tag conf d_++ -foreground {#00a000}
3268 $ui_diff tag conf d_-- -foreground red
3269 $ui_diff tag conf d_+s \
3270 -foreground {#00a000} \
3271 -background {#e2effa}
3272 $ui_diff tag conf d_-s \
3273 -foreground red \
3274 -background {#e2effa}
3275 $ui_diff tag conf d_s+ \
3276 -foreground {#00a000} \
3277 -background ivory1
3278 $ui_diff tag conf d_s- \
3279 -foreground red \
3280 -background ivory1
3282 $ui_diff tag conf d<<<<<<< \
3283 -foreground orange \
3284 -font font_diffbold
3285 $ui_diff tag conf d======= \
3286 -foreground orange \
3287 -font font_diffbold
3288 $ui_diff tag conf d>>>>>>> \
3289 -foreground orange \
3290 -font font_diffbold
3292 $ui_diff tag raise sel
3294 # -- Diff Body Context Menu
3297 proc create_common_diff_popup {ctxm} {
3298 $ctxm add command \
3299 -label [mc Refresh] \
3300 -command reshow_diff
3301 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3302 $ctxm add command \
3303 -label [mc Copy] \
3304 -command {tk_textCopy $ui_diff}
3305 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3306 $ctxm add command \
3307 -label [mc "Select All"] \
3308 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
3309 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3310 $ctxm add command \
3311 -label [mc "Copy All"] \
3312 -command {
3313 $ui_diff tag add sel 0.0 end
3314 tk_textCopy $ui_diff
3315 $ui_diff tag remove sel 0.0 end
3317 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3318 $ctxm add separator
3319 $ctxm add command \
3320 -label [mc "Decrease Font Size"] \
3321 -command {incr_font_size font_diff -1}
3322 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3323 $ctxm add command \
3324 -label [mc "Increase Font Size"] \
3325 -command {incr_font_size font_diff 1}
3326 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3327 $ctxm add separator
3328 set emenu $ctxm.enc
3329 menu $emenu
3330 build_encoding_menu $emenu [list force_diff_encoding]
3331 $ctxm add cascade \
3332 -label [mc "Encoding"] \
3333 -menu $emenu
3334 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3335 $ctxm add separator
3336 $ctxm add command -label [mc "Options..."] \
3337 -command do_options
3340 set ctxm .vpane.lower.diff.body.ctxm
3341 menu $ctxm -tearoff 0
3342 $ctxm add command \
3343 -label [mc "Apply/Reverse Hunk"] \
3344 -command {apply_hunk $cursorX $cursorY}
3345 set ui_diff_applyhunk [$ctxm index last]
3346 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
3347 $ctxm add command \
3348 -label [mc "Apply/Reverse Line"] \
3349 -command {apply_range_or_line $cursorX $cursorY; do_rescan}
3350 set ui_diff_applyline [$ctxm index last]
3351 lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
3352 $ctxm add separator
3353 $ctxm add command \
3354 -label [mc "Show Less Context"] \
3355 -command show_less_context
3356 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3357 $ctxm add command \
3358 -label [mc "Show More Context"] \
3359 -command show_more_context
3360 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3361 $ctxm add separator
3362 create_common_diff_popup $ctxm
3364 set ctxmmg .vpane.lower.diff.body.ctxmmg
3365 menu $ctxmmg -tearoff 0
3366 $ctxmmg add command \
3367 -label [mc "Run Merge Tool"] \
3368 -command {merge_resolve_tool}
3369 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3370 $ctxmmg add separator
3371 $ctxmmg add command \
3372 -label [mc "Use Remote Version"] \
3373 -command {merge_resolve_one 3}
3374 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3375 $ctxmmg add command \
3376 -label [mc "Use Local Version"] \
3377 -command {merge_resolve_one 2}
3378 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3379 $ctxmmg add command \
3380 -label [mc "Revert To Base"] \
3381 -command {merge_resolve_one 1}
3382 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3383 $ctxmmg add separator
3384 $ctxmmg add command \
3385 -label [mc "Show Less Context"] \
3386 -command show_less_context
3387 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3388 $ctxmmg add command \
3389 -label [mc "Show More Context"] \
3390 -command show_more_context
3391 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3392 $ctxmmg add separator
3393 create_common_diff_popup $ctxmmg
3395 set ctxmsm .vpane.lower.diff.body.ctxmsm
3396 menu $ctxmsm -tearoff 0
3397 $ctxmsm add command \
3398 -label [mc "Visualize These Changes In The Submodule"] \
3399 -command {do_gitk -- true}
3400 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3401 $ctxmsm add command \
3402 -label [mc "Visualize Current Branch History In The Submodule"] \
3403 -command {do_gitk {} true}
3404 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3405 $ctxmsm add command \
3406 -label [mc "Visualize All Branch History In The Submodule"] \
3407 -command {do_gitk --all true}
3408 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3409 $ctxmsm add separator
3410 $ctxmsm add command \
3411 -label [mc "Start git gui In The Submodule"] \
3412 -command {do_git_gui}
3413 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3414 $ctxmsm add separator
3415 create_common_diff_popup $ctxmsm
3417 proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
3418 global current_diff_path file_states
3419 set ::cursorX $x
3420 set ::cursorY $y
3421 if {[info exists file_states($current_diff_path)]} {
3422 set state [lindex $file_states($current_diff_path) 0]
3423 } else {
3424 set state {__}
3426 if {[string first {U} $state] >= 0} {
3427 tk_popup $ctxmmg $X $Y
3428 } elseif {$::is_submodule_diff} {
3429 tk_popup $ctxmsm $X $Y
3430 } else {
3431 set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}]
3432 if {$::ui_index eq $::current_diff_side} {
3433 set l [mc "Unstage Hunk From Commit"]
3434 if {$has_range} {
3435 set t [mc "Unstage Lines From Commit"]
3436 } else {
3437 set t [mc "Unstage Line From Commit"]
3439 } else {
3440 set l [mc "Stage Hunk For Commit"]
3441 if {$has_range} {
3442 set t [mc "Stage Lines For Commit"]
3443 } else {
3444 set t [mc "Stage Line For Commit"]
3447 if {$::is_3way_diff
3448 || $current_diff_path eq {}
3449 || {__} eq $state
3450 || {_O} eq $state
3451 || {_T} eq $state
3452 || {T_} eq $state} {
3453 set s disabled
3454 } else {
3455 set s normal
3457 $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
3458 $ctxm entryconf $::ui_diff_applyline -state $s -label $t
3459 tk_popup $ctxm $X $Y
3462 bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg $ctxmsm %x %y %X %Y]
3464 # -- Status Bar
3466 set main_status [::status_bar::new .status]
3467 pack .status -anchor w -side bottom -fill x
3468 $main_status show [mc "Initializing..."]
3470 # -- Load geometry
3472 catch {
3473 set gm $repo_config(gui.geometry)
3474 wm geometry . [lindex $gm 0]
3475 if {$use_ttk} {
3476 .vpane sashpos 0 [lindex $gm 1]
3477 .vpane.files sashpos 0 [lindex $gm 2]
3478 } else {
3479 .vpane sash place 0 \
3480 [lindex $gm 1] \
3481 [lindex [.vpane sash coord 0] 1]
3482 .vpane.files sash place 0 \
3483 [lindex [.vpane.files sash coord 0] 0] \
3484 [lindex $gm 2]
3486 unset gm
3489 # -- Load window state
3491 catch {
3492 set gws $repo_config(gui.wmstate)
3493 wm state . $gws
3494 unset gws
3497 # -- Key Bindings
3499 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3500 bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
3501 bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
3502 bind $ui_comm <$M1B-Key-u> {do_unstage_selection;break}
3503 bind $ui_comm <$M1B-Key-U> {do_unstage_selection;break}
3504 bind $ui_comm <$M1B-Key-j> {do_revert_selection;break}
3505 bind $ui_comm <$M1B-Key-J> {do_revert_selection;break}
3506 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3507 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3508 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3509 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3510 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3511 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3512 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3513 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3514 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3515 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3516 bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
3517 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
3518 bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
3519 bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
3520 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
3522 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3523 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3524 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3525 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3526 bind $ui_diff <$M1B-Key-v> {break}
3527 bind $ui_diff <$M1B-Key-V> {break}
3528 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3529 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3530 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3531 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3532 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3533 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3534 bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
3535 bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
3536 bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
3537 bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
3538 bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
3539 bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
3540 bind $ui_diff <Button-1> {focus %W}
3542 if {[is_enabled branch]} {
3543 bind . <$M1B-Key-n> branch_create::dialog
3544 bind . <$M1B-Key-N> branch_create::dialog
3545 bind . <$M1B-Key-o> branch_checkout::dialog
3546 bind . <$M1B-Key-O> branch_checkout::dialog
3547 bind . <$M1B-Key-m> merge::dialog
3548 bind . <$M1B-Key-M> merge::dialog
3550 if {[is_enabled transport]} {
3551 bind . <$M1B-Key-p> do_push_anywhere
3552 bind . <$M1B-Key-P> do_push_anywhere
3555 bind . <Key-F5> ui_do_rescan
3556 bind . <$M1B-Key-r> ui_do_rescan
3557 bind . <$M1B-Key-R> ui_do_rescan
3558 bind . <$M1B-Key-s> do_signoff
3559 bind . <$M1B-Key-S> do_signoff
3560 bind . <$M1B-Key-t> do_add_selection
3561 bind . <$M1B-Key-T> do_add_selection
3562 bind . <$M1B-Key-j> do_revert_selection
3563 bind . <$M1B-Key-J> do_revert_selection
3564 bind . <$M1B-Key-i> do_add_all
3565 bind . <$M1B-Key-I> do_add_all
3566 bind . <$M1B-Key-minus> {show_less_context;break}
3567 bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
3568 bind . <$M1B-Key-equal> {show_more_context;break}
3569 bind . <$M1B-Key-plus> {show_more_context;break}
3570 bind . <$M1B-Key-KP_Add> {show_more_context;break}
3571 bind . <$M1B-Key-Return> do_commit
3572 foreach i [list $ui_index $ui_workdir] {
3573 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3574 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3575 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3577 unset i
3579 set file_lists($ui_index) [list]
3580 set file_lists($ui_workdir) [list]
3582 wm title . "[appname] ([reponame]) [file normalize $_gitworktree]"
3583 focus -force $ui_comm
3585 # -- Warn the user about environmental problems. Cygwin's Tcl
3586 # does *not* pass its env array onto any processes it spawns.
3587 # This means that git processes get none of our environment.
3589 if {[is_Cygwin]} {
3590 set ignored_env 0
3591 set suggest_user {}
3592 set msg [mc "Possible environment issues exist.
3594 The following environment variables are probably
3595 going to be ignored by any Git subprocess run
3596 by %s:
3598 " [appname]]
3599 foreach name [array names env] {
3600 switch -regexp -- $name {
3601 {^GIT_INDEX_FILE$} -
3602 {^GIT_OBJECT_DIRECTORY$} -
3603 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3604 {^GIT_DIFF_OPTS$} -
3605 {^GIT_EXTERNAL_DIFF$} -
3606 {^GIT_PAGER$} -
3607 {^GIT_TRACE$} -
3608 {^GIT_CONFIG$} -
3609 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3610 append msg " - $name\n"
3611 incr ignored_env
3613 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3614 append msg " - $name\n"
3615 incr ignored_env
3616 set suggest_user $name
3620 if {$ignored_env > 0} {
3621 append msg [mc "
3622 This is due to a known issue with the
3623 Tcl binary distributed by Cygwin."]
3625 if {$suggest_user ne {}} {
3626 append msg [mc "
3628 A good replacement for %s
3629 is placing values for the user.name and
3630 user.email settings into your personal
3631 ~/.gitconfig file.
3632 " $suggest_user]
3634 warn_popup $msg
3636 unset ignored_env msg suggest_user name
3639 # -- Only initialize complex UI if we are going to stay running.
3641 if {[is_enabled transport]} {
3642 load_all_remotes
3644 set n [.mbar.remote index end]
3645 populate_remotes_menu
3646 set n [expr {[.mbar.remote index end] - $n}]
3647 if {$n > 0} {
3648 if {[.mbar.remote type 0] eq "tearoff"} { incr n }
3649 .mbar.remote insert $n separator
3651 unset n
3654 if {[winfo exists $ui_comm]} {
3655 set GITGUI_BCK_exists [load_message GITGUI_BCK]
3657 # -- If both our backup and message files exist use the
3658 # newer of the two files to initialize the buffer.
3660 if {$GITGUI_BCK_exists} {
3661 set m [gitdir GITGUI_MSG]
3662 if {[file isfile $m]} {
3663 if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
3664 catch {file delete [gitdir GITGUI_MSG]}
3665 } else {
3666 $ui_comm delete 0.0 end
3667 $ui_comm edit reset
3668 $ui_comm edit modified false
3669 catch {file delete [gitdir GITGUI_BCK]}
3670 set GITGUI_BCK_exists 0
3673 unset m
3676 proc backup_commit_buffer {} {
3677 global ui_comm GITGUI_BCK_exists
3679 set m [$ui_comm edit modified]
3680 if {$m || $GITGUI_BCK_exists} {
3681 set msg [string trim [$ui_comm get 0.0 end]]
3682 regsub -all -line {[ \r\t]+$} $msg {} msg
3684 if {$msg eq {}} {
3685 if {$GITGUI_BCK_exists} {
3686 catch {file delete [gitdir GITGUI_BCK]}
3687 set GITGUI_BCK_exists 0
3689 } elseif {$m} {
3690 catch {
3691 set fd [open [gitdir GITGUI_BCK] w]
3692 puts -nonewline $fd $msg
3693 close $fd
3694 set GITGUI_BCK_exists 1
3698 $ui_comm edit modified false
3701 set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
3704 backup_commit_buffer
3706 # -- If the user has aspell available we can drive it
3707 # in pipe mode to spellcheck the commit message.
3709 set spell_cmd [list |]
3710 set spell_dict [get_config gui.spellingdictionary]
3711 lappend spell_cmd aspell
3712 if {$spell_dict ne {}} {
3713 lappend spell_cmd --master=$spell_dict
3715 lappend spell_cmd --mode=none
3716 lappend spell_cmd --encoding=utf-8
3717 lappend spell_cmd pipe
3718 if {$spell_dict eq {none}
3719 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
3720 bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
3721 } else {
3722 set ui_comm_spell [spellcheck::init \
3723 $spell_fd \
3724 $ui_comm \
3725 $ui_comm_ctxm \
3728 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3731 lock_index begin-read
3732 if {![winfo ismapped .]} {
3733 wm deiconify .
3735 after 1 {
3736 if {[is_enabled initialamend]} {
3737 force_amend
3738 } else {
3739 do_rescan
3742 if {[is_enabled nocommitmsg]} {
3743 $ui_comm configure -state disabled -background gray
3746 if {[is_enabled multicommit]} {
3747 after 1000 hint_gc
3749 if {[is_enabled retcode]} {
3750 bind . <Destroy> {+terminate_me %W}
3752 if {$picked && [is_config_true gui.autoexplore]} {
3753 do_explore
3756 # Local variables:
3757 # mode: tcl
3758 # indent-tabs-mode: t
3759 # tab-width: 4
3760 # End: