git-gui: Add gui.displayuntracked option
[git-gui.git] / git-gui.sh
blob32303b01c9690d81e2d8a447f7920dddcbff63b8
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 [string map [list (c) \u00a9] {
14 Copyright (c) 2006-2010 Shawn Pearce, et. al.
16 This program is free software; you can redistribute it and/or modify
17 it under the terms of the GNU General Public License as published by
18 the Free Software Foundation; either version 2 of the License, or
19 (at your option) any later version.
21 This program is distributed in the hope that it will be useful,
22 but WITHOUT ANY WARRANTY; without even the implied warranty of
23 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24 GNU General Public License for more details.
26 You should have received a copy of the GNU General Public License
27 along with this program; if not, write to the Free Software
28 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}]
30 ######################################################################
32 ## Tcl/Tk sanity check
34 if {[catch {package require Tcl 8.4} err]
35 || [catch {package require Tk 8.4} err]
36 } {
37 catch {wm withdraw .}
38 tk_messageBox \
39 -icon error \
40 -type ok \
41 -title "git-gui: fatal error" \
42 -message $err
43 exit 1
46 catch {rename send {}} ; # What an evil concept...
48 ######################################################################
50 ## locate our library
52 set oguilib {@@GITGUI_LIBDIR@@}
53 set oguirel {@@GITGUI_RELATIVE@@}
54 if {$oguirel eq {1}} {
55 set oguilib [file dirname [file normalize $argv0]]
56 if {[file tail $oguilib] eq {git-core}} {
57 set oguilib [file dirname $oguilib]
59 set oguilib [file dirname $oguilib]
60 set oguilib [file join $oguilib share git-gui lib]
61 set oguimsg [file join $oguilib msgs]
62 } elseif {[string match @@* $oguirel]} {
63 set oguilib [file join [file dirname [file normalize $argv0]] lib]
64 set oguimsg [file join [file dirname [file normalize $argv0]] po]
65 } else {
66 set oguimsg [file join $oguilib msgs]
68 unset oguirel
70 ######################################################################
72 ## enable verbose loading?
74 if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
75 unset _verbose
76 rename auto_load real__auto_load
77 proc auto_load {name args} {
78 puts stderr "auto_load $name"
79 return [uplevel 1 real__auto_load $name $args]
81 rename source real__source
82 proc source {name} {
83 puts stderr "source $name"
84 uplevel 1 real__source $name
86 if {[tk windowingsystem] eq "win32"} { console show }
89 ######################################################################
91 ## Internationalization (i18n) through msgcat and gettext. See
92 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
94 package require msgcat
96 # Check for Windows 7 MUI language pack (missed by msgcat < 1.4.4)
97 if {[tk windowingsystem] eq "win32"
98 && [package vcompare [package provide msgcat] 1.4.4] < 0
99 } then {
100 proc _mc_update_locale {} {
101 set key {HKEY_CURRENT_USER\Control Panel\Desktop}
102 if {![catch {
103 package require registry
104 set uilocale [registry get $key "PreferredUILanguages"]
105 msgcat::ConvertLocale [string map {- _} [lindex $uilocale 0]]
106 } uilocale]} {
107 if {[string length $uilocale] > 0} {
108 msgcat::mclocale $uilocale
112 _mc_update_locale
115 proc _mc_trim {fmt} {
116 set cmk [string first @@ $fmt]
117 if {$cmk > 0} {
118 return [string range $fmt 0 [expr {$cmk - 1}]]
120 return $fmt
123 proc mc {en_fmt args} {
124 set fmt [_mc_trim [::msgcat::mc $en_fmt]]
125 if {[catch {set msg [eval [list format $fmt] $args]} err]} {
126 set msg [eval [list format [_mc_trim $en_fmt]] $args]
128 return $msg
131 proc strcat {args} {
132 return [join $args {}]
135 ::msgcat::mcload $oguimsg
136 unset oguimsg
138 ######################################################################
140 ## On Mac, bring the current Wish process window to front
142 if {[tk windowingsystem] eq "aqua"} {
143 catch {
144 exec osascript -e [format {
145 tell application "System Events"
146 set frontmost of processes whose unix id is %d to true
147 end tell
148 } [pid]]
152 ######################################################################
154 ## read only globals
156 set _appname {Git Gui}
157 set _gitdir {}
158 set _gitworktree {}
159 set _isbare {}
160 set _gitexec {}
161 set _githtmldir {}
162 set _reponame {}
163 set _iscygwin {}
164 set _search_path {}
165 set _shellpath {@@SHELL_PATH@@}
167 set _trace [lsearch -exact $argv --trace]
168 if {$_trace >= 0} {
169 set argv [lreplace $argv $_trace $_trace]
170 set _trace 1
171 if {[tk windowingsystem] eq "win32"} { console show }
172 } else {
173 set _trace 0
176 # variable for the last merged branch (useful for a default when deleting
177 # branches).
178 set _last_merged_branch {}
180 proc shellpath {} {
181 global _shellpath env
182 if {[string match @@* $_shellpath]} {
183 if {[info exists env(SHELL)]} {
184 return $env(SHELL)
185 } else {
186 return /bin/sh
189 return $_shellpath
192 proc appname {} {
193 global _appname
194 return $_appname
197 proc gitdir {args} {
198 global _gitdir
199 if {$args eq {}} {
200 return $_gitdir
202 return [eval [list file join $_gitdir] $args]
205 proc gitexec {args} {
206 global _gitexec
207 if {$_gitexec eq {}} {
208 if {[catch {set _gitexec [git --exec-path]} err]} {
209 error "Git not installed?\n\n$err"
211 if {[is_Cygwin]} {
212 set _gitexec [exec cygpath \
213 --windows \
214 --absolute \
215 $_gitexec]
216 } else {
217 set _gitexec [file normalize $_gitexec]
220 if {$args eq {}} {
221 return $_gitexec
223 return [eval [list file join $_gitexec] $args]
226 proc githtmldir {args} {
227 global _githtmldir
228 if {$_githtmldir eq {}} {
229 if {[catch {set _githtmldir [git --html-path]}]} {
230 # Git not installed or option not yet supported
231 return {}
233 if {[is_Cygwin]} {
234 set _githtmldir [exec cygpath \
235 --windows \
236 --absolute \
237 $_githtmldir]
238 } else {
239 set _githtmldir [file normalize $_githtmldir]
242 if {$args eq {}} {
243 return $_githtmldir
245 return [eval [list file join $_githtmldir] $args]
248 proc reponame {} {
249 return $::_reponame
252 proc is_MacOSX {} {
253 if {[tk windowingsystem] eq {aqua}} {
254 return 1
256 return 0
259 proc is_Windows {} {
260 if {$::tcl_platform(platform) eq {windows}} {
261 return 1
263 return 0
266 proc is_Cygwin {} {
267 global _iscygwin
268 if {$_iscygwin eq {}} {
269 if {$::tcl_platform(platform) eq {windows}} {
270 if {[catch {set p [exec cygpath --windir]} err]} {
271 set _iscygwin 0
272 } else {
273 set _iscygwin 1
275 } else {
276 set _iscygwin 0
279 return $_iscygwin
282 proc is_enabled {option} {
283 global enabled_options
284 if {[catch {set on $enabled_options($option)}]} {return 0}
285 return $on
288 proc enable_option {option} {
289 global enabled_options
290 set enabled_options($option) 1
293 proc disable_option {option} {
294 global enabled_options
295 set enabled_options($option) 0
298 ######################################################################
300 ## config
302 proc is_many_config {name} {
303 switch -glob -- $name {
304 gui.recentrepo -
305 remote.*.fetch -
306 remote.*.push
307 {return 1}
309 {return 0}
313 proc is_config_true {name} {
314 global repo_config
315 if {[catch {set v $repo_config($name)}]} {
316 return 0
318 set v [string tolower $v]
319 if {$v eq {} || $v eq {true} || $v eq {1} || $v eq {yes} || $v eq {on}} {
320 return 1
321 } else {
322 return 0
326 proc is_config_false {name} {
327 global repo_config
328 if {[catch {set v $repo_config($name)}]} {
329 return 0
331 set v [string tolower $v]
332 if {$v eq {false} || $v eq {0} || $v eq {no} || $v eq {off}} {
333 return 1
334 } else {
335 return 0
339 proc get_config {name} {
340 global repo_config
341 if {[catch {set v $repo_config($name)}]} {
342 return {}
343 } else {
344 return $v
348 proc is_bare {} {
349 global _isbare
350 global _gitdir
351 global _gitworktree
353 if {$_isbare eq {}} {
354 if {[catch {
355 set _bare [git rev-parse --is-bare-repository]
356 switch -- $_bare {
357 true { set _isbare 1 }
358 false { set _isbare 0}
359 default { throw }
361 }]} {
362 if {[is_config_true core.bare]
363 || ($_gitworktree eq {}
364 && [lindex [file split $_gitdir] end] ne {.git})} {
365 set _isbare 1
366 } else {
367 set _isbare 0
371 return $_isbare
374 ######################################################################
376 ## handy utils
378 proc _trace_exec {cmd} {
379 if {!$::_trace} return
380 set d {}
381 foreach v $cmd {
382 if {$d ne {}} {
383 append d { }
385 if {[regexp {[ \t\r\n'"$?*]} $v]} {
386 set v [sq $v]
388 append d $v
390 puts stderr $d
393 #'" fix poor old emacs font-lock mode
395 proc _git_cmd {name} {
396 global _git_cmd_path
398 if {[catch {set v $_git_cmd_path($name)}]} {
399 switch -- $name {
400 version -
401 --version -
402 --exec-path { return [list $::_git $name] }
405 set p [gitexec git-$name$::_search_exe]
406 if {[file exists $p]} {
407 set v [list $p]
408 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
409 # Try to determine what sort of magic will make
410 # git-$name go and do its thing, because native
411 # Tcl on Windows doesn't know it.
413 set p [gitexec git-$name]
414 set f [open $p r]
415 set s [gets $f]
416 close $f
418 switch -glob -- [lindex $s 0] {
419 #!*sh { set i sh }
420 #!*perl { set i perl }
421 #!*python { set i python }
422 default { error "git-$name is not supported: $s" }
425 upvar #0 _$i interp
426 if {![info exists interp]} {
427 set interp [_which $i]
429 if {$interp eq {}} {
430 error "git-$name requires $i (not in PATH)"
432 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
433 } else {
434 # Assume it is builtin to git somehow and we
435 # aren't actually able to see a file for it.
437 set v [list $::_git $name]
439 set _git_cmd_path($name) $v
441 return $v
444 proc _which {what args} {
445 global env _search_exe _search_path
447 if {$_search_path eq {}} {
448 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
449 set _search_path [split [exec cygpath \
450 --windows \
451 --path \
452 --absolute \
453 $env(PATH)] {;}]
454 set _search_exe .exe
455 } elseif {[is_Windows]} {
456 set gitguidir [file dirname [info script]]
457 regsub -all ";" $gitguidir "\\;" gitguidir
458 set env(PATH) "$gitguidir;$env(PATH)"
459 set _search_path [split $env(PATH) {;}]
460 set _search_exe .exe
461 } else {
462 set _search_path [split $env(PATH) :]
463 set _search_exe {}
467 if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
468 set suffix {}
469 } else {
470 set suffix $_search_exe
473 foreach p $_search_path {
474 set p [file join $p $what$suffix]
475 if {[file exists $p]} {
476 return [file normalize $p]
479 return {}
482 # Test a file for a hashbang to identify executable scripts on Windows.
483 proc is_shellscript {filename} {
484 if {![file exists $filename]} {return 0}
485 set f [open $filename r]
486 fconfigure $f -encoding binary
487 set magic [read $f 2]
488 close $f
489 return [expr {$magic eq "#!"}]
492 # Run a command connected via pipes on stdout.
493 # This is for use with textconv filters and uses sh -c "..." to allow it to
494 # contain a command with arguments. On windows we must check for shell
495 # scripts specifically otherwise just call the filter command.
496 proc open_cmd_pipe {cmd path} {
497 global env
498 if {![file executable [shellpath]]} {
499 set exe [auto_execok [lindex $cmd 0]]
500 if {[is_shellscript [lindex $exe 0]]} {
501 set run [linsert [auto_execok sh] end -c "$cmd \"\$0\"" $path]
502 } else {
503 set run [concat $exe [lrange $cmd 1 end] $path]
505 } else {
506 set run [list [shellpath] -c "$cmd \"\$0\"" $path]
508 return [open |$run r]
511 proc _lappend_nice {cmd_var} {
512 global _nice
513 upvar $cmd_var cmd
515 if {![info exists _nice]} {
516 set _nice [_which nice]
517 if {[catch {exec $_nice git version}]} {
518 set _nice {}
519 } elseif {[is_Windows] && [file dirname $_nice] ne [file dirname $::_git]} {
520 set _nice {}
523 if {$_nice ne {}} {
524 lappend cmd $_nice
528 proc git {args} {
529 set opt [list]
531 while {1} {
532 switch -- [lindex $args 0] {
533 --nice {
534 _lappend_nice opt
537 default {
538 break
543 set args [lrange $args 1 end]
546 set cmdp [_git_cmd [lindex $args 0]]
547 set args [lrange $args 1 end]
549 _trace_exec [concat $opt $cmdp $args]
550 set result [eval exec $opt $cmdp $args]
551 if {$::_trace} {
552 puts stderr "< $result"
554 return $result
557 proc _open_stdout_stderr {cmd} {
558 _trace_exec $cmd
559 if {[catch {
560 set fd [open [concat [list | ] $cmd] r]
561 } err]} {
562 if { [lindex $cmd end] eq {2>@1}
563 && $err eq {can not find channel named "1"}
565 # Older versions of Tcl 8.4 don't have this 2>@1 IO
566 # redirect operator. Fallback to |& cat for those.
567 # The command was not actually started, so its safe
568 # to try to start it a second time.
570 set fd [open [concat \
571 [list | ] \
572 [lrange $cmd 0 end-1] \
573 [list |& cat] \
574 ] r]
575 } else {
576 error $err
579 fconfigure $fd -eofchar {}
580 return $fd
583 proc git_read {args} {
584 set opt [list]
586 while {1} {
587 switch -- [lindex $args 0] {
588 --nice {
589 _lappend_nice opt
592 --stderr {
593 lappend args 2>@1
596 default {
597 break
602 set args [lrange $args 1 end]
605 set cmdp [_git_cmd [lindex $args 0]]
606 set args [lrange $args 1 end]
608 return [_open_stdout_stderr [concat $opt $cmdp $args]]
611 proc git_write {args} {
612 set opt [list]
614 while {1} {
615 switch -- [lindex $args 0] {
616 --nice {
617 _lappend_nice opt
620 default {
621 break
626 set args [lrange $args 1 end]
629 set cmdp [_git_cmd [lindex $args 0]]
630 set args [lrange $args 1 end]
632 _trace_exec [concat $opt $cmdp $args]
633 return [open [concat [list | ] $opt $cmdp $args] w]
636 proc githook_read {hook_name args} {
637 set pchook [gitdir hooks $hook_name]
638 lappend args 2>@1
640 # On Windows [file executable] might lie so we need to ask
641 # the shell if the hook is executable. Yes that's annoying.
643 if {[is_Windows]} {
644 upvar #0 _sh interp
645 if {![info exists interp]} {
646 set interp [_which sh]
648 if {$interp eq {}} {
649 error "hook execution requires sh (not in PATH)"
652 set scr {if test -x "$1";then exec "$@";fi}
653 set sh_c [list $interp -c $scr $interp $pchook]
654 return [_open_stdout_stderr [concat $sh_c $args]]
657 if {[file executable $pchook]} {
658 return [_open_stdout_stderr [concat [list $pchook] $args]]
661 return {}
664 proc kill_file_process {fd} {
665 set process [pid $fd]
667 catch {
668 if {[is_Windows]} {
669 # Use a Cygwin-specific flag to allow killing
670 # native Windows processes
671 exec kill -f $process
672 } else {
673 exec kill $process
678 proc gitattr {path attr default} {
679 if {[catch {set r [git check-attr $attr -- $path]}]} {
680 set r unspecified
681 } else {
682 set r [join [lrange [split $r :] 2 end] :]
683 regsub {^ } $r {} r
685 if {$r eq {unspecified}} {
686 return $default
688 return $r
691 proc sq {value} {
692 regsub -all ' $value "'\\''" value
693 return "'$value'"
696 proc load_current_branch {} {
697 global current_branch is_detached
699 set fd [open [gitdir HEAD] r]
700 if {[gets $fd ref] < 1} {
701 set ref {}
703 close $fd
705 set pfx {ref: refs/heads/}
706 set len [string length $pfx]
707 if {[string equal -length $len $pfx $ref]} {
708 # We're on a branch. It might not exist. But
709 # HEAD looks good enough to be a branch.
711 set current_branch [string range $ref $len end]
712 set is_detached 0
713 } else {
714 # Assume this is a detached head.
716 set current_branch HEAD
717 set is_detached 1
721 auto_load tk_optionMenu
722 rename tk_optionMenu real__tkOptionMenu
723 proc tk_optionMenu {w varName args} {
724 set m [eval real__tkOptionMenu $w $varName $args]
725 $m configure -font font_ui
726 $w configure -font font_ui
727 return $m
730 proc rmsel_tag {text} {
731 $text tag conf sel \
732 -background [$text cget -background] \
733 -foreground [$text cget -foreground] \
734 -borderwidth 0
735 $text tag conf in_sel -background lightgray
736 bind $text <Motion> break
737 return $text
740 wm withdraw .
741 set root_exists 0
742 bind . <Visibility> {
743 bind . <Visibility> {}
744 set root_exists 1
747 if {[is_Windows]} {
748 wm iconbitmap . -default $oguilib/git-gui.ico
749 set ::tk::AlwaysShowSelection 1
750 bind . <Control-F2> {console show}
752 # Spoof an X11 display for SSH
753 if {![info exists env(DISPLAY)]} {
754 set env(DISPLAY) :9999
756 } else {
757 catch {
758 image create photo gitlogo -width 16 -height 16
760 gitlogo put #33CC33 -to 7 0 9 2
761 gitlogo put #33CC33 -to 4 2 12 4
762 gitlogo put #33CC33 -to 7 4 9 6
763 gitlogo put #CC3333 -to 4 6 12 8
764 gitlogo put gray26 -to 4 9 6 10
765 gitlogo put gray26 -to 3 10 6 12
766 gitlogo put gray26 -to 8 9 13 11
767 gitlogo put gray26 -to 8 11 10 12
768 gitlogo put gray26 -to 11 11 13 14
769 gitlogo put gray26 -to 3 12 5 14
770 gitlogo put gray26 -to 5 13
771 gitlogo put gray26 -to 10 13
772 gitlogo put gray26 -to 4 14 12 15
773 gitlogo put gray26 -to 5 15 11 16
774 gitlogo redither
776 image create photo gitlogo32 -width 32 -height 32
777 gitlogo32 copy gitlogo -zoom 2 2
779 wm iconphoto . -default gitlogo gitlogo32
783 ######################################################################
785 ## config defaults
787 set cursor_ptr arrow
788 font create font_ui
789 if {[lsearch -exact [font names] TkDefaultFont] != -1} {
790 eval [linsert [font actual TkDefaultFont] 0 font configure font_ui]
791 eval [linsert [font actual TkFixedFont] 0 font create font_diff]
792 } else {
793 font create font_diff -family Courier -size 10
794 catch {
795 label .dummy
796 eval font configure font_ui [font actual [.dummy cget -font]]
797 destroy .dummy
801 font create font_uiitalic
802 font create font_uibold
803 font create font_diffbold
804 font create font_diffitalic
806 foreach class {Button Checkbutton Entry Label
807 Labelframe Listbox Message
808 Radiobutton Spinbox Text} {
809 option add *$class.font font_ui
811 if {![is_MacOSX]} {
812 option add *Menu.font font_ui
813 option add *Entry.borderWidth 1 startupFile
814 option add *Entry.relief sunken startupFile
815 option add *RadioButton.anchor w startupFile
817 unset class
819 if {[is_Windows] || [is_MacOSX]} {
820 option add *Menu.tearOff 0
823 if {[is_MacOSX]} {
824 set M1B M1
825 set M1T Cmd
826 } else {
827 set M1B Control
828 set M1T Ctrl
831 proc bind_button3 {w cmd} {
832 bind $w <Any-Button-3> $cmd
833 if {[is_MacOSX]} {
834 # Mac OS X sends Button-2 on right click through three-button mouse,
835 # or through trackpad right-clicking (two-finger touch + click).
836 bind $w <Any-Button-2> $cmd
837 bind $w <Control-Button-1> $cmd
841 proc apply_config {} {
842 global repo_config font_descs
844 foreach option $font_descs {
845 set name [lindex $option 0]
846 set font [lindex $option 1]
847 if {[catch {
848 set need_weight 1
849 foreach {cn cv} $repo_config(gui.$name) {
850 if {$cn eq {-weight}} {
851 set need_weight 0
853 font configure $font $cn $cv
855 if {$need_weight} {
856 font configure $font -weight normal
858 } err]} {
859 error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
861 foreach {cn cv} [font configure $font] {
862 font configure ${font}bold $cn $cv
863 font configure ${font}italic $cn $cv
865 font configure ${font}bold -weight bold
866 font configure ${font}italic -slant italic
869 global use_ttk NS
870 set use_ttk 0
871 set NS {}
872 if {$repo_config(gui.usettk)} {
873 set use_ttk [package vsatisfies [package provide Tk] 8.5]
874 if {$use_ttk} {
875 set NS ttk
876 bind [winfo class .] <<ThemeChanged>> [list InitTheme]
877 pave_toplevel .
882 set default_config(branch.autosetupmerge) true
883 set default_config(merge.tool) {}
884 set default_config(mergetool.keepbackup) true
885 set default_config(merge.diffstat) true
886 set default_config(merge.summary) false
887 set default_config(merge.verbosity) 2
888 set default_config(user.name) {}
889 set default_config(user.email) {}
891 set default_config(gui.encoding) [encoding system]
892 set default_config(gui.matchtrackingbranch) false
893 set default_config(gui.textconv) true
894 set default_config(gui.pruneduringfetch) false
895 set default_config(gui.trustmtime) false
896 set default_config(gui.fastcopyblame) false
897 set default_config(gui.maxrecentrepo) 10
898 set default_config(gui.copyblamethreshold) 40
899 set default_config(gui.blamehistoryctx) 7
900 set default_config(gui.diffcontext) 5
901 set default_config(gui.diffopts) {}
902 set default_config(gui.commitmsgwidth) 75
903 set default_config(gui.newbranchtemplate) {}
904 set default_config(gui.spellingdictionary) {}
905 set default_config(gui.fontui) [font configure font_ui]
906 set default_config(gui.fontdiff) [font configure font_diff]
907 # TODO: this option should be added to the git-config documentation
908 set default_config(gui.maxfilesdisplayed) 5000
909 set default_config(gui.usettk) 1
910 set default_config(gui.warndetachedcommit) 1
911 set font_descs {
912 {fontui font_ui {mc "Main Font"}}
913 {fontdiff font_diff {mc "Diff/Console Font"}}
915 set default_config(gui.stageuntracked) ask
916 set default_config(gui.displayuntracked) true
918 ######################################################################
920 ## find git
922 set _git [_which git]
923 if {$_git eq {}} {
924 catch {wm withdraw .}
925 tk_messageBox \
926 -icon error \
927 -type ok \
928 -title [mc "git-gui: fatal error"] \
929 -message [mc "Cannot find git in PATH."]
930 exit 1
933 ######################################################################
935 ## version check
937 if {[catch {set _git_version [git --version]} err]} {
938 catch {wm withdraw .}
939 tk_messageBox \
940 -icon error \
941 -type ok \
942 -title [mc "git-gui: fatal error"] \
943 -message "Cannot determine Git version:
945 $err
947 [appname] requires Git 1.5.0 or later."
948 exit 1
950 if {![regsub {^git version } $_git_version {} _git_version]} {
951 catch {wm withdraw .}
952 tk_messageBox \
953 -icon error \
954 -type ok \
955 -title [mc "git-gui: fatal error"] \
956 -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
957 exit 1
960 proc get_trimmed_version {s} {
961 set r {}
962 foreach x [split $s -._] {
963 if {[string is integer -strict $x]} {
964 lappend r $x
965 } else {
966 break
969 return [join $r .]
971 set _real_git_version $_git_version
972 set _git_version [get_trimmed_version $_git_version]
974 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
975 catch {wm withdraw .}
976 if {[tk_messageBox \
977 -icon warning \
978 -type yesno \
979 -default no \
980 -title "[appname]: warning" \
981 -message [mc "Git version cannot be determined.
983 %s claims it is version '%s'.
985 %s requires at least Git 1.5.0 or later.
987 Assume '%s' is version 1.5.0?
988 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
989 set _git_version 1.5.0
990 } else {
991 exit 1
994 unset _real_git_version
996 proc git-version {args} {
997 global _git_version
999 switch [llength $args] {
1001 return $_git_version
1005 set op [lindex $args 0]
1006 set vr [lindex $args 1]
1007 set cm [package vcompare $_git_version $vr]
1008 return [expr $cm $op 0]
1012 set type [lindex $args 0]
1013 set name [lindex $args 1]
1014 set parm [lindex $args 2]
1015 set body [lindex $args 3]
1017 if {($type ne {proc} && $type ne {method})} {
1018 error "Invalid arguments to git-version"
1020 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
1021 error "Last arm of $type $name must be default"
1024 foreach {op vr cb} [lrange $body 0 end-2] {
1025 if {[git-version $op $vr]} {
1026 return [uplevel [list $type $name $parm $cb]]
1030 return [uplevel [list $type $name $parm [lindex $body end]]]
1033 default {
1034 error "git-version >= x"
1040 if {[git-version < 1.5]} {
1041 catch {wm withdraw .}
1042 tk_messageBox \
1043 -icon error \
1044 -type ok \
1045 -title [mc "git-gui: fatal error"] \
1046 -message "[appname] requires Git 1.5.0 or later.
1048 You are using [git-version]:
1050 [git --version]"
1051 exit 1
1054 ######################################################################
1056 ## configure our library
1058 set idx [file join $oguilib tclIndex]
1059 if {[catch {set fd [open $idx r]} err]} {
1060 catch {wm withdraw .}
1061 tk_messageBox \
1062 -icon error \
1063 -type ok \
1064 -title [mc "git-gui: fatal error"] \
1065 -message $err
1066 exit 1
1068 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
1069 set idx [list]
1070 while {[gets $fd n] >= 0} {
1071 if {$n ne {} && ![string match #* $n]} {
1072 lappend idx $n
1075 } else {
1076 set idx {}
1078 close $fd
1080 if {$idx ne {}} {
1081 set loaded [list]
1082 foreach p $idx {
1083 if {[lsearch -exact $loaded $p] >= 0} continue
1084 source [file join $oguilib $p]
1085 lappend loaded $p
1087 unset loaded p
1088 } else {
1089 set auto_path [concat [list $oguilib] $auto_path]
1091 unset -nocomplain idx fd
1093 ######################################################################
1095 ## config file parsing
1097 git-version proc _parse_config {arr_name args} {
1098 >= 1.5.3 {
1099 upvar $arr_name arr
1100 array unset arr
1101 set buf {}
1102 catch {
1103 set fd_rc [eval \
1104 [list git_read config] \
1105 $args \
1106 [list --null --list]]
1107 fconfigure $fd_rc -translation binary
1108 set buf [read $fd_rc]
1109 close $fd_rc
1111 foreach line [split $buf "\0"] {
1112 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
1113 if {[is_many_config $name]} {
1114 lappend arr($name) $value
1115 } else {
1116 set arr($name) $value
1118 } elseif {[regexp {^([^\n]+)$} $line line name]} {
1119 # no value given, but interpreting them as
1120 # boolean will be handled as true
1121 set arr($name) {}
1125 default {
1126 upvar $arr_name arr
1127 array unset arr
1128 catch {
1129 set fd_rc [eval [list git_read config --list] $args]
1130 while {[gets $fd_rc line] >= 0} {
1131 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
1132 if {[is_many_config $name]} {
1133 lappend arr($name) $value
1134 } else {
1135 set arr($name) $value
1137 } elseif {[regexp {^([^=]+)$} $line line name]} {
1138 # no value given, but interpreting them as
1139 # boolean will be handled as true
1140 set arr($name) {}
1143 close $fd_rc
1148 proc load_config {include_global} {
1149 global repo_config global_config system_config default_config
1151 if {$include_global} {
1152 _parse_config system_config --system
1153 _parse_config global_config --global
1155 _parse_config repo_config
1157 foreach name [array names default_config] {
1158 if {[catch {set v $system_config($name)}]} {
1159 set system_config($name) $default_config($name)
1162 foreach name [array names system_config] {
1163 if {[catch {set v $global_config($name)}]} {
1164 set global_config($name) $system_config($name)
1166 if {[catch {set v $repo_config($name)}]} {
1167 set repo_config($name) $system_config($name)
1172 ######################################################################
1174 ## feature option selection
1176 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1177 unset _junk
1178 } else {
1179 set subcommand gui
1181 if {$subcommand eq {gui.sh}} {
1182 set subcommand gui
1184 if {$subcommand eq {gui} && [llength $argv] > 0} {
1185 set subcommand [lindex $argv 0]
1186 set argv [lrange $argv 1 end]
1189 enable_option multicommit
1190 enable_option branch
1191 enable_option transport
1192 disable_option bare
1194 switch -- $subcommand {
1195 browser -
1196 blame {
1197 enable_option bare
1199 disable_option multicommit
1200 disable_option branch
1201 disable_option transport
1203 citool {
1204 enable_option singlecommit
1205 enable_option retcode
1207 disable_option multicommit
1208 disable_option branch
1209 disable_option transport
1211 while {[llength $argv] > 0} {
1212 set a [lindex $argv 0]
1213 switch -- $a {
1214 --amend {
1215 enable_option initialamend
1217 --nocommit {
1218 enable_option nocommit
1219 enable_option nocommitmsg
1221 --commitmsg {
1222 disable_option nocommitmsg
1224 default {
1225 break
1229 set argv [lrange $argv 1 end]
1234 ######################################################################
1236 ## execution environment
1238 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1240 # Suggest our implementation of askpass, if none is set
1241 if {![info exists env(SSH_ASKPASS)]} {
1242 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1245 ######################################################################
1247 ## repository setup
1249 set picked 0
1250 if {[catch {
1251 set _gitdir $env(GIT_DIR)
1252 set _prefix {}
1254 && [catch {
1255 # beware that from the .git dir this sets _gitdir to .
1256 # and _prefix to the empty string
1257 set _gitdir [git rev-parse --git-dir]
1258 set _prefix [git rev-parse --show-prefix]
1259 } err]} {
1260 load_config 1
1261 apply_config
1262 choose_repository::pick
1263 set picked 1
1266 # we expand the _gitdir when it's just a single dot (i.e. when we're being
1267 # run from the .git dir itself) lest the routines to find the worktree
1268 # get confused
1269 if {$_gitdir eq "."} {
1270 set _gitdir [pwd]
1273 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1274 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1276 if {![file isdirectory $_gitdir]} {
1277 catch {wm withdraw .}
1278 error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
1279 exit 1
1281 # _gitdir exists, so try loading the config
1282 load_config 0
1283 apply_config
1285 # v1.7.0 introduced --show-toplevel to return the canonical work-tree
1286 if {[package vsatisfies $_git_version 1.7.0]} {
1287 set _gitworktree [git rev-parse --show-toplevel]
1288 } else {
1289 # try to set work tree from environment, core.worktree or use
1290 # cdup to obtain a relative path to the top of the worktree. If
1291 # run from the top, the ./ prefix ensures normalize expands pwd.
1292 if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
1293 set _gitworktree [get_config core.worktree]
1294 if {$_gitworktree eq ""} {
1295 set _gitworktree [file normalize ./[git rev-parse --show-cdup]]
1300 if {$_prefix ne {}} {
1301 if {$_gitworktree eq {}} {
1302 regsub -all {[^/]+/} $_prefix ../ cdup
1303 } else {
1304 set cdup $_gitworktree
1306 if {[catch {cd $cdup} err]} {
1307 catch {wm withdraw .}
1308 error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
1309 exit 1
1311 set _gitworktree [pwd]
1312 unset cdup
1313 } elseif {![is_enabled bare]} {
1314 if {[is_bare]} {
1315 catch {wm withdraw .}
1316 error_popup [strcat [mc "Cannot use bare repository:"] "\n\n$_gitdir"]
1317 exit 1
1319 if {$_gitworktree eq {}} {
1320 set _gitworktree [file dirname $_gitdir]
1322 if {[catch {cd $_gitworktree} err]} {
1323 catch {wm withdraw .}
1324 error_popup [strcat [mc "No working directory"] " $_gitworktree:\n\n$err"]
1325 exit 1
1327 set _gitworktree [pwd]
1329 set _reponame [file split [file normalize $_gitdir]]
1330 if {[lindex $_reponame end] eq {.git}} {
1331 set _reponame [lindex $_reponame end-1]
1332 } else {
1333 set _reponame [lindex $_reponame end]
1336 set env(GIT_DIR) $_gitdir
1337 set env(GIT_WORK_TREE) $_gitworktree
1339 ######################################################################
1341 ## global init
1343 set current_diff_path {}
1344 set current_diff_side {}
1345 set diff_actions [list]
1347 set HEAD {}
1348 set PARENT {}
1349 set MERGE_HEAD [list]
1350 set commit_type {}
1351 set empty_tree {}
1352 set current_branch {}
1353 set is_detached 0
1354 set current_diff_path {}
1355 set is_3way_diff 0
1356 set is_submodule_diff 0
1357 set is_conflict_diff 0
1358 set selected_commit_type new
1359 set diff_empty_count 0
1361 set nullid "0000000000000000000000000000000000000000"
1362 set nullid2 "0000000000000000000000000000000000000001"
1364 ######################################################################
1366 ## task management
1368 set rescan_active 0
1369 set diff_active 0
1370 set last_clicked {}
1372 set disable_on_lock [list]
1373 set index_lock_type none
1375 proc lock_index {type} {
1376 global index_lock_type disable_on_lock
1378 if {$index_lock_type eq {none}} {
1379 set index_lock_type $type
1380 foreach w $disable_on_lock {
1381 uplevel #0 $w disabled
1383 return 1
1384 } elseif {$index_lock_type eq "begin-$type"} {
1385 set index_lock_type $type
1386 return 1
1388 return 0
1391 proc unlock_index {} {
1392 global index_lock_type disable_on_lock
1394 set index_lock_type none
1395 foreach w $disable_on_lock {
1396 uplevel #0 $w normal
1400 ######################################################################
1402 ## status
1404 proc repository_state {ctvar hdvar mhvar} {
1405 global current_branch
1406 upvar $ctvar ct $hdvar hd $mhvar mh
1408 set mh [list]
1410 load_current_branch
1411 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1412 set hd {}
1413 set ct initial
1414 return
1417 set merge_head [gitdir MERGE_HEAD]
1418 if {[file exists $merge_head]} {
1419 set ct merge
1420 set fd_mh [open $merge_head r]
1421 while {[gets $fd_mh line] >= 0} {
1422 lappend mh $line
1424 close $fd_mh
1425 return
1428 set ct normal
1431 proc PARENT {} {
1432 global PARENT empty_tree
1434 set p [lindex $PARENT 0]
1435 if {$p ne {}} {
1436 return $p
1438 if {$empty_tree eq {}} {
1439 set empty_tree [git mktree << {}]
1441 return $empty_tree
1444 proc force_amend {} {
1445 global selected_commit_type
1446 global HEAD PARENT MERGE_HEAD commit_type
1448 repository_state newType newHEAD newMERGE_HEAD
1449 set HEAD $newHEAD
1450 set PARENT $newHEAD
1451 set MERGE_HEAD $newMERGE_HEAD
1452 set commit_type $newType
1454 set selected_commit_type amend
1455 do_select_commit_type
1458 proc rescan {after {honor_trustmtime 1}} {
1459 global HEAD PARENT MERGE_HEAD commit_type
1460 global ui_index ui_workdir ui_comm
1461 global rescan_active file_states
1462 global repo_config
1464 if {$rescan_active > 0 || ![lock_index read]} return
1466 repository_state newType newHEAD newMERGE_HEAD
1467 if {[string match amend* $commit_type]
1468 && $newType eq {normal}
1469 && $newHEAD eq $HEAD} {
1470 } else {
1471 set HEAD $newHEAD
1472 set PARENT $newHEAD
1473 set MERGE_HEAD $newMERGE_HEAD
1474 set commit_type $newType
1477 array unset file_states
1479 if {!$::GITGUI_BCK_exists &&
1480 (![$ui_comm edit modified]
1481 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1482 if {[string match amend* $commit_type]} {
1483 } elseif {[load_message GITGUI_MSG utf-8]} {
1484 } elseif {[run_prepare_commit_msg_hook]} {
1485 } elseif {[load_message MERGE_MSG]} {
1486 } elseif {[load_message SQUASH_MSG]} {
1488 $ui_comm edit reset
1489 $ui_comm edit modified false
1492 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1493 rescan_stage2 {} $after
1494 } else {
1495 set rescan_active 1
1496 ui_status [mc "Refreshing file status..."]
1497 set fd_rf [git_read update-index \
1498 -q \
1499 --unmerged \
1500 --ignore-missing \
1501 --refresh \
1503 fconfigure $fd_rf -blocking 0 -translation binary
1504 fileevent $fd_rf readable \
1505 [list rescan_stage2 $fd_rf $after]
1509 if {[is_Cygwin]} {
1510 set is_git_info_exclude {}
1511 proc have_info_exclude {} {
1512 global is_git_info_exclude
1514 if {$is_git_info_exclude eq {}} {
1515 if {[catch {exec test -f [gitdir info exclude]}]} {
1516 set is_git_info_exclude 0
1517 } else {
1518 set is_git_info_exclude 1
1521 return $is_git_info_exclude
1523 } else {
1524 proc have_info_exclude {} {
1525 return [file readable [gitdir info exclude]]
1529 proc rescan_stage2 {fd after} {
1530 global rescan_active buf_rdi buf_rdf buf_rlo
1532 if {$fd ne {}} {
1533 read $fd
1534 if {![eof $fd]} return
1535 close $fd
1538 if {[package vsatisfies $::_git_version 1.6.3]} {
1539 set ls_others [list --exclude-standard]
1540 } else {
1541 set ls_others [list --exclude-per-directory=.gitignore]
1542 if {[have_info_exclude]} {
1543 lappend ls_others "--exclude-from=[gitdir info exclude]"
1545 set user_exclude [get_config core.excludesfile]
1546 if {$user_exclude ne {} && [file readable $user_exclude]} {
1547 lappend ls_others "--exclude-from=[file normalize $user_exclude]"
1551 set buf_rdi {}
1552 set buf_rdf {}
1553 set buf_rlo {}
1555 set rescan_active 2
1556 ui_status [mc "Scanning for modified files ..."]
1557 set fd_di [git_read diff-index --cached -z [PARENT]]
1558 set fd_df [git_read diff-files -z]
1560 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1561 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1563 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1564 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1566 if {[is_config_true gui.displayuntracked]} {
1567 set fd_lo [eval git_read ls-files --others -z $ls_others]
1568 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1569 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1570 incr rescan_active
1574 proc load_message {file {encoding {}}} {
1575 global ui_comm
1577 set f [gitdir $file]
1578 if {[file isfile $f]} {
1579 if {[catch {set fd [open $f r]}]} {
1580 return 0
1582 fconfigure $fd -eofchar {}
1583 if {$encoding ne {}} {
1584 fconfigure $fd -encoding $encoding
1586 set content [string trim [read $fd]]
1587 close $fd
1588 regsub -all -line {[ \r\t]+$} $content {} content
1589 $ui_comm delete 0.0 end
1590 $ui_comm insert end $content
1591 return 1
1593 return 0
1596 proc run_prepare_commit_msg_hook {} {
1597 global pch_error
1599 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1600 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1601 # empty file but existent file.
1603 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1605 if {[file isfile [gitdir MERGE_MSG]]} {
1606 set pcm_source "merge"
1607 set fd_mm [open [gitdir MERGE_MSG] r]
1608 puts -nonewline $fd_pcm [read $fd_mm]
1609 close $fd_mm
1610 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1611 set pcm_source "squash"
1612 set fd_sm [open [gitdir SQUASH_MSG] r]
1613 puts -nonewline $fd_pcm [read $fd_sm]
1614 close $fd_sm
1615 } else {
1616 set pcm_source ""
1619 close $fd_pcm
1621 set fd_ph [githook_read prepare-commit-msg \
1622 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1623 if {$fd_ph eq {}} {
1624 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1625 return 0;
1628 ui_status [mc "Calling prepare-commit-msg hook..."]
1629 set pch_error {}
1631 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1632 fileevent $fd_ph readable \
1633 [list prepare_commit_msg_hook_wait $fd_ph]
1635 return 1;
1638 proc prepare_commit_msg_hook_wait {fd_ph} {
1639 global pch_error
1641 append pch_error [read $fd_ph]
1642 fconfigure $fd_ph -blocking 1
1643 if {[eof $fd_ph]} {
1644 if {[catch {close $fd_ph}]} {
1645 ui_status [mc "Commit declined by prepare-commit-msg hook."]
1646 hook_failed_popup prepare-commit-msg $pch_error
1647 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1648 exit 1
1649 } else {
1650 load_message PREPARE_COMMIT_MSG
1652 set pch_error {}
1653 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1654 return
1656 fconfigure $fd_ph -blocking 0
1657 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1660 proc read_diff_index {fd after} {
1661 global buf_rdi
1663 append buf_rdi [read $fd]
1664 set c 0
1665 set n [string length $buf_rdi]
1666 while {$c < $n} {
1667 set z1 [string first "\0" $buf_rdi $c]
1668 if {$z1 == -1} break
1669 incr z1
1670 set z2 [string first "\0" $buf_rdi $z1]
1671 if {$z2 == -1} break
1673 incr c
1674 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1675 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1676 merge_state \
1677 [encoding convertfrom $p] \
1678 [lindex $i 4]? \
1679 [list [lindex $i 0] [lindex $i 2]] \
1680 [list]
1681 set c $z2
1682 incr c
1684 if {$c < $n} {
1685 set buf_rdi [string range $buf_rdi $c end]
1686 } else {
1687 set buf_rdi {}
1690 rescan_done $fd buf_rdi $after
1693 proc read_diff_files {fd after} {
1694 global buf_rdf
1696 append buf_rdf [read $fd]
1697 set c 0
1698 set n [string length $buf_rdf]
1699 while {$c < $n} {
1700 set z1 [string first "\0" $buf_rdf $c]
1701 if {$z1 == -1} break
1702 incr z1
1703 set z2 [string first "\0" $buf_rdf $z1]
1704 if {$z2 == -1} break
1706 incr c
1707 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1708 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1709 merge_state \
1710 [encoding convertfrom $p] \
1711 ?[lindex $i 4] \
1712 [list] \
1713 [list [lindex $i 0] [lindex $i 2]]
1714 set c $z2
1715 incr c
1717 if {$c < $n} {
1718 set buf_rdf [string range $buf_rdf $c end]
1719 } else {
1720 set buf_rdf {}
1723 rescan_done $fd buf_rdf $after
1726 proc read_ls_others {fd after} {
1727 global buf_rlo
1729 append buf_rlo [read $fd]
1730 set pck [split $buf_rlo "\0"]
1731 set buf_rlo [lindex $pck end]
1732 foreach p [lrange $pck 0 end-1] {
1733 set p [encoding convertfrom $p]
1734 if {[string index $p end] eq {/}} {
1735 set p [string range $p 0 end-1]
1737 merge_state $p ?O
1739 rescan_done $fd buf_rlo $after
1742 proc rescan_done {fd buf after} {
1743 global rescan_active current_diff_path
1744 global file_states repo_config
1745 upvar $buf to_clear
1747 if {![eof $fd]} return
1748 set to_clear {}
1749 close $fd
1750 if {[incr rescan_active -1] > 0} return
1752 prune_selection
1753 unlock_index
1754 display_all_files
1755 if {$current_diff_path ne {}} { reshow_diff $after }
1756 if {$current_diff_path eq {}} { select_first_diff $after }
1759 proc prune_selection {} {
1760 global file_states selected_paths
1762 foreach path [array names selected_paths] {
1763 if {[catch {set still_here $file_states($path)}]} {
1764 unset selected_paths($path)
1769 ######################################################################
1771 ## ui helpers
1773 proc mapicon {w state path} {
1774 global all_icons
1776 if {[catch {set r $all_icons($state$w)}]} {
1777 puts "error: no icon for $w state={$state} $path"
1778 return file_plain
1780 return $r
1783 proc mapdesc {state path} {
1784 global all_descs
1786 if {[catch {set r $all_descs($state)}]} {
1787 puts "error: no desc for state={$state} $path"
1788 return $state
1790 return $r
1793 proc ui_status {msg} {
1794 global main_status
1795 if {[info exists main_status]} {
1796 $main_status show $msg
1800 proc ui_ready {{test {}}} {
1801 global main_status
1802 if {[info exists main_status]} {
1803 $main_status show [mc "Ready."] $test
1807 proc escape_path {path} {
1808 regsub -all {\\} $path "\\\\" path
1809 regsub -all "\n" $path "\\n" path
1810 return $path
1813 proc short_path {path} {
1814 return [escape_path [lindex [file split $path] end]]
1817 set next_icon_id 0
1818 set null_sha1 [string repeat 0 40]
1820 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1821 global file_states next_icon_id null_sha1
1823 set s0 [string index $new_state 0]
1824 set s1 [string index $new_state 1]
1826 if {[catch {set info $file_states($path)}]} {
1827 set state __
1828 set icon n[incr next_icon_id]
1829 } else {
1830 set state [lindex $info 0]
1831 set icon [lindex $info 1]
1832 if {$head_info eq {}} {set head_info [lindex $info 2]}
1833 if {$index_info eq {}} {set index_info [lindex $info 3]}
1836 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1837 elseif {$s0 eq {_}} {set s0 _}
1839 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1840 elseif {$s1 eq {_}} {set s1 _}
1842 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1843 set head_info [list 0 $null_sha1]
1844 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1845 && $head_info eq {}} {
1846 set head_info $index_info
1847 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1848 set index_info $head_info
1849 set head_info {}
1852 set file_states($path) [list $s0$s1 $icon \
1853 $head_info $index_info \
1855 return $state
1858 proc display_file_helper {w path icon_name old_m new_m} {
1859 global file_lists
1861 if {$new_m eq {_}} {
1862 set lno [lsearch -sorted -exact $file_lists($w) $path]
1863 if {$lno >= 0} {
1864 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1865 incr lno
1866 $w conf -state normal
1867 $w delete $lno.0 [expr {$lno + 1}].0
1868 $w conf -state disabled
1870 } elseif {$old_m eq {_} && $new_m ne {_}} {
1871 lappend file_lists($w) $path
1872 set file_lists($w) [lsort -unique $file_lists($w)]
1873 set lno [lsearch -sorted -exact $file_lists($w) $path]
1874 incr lno
1875 $w conf -state normal
1876 $w image create $lno.0 \
1877 -align center -padx 5 -pady 1 \
1878 -name $icon_name \
1879 -image [mapicon $w $new_m $path]
1880 $w insert $lno.1 "[escape_path $path]\n"
1881 $w conf -state disabled
1882 } elseif {$old_m ne $new_m} {
1883 $w conf -state normal
1884 $w image conf $icon_name -image [mapicon $w $new_m $path]
1885 $w conf -state disabled
1889 proc display_file {path state} {
1890 global file_states selected_paths
1891 global ui_index ui_workdir
1893 set old_m [merge_state $path $state]
1894 set s $file_states($path)
1895 set new_m [lindex $s 0]
1896 set icon_name [lindex $s 1]
1898 set o [string index $old_m 0]
1899 set n [string index $new_m 0]
1900 if {$o eq {U}} {
1901 set o _
1903 if {$n eq {U}} {
1904 set n _
1906 display_file_helper $ui_index $path $icon_name $o $n
1908 if {[string index $old_m 0] eq {U}} {
1909 set o U
1910 } else {
1911 set o [string index $old_m 1]
1913 if {[string index $new_m 0] eq {U}} {
1914 set n U
1915 } else {
1916 set n [string index $new_m 1]
1918 display_file_helper $ui_workdir $path $icon_name $o $n
1920 if {$new_m eq {__}} {
1921 unset file_states($path)
1922 catch {unset selected_paths($path)}
1926 proc display_all_files_helper {w path icon_name m} {
1927 global file_lists
1929 lappend file_lists($w) $path
1930 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1931 $w image create end \
1932 -align center -padx 5 -pady 1 \
1933 -name $icon_name \
1934 -image [mapicon $w $m $path]
1935 $w insert end "[escape_path $path]\n"
1938 set files_warning 0
1939 proc display_all_files {} {
1940 global ui_index ui_workdir
1941 global file_states file_lists
1942 global last_clicked
1943 global files_warning
1945 $ui_index conf -state normal
1946 $ui_workdir conf -state normal
1948 $ui_index delete 0.0 end
1949 $ui_workdir delete 0.0 end
1950 set last_clicked {}
1952 set file_lists($ui_index) [list]
1953 set file_lists($ui_workdir) [list]
1955 set to_display [lsort [array names file_states]]
1956 set display_limit [get_config gui.maxfilesdisplayed]
1957 if {[llength $to_display] > $display_limit} {
1958 if {!$files_warning} {
1959 # do not repeatedly warn:
1960 set files_warning 1
1961 info_popup [mc "Displaying only %s of %s files." \
1962 $display_limit [llength $to_display]]
1964 set to_display [lrange $to_display 0 [expr {$display_limit-1}]]
1966 foreach path $to_display {
1967 set s $file_states($path)
1968 set m [lindex $s 0]
1969 set icon_name [lindex $s 1]
1971 set s [string index $m 0]
1972 if {$s ne {U} && $s ne {_}} {
1973 display_all_files_helper $ui_index $path \
1974 $icon_name $s
1977 if {[string index $m 0] eq {U}} {
1978 set s U
1979 } else {
1980 set s [string index $m 1]
1982 if {$s ne {_}} {
1983 display_all_files_helper $ui_workdir $path \
1984 $icon_name $s
1988 $ui_index conf -state disabled
1989 $ui_workdir conf -state disabled
1992 ######################################################################
1994 ## icons
1996 set filemask {
1997 #define mask_width 14
1998 #define mask_height 15
1999 static unsigned char mask_bits[] = {
2000 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2001 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2002 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2005 image create bitmap file_plain -background white -foreground black -data {
2006 #define plain_width 14
2007 #define plain_height 15
2008 static unsigned char plain_bits[] = {
2009 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2010 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2011 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2012 } -maskdata $filemask
2014 image create bitmap file_mod -background white -foreground blue -data {
2015 #define mod_width 14
2016 #define mod_height 15
2017 static unsigned char mod_bits[] = {
2018 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2019 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2020 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2021 } -maskdata $filemask
2023 image create bitmap file_fulltick -background white -foreground "#007000" -data {
2024 #define file_fulltick_width 14
2025 #define file_fulltick_height 15
2026 static unsigned char file_fulltick_bits[] = {
2027 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2028 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2029 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2030 } -maskdata $filemask
2032 image create bitmap file_question -background white -foreground black -data {
2033 #define file_question_width 14
2034 #define file_question_height 15
2035 static unsigned char file_question_bits[] = {
2036 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2037 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2038 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2039 } -maskdata $filemask
2041 image create bitmap file_removed -background white -foreground red -data {
2042 #define file_removed_width 14
2043 #define file_removed_height 15
2044 static unsigned char file_removed_bits[] = {
2045 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2046 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2047 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2048 } -maskdata $filemask
2050 image create bitmap file_merge -background white -foreground blue -data {
2051 #define file_merge_width 14
2052 #define file_merge_height 15
2053 static unsigned char file_merge_bits[] = {
2054 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2055 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2056 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2057 } -maskdata $filemask
2059 image create bitmap file_statechange -background white -foreground green -data {
2060 #define file_statechange_width 14
2061 #define file_statechange_height 15
2062 static unsigned char file_statechange_bits[] = {
2063 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
2064 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
2065 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2066 } -maskdata $filemask
2068 set ui_index .vpane.files.index.list
2069 set ui_workdir .vpane.files.workdir.list
2071 set all_icons(_$ui_index) file_plain
2072 set all_icons(A$ui_index) file_plain
2073 set all_icons(M$ui_index) file_fulltick
2074 set all_icons(D$ui_index) file_removed
2075 set all_icons(U$ui_index) file_merge
2076 set all_icons(T$ui_index) file_statechange
2078 set all_icons(_$ui_workdir) file_plain
2079 set all_icons(M$ui_workdir) file_mod
2080 set all_icons(D$ui_workdir) file_question
2081 set all_icons(U$ui_workdir) file_merge
2082 set all_icons(O$ui_workdir) file_plain
2083 set all_icons(T$ui_workdir) file_statechange
2085 set max_status_desc 0
2086 foreach i {
2087 {__ {mc "Unmodified"}}
2089 {_M {mc "Modified, not staged"}}
2090 {M_ {mc "Staged for commit"}}
2091 {MM {mc "Portions staged for commit"}}
2092 {MD {mc "Staged for commit, missing"}}
2094 {_T {mc "File type changed, not staged"}}
2095 {MT {mc "File type changed, old type staged for commit"}}
2096 {AT {mc "File type changed, old type staged for commit"}}
2097 {T_ {mc "File type changed, staged"}}
2098 {TM {mc "File type change staged, modification not staged"}}
2099 {TD {mc "File type change staged, file missing"}}
2101 {_O {mc "Untracked, not staged"}}
2102 {A_ {mc "Staged for commit"}}
2103 {AM {mc "Portions staged for commit"}}
2104 {AD {mc "Staged for commit, missing"}}
2106 {_D {mc "Missing"}}
2107 {D_ {mc "Staged for removal"}}
2108 {DO {mc "Staged for removal, still present"}}
2110 {_U {mc "Requires merge resolution"}}
2111 {U_ {mc "Requires merge resolution"}}
2112 {UU {mc "Requires merge resolution"}}
2113 {UM {mc "Requires merge resolution"}}
2114 {UD {mc "Requires merge resolution"}}
2115 {UT {mc "Requires merge resolution"}}
2117 set text [eval [lindex $i 1]]
2118 if {$max_status_desc < [string length $text]} {
2119 set max_status_desc [string length $text]
2121 set all_descs([lindex $i 0]) $text
2123 unset i
2125 ######################################################################
2127 ## util
2129 proc scrollbar2many {list mode args} {
2130 foreach w $list {eval $w $mode $args}
2133 proc many2scrollbar {list mode sb top bottom} {
2134 $sb set $top $bottom
2135 foreach w $list {$w $mode moveto $top}
2138 proc incr_font_size {font {amt 1}} {
2139 set sz [font configure $font -size]
2140 incr sz $amt
2141 font configure $font -size $sz
2142 font configure ${font}bold -size $sz
2143 font configure ${font}italic -size $sz
2146 ######################################################################
2148 ## ui commands
2150 set starting_gitk_msg [mc "Starting gitk... please wait..."]
2152 proc do_gitk {revs {is_submodule false}} {
2153 global current_diff_path file_states current_diff_side ui_index
2154 global _gitdir _gitworktree
2156 # -- Always start gitk through whatever we were loaded with. This
2157 # lets us bypass using shell process on Windows systems.
2159 set exe [_which gitk -script]
2160 set cmd [list [info nameofexecutable] $exe]
2161 if {$exe eq {}} {
2162 error_popup [mc "Couldn't find gitk in PATH"]
2163 } else {
2164 global env
2166 set pwd [pwd]
2168 if {!$is_submodule} {
2169 if {![is_bare]} {
2170 cd $_gitworktree
2172 } else {
2173 cd $current_diff_path
2174 if {$revs eq {--}} {
2175 set s $file_states($current_diff_path)
2176 set old_sha1 {}
2177 set new_sha1 {}
2178 switch -glob -- [lindex $s 0] {
2179 M_ { set old_sha1 [lindex [lindex $s 2] 1] }
2180 _M { set old_sha1 [lindex [lindex $s 3] 1] }
2181 MM {
2182 if {$current_diff_side eq $ui_index} {
2183 set old_sha1 [lindex [lindex $s 2] 1]
2184 set new_sha1 [lindex [lindex $s 3] 1]
2185 } else {
2186 set old_sha1 [lindex [lindex $s 3] 1]
2190 set revs $old_sha1...$new_sha1
2192 # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones
2193 # we've been using for the main repository, so unset them.
2194 # TODO we could make life easier (start up faster?) for gitk
2195 # by setting these to the appropriate values to allow gitk
2196 # to skip the heuristics to find their proper value
2197 unset env(GIT_DIR)
2198 unset env(GIT_WORK_TREE)
2200 eval exec $cmd $revs "--" "--" &
2202 set env(GIT_DIR) $_gitdir
2203 set env(GIT_WORK_TREE) $_gitworktree
2204 cd $pwd
2206 ui_status $::starting_gitk_msg
2207 after 10000 {
2208 ui_ready $starting_gitk_msg
2213 proc do_git_gui {} {
2214 global current_diff_path
2216 # -- Always start git gui through whatever we were loaded with. This
2217 # lets us bypass using shell process on Windows systems.
2219 set exe [list [_which git]]
2220 if {$exe eq {}} {
2221 error_popup [mc "Couldn't find git gui in PATH"]
2222 } else {
2223 global env
2224 global _gitdir _gitworktree
2226 # see note in do_gitk about unsetting these vars when
2227 # running tools in a submodule
2228 unset env(GIT_DIR)
2229 unset env(GIT_WORK_TREE)
2231 set pwd [pwd]
2232 cd $current_diff_path
2234 eval exec $exe gui &
2236 set env(GIT_DIR) $_gitdir
2237 set env(GIT_WORK_TREE) $_gitworktree
2238 cd $pwd
2240 ui_status $::starting_gitk_msg
2241 after 10000 {
2242 ui_ready $starting_gitk_msg
2247 proc do_explore {} {
2248 global _gitworktree
2249 set explorer {}
2250 if {[is_Cygwin] || [is_Windows]} {
2251 set explorer "explorer.exe"
2252 } elseif {[is_MacOSX]} {
2253 set explorer "open"
2254 } else {
2255 # freedesktop.org-conforming system is our best shot
2256 set explorer "xdg-open"
2258 eval exec $explorer [list [file nativename $_gitworktree]] &
2261 set is_quitting 0
2262 set ret_code 1
2264 proc terminate_me {win} {
2265 global ret_code
2266 if {$win ne {.}} return
2267 exit $ret_code
2270 proc do_quit {{rc {1}}} {
2271 global ui_comm is_quitting repo_config commit_type
2272 global GITGUI_BCK_exists GITGUI_BCK_i
2273 global ui_comm_spell
2274 global ret_code use_ttk
2276 if {$is_quitting} return
2277 set is_quitting 1
2279 if {[winfo exists $ui_comm]} {
2280 # -- Stash our current commit buffer.
2282 set save [gitdir GITGUI_MSG]
2283 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
2284 file rename -force [gitdir GITGUI_BCK] $save
2285 set GITGUI_BCK_exists 0
2286 } else {
2287 set msg [string trim [$ui_comm get 0.0 end]]
2288 regsub -all -line {[ \r\t]+$} $msg {} msg
2289 if {(![string match amend* $commit_type]
2290 || [$ui_comm edit modified])
2291 && $msg ne {}} {
2292 catch {
2293 set fd [open $save w]
2294 fconfigure $fd -encoding utf-8
2295 puts -nonewline $fd $msg
2296 close $fd
2298 } else {
2299 catch {file delete $save}
2303 # -- Cancel our spellchecker if its running.
2305 if {[info exists ui_comm_spell]} {
2306 $ui_comm_spell stop
2309 # -- Remove our editor backup, its not needed.
2311 after cancel $GITGUI_BCK_i
2312 if {$GITGUI_BCK_exists} {
2313 catch {file delete [gitdir GITGUI_BCK]}
2316 # -- Stash our current window geometry into this repository.
2318 set cfg_wmstate [wm state .]
2319 if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} {
2320 set rc_wmstate {}
2322 if {$cfg_wmstate ne $rc_wmstate} {
2323 catch {git config gui.wmstate $cfg_wmstate}
2325 if {$cfg_wmstate eq {zoomed}} {
2326 # on Windows wm geometry will lie about window
2327 # position (but not size) when window is zoomed
2328 # restore the window before querying wm geometry
2329 wm state . normal
2331 set cfg_geometry [list]
2332 lappend cfg_geometry [wm geometry .]
2333 if {$use_ttk} {
2334 lappend cfg_geometry [.vpane sashpos 0]
2335 lappend cfg_geometry [.vpane.files sashpos 0]
2336 } else {
2337 lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
2338 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
2340 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2341 set rc_geometry {}
2343 if {$cfg_geometry ne $rc_geometry} {
2344 catch {git config gui.geometry $cfg_geometry}
2348 set ret_code $rc
2350 # Briefly enable send again, working around Tk bug
2351 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2352 tk appname [appname]
2354 destroy .
2357 proc do_rescan {} {
2358 rescan ui_ready
2361 proc ui_do_rescan {} {
2362 rescan {force_first_diff ui_ready}
2365 proc do_commit {} {
2366 commit_tree
2369 proc next_diff {{after {}}} {
2370 global next_diff_p next_diff_w next_diff_i
2371 show_diff $next_diff_p $next_diff_w {} {} $after
2374 proc find_anchor_pos {lst name} {
2375 set lid [lsearch -sorted -exact $lst $name]
2377 if {$lid == -1} {
2378 set lid 0
2379 foreach lname $lst {
2380 if {$lname >= $name} break
2381 incr lid
2385 return $lid
2388 proc find_file_from {flist idx delta path mmask} {
2389 global file_states
2391 set len [llength $flist]
2392 while {$idx >= 0 && $idx < $len} {
2393 set name [lindex $flist $idx]
2395 if {$name ne $path && [info exists file_states($name)]} {
2396 set state [lindex $file_states($name) 0]
2398 if {$mmask eq {} || [regexp $mmask $state]} {
2399 return $idx
2403 incr idx $delta
2406 return {}
2409 proc find_next_diff {w path {lno {}} {mmask {}}} {
2410 global next_diff_p next_diff_w next_diff_i
2411 global file_lists ui_index ui_workdir
2413 set flist $file_lists($w)
2414 if {$lno eq {}} {
2415 set lno [find_anchor_pos $flist $path]
2416 } else {
2417 incr lno -1
2420 if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} {
2421 if {$w eq $ui_index} {
2422 set mmask "^$mmask"
2423 } else {
2424 set mmask "$mmask\$"
2428 set idx [find_file_from $flist $lno 1 $path $mmask]
2429 if {$idx eq {}} {
2430 incr lno -1
2431 set idx [find_file_from $flist $lno -1 $path $mmask]
2434 if {$idx ne {}} {
2435 set next_diff_w $w
2436 set next_diff_p [lindex $flist $idx]
2437 set next_diff_i [expr {$idx+1}]
2438 return 1
2439 } else {
2440 return 0
2444 proc next_diff_after_action {w path {lno {}} {mmask {}}} {
2445 global current_diff_path
2447 if {$path ne $current_diff_path} {
2448 return {}
2449 } elseif {[find_next_diff $w $path $lno $mmask]} {
2450 return {next_diff;}
2451 } else {
2452 return {reshow_diff;}
2456 proc select_first_diff {after} {
2457 global ui_workdir
2459 if {[find_next_diff $ui_workdir {} 1 {^_?U}] ||
2460 [find_next_diff $ui_workdir {} 1 {[^O]$}]} {
2461 next_diff $after
2462 } else {
2463 uplevel #0 $after
2467 proc force_first_diff {after} {
2468 global ui_workdir current_diff_path file_states
2470 if {[info exists file_states($current_diff_path)]} {
2471 set state [lindex $file_states($current_diff_path) 0]
2472 } else {
2473 set state {OO}
2476 set reselect 0
2477 if {[string first {U} $state] >= 0} {
2478 # Already a conflict, do nothing
2479 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} {
2480 set reselect 1
2481 } elseif {[string index $state 1] ne {O}} {
2482 # Already a diff & no conflicts, do nothing
2483 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} {
2484 set reselect 1
2487 if {$reselect} {
2488 next_diff $after
2489 } else {
2490 uplevel #0 $after
2494 proc toggle_or_diff {w x y} {
2495 global file_states file_lists current_diff_path ui_index ui_workdir
2496 global last_clicked selected_paths
2498 set pos [split [$w index @$x,$y] .]
2499 set lno [lindex $pos 0]
2500 set col [lindex $pos 1]
2501 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2502 if {$path eq {}} {
2503 set last_clicked {}
2504 return
2507 set last_clicked [list $w $lno]
2508 array unset selected_paths
2509 $ui_index tag remove in_sel 0.0 end
2510 $ui_workdir tag remove in_sel 0.0 end
2512 # Determine the state of the file
2513 if {[info exists file_states($path)]} {
2514 set state [lindex $file_states($path) 0]
2515 } else {
2516 set state {__}
2519 # Restage the file, or simply show the diff
2520 if {$col == 0 && $y > 1} {
2521 # Conflicts need special handling
2522 if {[string first {U} $state] >= 0} {
2523 # $w must always be $ui_workdir, but...
2524 if {$w ne $ui_workdir} { set lno {} }
2525 merge_stage_workdir $path $lno
2526 return
2529 if {[string index $state 1] eq {O}} {
2530 set mmask {}
2531 } else {
2532 set mmask {[^O]}
2535 set after [next_diff_after_action $w $path $lno $mmask]
2537 if {$w eq $ui_index} {
2538 update_indexinfo \
2539 "Unstaging [short_path $path] from commit" \
2540 [list $path] \
2541 [concat $after [list ui_ready]]
2542 } elseif {$w eq $ui_workdir} {
2543 update_index \
2544 "Adding [short_path $path]" \
2545 [list $path] \
2546 [concat $after [list ui_ready]]
2548 } else {
2549 set selected_paths($path) 1
2550 show_diff $path $w $lno
2554 proc add_one_to_selection {w x y} {
2555 global file_lists last_clicked selected_paths
2557 set lno [lindex [split [$w index @$x,$y] .] 0]
2558 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2559 if {$path eq {}} {
2560 set last_clicked {}
2561 return
2564 if {$last_clicked ne {}
2565 && [lindex $last_clicked 0] ne $w} {
2566 array unset selected_paths
2567 [lindex $last_clicked 0] tag remove in_sel 0.0 end
2570 set last_clicked [list $w $lno]
2571 if {[catch {set in_sel $selected_paths($path)}]} {
2572 set in_sel 0
2574 if {$in_sel} {
2575 unset selected_paths($path)
2576 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2577 } else {
2578 set selected_paths($path) 1
2579 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2583 proc add_range_to_selection {w x y} {
2584 global file_lists last_clicked selected_paths
2586 if {[lindex $last_clicked 0] ne $w} {
2587 toggle_or_diff $w $x $y
2588 return
2591 set lno [lindex [split [$w index @$x,$y] .] 0]
2592 set lc [lindex $last_clicked 1]
2593 if {$lc < $lno} {
2594 set begin $lc
2595 set end $lno
2596 } else {
2597 set begin $lno
2598 set end $lc
2601 foreach path [lrange $file_lists($w) \
2602 [expr {$begin - 1}] \
2603 [expr {$end - 1}]] {
2604 set selected_paths($path) 1
2606 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2609 proc show_more_context {} {
2610 global repo_config
2611 if {$repo_config(gui.diffcontext) < 99} {
2612 incr repo_config(gui.diffcontext)
2613 reshow_diff
2617 proc show_less_context {} {
2618 global repo_config
2619 if {$repo_config(gui.diffcontext) > 1} {
2620 incr repo_config(gui.diffcontext) -1
2621 reshow_diff
2625 ######################################################################
2627 ## ui construction
2629 set ui_comm {}
2631 # -- Menu Bar
2633 menu .mbar -tearoff 0
2634 if {[is_MacOSX]} {
2635 # -- Apple Menu (Mac OS X only)
2637 .mbar add cascade -label Apple -menu .mbar.apple
2638 menu .mbar.apple
2640 .mbar add cascade -label [mc Repository] -menu .mbar.repository
2641 .mbar add cascade -label [mc Edit] -menu .mbar.edit
2642 if {[is_enabled branch]} {
2643 .mbar add cascade -label [mc Branch] -menu .mbar.branch
2645 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2646 .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
2648 if {[is_enabled transport]} {
2649 .mbar add cascade -label [mc Merge] -menu .mbar.merge
2650 .mbar add cascade -label [mc Remote] -menu .mbar.remote
2652 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2653 .mbar add cascade -label [mc Tools] -menu .mbar.tools
2656 # -- Repository Menu
2658 menu .mbar.repository
2660 if {![is_bare]} {
2661 .mbar.repository add command \
2662 -label [mc "Explore Working Copy"] \
2663 -command {do_explore}
2664 .mbar.repository add separator
2667 .mbar.repository add command \
2668 -label [mc "Browse Current Branch's Files"] \
2669 -command {browser::new $current_branch}
2670 set ui_browse_current [.mbar.repository index last]
2671 .mbar.repository add command \
2672 -label [mc "Browse Branch Files..."] \
2673 -command browser_open::dialog
2674 .mbar.repository add separator
2676 .mbar.repository add command \
2677 -label [mc "Visualize Current Branch's History"] \
2678 -command {do_gitk $current_branch}
2679 set ui_visualize_current [.mbar.repository index last]
2680 .mbar.repository add command \
2681 -label [mc "Visualize All Branch History"] \
2682 -command {do_gitk --all}
2683 .mbar.repository add separator
2685 proc current_branch_write {args} {
2686 global current_branch
2687 .mbar.repository entryconf $::ui_browse_current \
2688 -label [mc "Browse %s's Files" $current_branch]
2689 .mbar.repository entryconf $::ui_visualize_current \
2690 -label [mc "Visualize %s's History" $current_branch]
2692 trace add variable current_branch write current_branch_write
2694 if {[is_enabled multicommit]} {
2695 .mbar.repository add command -label [mc "Database Statistics"] \
2696 -command do_stats
2698 .mbar.repository add command -label [mc "Compress Database"] \
2699 -command do_gc
2701 .mbar.repository add command -label [mc "Verify Database"] \
2702 -command do_fsck_objects
2704 .mbar.repository add separator
2706 if {[is_Cygwin]} {
2707 .mbar.repository add command \
2708 -label [mc "Create Desktop Icon"] \
2709 -command do_cygwin_shortcut
2710 } elseif {[is_Windows]} {
2711 .mbar.repository add command \
2712 -label [mc "Create Desktop Icon"] \
2713 -command do_windows_shortcut
2714 } elseif {[is_MacOSX]} {
2715 .mbar.repository add command \
2716 -label [mc "Create Desktop Icon"] \
2717 -command do_macosx_app
2721 if {[is_MacOSX]} {
2722 proc ::tk::mac::Quit {args} { do_quit }
2723 } else {
2724 .mbar.repository add command -label [mc Quit] \
2725 -command do_quit \
2726 -accelerator $M1T-Q
2729 # -- Edit Menu
2731 menu .mbar.edit
2732 .mbar.edit add command -label [mc Undo] \
2733 -command {catch {[focus] edit undo}} \
2734 -accelerator $M1T-Z
2735 .mbar.edit add command -label [mc Redo] \
2736 -command {catch {[focus] edit redo}} \
2737 -accelerator $M1T-Y
2738 .mbar.edit add separator
2739 .mbar.edit add command -label [mc Cut] \
2740 -command {catch {tk_textCut [focus]}} \
2741 -accelerator $M1T-X
2742 .mbar.edit add command -label [mc Copy] \
2743 -command {catch {tk_textCopy [focus]}} \
2744 -accelerator $M1T-C
2745 .mbar.edit add command -label [mc Paste] \
2746 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2747 -accelerator $M1T-V
2748 .mbar.edit add command -label [mc Delete] \
2749 -command {catch {[focus] delete sel.first sel.last}} \
2750 -accelerator Del
2751 .mbar.edit add separator
2752 .mbar.edit add command -label [mc "Select All"] \
2753 -command {catch {[focus] tag add sel 0.0 end}} \
2754 -accelerator $M1T-A
2756 # -- Branch Menu
2758 if {[is_enabled branch]} {
2759 menu .mbar.branch
2761 .mbar.branch add command -label [mc "Create..."] \
2762 -command branch_create::dialog \
2763 -accelerator $M1T-N
2764 lappend disable_on_lock [list .mbar.branch entryconf \
2765 [.mbar.branch index last] -state]
2767 .mbar.branch add command -label [mc "Checkout..."] \
2768 -command branch_checkout::dialog \
2769 -accelerator $M1T-O
2770 lappend disable_on_lock [list .mbar.branch entryconf \
2771 [.mbar.branch index last] -state]
2773 .mbar.branch add command -label [mc "Rename..."] \
2774 -command branch_rename::dialog
2775 lappend disable_on_lock [list .mbar.branch entryconf \
2776 [.mbar.branch index last] -state]
2778 .mbar.branch add command -label [mc "Delete..."] \
2779 -command branch_delete::dialog
2780 lappend disable_on_lock [list .mbar.branch entryconf \
2781 [.mbar.branch index last] -state]
2783 .mbar.branch add command -label [mc "Reset..."] \
2784 -command merge::reset_hard
2785 lappend disable_on_lock [list .mbar.branch entryconf \
2786 [.mbar.branch index last] -state]
2789 # -- Commit Menu
2791 proc commit_btn_caption {} {
2792 if {[is_enabled nocommit]} {
2793 return [mc "Done"]
2794 } else {
2795 return [mc Commit@@verb]
2799 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2800 menu .mbar.commit
2802 if {![is_enabled nocommit]} {
2803 .mbar.commit add radiobutton \
2804 -label [mc "New Commit"] \
2805 -command do_select_commit_type \
2806 -variable selected_commit_type \
2807 -value new
2808 lappend disable_on_lock \
2809 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2811 .mbar.commit add radiobutton \
2812 -label [mc "Amend Last Commit"] \
2813 -command do_select_commit_type \
2814 -variable selected_commit_type \
2815 -value amend
2816 lappend disable_on_lock \
2817 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2819 .mbar.commit add separator
2822 .mbar.commit add command -label [mc Rescan] \
2823 -command ui_do_rescan \
2824 -accelerator F5
2825 lappend disable_on_lock \
2826 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2828 .mbar.commit add command -label [mc "Stage To Commit"] \
2829 -command do_add_selection \
2830 -accelerator $M1T-T
2831 lappend disable_on_lock \
2832 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2834 .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
2835 -command do_add_all \
2836 -accelerator $M1T-I
2837 lappend disable_on_lock \
2838 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2840 .mbar.commit add command -label [mc "Unstage From Commit"] \
2841 -command do_unstage_selection \
2842 -accelerator $M1T-U
2843 lappend disable_on_lock \
2844 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2846 .mbar.commit add command -label [mc "Revert Changes"] \
2847 -command do_revert_selection \
2848 -accelerator $M1T-J
2849 lappend disable_on_lock \
2850 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2852 .mbar.commit add separator
2854 .mbar.commit add command -label [mc "Show Less Context"] \
2855 -command show_less_context \
2856 -accelerator $M1T-\-
2858 .mbar.commit add command -label [mc "Show More Context"] \
2859 -command show_more_context \
2860 -accelerator $M1T-=
2862 .mbar.commit add separator
2864 if {![is_enabled nocommitmsg]} {
2865 .mbar.commit add command -label [mc "Sign Off"] \
2866 -command do_signoff \
2867 -accelerator $M1T-S
2870 .mbar.commit add command -label [commit_btn_caption] \
2871 -command do_commit \
2872 -accelerator $M1T-Return
2873 lappend disable_on_lock \
2874 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2877 # -- Merge Menu
2879 if {[is_enabled branch]} {
2880 menu .mbar.merge
2881 .mbar.merge add command -label [mc "Local Merge..."] \
2882 -command merge::dialog \
2883 -accelerator $M1T-M
2884 lappend disable_on_lock \
2885 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2886 .mbar.merge add command -label [mc "Abort Merge..."] \
2887 -command merge::reset_hard
2888 lappend disable_on_lock \
2889 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2892 # -- Transport Menu
2894 if {[is_enabled transport]} {
2895 menu .mbar.remote
2897 .mbar.remote add command \
2898 -label [mc "Add..."] \
2899 -command remote_add::dialog \
2900 -accelerator $M1T-A
2901 .mbar.remote add command \
2902 -label [mc "Push..."] \
2903 -command do_push_anywhere \
2904 -accelerator $M1T-P
2905 .mbar.remote add command \
2906 -label [mc "Delete Branch..."] \
2907 -command remote_branch_delete::dialog
2910 if {[is_MacOSX]} {
2911 proc ::tk::mac::ShowPreferences {} {do_options}
2912 } else {
2913 # -- Edit Menu
2915 .mbar.edit add separator
2916 .mbar.edit add command -label [mc "Options..."] \
2917 -command do_options
2920 # -- Tools Menu
2922 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2923 set tools_menubar .mbar.tools
2924 menu $tools_menubar
2925 $tools_menubar add separator
2926 $tools_menubar add command -label [mc "Add..."] -command tools_add::dialog
2927 $tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog
2928 set tools_tailcnt 3
2929 if {[array names repo_config guitool.*.cmd] ne {}} {
2930 tools_populate_all
2934 # -- Help Menu
2936 .mbar add cascade -label [mc Help] -menu .mbar.help
2937 menu .mbar.help
2939 if {[is_MacOSX]} {
2940 .mbar.apple add command -label [mc "About %s" [appname]] \
2941 -command do_about
2942 .mbar.apple add separator
2943 } else {
2944 .mbar.help add command -label [mc "About %s" [appname]] \
2945 -command do_about
2947 . configure -menu .mbar
2949 set doc_path [githtmldir]
2950 if {$doc_path ne {}} {
2951 set doc_path [file join $doc_path index.html]
2953 if {[is_Cygwin]} {
2954 set doc_path [exec cygpath --mixed $doc_path]
2958 if {[file isfile $doc_path]} {
2959 set doc_url "file:$doc_path"
2960 } else {
2961 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
2964 proc start_browser {url} {
2965 git "web--browse" $url
2968 .mbar.help add command -label [mc "Online Documentation"] \
2969 -command [list start_browser $doc_url]
2971 .mbar.help add command -label [mc "Show SSH Key"] \
2972 -command do_ssh_key
2974 unset doc_path doc_url
2976 # -- Standard bindings
2978 wm protocol . WM_DELETE_WINDOW do_quit
2979 bind all <$M1B-Key-q> do_quit
2980 bind all <$M1B-Key-Q> do_quit
2981 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2982 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
2984 set subcommand_args {}
2985 proc usage {} {
2986 set s "usage: $::argv0 $::subcommand $::subcommand_args"
2987 if {[tk windowingsystem] eq "win32"} {
2988 wm withdraw .
2989 tk_messageBox -icon info -message $s \
2990 -title [mc "Usage"]
2991 } else {
2992 puts stderr $s
2994 exit 1
2997 proc normalize_relpath {path} {
2998 set elements {}
2999 foreach item [file split $path] {
3000 if {$item eq {.}} continue
3001 if {$item eq {..} && [llength $elements] > 0
3002 && [lindex $elements end] ne {..}} {
3003 set elements [lrange $elements 0 end-1]
3004 continue
3006 lappend elements $item
3008 return [eval file join $elements]
3011 # -- Not a normal commit type invocation? Do that instead!
3013 switch -- $subcommand {
3014 browser -
3015 blame {
3016 if {$subcommand eq "blame"} {
3017 set subcommand_args {[--line=<num>] rev? path}
3018 } else {
3019 set subcommand_args {rev? path}
3021 if {$argv eq {}} usage
3022 set head {}
3023 set path {}
3024 set jump_spec {}
3025 set is_path 0
3026 foreach a $argv {
3027 set p [file join $_prefix $a]
3029 if {$is_path || [file exists $p]} {
3030 if {$path ne {}} usage
3031 set path [normalize_relpath $p]
3032 break
3033 } elseif {$a eq {--}} {
3034 if {$path ne {}} {
3035 if {$head ne {}} usage
3036 set head $path
3037 set path {}
3039 set is_path 1
3040 } elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
3041 if {$jump_spec ne {} || $head ne {}} usage
3042 set jump_spec [list $lnum]
3043 } elseif {$head eq {}} {
3044 if {$head ne {}} usage
3045 set head $a
3046 set is_path 1
3047 } else {
3048 usage
3051 unset is_path
3053 if {$head ne {} && $path eq {}} {
3054 if {[string index $head 0] eq {/}} {
3055 set path [normalize_relpath $head]
3056 set head {}
3057 } else {
3058 set path [normalize_relpath $_prefix$head]
3059 set head {}
3063 if {$head eq {}} {
3064 load_current_branch
3065 } else {
3066 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
3067 if {[catch {
3068 set head [git rev-parse --verify $head]
3069 } err]} {
3070 if {[tk windowingsystem] eq "win32"} {
3071 tk_messageBox -icon error -title [mc Error] -message $err
3072 } else {
3073 puts stderr $err
3075 exit 1
3078 set current_branch $head
3081 wm deiconify .
3082 switch -- $subcommand {
3083 browser {
3084 if {$jump_spec ne {}} usage
3085 if {$head eq {}} {
3086 if {$path ne {} && [file isdirectory $path]} {
3087 set head $current_branch
3088 } else {
3089 set head $path
3090 set path {}
3093 browser::new $head $path
3095 blame {
3096 if {$head eq {} && ![file exists $path]} {
3097 catch {wm withdraw .}
3098 tk_messageBox \
3099 -icon error \
3100 -type ok \
3101 -title [mc "git-gui: fatal error"] \
3102 -message [mc "fatal: cannot stat path %s: No such file or directory" $path]
3103 exit 1
3105 blame::new $head $path $jump_spec
3108 return
3110 citool -
3111 gui {
3112 if {[llength $argv] != 0} {
3113 usage
3115 # fall through to setup UI for commits
3117 default {
3118 set err "usage: $argv0 \[{blame|browser|citool}\]"
3119 if {[tk windowingsystem] eq "win32"} {
3120 wm withdraw .
3121 tk_messageBox -icon error -message $err \
3122 -title [mc "Usage"]
3123 } else {
3124 puts stderr $err
3126 exit 1
3130 # -- Branch Control
3132 ${NS}::frame .branch
3133 if {!$use_ttk} {.branch configure -borderwidth 1 -relief sunken}
3134 ${NS}::label .branch.l1 \
3135 -text [mc "Current Branch:"] \
3136 -anchor w \
3137 -justify left
3138 ${NS}::label .branch.cb \
3139 -textvariable current_branch \
3140 -anchor w \
3141 -justify left
3142 pack .branch.l1 -side left
3143 pack .branch.cb -side left -fill x
3144 pack .branch -side top -fill x
3146 # -- Main Window Layout
3148 ${NS}::panedwindow .vpane -orient horizontal
3149 ${NS}::panedwindow .vpane.files -orient vertical
3150 if {$use_ttk} {
3151 .vpane add .vpane.files
3152 } else {
3153 .vpane add .vpane.files -sticky nsew -height 100 -width 200
3155 pack .vpane -anchor n -side top -fill both -expand 1
3157 # -- Index File List
3159 ${NS}::frame .vpane.files.index -height 100 -width 200
3160 tlabel .vpane.files.index.title \
3161 -text [mc "Staged Changes (Will Commit)"] \
3162 -background lightgreen -foreground black
3163 text $ui_index -background white -foreground black \
3164 -borderwidth 0 \
3165 -width 20 -height 10 \
3166 -wrap none \
3167 -cursor $cursor_ptr \
3168 -xscrollcommand {.vpane.files.index.sx set} \
3169 -yscrollcommand {.vpane.files.index.sy set} \
3170 -state disabled
3171 ${NS}::scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
3172 ${NS}::scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
3173 pack .vpane.files.index.title -side top -fill x
3174 pack .vpane.files.index.sx -side bottom -fill x
3175 pack .vpane.files.index.sy -side right -fill y
3176 pack $ui_index -side left -fill both -expand 1
3178 # -- Working Directory File List
3180 ${NS}::frame .vpane.files.workdir -height 100 -width 200
3181 tlabel .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
3182 -background lightsalmon -foreground black
3183 text $ui_workdir -background white -foreground black \
3184 -borderwidth 0 \
3185 -width 20 -height 10 \
3186 -wrap none \
3187 -cursor $cursor_ptr \
3188 -xscrollcommand {.vpane.files.workdir.sx set} \
3189 -yscrollcommand {.vpane.files.workdir.sy set} \
3190 -state disabled
3191 ${NS}::scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
3192 ${NS}::scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
3193 pack .vpane.files.workdir.title -side top -fill x
3194 pack .vpane.files.workdir.sx -side bottom -fill x
3195 pack .vpane.files.workdir.sy -side right -fill y
3196 pack $ui_workdir -side left -fill both -expand 1
3198 .vpane.files add .vpane.files.workdir
3199 .vpane.files add .vpane.files.index
3200 if {!$use_ttk} {
3201 .vpane.files paneconfigure .vpane.files.workdir -sticky news
3202 .vpane.files paneconfigure .vpane.files.index -sticky news
3205 foreach i [list $ui_index $ui_workdir] {
3206 rmsel_tag $i
3207 $i tag conf in_diff -background [$i tag cget in_sel -background]
3209 unset i
3211 # -- Diff and Commit Area
3213 ${NS}::frame .vpane.lower -height 300 -width 400
3214 ${NS}::frame .vpane.lower.commarea
3215 ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1
3216 pack .vpane.lower.diff -fill both -expand 1
3217 pack .vpane.lower.commarea -side bottom -fill x
3218 .vpane add .vpane.lower
3219 if {!$use_ttk} {.vpane paneconfigure .vpane.lower -sticky nsew}
3221 # -- Commit Area Buttons
3223 ${NS}::frame .vpane.lower.commarea.buttons
3224 ${NS}::label .vpane.lower.commarea.buttons.l -text {} \
3225 -anchor w \
3226 -justify left
3227 pack .vpane.lower.commarea.buttons.l -side top -fill x
3228 pack .vpane.lower.commarea.buttons -side left -fill y
3230 ${NS}::button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
3231 -command ui_do_rescan
3232 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3233 lappend disable_on_lock \
3234 {.vpane.lower.commarea.buttons.rescan conf -state}
3236 ${NS}::button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
3237 -command do_add_all
3238 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3239 lappend disable_on_lock \
3240 {.vpane.lower.commarea.buttons.incall conf -state}
3242 if {![is_enabled nocommitmsg]} {
3243 ${NS}::button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
3244 -command do_signoff
3245 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3248 ${NS}::button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
3249 -command do_commit
3250 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3251 lappend disable_on_lock \
3252 {.vpane.lower.commarea.buttons.commit conf -state}
3254 if {![is_enabled nocommit]} {
3255 ${NS}::button .vpane.lower.commarea.buttons.push -text [mc Push] \
3256 -command do_push_anywhere
3257 pack .vpane.lower.commarea.buttons.push -side top -fill x
3260 # -- Commit Message Buffer
3262 ${NS}::frame .vpane.lower.commarea.buffer
3263 ${NS}::frame .vpane.lower.commarea.buffer.header
3264 set ui_comm .vpane.lower.commarea.buffer.t
3265 set ui_coml .vpane.lower.commarea.buffer.header.l
3267 if {![is_enabled nocommit]} {
3268 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \
3269 -text [mc "New Commit"] \
3270 -command do_select_commit_type \
3271 -variable selected_commit_type \
3272 -value new
3273 lappend disable_on_lock \
3274 [list .vpane.lower.commarea.buffer.header.new conf -state]
3275 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \
3276 -text [mc "Amend Last Commit"] \
3277 -command do_select_commit_type \
3278 -variable selected_commit_type \
3279 -value amend
3280 lappend disable_on_lock \
3281 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3284 ${NS}::label $ui_coml \
3285 -anchor w \
3286 -justify left
3287 proc trace_commit_type {varname args} {
3288 global ui_coml commit_type
3289 switch -glob -- $commit_type {
3290 initial {set txt [mc "Initial Commit Message:"]}
3291 amend {set txt [mc "Amended Commit Message:"]}
3292 amend-initial {set txt [mc "Amended Initial Commit Message:"]}
3293 amend-merge {set txt [mc "Amended Merge Commit Message:"]}
3294 merge {set txt [mc "Merge Commit Message:"]}
3295 * {set txt [mc "Commit Message:"]}
3297 $ui_coml conf -text $txt
3299 trace add variable commit_type write trace_commit_type
3300 pack $ui_coml -side left -fill x
3302 if {![is_enabled nocommit]} {
3303 pack .vpane.lower.commarea.buffer.header.amend -side right
3304 pack .vpane.lower.commarea.buffer.header.new -side right
3307 text $ui_comm -background white -foreground black \
3308 -borderwidth 1 \
3309 -undo true \
3310 -maxundo 20 \
3311 -autoseparators true \
3312 -relief sunken \
3313 -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
3314 -font font_diff \
3315 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3316 ${NS}::scrollbar .vpane.lower.commarea.buffer.sby \
3317 -command [list $ui_comm yview]
3318 pack .vpane.lower.commarea.buffer.header -side top -fill x
3319 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3320 pack $ui_comm -side left -fill y
3321 pack .vpane.lower.commarea.buffer -side left -fill y
3323 # -- Commit Message Buffer Context Menu
3325 set ctxm .vpane.lower.commarea.buffer.ctxm
3326 menu $ctxm -tearoff 0
3327 $ctxm add command \
3328 -label [mc Cut] \
3329 -command {tk_textCut $ui_comm}
3330 $ctxm add command \
3331 -label [mc Copy] \
3332 -command {tk_textCopy $ui_comm}
3333 $ctxm add command \
3334 -label [mc Paste] \
3335 -command {tk_textPaste $ui_comm}
3336 $ctxm add command \
3337 -label [mc Delete] \
3338 -command {catch {$ui_comm delete sel.first sel.last}}
3339 $ctxm add separator
3340 $ctxm add command \
3341 -label [mc "Select All"] \
3342 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
3343 $ctxm add command \
3344 -label [mc "Copy All"] \
3345 -command {
3346 $ui_comm tag add sel 0.0 end
3347 tk_textCopy $ui_comm
3348 $ui_comm tag remove sel 0.0 end
3350 $ctxm add separator
3351 $ctxm add command \
3352 -label [mc "Sign Off"] \
3353 -command do_signoff
3354 set ui_comm_ctxm $ctxm
3356 # -- Diff Header
3358 proc trace_current_diff_path {varname args} {
3359 global current_diff_path diff_actions file_states
3360 if {$current_diff_path eq {}} {
3361 set s {}
3362 set f {}
3363 set p {}
3364 set o disabled
3365 } else {
3366 set p $current_diff_path
3367 set s [mapdesc [lindex $file_states($p) 0] $p]
3368 set f [mc "File:"]
3369 set p [escape_path $p]
3370 set o normal
3373 .vpane.lower.diff.header.status configure -text $s
3374 .vpane.lower.diff.header.file configure -text $f
3375 .vpane.lower.diff.header.path configure -text $p
3376 foreach w $diff_actions {
3377 uplevel #0 $w $o
3380 trace add variable current_diff_path write trace_current_diff_path
3382 gold_frame .vpane.lower.diff.header
3383 tlabel .vpane.lower.diff.header.status \
3384 -background gold \
3385 -foreground black \
3386 -width $max_status_desc \
3387 -anchor w \
3388 -justify left
3389 tlabel .vpane.lower.diff.header.file \
3390 -background gold \
3391 -foreground black \
3392 -anchor w \
3393 -justify left
3394 tlabel .vpane.lower.diff.header.path \
3395 -background gold \
3396 -foreground black \
3397 -anchor w \
3398 -justify left
3399 pack .vpane.lower.diff.header.status -side left
3400 pack .vpane.lower.diff.header.file -side left
3401 pack .vpane.lower.diff.header.path -fill x
3402 set ctxm .vpane.lower.diff.header.ctxm
3403 menu $ctxm -tearoff 0
3404 $ctxm add command \
3405 -label [mc Copy] \
3406 -command {
3407 clipboard clear
3408 clipboard append \
3409 -format STRING \
3410 -type STRING \
3411 -- $current_diff_path
3413 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3414 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3416 # -- Diff Body
3418 ${NS}::frame .vpane.lower.diff.body
3419 set ui_diff .vpane.lower.diff.body.t
3420 text $ui_diff -background white -foreground black \
3421 -borderwidth 0 \
3422 -width 80 -height 5 -wrap none \
3423 -font font_diff \
3424 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3425 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3426 -state disabled
3427 catch {$ui_diff configure -tabstyle wordprocessor}
3428 ${NS}::scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3429 -command [list $ui_diff xview]
3430 ${NS}::scrollbar .vpane.lower.diff.body.sby -orient vertical \
3431 -command [list $ui_diff yview]
3432 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3433 pack .vpane.lower.diff.body.sby -side right -fill y
3434 pack $ui_diff -side left -fill both -expand 1
3435 pack .vpane.lower.diff.header -side top -fill x
3436 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3438 foreach {n c} {0 black 1 red4 2 green4 3 yellow4 4 blue4 5 magenta4 6 cyan4 7 grey60} {
3439 $ui_diff tag configure clr4$n -background $c
3440 $ui_diff tag configure clri4$n -foreground $c
3441 $ui_diff tag configure clr3$n -foreground $c
3442 $ui_diff tag configure clri3$n -background $c
3444 $ui_diff tag configure clr1 -font font_diffbold
3445 $ui_diff tag configure clr4 -underline 1
3447 $ui_diff tag conf d_info -foreground blue -font font_diffbold
3449 $ui_diff tag conf d_cr -elide true
3450 $ui_diff tag conf d_@ -font font_diffbold
3451 $ui_diff tag conf d_+ -foreground {#00a000}
3452 $ui_diff tag conf d_- -foreground red
3454 $ui_diff tag conf d_++ -foreground {#00a000}
3455 $ui_diff tag conf d_-- -foreground red
3456 $ui_diff tag conf d_+s \
3457 -foreground {#00a000} \
3458 -background {#e2effa}
3459 $ui_diff tag conf d_-s \
3460 -foreground red \
3461 -background {#e2effa}
3462 $ui_diff tag conf d_s+ \
3463 -foreground {#00a000} \
3464 -background ivory1
3465 $ui_diff tag conf d_s- \
3466 -foreground red \
3467 -background ivory1
3469 $ui_diff tag conf d< \
3470 -foreground orange \
3471 -font font_diffbold
3472 $ui_diff tag conf d= \
3473 -foreground orange \
3474 -font font_diffbold
3475 $ui_diff tag conf d> \
3476 -foreground orange \
3477 -font font_diffbold
3479 $ui_diff tag raise sel
3481 # -- Diff Body Context Menu
3484 proc create_common_diff_popup {ctxm} {
3485 $ctxm add command \
3486 -label [mc Refresh] \
3487 -command reshow_diff
3488 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3489 $ctxm add command \
3490 -label [mc Copy] \
3491 -command {tk_textCopy $ui_diff}
3492 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3493 $ctxm add command \
3494 -label [mc "Select All"] \
3495 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
3496 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3497 $ctxm add command \
3498 -label [mc "Copy All"] \
3499 -command {
3500 $ui_diff tag add sel 0.0 end
3501 tk_textCopy $ui_diff
3502 $ui_diff tag remove sel 0.0 end
3504 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3505 $ctxm add separator
3506 $ctxm add command \
3507 -label [mc "Decrease Font Size"] \
3508 -command {incr_font_size font_diff -1}
3509 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3510 $ctxm add command \
3511 -label [mc "Increase Font Size"] \
3512 -command {incr_font_size font_diff 1}
3513 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3514 $ctxm add separator
3515 set emenu $ctxm.enc
3516 menu $emenu
3517 build_encoding_menu $emenu [list force_diff_encoding]
3518 $ctxm add cascade \
3519 -label [mc "Encoding"] \
3520 -menu $emenu
3521 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3522 $ctxm add separator
3523 $ctxm add command -label [mc "Options..."] \
3524 -command do_options
3527 set ctxm .vpane.lower.diff.body.ctxm
3528 menu $ctxm -tearoff 0
3529 $ctxm add command \
3530 -label [mc "Apply/Reverse Hunk"] \
3531 -command {apply_hunk $cursorX $cursorY}
3532 set ui_diff_applyhunk [$ctxm index last]
3533 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
3534 $ctxm add command \
3535 -label [mc "Apply/Reverse Line"] \
3536 -command {apply_range_or_line $cursorX $cursorY; do_rescan}
3537 set ui_diff_applyline [$ctxm index last]
3538 lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
3539 $ctxm add separator
3540 $ctxm add command \
3541 -label [mc "Show Less Context"] \
3542 -command show_less_context
3543 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3544 $ctxm add command \
3545 -label [mc "Show More Context"] \
3546 -command show_more_context
3547 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3548 $ctxm add separator
3549 create_common_diff_popup $ctxm
3551 set ctxmmg .vpane.lower.diff.body.ctxmmg
3552 menu $ctxmmg -tearoff 0
3553 $ctxmmg add command \
3554 -label [mc "Run Merge Tool"] \
3555 -command {merge_resolve_tool}
3556 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3557 $ctxmmg add separator
3558 $ctxmmg add command \
3559 -label [mc "Use Remote Version"] \
3560 -command {merge_resolve_one 3}
3561 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3562 $ctxmmg add command \
3563 -label [mc "Use Local Version"] \
3564 -command {merge_resolve_one 2}
3565 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3566 $ctxmmg add command \
3567 -label [mc "Revert To Base"] \
3568 -command {merge_resolve_one 1}
3569 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3570 $ctxmmg add separator
3571 $ctxmmg add command \
3572 -label [mc "Show Less Context"] \
3573 -command show_less_context
3574 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3575 $ctxmmg add command \
3576 -label [mc "Show More Context"] \
3577 -command show_more_context
3578 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3579 $ctxmmg add separator
3580 create_common_diff_popup $ctxmmg
3582 set ctxmsm .vpane.lower.diff.body.ctxmsm
3583 menu $ctxmsm -tearoff 0
3584 $ctxmsm add command \
3585 -label [mc "Visualize These Changes In The Submodule"] \
3586 -command {do_gitk -- true}
3587 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3588 $ctxmsm add command \
3589 -label [mc "Visualize Current Branch History In The Submodule"] \
3590 -command {do_gitk {} true}
3591 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3592 $ctxmsm add command \
3593 -label [mc "Visualize All Branch History In The Submodule"] \
3594 -command {do_gitk --all true}
3595 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3596 $ctxmsm add separator
3597 $ctxmsm add command \
3598 -label [mc "Start git gui In The Submodule"] \
3599 -command {do_git_gui}
3600 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3601 $ctxmsm add separator
3602 create_common_diff_popup $ctxmsm
3604 proc has_textconv {path} {
3605 if {[is_config_false gui.textconv]} {
3606 return 0
3608 set filter [gitattr $path diff set]
3609 set textconv [get_config [join [list diff $filter textconv] .]]
3610 if {$filter ne {set} && $textconv ne {}} {
3611 return 1
3612 } else {
3613 return 0
3617 proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
3618 global current_diff_path file_states
3619 set ::cursorX $x
3620 set ::cursorY $y
3621 if {[info exists file_states($current_diff_path)]} {
3622 set state [lindex $file_states($current_diff_path) 0]
3623 } else {
3624 set state {__}
3626 if {[string first {U} $state] >= 0} {
3627 tk_popup $ctxmmg $X $Y
3628 } elseif {$::is_submodule_diff} {
3629 tk_popup $ctxmsm $X $Y
3630 } else {
3631 set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}]
3632 if {$::ui_index eq $::current_diff_side} {
3633 set l [mc "Unstage Hunk From Commit"]
3634 if {$has_range} {
3635 set t [mc "Unstage Lines From Commit"]
3636 } else {
3637 set t [mc "Unstage Line From Commit"]
3639 } else {
3640 set l [mc "Stage Hunk For Commit"]
3641 if {$has_range} {
3642 set t [mc "Stage Lines For Commit"]
3643 } else {
3644 set t [mc "Stage Line For Commit"]
3647 if {$::is_3way_diff
3648 || $current_diff_path eq {}
3649 || {__} eq $state
3650 || {_O} eq $state
3651 || [string match {?T} $state]
3652 || [string match {T?} $state]
3653 || [has_textconv $current_diff_path]} {
3654 set s disabled
3655 } else {
3656 set s normal
3658 $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
3659 $ctxm entryconf $::ui_diff_applyline -state $s -label $t
3660 tk_popup $ctxm $X $Y
3663 bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg $ctxmsm %x %y %X %Y]
3665 # -- Status Bar
3667 set main_status [::status_bar::new .status]
3668 pack .status -anchor w -side bottom -fill x
3669 $main_status show [mc "Initializing..."]
3671 # -- Load geometry
3673 proc on_ttk_pane_mapped {w pane pos} {
3674 bind $w <Map> {}
3675 after 0 [list after idle [list $w sashpos $pane $pos]]
3677 proc on_tk_pane_mapped {w pane x y} {
3678 bind $w <Map> {}
3679 after 0 [list after idle [list $w sash place $pane $x $y]]
3681 proc on_application_mapped {} {
3682 global repo_config use_ttk
3683 bind . <Map> {}
3684 set gm $repo_config(gui.geometry)
3685 if {$use_ttk} {
3686 bind .vpane <Map> \
3687 [list on_ttk_pane_mapped %W 0 [lindex $gm 1]]
3688 bind .vpane.files <Map> \
3689 [list on_ttk_pane_mapped %W 0 [lindex $gm 2]]
3690 } else {
3691 bind .vpane <Map> \
3692 [list on_tk_pane_mapped %W 0 \
3693 [lindex $gm 1] \
3694 [lindex [.vpane sash coord 0] 1]]
3695 bind .vpane.files <Map> \
3696 [list on_tk_pane_mapped %W 0 \
3697 [lindex [.vpane.files sash coord 0] 0] \
3698 [lindex $gm 2]]
3700 wm geometry . [lindex $gm 0]
3702 if {[info exists repo_config(gui.geometry)]} {
3703 bind . <Map> [list on_application_mapped]
3704 wm geometry . [lindex $repo_config(gui.geometry) 0]
3707 # -- Load window state
3709 if {[info exists repo_config(gui.wmstate)]} {
3710 catch {wm state . $repo_config(gui.wmstate)}
3713 # -- Key Bindings
3715 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3716 bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
3717 bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
3718 bind $ui_comm <$M1B-Key-u> {do_unstage_selection;break}
3719 bind $ui_comm <$M1B-Key-U> {do_unstage_selection;break}
3720 bind $ui_comm <$M1B-Key-j> {do_revert_selection;break}
3721 bind $ui_comm <$M1B-Key-J> {do_revert_selection;break}
3722 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3723 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3724 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3725 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3726 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3727 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3728 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3729 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3730 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3731 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3732 bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
3733 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
3734 bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
3735 bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
3736 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
3738 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3739 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3740 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3741 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3742 bind $ui_diff <$M1B-Key-v> {break}
3743 bind $ui_diff <$M1B-Key-V> {break}
3744 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3745 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3746 bind $ui_diff <$M1B-Key-j> {do_revert_selection;break}
3747 bind $ui_diff <$M1B-Key-J> {do_revert_selection;break}
3748 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3749 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3750 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3751 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3752 bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
3753 bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
3754 bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
3755 bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
3756 bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
3757 bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
3758 bind $ui_diff <Button-1> {focus %W}
3760 if {[is_enabled branch]} {
3761 bind . <$M1B-Key-n> branch_create::dialog
3762 bind . <$M1B-Key-N> branch_create::dialog
3763 bind . <$M1B-Key-o> branch_checkout::dialog
3764 bind . <$M1B-Key-O> branch_checkout::dialog
3765 bind . <$M1B-Key-m> merge::dialog
3766 bind . <$M1B-Key-M> merge::dialog
3768 if {[is_enabled transport]} {
3769 bind . <$M1B-Key-p> do_push_anywhere
3770 bind . <$M1B-Key-P> do_push_anywhere
3773 bind . <Key-F5> ui_do_rescan
3774 bind . <$M1B-Key-r> ui_do_rescan
3775 bind . <$M1B-Key-R> ui_do_rescan
3776 bind . <$M1B-Key-s> do_signoff
3777 bind . <$M1B-Key-S> do_signoff
3778 bind . <$M1B-Key-t> do_add_selection
3779 bind . <$M1B-Key-T> do_add_selection
3780 bind . <$M1B-Key-u> do_unstage_selection
3781 bind . <$M1B-Key-U> do_unstage_selection
3782 bind . <$M1B-Key-j> do_revert_selection
3783 bind . <$M1B-Key-J> do_revert_selection
3784 bind . <$M1B-Key-i> do_add_all
3785 bind . <$M1B-Key-I> do_add_all
3786 bind . <$M1B-Key-minus> {show_less_context;break}
3787 bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
3788 bind . <$M1B-Key-equal> {show_more_context;break}
3789 bind . <$M1B-Key-plus> {show_more_context;break}
3790 bind . <$M1B-Key-KP_Add> {show_more_context;break}
3791 bind . <$M1B-Key-Return> do_commit
3792 foreach i [list $ui_index $ui_workdir] {
3793 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3794 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3795 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3797 unset i
3799 set file_lists($ui_index) [list]
3800 set file_lists($ui_workdir) [list]
3802 wm title . "[appname] ([reponame]) [file normalize $_gitworktree]"
3803 focus -force $ui_comm
3805 # -- Warn the user about environmental problems. Cygwin's Tcl
3806 # does *not* pass its env array onto any processes it spawns.
3807 # This means that git processes get none of our environment.
3809 if {[is_Cygwin]} {
3810 set ignored_env 0
3811 set suggest_user {}
3812 set msg [mc "Possible environment issues exist.
3814 The following environment variables are probably
3815 going to be ignored by any Git subprocess run
3816 by %s:
3818 " [appname]]
3819 foreach name [array names env] {
3820 switch -regexp -- $name {
3821 {^GIT_INDEX_FILE$} -
3822 {^GIT_OBJECT_DIRECTORY$} -
3823 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3824 {^GIT_DIFF_OPTS$} -
3825 {^GIT_EXTERNAL_DIFF$} -
3826 {^GIT_PAGER$} -
3827 {^GIT_TRACE$} -
3828 {^GIT_CONFIG$} -
3829 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3830 append msg " - $name\n"
3831 incr ignored_env
3833 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3834 append msg " - $name\n"
3835 incr ignored_env
3836 set suggest_user $name
3840 if {$ignored_env > 0} {
3841 append msg [mc "
3842 This is due to a known issue with the
3843 Tcl binary distributed by Cygwin."]
3845 if {$suggest_user ne {}} {
3846 append msg [mc "
3848 A good replacement for %s
3849 is placing values for the user.name and
3850 user.email settings into your personal
3851 ~/.gitconfig file.
3852 " $suggest_user]
3854 warn_popup $msg
3856 unset ignored_env msg suggest_user name
3859 # -- Only initialize complex UI if we are going to stay running.
3861 if {[is_enabled transport]} {
3862 load_all_remotes
3864 set n [.mbar.remote index end]
3865 populate_remotes_menu
3866 set n [expr {[.mbar.remote index end] - $n}]
3867 if {$n > 0} {
3868 if {[.mbar.remote type 0] eq "tearoff"} { incr n }
3869 .mbar.remote insert $n separator
3871 unset n
3874 if {[winfo exists $ui_comm]} {
3875 set GITGUI_BCK_exists [load_message GITGUI_BCK utf-8]
3877 # -- If both our backup and message files exist use the
3878 # newer of the two files to initialize the buffer.
3880 if {$GITGUI_BCK_exists} {
3881 set m [gitdir GITGUI_MSG]
3882 if {[file isfile $m]} {
3883 if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
3884 catch {file delete [gitdir GITGUI_MSG]}
3885 } else {
3886 $ui_comm delete 0.0 end
3887 $ui_comm edit reset
3888 $ui_comm edit modified false
3889 catch {file delete [gitdir GITGUI_BCK]}
3890 set GITGUI_BCK_exists 0
3893 unset m
3896 proc backup_commit_buffer {} {
3897 global ui_comm GITGUI_BCK_exists
3899 set m [$ui_comm edit modified]
3900 if {$m || $GITGUI_BCK_exists} {
3901 set msg [string trim [$ui_comm get 0.0 end]]
3902 regsub -all -line {[ \r\t]+$} $msg {} msg
3904 if {$msg eq {}} {
3905 if {$GITGUI_BCK_exists} {
3906 catch {file delete [gitdir GITGUI_BCK]}
3907 set GITGUI_BCK_exists 0
3909 } elseif {$m} {
3910 catch {
3911 set fd [open [gitdir GITGUI_BCK] w]
3912 fconfigure $fd -encoding utf-8
3913 puts -nonewline $fd $msg
3914 close $fd
3915 set GITGUI_BCK_exists 1
3919 $ui_comm edit modified false
3922 set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
3925 backup_commit_buffer
3927 # -- If the user has aspell available we can drive it
3928 # in pipe mode to spellcheck the commit message.
3930 set spell_cmd [list |]
3931 set spell_dict [get_config gui.spellingdictionary]
3932 lappend spell_cmd aspell
3933 if {$spell_dict ne {}} {
3934 lappend spell_cmd --master=$spell_dict
3936 lappend spell_cmd --mode=none
3937 lappend spell_cmd --encoding=utf-8
3938 lappend spell_cmd pipe
3939 if {$spell_dict eq {none}
3940 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
3941 bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
3942 } else {
3943 set ui_comm_spell [spellcheck::init \
3944 $spell_fd \
3945 $ui_comm \
3946 $ui_comm_ctxm \
3949 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3952 lock_index begin-read
3953 if {![winfo ismapped .]} {
3954 wm deiconify .
3956 after 1 {
3957 if {[is_enabled initialamend]} {
3958 force_amend
3959 } else {
3960 do_rescan
3963 if {[is_enabled nocommitmsg]} {
3964 $ui_comm configure -state disabled -background gray
3967 if {[is_enabled multicommit] && ![is_config_false gui.gcwarning]} {
3968 after 1000 hint_gc
3970 if {[is_enabled retcode]} {
3971 bind . <Destroy> {+terminate_me %W}
3973 if {$picked && [is_config_true gui.autoexplore]} {
3974 do_explore
3977 # Local variables:
3978 # mode: tcl
3979 # indent-tabs-mode: t
3980 # tab-width: 4
3981 # End: