2 # Tcl ignores the next line -*- tcl -*- \
3 if test "z$*" = zversion \
4 || test "z$*" = z--version; \
6 echo 'git-gui version @@GITGUI_VERSION@@'; \
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]
41 -title "git-gui: fatal error" \
46 catch {rename send {}} ; # What an evil concept...
48 ######################################################################
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]
66 set oguimsg [file join $oguilib msgs]
70 ######################################################################
72 ## enable verbose loading?
74 if {![catch {set _verbose $env(GITGUI_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
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
100 proc _mc_update_locale {} {
101 set key {HKEY_CURRENT_USER\Control Panel\Desktop}
103 package require registry
104 set uilocale [registry get $key "PreferredUILanguages"]
105 msgcat::ConvertLocale [string map {- _} [lindex $uilocale 0]]
107 if {[string length $uilocale] > 0} {
108 msgcat::mclocale $uilocale
115 proc _mc_trim {fmt} {
116 set cmk [string first @@ $fmt]
118 return [string range $fmt 0 [expr {$cmk - 1}]]
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]
132 return [join $args {}]
135 ::msgcat::mcload $oguimsg
138 ######################################################################
142 set _appname {Git Gui}
151 set _shellpath {@@SHELL_PATH@@}
153 set _trace [lsearch -exact $argv --trace]
155 set argv [lreplace $argv $_trace $_trace]
161 # variable for the last merged branch (useful for a default when deleting
163 set _last_merged_branch {}
166 global _shellpath env
167 if {[string match @@* $_shellpath]} {
168 if {[info exists env(SHELL)]} {
187 return [eval [list file join $_gitdir] $args]
190 proc gitexec {args} {
192 if {$_gitexec eq {}} {
193 if {[catch {set _gitexec [git --exec-path]} err]} {
194 error "Git not installed?\n\n$err"
197 set _gitexec [exec cygpath \
202 set _gitexec [file normalize $_gitexec]
208 return [eval [list file join $_gitexec] $args]
211 proc githtmldir {args} {
213 if {$_githtmldir eq {}} {
214 if {[catch {set _githtmldir [git --html-path]}]} {
215 # Git not installed or option not yet supported
219 set _githtmldir [exec cygpath \
224 set _githtmldir [file normalize $_githtmldir]
230 return [eval [list file join $_githtmldir] $args]
238 if {[tk windowingsystem] eq {aqua}} {
245 if {$::tcl_platform(platform) eq {windows}} {
253 if {$_iscygwin eq {}} {
254 if {$::tcl_platform(platform) eq {windows}} {
255 if {[catch {set p [exec cygpath --windir]} err]} {
267 proc is_enabled {option} {
268 global enabled_options
269 if {[catch {set on $enabled_options($option)}]} {return 0}
273 proc enable_option {option} {
274 global enabled_options
275 set enabled_options($option) 1
278 proc disable_option {option} {
279 global enabled_options
280 set enabled_options($option) 0
283 ######################################################################
287 proc is_many_config {name} {
288 switch -glob -- $name {
298 proc is_config_true {name} {
300 if {[catch {set v $repo_config($name)}]} {
302 } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
309 proc is_config_false {name} {
311 if {[catch {set v $repo_config($name)}]} {
313 } elseif {$v eq {false} || $v eq {0} || $v eq {no}} {
320 proc get_config {name} {
322 if {[catch {set v $repo_config($name)}]} {
334 if {$_isbare eq {}} {
336 set _bare [git rev-parse --is-bare-repository]
338 true { set _isbare 1 }
339 false { set _isbare 0}
343 if {[is_config_true core.bare]
344 || ($_gitworktree eq {}
345 && [lindex [file split $_gitdir] end] ne {.git})} {
355 ######################################################################
359 proc _trace_exec {cmd} {
360 if {!$::_trace} return
366 if {[regexp {[ \t\r\n'"$?*]} $v]} {
374 #'" fix poor old emacs font-lock mode
376 proc _git_cmd {name} {
379 if {[catch {set v $_git_cmd_path($name)}]} {
383 --exec-path { return [list $::_git $name] }
386 set p [gitexec git-$name$::_search_exe]
387 if {[file exists $p]} {
389 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
390 # Try to determine what sort of magic will make
391 # git-$name go and do its thing, because native
392 # Tcl on Windows doesn't know it.
394 set p [gitexec git-$name]
399 switch -glob -- [lindex $s 0] {
401 #!*perl { set i perl }
402 #!*python { set i python }
403 default { error "git-$name is not supported: $s" }
407 if {![info exists interp]} {
408 set interp [_which $i]
411 error "git-$name requires $i (not in PATH)"
413 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
415 # Assume it is builtin to git somehow and we
416 # aren't actually able to see a file for it.
418 set v [list $::_git $name]
420 set _git_cmd_path($name) $v
425 proc _which {what args} {
426 global env _search_exe _search_path
428 if {$_search_path eq {}} {
429 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
430 set _search_path [split [exec cygpath \
436 } elseif {[is_Windows]} {
437 set gitguidir [file dirname [info script]]
438 regsub -all ";" $gitguidir "\\;" gitguidir
439 set env(PATH) "$gitguidir;$env(PATH)"
440 set _search_path [split $env(PATH) {;}]
443 set _search_path [split $env(PATH) :]
448 if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
451 set suffix $_search_exe
454 foreach p $_search_path {
455 set p [file join $p $what$suffix]
456 if {[file exists $p]} {
457 return [file normalize $p]
463 proc _lappend_nice {cmd_var} {
467 if {![info exists _nice]} {
468 set _nice [_which nice]
469 if {[catch {exec $_nice git version}]} {
471 } elseif {[is_Windows] && [file dirname $_nice] ne [file dirname $::_git]} {
484 switch -- [lindex $args 0] {
495 set args [lrange $args 1 end]
498 set cmdp [_git_cmd [lindex $args 0]]
499 set args [lrange $args 1 end]
501 _trace_exec [concat $opt $cmdp $args]
502 set result [eval exec $opt $cmdp $args]
504 puts stderr "< $result"
509 proc _open_stdout_stderr {cmd} {
512 set fd [open [concat [list | ] $cmd] r]
514 if { [lindex $cmd end] eq {2>@1}
515 && $err eq {can not find channel named "1"}
517 # Older versions of Tcl 8.4 don't have this 2>@1 IO
518 # redirect operator. Fallback to |& cat for those.
519 # The command was not actually started, so its safe
520 # to try to start it a second time.
522 set fd [open [concat \
524 [lrange $cmd 0 end-1] \
531 fconfigure $fd -eofchar {}
535 proc git_read {args} {
539 switch -- [lindex $args 0] {
554 set args [lrange $args 1 end]
557 set cmdp [_git_cmd [lindex $args 0]]
558 set args [lrange $args 1 end]
560 return [_open_stdout_stderr [concat $opt $cmdp $args]]
563 proc git_write {args} {
567 switch -- [lindex $args 0] {
578 set args [lrange $args 1 end]
581 set cmdp [_git_cmd [lindex $args 0]]
582 set args [lrange $args 1 end]
584 _trace_exec [concat $opt $cmdp $args]
585 return [open [concat [list | ] $opt $cmdp $args] w]
588 proc githook_read {hook_name args} {
589 set pchook [gitdir hooks $hook_name]
592 # On Windows [file executable] might lie so we need to ask
593 # the shell if the hook is executable. Yes that's annoying.
597 if {![info exists interp]} {
598 set interp [_which sh]
601 error "hook execution requires sh (not in PATH)"
604 set scr {if test -x "$1";then exec "$@";fi}
605 set sh_c [list $interp -c $scr $interp $pchook]
606 return [_open_stdout_stderr [concat $sh_c $args]]
609 if {[file executable $pchook]} {
610 return [_open_stdout_stderr [concat [list $pchook] $args]]
616 proc kill_file_process {fd} {
617 set process [pid $fd]
621 # Use a Cygwin-specific flag to allow killing
622 # native Windows processes
623 exec kill -f $process
630 proc gitattr {path attr default} {
631 if {[catch {set r [git check-attr $attr -- $path]}]} {
634 set r [join [lrange [split $r :] 2 end] :]
637 if {$r eq {unspecified}} {
644 regsub -all ' $value "'\\''" value
648 proc load_current_branch {} {
649 global current_branch is_detached
651 set fd [open [gitdir HEAD] r]
652 if {[gets $fd ref] < 1} {
657 set pfx {ref: refs/heads/}
658 set len [string length $pfx]
659 if {[string equal -length $len $pfx $ref]} {
660 # We're on a branch. It might not exist. But
661 # HEAD looks good enough to be a branch.
663 set current_branch [string range $ref $len end]
666 # Assume this is a detached head.
668 set current_branch HEAD
673 auto_load tk_optionMenu
674 rename tk_optionMenu real__tkOptionMenu
675 proc tk_optionMenu {w varName args} {
676 set m [eval real__tkOptionMenu $w $varName $args]
677 $m configure -font font_ui
678 $w configure -font font_ui
682 proc rmsel_tag {text} {
684 -background [$text cget -background] \
685 -foreground [$text cget -foreground] \
687 $text tag conf in_sel -background lightgray
688 bind $text <Motion> break
694 bind . <Visibility> {
695 bind . <Visibility> {}
700 wm iconbitmap . -default $oguilib/git-gui.ico
701 set ::tk::AlwaysShowSelection 1
702 bind . <Control-F2> {console show}
704 # Spoof an X11 display for SSH
705 if {![info exists env(DISPLAY)]} {
706 set env(DISPLAY) :9999
710 image create photo gitlogo -width 16 -height 16
712 gitlogo put #33CC33 -to 7 0 9 2
713 gitlogo put #33CC33 -to 4 2 12 4
714 gitlogo put #33CC33 -to 7 4 9 6
715 gitlogo put #CC3333 -to 4 6 12 8
716 gitlogo put gray26 -to 4 9 6 10
717 gitlogo put gray26 -to 3 10 6 12
718 gitlogo put gray26 -to 8 9 13 11
719 gitlogo put gray26 -to 8 11 10 12
720 gitlogo put gray26 -to 11 11 13 14
721 gitlogo put gray26 -to 3 12 5 14
722 gitlogo put gray26 -to 5 13
723 gitlogo put gray26 -to 10 13
724 gitlogo put gray26 -to 4 14 12 15
725 gitlogo put gray26 -to 5 15 11 16
728 wm iconphoto . -default gitlogo
732 ######################################################################
738 if {[lsearch -exact [font names] TkDefaultFont] != -1} {
739 eval [linsert [font actual TkDefaultFont] 0 font configure font_ui]
740 eval [linsert [font actual TkFixedFont] 0 font create font_diff]
742 font create font_diff -family Courier -size 10
745 eval font configure font_ui [font actual [.dummy cget -font]]
750 font create font_uiitalic
751 font create font_uibold
752 font create font_diffbold
753 font create font_diffitalic
755 foreach class {Button Checkbutton Entry Label
756 Labelframe Listbox Message
757 Radiobutton Spinbox Text} {
758 option add *$class.font font_ui
761 option add *Menu.font font_ui
762 option add *Entry.borderWidth 1 startupFile
763 option add *Entry.relief sunken startupFile
764 option add *RadioButton.anchor w startupFile
768 if {[is_Windows] || [is_MacOSX]} {
769 option add *Menu.tearOff 0
780 proc bind_button3 {w cmd} {
781 bind $w <Any-Button-3> $cmd
783 # Mac OS X sends Button-2 on right click through three-button mouse,
784 # or through trackpad right-clicking (two-finger touch + click).
785 bind $w <Any-Button-2> $cmd
786 bind $w <Control-Button-1> $cmd
790 proc apply_config {} {
791 global repo_config font_descs
793 foreach option $font_descs {
794 set name [lindex $option 0]
795 set font [lindex $option 1]
798 foreach {cn cv} $repo_config(gui.$name) {
799 if {$cn eq {-weight}} {
802 font configure $font $cn $cv
805 font configure $font -weight normal
808 error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
810 foreach {cn cv} [font configure $font] {
811 font configure ${font}bold $cn $cv
812 font configure ${font}italic $cn $cv
814 font configure ${font}bold -weight bold
815 font configure ${font}italic -slant italic
821 if {$repo_config(gui.usettk)} {
822 set use_ttk [package vsatisfies [package provide Tk] 8.5]
825 bind [winfo class .] <<ThemeChanged>> [list InitTheme]
831 set default_config(branch.autosetupmerge) true
832 set default_config(merge.tool) {}
833 set default_config(mergetool.keepbackup) true
834 set default_config(merge.diffstat) true
835 set default_config(merge.summary) false
836 set default_config(merge.verbosity) 2
837 set default_config(user.name) {}
838 set default_config(user.email) {}
840 set default_config(gui.encoding) [encoding system]
841 set default_config(gui.matchtrackingbranch) false
842 set default_config(gui.textconv) true
843 set default_config(gui.pruneduringfetch) false
844 set default_config(gui.trustmtime) false
845 set default_config(gui.fastcopyblame) false
846 set default_config(gui.copyblamethreshold) 40
847 set default_config(gui.blamehistoryctx) 7
848 set default_config(gui.diffcontext) 5
849 set default_config(gui.commitmsgwidth) 75
850 set default_config(gui.newbranchtemplate) {}
851 set default_config(gui.spellingdictionary) {}
852 set default_config(gui.fontui) [font configure font_ui]
853 set default_config(gui.fontdiff) [font configure font_diff]
854 # TODO: this option should be added to the git-config documentation
855 set default_config(gui.maxfilesdisplayed) 5000
856 set default_config(gui.usettk) 1
858 {fontui font_ui {mc "Main Font"}}
859 {fontdiff font_diff {mc "Diff/Console Font"}}
862 ######################################################################
866 set _git [_which git]
868 catch {wm withdraw .}
872 -title [mc "git-gui: fatal error"] \
873 -message [mc "Cannot find git in PATH."]
877 ######################################################################
881 if {[catch {set _git_version [git --version]} err]} {
882 catch {wm withdraw .}
886 -title [mc "git-gui: fatal error"] \
887 -message "Cannot determine Git version:
891 [appname] requires Git 1.5.0 or later."
894 if {![regsub {^git version } $_git_version {} _git_version]} {
895 catch {wm withdraw .}
899 -title [mc "git-gui: fatal error"] \
900 -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
904 proc get_trimmed_version {s} {
906 foreach x [split $s -._] {
907 if {[string is integer -strict $x]} {
915 set _real_git_version $_git_version
916 set _git_version [get_trimmed_version $_git_version]
918 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
919 catch {wm withdraw .}
924 -title "[appname]: warning" \
925 -message [mc "Git version cannot be determined.
927 %s claims it is version '%s'.
929 %s requires at least Git 1.5.0 or later.
931 Assume '%s' is version 1.5.0?
932 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
933 set _git_version 1.5.0
938 unset _real_git_version
940 proc git-version {args} {
943 switch [llength $args] {
949 set op [lindex $args 0]
950 set vr [lindex $args 1]
951 set cm [package vcompare $_git_version $vr]
952 return [expr $cm $op 0]
956 set type [lindex $args 0]
957 set name [lindex $args 1]
958 set parm [lindex $args 2]
959 set body [lindex $args 3]
961 if {($type ne {proc} && $type ne {method})} {
962 error "Invalid arguments to git-version"
964 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
965 error "Last arm of $type $name must be default"
968 foreach {op vr cb} [lrange $body 0 end-2] {
969 if {[git-version $op $vr]} {
970 return [uplevel [list $type $name $parm $cb]]
974 return [uplevel [list $type $name $parm [lindex $body end]]]
978 error "git-version >= x"
984 if {[git-version < 1.5]} {
985 catch {wm withdraw .}
989 -title [mc "git-gui: fatal error"] \
990 -message "[appname] requires Git 1.5.0 or later.
992 You are using [git-version]:
998 ######################################################################
1000 ## configure our library
1002 set idx [file join $oguilib tclIndex]
1003 if {[catch {set fd [open $idx r]} err]} {
1004 catch {wm withdraw .}
1008 -title [mc "git-gui: fatal error"] \
1012 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
1014 while {[gets $fd n] >= 0} {
1015 if {$n ne {} && ![string match #* $n]} {
1027 if {[lsearch -exact $loaded $p] >= 0} continue
1028 source [file join $oguilib $p]
1033 set auto_path [concat [list $oguilib] $auto_path]
1035 unset -nocomplain idx fd
1037 ######################################################################
1039 ## config file parsing
1041 git-version proc _parse_config {arr_name args} {
1048 [list git_read config] \
1050 [list --null --list]]
1051 fconfigure $fd_rc -translation binary
1052 set buf [read $fd_rc]
1055 foreach line [split $buf "\0"] {
1056 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
1057 if {[is_many_config $name]} {
1058 lappend arr($name) $value
1060 set arr($name) $value
1069 set fd_rc [eval [list git_read config --list] $args]
1070 while {[gets $fd_rc line] >= 0} {
1071 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
1072 if {[is_many_config $name]} {
1073 lappend arr($name) $value
1075 set arr($name) $value
1084 proc load_config {include_global} {
1085 global repo_config global_config system_config default_config
1087 if {$include_global} {
1088 _parse_config system_config --system
1089 _parse_config global_config --global
1091 _parse_config repo_config
1093 foreach name [array names default_config] {
1094 if {[catch {set v $system_config($name)}]} {
1095 set system_config($name) $default_config($name)
1098 foreach name [array names system_config] {
1099 if {[catch {set v $global_config($name)}]} {
1100 set global_config($name) $system_config($name)
1102 if {[catch {set v $repo_config($name)}]} {
1103 set repo_config($name) $system_config($name)
1108 ######################################################################
1110 ## feature option selection
1112 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1117 if {$subcommand eq {gui.sh}} {
1120 if {$subcommand eq {gui} && [llength $argv] > 0} {
1121 set subcommand [lindex $argv 0]
1122 set argv [lrange $argv 1 end]
1125 enable_option multicommit
1126 enable_option branch
1127 enable_option transport
1130 switch -- $subcommand {
1135 disable_option multicommit
1136 disable_option branch
1137 disable_option transport
1140 enable_option singlecommit
1141 enable_option retcode
1143 disable_option multicommit
1144 disable_option branch
1145 disable_option transport
1147 while {[llength $argv] > 0} {
1148 set a [lindex $argv 0]
1151 enable_option initialamend
1154 enable_option nocommit
1155 enable_option nocommitmsg
1158 disable_option nocommitmsg
1165 set argv [lrange $argv 1 end]
1170 ######################################################################
1172 ## execution environment
1174 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1176 # Suggest our implementation of askpass, if none is set
1177 if {![info exists env(SSH_ASKPASS)]} {
1178 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1181 ######################################################################
1187 set _gitdir $env(GIT_DIR)
1191 # beware that from the .git dir this sets _gitdir to .
1192 # and _prefix to the empty string
1193 set _gitdir [git rev-parse --git-dir]
1194 set _prefix [git rev-parse --show-prefix]
1198 choose_repository::pick
1202 # we expand the _gitdir when it's just a single dot (i.e. when we're being
1203 # run from the .git dir itself) lest the routines to find the worktree
1205 if {$_gitdir eq "."} {
1209 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1210 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1212 if {![file isdirectory $_gitdir]} {
1213 catch {wm withdraw .}
1214 error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
1217 # _gitdir exists, so try loading the config
1221 # v1.7.0 introduced --show-toplevel to return the canonical work-tree
1222 if {[package vsatisfies $_git_version 1.7.0]} {
1223 set _gitworktree [git rev-parse --show-toplevel]
1225 # try to set work tree from environment, core.worktree or use
1226 # cdup to obtain a relative path to the top of the worktree. If
1227 # run from the top, the ./ prefix ensures normalize expands pwd.
1228 if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
1229 set _gitworktree [get_config core.worktree]
1230 if {$_gitworktree eq ""} {
1231 set _gitworktree [file normalize ./[git rev-parse --show-cdup]]
1236 if {$_prefix ne {}} {
1237 if {$_gitworktree eq {}} {
1238 regsub -all {[^/]+/} $_prefix ../ cdup
1240 set cdup $_gitworktree
1242 if {[catch {cd $cdup} err]} {
1243 catch {wm withdraw .}
1244 error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
1247 set _gitworktree [pwd]
1249 } elseif {![is_enabled bare]} {
1251 catch {wm withdraw .}
1252 error_popup [strcat [mc "Cannot use bare repository:"] "\n\n$_gitdir"]
1255 if {$_gitworktree eq {}} {
1256 set _gitworktree [file dirname $_gitdir]
1258 if {[catch {cd $_gitworktree} err]} {
1259 catch {wm withdraw .}
1260 error_popup [strcat [mc "No working directory"] " $_gitworktree:\n\n$err"]
1263 set _gitworktree [pwd]
1265 set _reponame [file split [file normalize $_gitdir]]
1266 if {[lindex $_reponame end] eq {.git}} {
1267 set _reponame [lindex $_reponame end-1]
1269 set _reponame [lindex $_reponame end]
1272 set env(GIT_DIR) $_gitdir
1273 set env(GIT_WORK_TREE) $_gitworktree
1275 ######################################################################
1279 set current_diff_path {}
1280 set current_diff_side {}
1281 set diff_actions [list]
1285 set MERGE_HEAD [list]
1288 set current_branch {}
1290 set current_diff_path {}
1292 set is_submodule_diff 0
1293 set is_conflict_diff 0
1294 set selected_commit_type new
1295 set diff_empty_count 0
1297 set nullid "0000000000000000000000000000000000000000"
1298 set nullid2 "0000000000000000000000000000000000000001"
1300 ######################################################################
1308 set disable_on_lock [list]
1309 set index_lock_type none
1311 proc lock_index {type} {
1312 global index_lock_type disable_on_lock
1314 if {$index_lock_type eq {none}} {
1315 set index_lock_type $type
1316 foreach w $disable_on_lock {
1317 uplevel #0 $w disabled
1320 } elseif {$index_lock_type eq "begin-$type"} {
1321 set index_lock_type $type
1327 proc unlock_index {} {
1328 global index_lock_type disable_on_lock
1330 set index_lock_type none
1331 foreach w $disable_on_lock {
1332 uplevel #0 $w normal
1336 ######################################################################
1340 proc repository_state {ctvar hdvar mhvar} {
1341 global current_branch
1342 upvar $ctvar ct $hdvar hd $mhvar mh
1347 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1353 set merge_head [gitdir MERGE_HEAD]
1354 if {[file exists $merge_head]} {
1356 set fd_mh [open $merge_head r]
1357 while {[gets $fd_mh line] >= 0} {
1368 global PARENT empty_tree
1370 set p [lindex $PARENT 0]
1374 if {$empty_tree eq {}} {
1375 set empty_tree [git mktree << {}]
1380 proc force_amend {} {
1381 global selected_commit_type
1382 global HEAD PARENT MERGE_HEAD commit_type
1384 repository_state newType newHEAD newMERGE_HEAD
1387 set MERGE_HEAD $newMERGE_HEAD
1388 set commit_type $newType
1390 set selected_commit_type amend
1391 do_select_commit_type
1394 proc rescan {after {honor_trustmtime 1}} {
1395 global HEAD PARENT MERGE_HEAD commit_type
1396 global ui_index ui_workdir ui_comm
1397 global rescan_active file_states
1400 if {$rescan_active > 0 || ![lock_index read]} return
1402 repository_state newType newHEAD newMERGE_HEAD
1403 if {[string match amend* $commit_type]
1404 && $newType eq {normal}
1405 && $newHEAD eq $HEAD} {
1409 set MERGE_HEAD $newMERGE_HEAD
1410 set commit_type $newType
1413 array unset file_states
1415 if {!$::GITGUI_BCK_exists &&
1416 (![$ui_comm edit modified]
1417 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1418 if {[string match amend* $commit_type]} {
1419 } elseif {[load_message GITGUI_MSG]} {
1420 } elseif {[run_prepare_commit_msg_hook]} {
1421 } elseif {[load_message MERGE_MSG]} {
1422 } elseif {[load_message SQUASH_MSG]} {
1425 $ui_comm edit modified false
1428 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1429 rescan_stage2 {} $after
1432 ui_status [mc "Refreshing file status..."]
1433 set fd_rf [git_read update-index \
1439 fconfigure $fd_rf -blocking 0 -translation binary
1440 fileevent $fd_rf readable \
1441 [list rescan_stage2 $fd_rf $after]
1446 set is_git_info_exclude {}
1447 proc have_info_exclude {} {
1448 global is_git_info_exclude
1450 if {$is_git_info_exclude eq {}} {
1451 if {[catch {exec test -f [gitdir info exclude]}]} {
1452 set is_git_info_exclude 0
1454 set is_git_info_exclude 1
1457 return $is_git_info_exclude
1460 proc have_info_exclude {} {
1461 return [file readable [gitdir info exclude]]
1465 proc rescan_stage2 {fd after} {
1466 global rescan_active buf_rdi buf_rdf buf_rlo
1470 if {![eof $fd]} return
1474 if {[package vsatisfies $::_git_version 1.6.3]} {
1475 set ls_others [list --exclude-standard]
1477 set ls_others [list --exclude-per-directory=.gitignore]
1478 if {[have_info_exclude]} {
1479 lappend ls_others "--exclude-from=[gitdir info exclude]"
1481 set user_exclude [get_config core.excludesfile]
1482 if {$user_exclude ne {} && [file readable $user_exclude]} {
1483 lappend ls_others "--exclude-from=[file normalize $user_exclude]"
1492 ui_status [mc "Scanning for modified files ..."]
1493 set fd_di [git_read diff-index --cached -z [PARENT]]
1494 set fd_df [git_read diff-files -z]
1495 set fd_lo [eval git_read ls-files --others -z $ls_others]
1497 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1498 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1499 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1500 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1501 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1502 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1505 proc load_message {file} {
1508 set f [gitdir $file]
1509 if {[file isfile $f]} {
1510 if {[catch {set fd [open $f r]}]} {
1513 fconfigure $fd -eofchar {}
1514 set content [string trim [read $fd]]
1516 regsub -all -line {[ \r\t]+$} $content {} content
1517 $ui_comm delete 0.0 end
1518 $ui_comm insert end $content
1524 proc run_prepare_commit_msg_hook {} {
1527 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1528 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1529 # empty file but existant file.
1531 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1533 if {[file isfile [gitdir MERGE_MSG]]} {
1534 set pcm_source "merge"
1535 set fd_mm [open [gitdir MERGE_MSG] r]
1536 puts -nonewline $fd_pcm [read $fd_mm]
1538 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1539 set pcm_source "squash"
1540 set fd_sm [open [gitdir SQUASH_MSG] r]
1541 puts -nonewline $fd_pcm [read $fd_sm]
1549 set fd_ph [githook_read prepare-commit-msg \
1550 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1552 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1556 ui_status [mc "Calling prepare-commit-msg hook..."]
1559 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1560 fileevent $fd_ph readable \
1561 [list prepare_commit_msg_hook_wait $fd_ph]
1566 proc prepare_commit_msg_hook_wait {fd_ph} {
1569 append pch_error [read $fd_ph]
1570 fconfigure $fd_ph -blocking 1
1572 if {[catch {close $fd_ph}]} {
1573 ui_status [mc "Commit declined by prepare-commit-msg hook."]
1574 hook_failed_popup prepare-commit-msg $pch_error
1575 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1578 load_message PREPARE_COMMIT_MSG
1581 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1584 fconfigure $fd_ph -blocking 0
1585 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1588 proc read_diff_index {fd after} {
1591 append buf_rdi [read $fd]
1593 set n [string length $buf_rdi]
1595 set z1 [string first "\0" $buf_rdi $c]
1596 if {$z1 == -1} break
1598 set z2 [string first "\0" $buf_rdi $z1]
1599 if {$z2 == -1} break
1602 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1603 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1605 [encoding convertfrom $p] \
1607 [list [lindex $i 0] [lindex $i 2]] \
1613 set buf_rdi [string range $buf_rdi $c end]
1618 rescan_done $fd buf_rdi $after
1621 proc read_diff_files {fd after} {
1624 append buf_rdf [read $fd]
1626 set n [string length $buf_rdf]
1628 set z1 [string first "\0" $buf_rdf $c]
1629 if {$z1 == -1} break
1631 set z2 [string first "\0" $buf_rdf $z1]
1632 if {$z2 == -1} break
1635 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1636 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1638 [encoding convertfrom $p] \
1641 [list [lindex $i 0] [lindex $i 2]]
1646 set buf_rdf [string range $buf_rdf $c end]
1651 rescan_done $fd buf_rdf $after
1654 proc read_ls_others {fd after} {
1657 append buf_rlo [read $fd]
1658 set pck [split $buf_rlo "\0"]
1659 set buf_rlo [lindex $pck end]
1660 foreach p [lrange $pck 0 end-1] {
1661 set p [encoding convertfrom $p]
1662 if {[string index $p end] eq {/}} {
1663 set p [string range $p 0 end-1]
1667 rescan_done $fd buf_rlo $after
1670 proc rescan_done {fd buf after} {
1671 global rescan_active current_diff_path
1672 global file_states repo_config
1675 if {![eof $fd]} return
1678 if {[incr rescan_active -1] > 0} return
1683 if {$current_diff_path ne {}} { reshow_diff $after }
1684 if {$current_diff_path eq {}} { select_first_diff $after }
1687 proc prune_selection {} {
1688 global file_states selected_paths
1690 foreach path [array names selected_paths] {
1691 if {[catch {set still_here $file_states($path)}]} {
1692 unset selected_paths($path)
1697 ######################################################################
1701 proc mapicon {w state path} {
1704 if {[catch {set r $all_icons($state$w)}]} {
1705 puts "error: no icon for $w state={$state} $path"
1711 proc mapdesc {state path} {
1714 if {[catch {set r $all_descs($state)}]} {
1715 puts "error: no desc for state={$state} $path"
1721 proc ui_status {msg} {
1723 if {[info exists main_status]} {
1724 $main_status show $msg
1728 proc ui_ready {{test {}}} {
1730 if {[info exists main_status]} {
1731 $main_status show [mc "Ready."] $test
1735 proc escape_path {path} {
1736 regsub -all {\\} $path "\\\\" path
1737 regsub -all "\n" $path "\\n" path
1741 proc short_path {path} {
1742 return [escape_path [lindex [file split $path] end]]
1746 set null_sha1 [string repeat 0 40]
1748 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1749 global file_states next_icon_id null_sha1
1751 set s0 [string index $new_state 0]
1752 set s1 [string index $new_state 1]
1754 if {[catch {set info $file_states($path)}]} {
1756 set icon n[incr next_icon_id]
1758 set state [lindex $info 0]
1759 set icon [lindex $info 1]
1760 if {$head_info eq {}} {set head_info [lindex $info 2]}
1761 if {$index_info eq {}} {set index_info [lindex $info 3]}
1764 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1765 elseif {$s0 eq {_}} {set s0 _}
1767 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1768 elseif {$s1 eq {_}} {set s1 _}
1770 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1771 set head_info [list 0 $null_sha1]
1772 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1773 && $head_info eq {}} {
1774 set head_info $index_info
1775 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1776 set index_info $head_info
1780 set file_states($path) [list $s0$s1 $icon \
1781 $head_info $index_info \
1786 proc display_file_helper {w path icon_name old_m new_m} {
1789 if {$new_m eq {_}} {
1790 set lno [lsearch -sorted -exact $file_lists($w) $path]
1792 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1794 $w conf -state normal
1795 $w delete $lno.0 [expr {$lno + 1}].0
1796 $w conf -state disabled
1798 } elseif {$old_m eq {_} && $new_m ne {_}} {
1799 lappend file_lists($w) $path
1800 set file_lists($w) [lsort -unique $file_lists($w)]
1801 set lno [lsearch -sorted -exact $file_lists($w) $path]
1803 $w conf -state normal
1804 $w image create $lno.0 \
1805 -align center -padx 5 -pady 1 \
1807 -image [mapicon $w $new_m $path]
1808 $w insert $lno.1 "[escape_path $path]\n"
1809 $w conf -state disabled
1810 } elseif {$old_m ne $new_m} {
1811 $w conf -state normal
1812 $w image conf $icon_name -image [mapicon $w $new_m $path]
1813 $w conf -state disabled
1817 proc display_file {path state} {
1818 global file_states selected_paths
1819 global ui_index ui_workdir
1821 set old_m [merge_state $path $state]
1822 set s $file_states($path)
1823 set new_m [lindex $s 0]
1824 set icon_name [lindex $s 1]
1826 set o [string index $old_m 0]
1827 set n [string index $new_m 0]
1834 display_file_helper $ui_index $path $icon_name $o $n
1836 if {[string index $old_m 0] eq {U}} {
1839 set o [string index $old_m 1]
1841 if {[string index $new_m 0] eq {U}} {
1844 set n [string index $new_m 1]
1846 display_file_helper $ui_workdir $path $icon_name $o $n
1848 if {$new_m eq {__}} {
1849 unset file_states($path)
1850 catch {unset selected_paths($path)}
1854 proc display_all_files_helper {w path icon_name m} {
1857 lappend file_lists($w) $path
1858 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1859 $w image create end \
1860 -align center -padx 5 -pady 1 \
1862 -image [mapicon $w $m $path]
1863 $w insert end "[escape_path $path]\n"
1867 proc display_all_files {} {
1868 global ui_index ui_workdir
1869 global file_states file_lists
1871 global files_warning
1873 $ui_index conf -state normal
1874 $ui_workdir conf -state normal
1876 $ui_index delete 0.0 end
1877 $ui_workdir delete 0.0 end
1880 set file_lists($ui_index) [list]
1881 set file_lists($ui_workdir) [list]
1883 set to_display [lsort [array names file_states]]
1884 set display_limit [get_config gui.maxfilesdisplayed]
1885 if {[llength $to_display] > $display_limit} {
1886 if {!$files_warning} {
1887 # do not repeatedly warn:
1889 info_popup [mc "Displaying only %s of %s files." \
1890 $display_limit [llength $to_display]]
1892 set to_display [lrange $to_display 0 [expr {$display_limit-1}]]
1894 foreach path $to_display {
1895 set s $file_states($path)
1897 set icon_name [lindex $s 1]
1899 set s [string index $m 0]
1900 if {$s ne {U} && $s ne {_}} {
1901 display_all_files_helper $ui_index $path \
1905 if {[string index $m 0] eq {U}} {
1908 set s [string index $m 1]
1911 display_all_files_helper $ui_workdir $path \
1916 $ui_index conf -state disabled
1917 $ui_workdir conf -state disabled
1920 ######################################################################
1925 #define mask_width 14
1926 #define mask_height 15
1927 static unsigned char mask_bits[] = {
1928 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1929 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1930 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1933 image create bitmap file_plain -background white -foreground black -data {
1934 #define plain_width 14
1935 #define plain_height 15
1936 static unsigned char plain_bits[] = {
1937 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1938 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1939 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1940 } -maskdata $filemask
1942 image create bitmap file_mod -background white -foreground blue -data {
1943 #define mod_width 14
1944 #define mod_height 15
1945 static unsigned char mod_bits[] = {
1946 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1947 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1948 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1949 } -maskdata $filemask
1951 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1952 #define file_fulltick_width 14
1953 #define file_fulltick_height 15
1954 static unsigned char file_fulltick_bits[] = {
1955 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1956 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1957 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1958 } -maskdata $filemask
1960 image create bitmap file_question -background white -foreground black -data {
1961 #define file_question_width 14
1962 #define file_question_height 15
1963 static unsigned char file_question_bits[] = {
1964 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1965 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1966 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1967 } -maskdata $filemask
1969 image create bitmap file_removed -background white -foreground red -data {
1970 #define file_removed_width 14
1971 #define file_removed_height 15
1972 static unsigned char file_removed_bits[] = {
1973 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1974 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1975 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1976 } -maskdata $filemask
1978 image create bitmap file_merge -background white -foreground blue -data {
1979 #define file_merge_width 14
1980 #define file_merge_height 15
1981 static unsigned char file_merge_bits[] = {
1982 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1983 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1984 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1985 } -maskdata $filemask
1987 image create bitmap file_statechange -background white -foreground green -data {
1988 #define file_statechange_width 14
1989 #define file_statechange_height 15
1990 static unsigned char file_statechange_bits[] = {
1991 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
1992 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
1993 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1994 } -maskdata $filemask
1996 set ui_index .vpane.files.index.list
1997 set ui_workdir .vpane.files.workdir.list
1999 set all_icons(_$ui_index) file_plain
2000 set all_icons(A$ui_index) file_plain
2001 set all_icons(M$ui_index) file_fulltick
2002 set all_icons(D$ui_index) file_removed
2003 set all_icons(U$ui_index) file_merge
2004 set all_icons(T$ui_index) file_statechange
2006 set all_icons(_$ui_workdir) file_plain
2007 set all_icons(M$ui_workdir) file_mod
2008 set all_icons(D$ui_workdir) file_question
2009 set all_icons(U$ui_workdir) file_merge
2010 set all_icons(O$ui_workdir) file_plain
2011 set all_icons(T$ui_workdir) file_statechange
2013 set max_status_desc 0
2015 {__ {mc "Unmodified"}}
2017 {_M {mc "Modified, not staged"}}
2018 {M_ {mc "Staged for commit"}}
2019 {MM {mc "Portions staged for commit"}}
2020 {MD {mc "Staged for commit, missing"}}
2022 {_T {mc "File type changed, not staged"}}
2023 {MT {mc "File type changed, old type staged for commit"}}
2024 {AT {mc "File type changed, old type staged for commit"}}
2025 {T_ {mc "File type changed, staged"}}
2026 {TM {mc "File type change staged, modification not staged"}}
2027 {TD {mc "File type change staged, file missing"}}
2029 {_O {mc "Untracked, not staged"}}
2030 {A_ {mc "Staged for commit"}}
2031 {AM {mc "Portions staged for commit"}}
2032 {AD {mc "Staged for commit, missing"}}
2035 {D_ {mc "Staged for removal"}}
2036 {DO {mc "Staged for removal, still present"}}
2038 {_U {mc "Requires merge resolution"}}
2039 {U_ {mc "Requires merge resolution"}}
2040 {UU {mc "Requires merge resolution"}}
2041 {UM {mc "Requires merge resolution"}}
2042 {UD {mc "Requires merge resolution"}}
2043 {UT {mc "Requires merge resolution"}}
2045 set text [eval [lindex $i 1]]
2046 if {$max_status_desc < [string length $text]} {
2047 set max_status_desc [string length $text]
2049 set all_descs([lindex $i 0]) $text
2053 ######################################################################
2057 proc scrollbar2many {list mode args} {
2058 foreach w $list {eval $w $mode $args}
2061 proc many2scrollbar {list mode sb top bottom} {
2062 $sb set $top $bottom
2063 foreach w $list {$w $mode moveto $top}
2066 proc incr_font_size {font {amt 1}} {
2067 set sz [font configure $font -size]
2069 font configure $font -size $sz
2070 font configure ${font}bold -size $sz
2071 font configure ${font}italic -size $sz
2074 ######################################################################
2078 set starting_gitk_msg [mc "Starting gitk... please wait..."]
2080 proc do_gitk {revs {is_submodule false}} {
2081 global current_diff_path file_states current_diff_side ui_index
2082 global _gitdir _gitworktree
2084 # -- Always start gitk through whatever we were loaded with. This
2085 # lets us bypass using shell process on Windows systems.
2087 set exe [_which gitk -script]
2088 set cmd [list [info nameofexecutable] $exe]
2090 error_popup [mc "Couldn't find gitk in PATH"]
2096 if {!$is_submodule} {
2101 cd $current_diff_path
2102 if {$revs eq {--}} {
2103 set s $file_states($current_diff_path)
2106 switch -glob -- [lindex $s 0] {
2107 M_ { set old_sha1 [lindex [lindex $s 2] 1] }
2108 _M { set old_sha1 [lindex [lindex $s 3] 1] }
2110 if {$current_diff_side eq $ui_index} {
2111 set old_sha1 [lindex [lindex $s 2] 1]
2112 set new_sha1 [lindex [lindex $s 3] 1]
2114 set old_sha1 [lindex [lindex $s 3] 1]
2118 set revs $old_sha1...$new_sha1
2120 # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones
2121 # we've been using for the main repository, so unset them.
2122 # TODO we could make life easier (start up faster?) for gitk
2123 # by setting these to the appropriate values to allow gitk
2124 # to skip the heuristics to find their proper value
2126 unset env(GIT_WORK_TREE)
2128 eval exec $cmd $revs "--" "--" &
2130 set env(GIT_DIR) $_gitdir
2131 set env(GIT_WORK_TREE) $_gitworktree
2134 ui_status $::starting_gitk_msg
2136 ui_ready $starting_gitk_msg
2141 proc do_git_gui {} {
2142 global current_diff_path
2144 # -- Always start git gui through whatever we were loaded with. This
2145 # lets us bypass using shell process on Windows systems.
2147 set exe [list [_which git]]
2149 error_popup [mc "Couldn't find git gui in PATH"]
2152 global _gitdir _gitworktree
2154 # see note in do_gitk about unsetting these vars when
2155 # running tools in a submodule
2157 unset env(GIT_WORK_TREE)
2160 cd $current_diff_path
2162 eval exec $exe gui &
2164 set env(GIT_DIR) $_gitdir
2165 set env(GIT_WORK_TREE) $_gitworktree
2168 ui_status $::starting_gitk_msg
2170 ui_ready $starting_gitk_msg
2175 proc do_explore {} {
2178 if {[is_Cygwin] || [is_Windows]} {
2179 set explorer "explorer.exe"
2180 } elseif {[is_MacOSX]} {
2183 # freedesktop.org-conforming system is our best shot
2184 set explorer "xdg-open"
2186 eval exec $explorer [list [file nativename $_gitworktree]] &
2192 proc terminate_me {win} {
2194 if {$win ne {.}} return
2198 proc do_quit {{rc {1}}} {
2199 global ui_comm is_quitting repo_config commit_type
2200 global GITGUI_BCK_exists GITGUI_BCK_i
2201 global ui_comm_spell
2202 global ret_code use_ttk
2204 if {$is_quitting} return
2207 if {[winfo exists $ui_comm]} {
2208 # -- Stash our current commit buffer.
2210 set save [gitdir GITGUI_MSG]
2211 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
2212 file rename -force [gitdir GITGUI_BCK] $save
2213 set GITGUI_BCK_exists 0
2215 set msg [string trim [$ui_comm get 0.0 end]]
2216 regsub -all -line {[ \r\t]+$} $msg {} msg
2217 if {(![string match amend* $commit_type]
2218 || [$ui_comm edit modified])
2221 set fd [open $save w]
2222 puts -nonewline $fd $msg
2226 catch {file delete $save}
2230 # -- Cancel our spellchecker if its running.
2232 if {[info exists ui_comm_spell]} {
2236 # -- Remove our editor backup, its not needed.
2238 after cancel $GITGUI_BCK_i
2239 if {$GITGUI_BCK_exists} {
2240 catch {file delete [gitdir GITGUI_BCK]}
2243 # -- Stash our current window geometry into this repository.
2245 set cfg_wmstate [wm state .]
2246 if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} {
2249 if {$cfg_wmstate ne $rc_wmstate} {
2250 catch {git config gui.wmstate $cfg_wmstate}
2252 if {$cfg_wmstate eq {zoomed}} {
2253 # on Windows wm geometry will lie about window
2254 # position (but not size) when window is zoomed
2255 # restore the window before querying wm geometry
2258 set cfg_geometry [list]
2259 lappend cfg_geometry [wm geometry .]
2261 lappend cfg_geometry [.vpane sashpos 0]
2262 lappend cfg_geometry [.vpane.files sashpos 0]
2264 lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
2265 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
2267 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2270 if {$cfg_geometry ne $rc_geometry} {
2271 catch {git config gui.geometry $cfg_geometry}
2277 # Briefly enable send again, working around Tk bug
2278 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2279 tk appname [appname]
2288 proc ui_do_rescan {} {
2289 rescan {force_first_diff ui_ready}
2296 proc next_diff {{after {}}} {
2297 global next_diff_p next_diff_w next_diff_i
2298 show_diff $next_diff_p $next_diff_w {} {} $after
2301 proc find_anchor_pos {lst name} {
2302 set lid [lsearch -sorted -exact $lst $name]
2306 foreach lname $lst {
2307 if {$lname >= $name} break
2315 proc find_file_from {flist idx delta path mmask} {
2318 set len [llength $flist]
2319 while {$idx >= 0 && $idx < $len} {
2320 set name [lindex $flist $idx]
2322 if {$name ne $path && [info exists file_states($name)]} {
2323 set state [lindex $file_states($name) 0]
2325 if {$mmask eq {} || [regexp $mmask $state]} {
2336 proc find_next_diff {w path {lno {}} {mmask {}}} {
2337 global next_diff_p next_diff_w next_diff_i
2338 global file_lists ui_index ui_workdir
2340 set flist $file_lists($w)
2342 set lno [find_anchor_pos $flist $path]
2347 if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} {
2348 if {$w eq $ui_index} {
2351 set mmask "$mmask\$"
2355 set idx [find_file_from $flist $lno 1 $path $mmask]
2358 set idx [find_file_from $flist $lno -1 $path $mmask]
2363 set next_diff_p [lindex $flist $idx]
2364 set next_diff_i [expr {$idx+1}]
2371 proc next_diff_after_action {w path {lno {}} {mmask {}}} {
2372 global current_diff_path
2374 if {$path ne $current_diff_path} {
2376 } elseif {[find_next_diff $w $path $lno $mmask]} {
2379 return {reshow_diff;}
2383 proc select_first_diff {after} {
2386 if {[find_next_diff $ui_workdir {} 1 {^_?U}] ||
2387 [find_next_diff $ui_workdir {} 1 {[^O]$}]} {
2394 proc force_first_diff {after} {
2395 global ui_workdir current_diff_path file_states
2397 if {[info exists file_states($current_diff_path)]} {
2398 set state [lindex $file_states($current_diff_path) 0]
2404 if {[string first {U} $state] >= 0} {
2405 # Already a conflict, do nothing
2406 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} {
2408 } elseif {[string index $state 1] ne {O}} {
2409 # Already a diff & no conflicts, do nothing
2410 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} {
2421 proc toggle_or_diff {w x y} {
2422 global file_states file_lists current_diff_path ui_index ui_workdir
2423 global last_clicked selected_paths
2425 set pos [split [$w index @$x,$y] .]
2426 set lno [lindex $pos 0]
2427 set col [lindex $pos 1]
2428 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2434 set last_clicked [list $w $lno]
2435 array unset selected_paths
2436 $ui_index tag remove in_sel 0.0 end
2437 $ui_workdir tag remove in_sel 0.0 end
2439 # Determine the state of the file
2440 if {[info exists file_states($path)]} {
2441 set state [lindex $file_states($path) 0]
2446 # Restage the file, or simply show the diff
2447 if {$col == 0 && $y > 1} {
2448 # Conflicts need special handling
2449 if {[string first {U} $state] >= 0} {
2450 # $w must always be $ui_workdir, but...
2451 if {$w ne $ui_workdir} { set lno {} }
2452 merge_stage_workdir $path $lno
2456 if {[string index $state 1] eq {O}} {
2462 set after [next_diff_after_action $w $path $lno $mmask]
2464 if {$w eq $ui_index} {
2466 "Unstaging [short_path $path] from commit" \
2468 [concat $after [list ui_ready]]
2469 } elseif {$w eq $ui_workdir} {
2471 "Adding [short_path $path]" \
2473 [concat $after [list ui_ready]]
2476 show_diff $path $w $lno
2480 proc add_one_to_selection {w x y} {
2481 global file_lists last_clicked selected_paths
2483 set lno [lindex [split [$w index @$x,$y] .] 0]
2484 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2490 if {$last_clicked ne {}
2491 && [lindex $last_clicked 0] ne $w} {
2492 array unset selected_paths
2493 [lindex $last_clicked 0] tag remove in_sel 0.0 end
2496 set last_clicked [list $w $lno]
2497 if {[catch {set in_sel $selected_paths($path)}]} {
2501 unset selected_paths($path)
2502 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2504 set selected_paths($path) 1
2505 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2509 proc add_range_to_selection {w x y} {
2510 global file_lists last_clicked selected_paths
2512 if {[lindex $last_clicked 0] ne $w} {
2513 toggle_or_diff $w $x $y
2517 set lno [lindex [split [$w index @$x,$y] .] 0]
2518 set lc [lindex $last_clicked 1]
2527 foreach path [lrange $file_lists($w) \
2528 [expr {$begin - 1}] \
2529 [expr {$end - 1}]] {
2530 set selected_paths($path) 1
2532 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2535 proc show_more_context {} {
2537 if {$repo_config(gui.diffcontext) < 99} {
2538 incr repo_config(gui.diffcontext)
2543 proc show_less_context {} {
2545 if {$repo_config(gui.diffcontext) > 1} {
2546 incr repo_config(gui.diffcontext) -1
2551 ######################################################################
2559 menu .mbar -tearoff 0
2561 # -- Apple Menu (Mac OS X only)
2563 .mbar add cascade -label Apple -menu .mbar.apple
2566 .mbar add cascade -label [mc Repository] -menu .mbar.repository
2567 .mbar add cascade -label [mc Edit] -menu .mbar.edit
2568 if {[is_enabled branch]} {
2569 .mbar add cascade -label [mc Branch] -menu .mbar.branch
2571 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2572 .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
2574 if {[is_enabled transport]} {
2575 .mbar add cascade -label [mc Merge] -menu .mbar.merge
2576 .mbar add cascade -label [mc Remote] -menu .mbar.remote
2578 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2579 .mbar add cascade -label [mc Tools] -menu .mbar.tools
2582 # -- Repository Menu
2584 menu .mbar.repository
2587 .mbar.repository add command \
2588 -label [mc "Explore Working Copy"] \
2589 -command {do_explore}
2590 .mbar.repository add separator
2593 .mbar.repository add command \
2594 -label [mc "Browse Current Branch's Files"] \
2595 -command {browser::new $current_branch}
2596 set ui_browse_current [.mbar.repository index last]
2597 .mbar.repository add command \
2598 -label [mc "Browse Branch Files..."] \
2599 -command browser_open::dialog
2600 .mbar.repository add separator
2602 .mbar.repository add command \
2603 -label [mc "Visualize Current Branch's History"] \
2604 -command {do_gitk $current_branch}
2605 set ui_visualize_current [.mbar.repository index last]
2606 .mbar.repository add command \
2607 -label [mc "Visualize All Branch History"] \
2608 -command {do_gitk --all}
2609 .mbar.repository add separator
2611 proc current_branch_write {args} {
2612 global current_branch
2613 .mbar.repository entryconf $::ui_browse_current \
2614 -label [mc "Browse %s's Files" $current_branch]
2615 .mbar.repository entryconf $::ui_visualize_current \
2616 -label [mc "Visualize %s's History" $current_branch]
2618 trace add variable current_branch write current_branch_write
2620 if {[is_enabled multicommit]} {
2621 .mbar.repository add command -label [mc "Database Statistics"] \
2624 .mbar.repository add command -label [mc "Compress Database"] \
2627 .mbar.repository add command -label [mc "Verify Database"] \
2628 -command do_fsck_objects
2630 .mbar.repository add separator
2633 .mbar.repository add command \
2634 -label [mc "Create Desktop Icon"] \
2635 -command do_cygwin_shortcut
2636 } elseif {[is_Windows]} {
2637 .mbar.repository add command \
2638 -label [mc "Create Desktop Icon"] \
2639 -command do_windows_shortcut
2640 } elseif {[is_MacOSX]} {
2641 .mbar.repository add command \
2642 -label [mc "Create Desktop Icon"] \
2643 -command do_macosx_app
2648 proc ::tk::mac::Quit {args} { do_quit }
2650 .mbar.repository add command -label [mc Quit] \
2658 .mbar.edit add command -label [mc Undo] \
2659 -command {catch {[focus] edit undo}} \
2661 .mbar.edit add command -label [mc Redo] \
2662 -command {catch {[focus] edit redo}} \
2664 .mbar.edit add separator
2665 .mbar.edit add command -label [mc Cut] \
2666 -command {catch {tk_textCut [focus]}} \
2668 .mbar.edit add command -label [mc Copy] \
2669 -command {catch {tk_textCopy [focus]}} \
2671 .mbar.edit add command -label [mc Paste] \
2672 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2674 .mbar.edit add command -label [mc Delete] \
2675 -command {catch {[focus] delete sel.first sel.last}} \
2677 .mbar.edit add separator
2678 .mbar.edit add command -label [mc "Select All"] \
2679 -command {catch {[focus] tag add sel 0.0 end}} \
2684 if {[is_enabled branch]} {
2687 .mbar.branch add command -label [mc "Create..."] \
2688 -command branch_create::dialog \
2690 lappend disable_on_lock [list .mbar.branch entryconf \
2691 [.mbar.branch index last] -state]
2693 .mbar.branch add command -label [mc "Checkout..."] \
2694 -command branch_checkout::dialog \
2696 lappend disable_on_lock [list .mbar.branch entryconf \
2697 [.mbar.branch index last] -state]
2699 .mbar.branch add command -label [mc "Rename..."] \
2700 -command branch_rename::dialog
2701 lappend disable_on_lock [list .mbar.branch entryconf \
2702 [.mbar.branch index last] -state]
2704 .mbar.branch add command -label [mc "Delete..."] \
2705 -command branch_delete::dialog
2706 lappend disable_on_lock [list .mbar.branch entryconf \
2707 [.mbar.branch index last] -state]
2709 .mbar.branch add command -label [mc "Reset..."] \
2710 -command merge::reset_hard
2711 lappend disable_on_lock [list .mbar.branch entryconf \
2712 [.mbar.branch index last] -state]
2717 proc commit_btn_caption {} {
2718 if {[is_enabled nocommit]} {
2721 return [mc Commit@@verb]
2725 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2728 if {![is_enabled nocommit]} {
2729 .mbar.commit add radiobutton \
2730 -label [mc "New Commit"] \
2731 -command do_select_commit_type \
2732 -variable selected_commit_type \
2734 lappend disable_on_lock \
2735 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2737 .mbar.commit add radiobutton \
2738 -label [mc "Amend Last Commit"] \
2739 -command do_select_commit_type \
2740 -variable selected_commit_type \
2742 lappend disable_on_lock \
2743 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2745 .mbar.commit add separator
2748 .mbar.commit add command -label [mc Rescan] \
2749 -command ui_do_rescan \
2751 lappend disable_on_lock \
2752 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2754 .mbar.commit add command -label [mc "Stage To Commit"] \
2755 -command do_add_selection \
2757 lappend disable_on_lock \
2758 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2760 .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
2761 -command do_add_all \
2763 lappend disable_on_lock \
2764 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2766 .mbar.commit add command -label [mc "Unstage From Commit"] \
2767 -command do_unstage_selection \
2769 lappend disable_on_lock \
2770 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2772 .mbar.commit add command -label [mc "Revert Changes"] \
2773 -command do_revert_selection \
2775 lappend disable_on_lock \
2776 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2778 .mbar.commit add separator
2780 .mbar.commit add command -label [mc "Show Less Context"] \
2781 -command show_less_context \
2782 -accelerator $M1T-\-
2784 .mbar.commit add command -label [mc "Show More Context"] \
2785 -command show_more_context \
2788 .mbar.commit add separator
2790 if {![is_enabled nocommitmsg]} {
2791 .mbar.commit add command -label [mc "Sign Off"] \
2792 -command do_signoff \
2796 .mbar.commit add command -label [commit_btn_caption] \
2797 -command do_commit \
2798 -accelerator $M1T-Return
2799 lappend disable_on_lock \
2800 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2805 if {[is_enabled branch]} {
2807 .mbar.merge add command -label [mc "Local Merge..."] \
2808 -command merge::dialog \
2810 lappend disable_on_lock \
2811 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2812 .mbar.merge add command -label [mc "Abort Merge..."] \
2813 -command merge::reset_hard
2814 lappend disable_on_lock \
2815 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2820 if {[is_enabled transport]} {
2823 .mbar.remote add command \
2824 -label [mc "Add..."] \
2825 -command remote_add::dialog \
2827 .mbar.remote add command \
2828 -label [mc "Push..."] \
2829 -command do_push_anywhere \
2831 .mbar.remote add command \
2832 -label [mc "Delete Branch..."] \
2833 -command remote_branch_delete::dialog
2837 proc ::tk::mac::ShowPreferences {} {do_options}
2841 .mbar.edit add separator
2842 .mbar.edit add command -label [mc "Options..."] \
2848 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2849 set tools_menubar .mbar.tools
2851 $tools_menubar add separator
2852 $tools_menubar add command -label [mc "Add..."] -command tools_add::dialog
2853 $tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog
2855 if {[array names repo_config guitool.*.cmd] ne {}} {
2862 .mbar add cascade -label [mc Help] -menu .mbar.help
2866 .mbar.apple add command -label [mc "About %s" [appname]] \
2868 .mbar.apple add separator
2870 .mbar.help add command -label [mc "About %s" [appname]] \
2873 . configure -menu .mbar
2875 set doc_path [githtmldir]
2876 if {$doc_path ne {}} {
2877 set doc_path [file join $doc_path index.html]
2880 set doc_path [exec cygpath --mixed $doc_path]
2884 if {[file isfile $doc_path]} {
2885 set doc_url "file:$doc_path"
2887 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
2890 proc start_browser {url} {
2891 git "web--browse" $url
2894 .mbar.help add command -label [mc "Online Documentation"] \
2895 -command [list start_browser $doc_url]
2897 .mbar.help add command -label [mc "Show SSH Key"] \
2900 unset doc_path doc_url
2902 # -- Standard bindings
2904 wm protocol . WM_DELETE_WINDOW do_quit
2905 bind all <$M1B-Key-q> do_quit
2906 bind all <$M1B-Key-Q> do_quit
2907 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2908 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
2910 set subcommand_args {}
2912 set s "usage: $::argv0 $::subcommand $::subcommand_args"
2913 if {[tk windowingsystem] eq "win32"} {
2915 tk_messageBox -icon info -message $s \
2923 proc normalize_relpath {path} {
2925 foreach item [file split $path] {
2926 if {$item eq {.}} continue
2927 if {$item eq {..} && [llength $elements] > 0
2928 && [lindex $elements end] ne {..}} {
2929 set elements [lrange $elements 0 end-1]
2932 lappend elements $item
2934 return [eval file join $elements]
2937 # -- Not a normal commit type invocation? Do that instead!
2939 switch -- $subcommand {
2942 if {$subcommand eq "blame"} {
2943 set subcommand_args {[--line=<num>] rev? path}
2945 set subcommand_args {rev? path}
2947 if {$argv eq {}} usage
2953 if {$is_path || [file exists $_prefix$a]} {
2954 if {$path ne {}} usage
2955 set path [normalize_relpath $_prefix$a]
2957 } elseif {$a eq {--}} {
2959 if {$head ne {}} usage
2964 } elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
2965 if {$jump_spec ne {} || $head ne {}} usage
2966 set jump_spec [list $lnum]
2967 } elseif {$head eq {}} {
2968 if {$head ne {}} usage
2977 if {$head ne {} && $path eq {}} {
2978 set path [normalize_relpath $_prefix$head]
2985 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
2987 set head [git rev-parse --verify $head]
2989 if {[tk windowingsystem] eq "win32"} {
2990 tk_messageBox -icon error -title [mc Error] -message $err
2997 set current_branch $head
3001 switch -- $subcommand {
3003 if {$jump_spec ne {}} usage
3005 if {$path ne {} && [file isdirectory $path]} {
3006 set head $current_branch
3012 browser::new $head $path
3015 if {$head eq {} && ![file exists $path]} {
3016 catch {wm withdraw .}
3020 -title [mc "git-gui: fatal error"] \
3021 -message [mc "fatal: cannot stat path %s: No such file or directory" $path]
3024 blame::new $head $path $jump_spec
3031 if {[llength $argv] != 0} {
3034 # fall through to setup UI for commits
3037 set err "usage: $argv0 \[{blame|browser|citool}\]"
3038 if {[tk windowingsystem] eq "win32"} {
3040 tk_messageBox -icon error -message $err \
3051 ${NS}::frame .branch
3052 if {!$use_ttk} {.branch configure -borderwidth 1 -relief sunken}
3053 ${NS}::label .branch.l1 \
3054 -text [mc "Current Branch:"] \
3057 ${NS}::label .branch.cb \
3058 -textvariable current_branch \
3061 pack .branch.l1 -side left
3062 pack .branch.cb -side left -fill x
3063 pack .branch -side top -fill x
3065 # -- Main Window Layout
3067 ${NS}::panedwindow .vpane -orient horizontal
3068 ${NS}::panedwindow .vpane.files -orient vertical
3070 .vpane add .vpane.files
3072 .vpane add .vpane.files -sticky nsew -height 100 -width 200
3074 pack .vpane -anchor n -side top -fill both -expand 1
3076 # -- Index File List
3078 ${NS}::frame .vpane.files.index -height 100 -width 200
3079 tlabel .vpane.files.index.title \
3080 -text [mc "Staged Changes (Will Commit)"] \
3081 -background lightgreen -foreground black
3082 text $ui_index -background white -foreground black \
3084 -width 20 -height 10 \
3086 -cursor $cursor_ptr \
3087 -xscrollcommand {.vpane.files.index.sx set} \
3088 -yscrollcommand {.vpane.files.index.sy set} \
3090 ${NS}::scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
3091 ${NS}::scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
3092 pack .vpane.files.index.title -side top -fill x
3093 pack .vpane.files.index.sx -side bottom -fill x
3094 pack .vpane.files.index.sy -side right -fill y
3095 pack $ui_index -side left -fill both -expand 1
3097 # -- Working Directory File List
3099 ${NS}::frame .vpane.files.workdir -height 100 -width 200
3100 tlabel .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
3101 -background lightsalmon -foreground black
3102 text $ui_workdir -background white -foreground black \
3104 -width 20 -height 10 \
3106 -cursor $cursor_ptr \
3107 -xscrollcommand {.vpane.files.workdir.sx set} \
3108 -yscrollcommand {.vpane.files.workdir.sy set} \
3110 ${NS}::scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
3111 ${NS}::scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
3112 pack .vpane.files.workdir.title -side top -fill x
3113 pack .vpane.files.workdir.sx -side bottom -fill x
3114 pack .vpane.files.workdir.sy -side right -fill y
3115 pack $ui_workdir -side left -fill both -expand 1
3117 .vpane.files add .vpane.files.workdir
3118 .vpane.files add .vpane.files.index
3120 .vpane.files paneconfigure .vpane.files.workdir -sticky news
3121 .vpane.files paneconfigure .vpane.files.index -sticky news
3124 foreach i [list $ui_index $ui_workdir] {
3126 $i tag conf in_diff -background [$i tag cget in_sel -background]
3130 # -- Diff and Commit Area
3132 ${NS}::frame .vpane.lower -height 300 -width 400
3133 ${NS}::frame .vpane.lower.commarea
3134 ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1
3135 pack .vpane.lower.diff -fill both -expand 1
3136 pack .vpane.lower.commarea -side bottom -fill x
3137 .vpane add .vpane.lower
3138 if {!$use_ttk} {.vpane paneconfigure .vpane.lower -sticky nsew}
3140 # -- Commit Area Buttons
3142 ${NS}::frame .vpane.lower.commarea.buttons
3143 ${NS}::label .vpane.lower.commarea.buttons.l -text {} \
3146 pack .vpane.lower.commarea.buttons.l -side top -fill x
3147 pack .vpane.lower.commarea.buttons -side left -fill y
3149 ${NS}::button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
3150 -command ui_do_rescan
3151 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3152 lappend disable_on_lock \
3153 {.vpane.lower.commarea.buttons.rescan conf -state}
3155 ${NS}::button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
3157 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3158 lappend disable_on_lock \
3159 {.vpane.lower.commarea.buttons.incall conf -state}
3161 if {![is_enabled nocommitmsg]} {
3162 ${NS}::button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
3164 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3167 ${NS}::button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
3169 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3170 lappend disable_on_lock \
3171 {.vpane.lower.commarea.buttons.commit conf -state}
3173 if {![is_enabled nocommit]} {
3174 ${NS}::button .vpane.lower.commarea.buttons.push -text [mc Push] \
3175 -command do_push_anywhere
3176 pack .vpane.lower.commarea.buttons.push -side top -fill x
3179 # -- Commit Message Buffer
3181 ${NS}::frame .vpane.lower.commarea.buffer
3182 ${NS}::frame .vpane.lower.commarea.buffer.header
3183 set ui_comm .vpane.lower.commarea.buffer.t
3184 set ui_coml .vpane.lower.commarea.buffer.header.l
3186 if {![is_enabled nocommit]} {
3187 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \
3188 -text [mc "New Commit"] \
3189 -command do_select_commit_type \
3190 -variable selected_commit_type \
3192 lappend disable_on_lock \
3193 [list .vpane.lower.commarea.buffer.header.new conf -state]
3194 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \
3195 -text [mc "Amend Last Commit"] \
3196 -command do_select_commit_type \
3197 -variable selected_commit_type \
3199 lappend disable_on_lock \
3200 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3203 ${NS}::label $ui_coml \
3206 proc trace_commit_type {varname args} {
3207 global ui_coml commit_type
3208 switch -glob -- $commit_type {
3209 initial {set txt [mc "Initial Commit Message:"]}
3210 amend {set txt [mc "Amended Commit Message:"]}
3211 amend-initial {set txt [mc "Amended Initial Commit Message:"]}
3212 amend-merge {set txt [mc "Amended Merge Commit Message:"]}
3213 merge {set txt [mc "Merge Commit Message:"]}
3214 * {set txt [mc "Commit Message:"]}
3216 $ui_coml conf -text $txt
3218 trace add variable commit_type write trace_commit_type
3219 pack $ui_coml -side left -fill x
3221 if {![is_enabled nocommit]} {
3222 pack .vpane.lower.commarea.buffer.header.amend -side right
3223 pack .vpane.lower.commarea.buffer.header.new -side right
3226 text $ui_comm -background white -foreground black \
3230 -autoseparators true \
3232 -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
3234 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3235 ${NS}::scrollbar .vpane.lower.commarea.buffer.sby \
3236 -command [list $ui_comm yview]
3237 pack .vpane.lower.commarea.buffer.header -side top -fill x
3238 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3239 pack $ui_comm -side left -fill y
3240 pack .vpane.lower.commarea.buffer -side left -fill y
3242 # -- Commit Message Buffer Context Menu
3244 set ctxm .vpane.lower.commarea.buffer.ctxm
3245 menu $ctxm -tearoff 0
3248 -command {tk_textCut $ui_comm}
3251 -command {tk_textCopy $ui_comm}
3254 -command {tk_textPaste $ui_comm}
3256 -label [mc Delete] \
3257 -command {catch {$ui_comm delete sel.first sel.last}}
3260 -label [mc "Select All"] \
3261 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
3263 -label [mc "Copy All"] \
3265 $ui_comm tag add sel 0.0 end
3266 tk_textCopy $ui_comm
3267 $ui_comm tag remove sel 0.0 end
3271 -label [mc "Sign Off"] \
3273 set ui_comm_ctxm $ctxm
3277 proc trace_current_diff_path {varname args} {
3278 global current_diff_path diff_actions file_states
3279 if {$current_diff_path eq {}} {
3285 set p $current_diff_path
3286 set s [mapdesc [lindex $file_states($p) 0] $p]
3288 set p [escape_path $p]
3292 .vpane.lower.diff.header.status configure -text $s
3293 .vpane.lower.diff.header.file configure -text $f
3294 .vpane.lower.diff.header.path configure -text $p
3295 foreach w $diff_actions {
3299 trace add variable current_diff_path write trace_current_diff_path
3301 gold_frame .vpane.lower.diff.header
3302 tlabel .vpane.lower.diff.header.status \
3305 -width $max_status_desc \
3308 tlabel .vpane.lower.diff.header.file \
3313 tlabel .vpane.lower.diff.header.path \
3318 pack .vpane.lower.diff.header.status -side left
3319 pack .vpane.lower.diff.header.file -side left
3320 pack .vpane.lower.diff.header.path -fill x
3321 set ctxm .vpane.lower.diff.header.ctxm
3322 menu $ctxm -tearoff 0
3330 -- $current_diff_path
3332 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3333 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3337 ${NS}::frame .vpane.lower.diff.body
3338 set ui_diff .vpane.lower.diff.body.t
3339 text $ui_diff -background white -foreground black \
3341 -width 80 -height 5 -wrap none \
3343 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3344 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3346 catch {$ui_diff configure -tabstyle wordprocessor}
3347 ${NS}::scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3348 -command [list $ui_diff xview]
3349 ${NS}::scrollbar .vpane.lower.diff.body.sby -orient vertical \
3350 -command [list $ui_diff yview]
3351 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3352 pack .vpane.lower.diff.body.sby -side right -fill y
3353 pack $ui_diff -side left -fill both -expand 1
3354 pack .vpane.lower.diff.header -side top -fill x
3355 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3357 foreach {n c} {0 black 1 red4 2 green4 3 yellow4 4 blue4 5 magenta4 6 cyan4 7 grey60} {
3358 $ui_diff tag configure clr4$n -background $c
3359 $ui_diff tag configure clri4$n -foreground $c
3360 $ui_diff tag configure clr3$n -foreground $c
3361 $ui_diff tag configure clri3$n -background $c
3363 $ui_diff tag configure clr1 -font font_diffbold
3365 $ui_diff tag conf d_info -foreground blue -font font_diffbold
3367 $ui_diff tag conf d_cr -elide true
3368 $ui_diff tag conf d_@ -font font_diffbold
3369 $ui_diff tag conf d_+ -foreground {#00a000}
3370 $ui_diff tag conf d_- -foreground red
3372 $ui_diff tag conf d_++ -foreground {#00a000}
3373 $ui_diff tag conf d_-- -foreground red
3374 $ui_diff tag conf d_+s \
3375 -foreground {#00a000} \
3376 -background {#e2effa}
3377 $ui_diff tag conf d_-s \
3379 -background {#e2effa}
3380 $ui_diff tag conf d_s+ \
3381 -foreground {#00a000} \
3383 $ui_diff tag conf d_s- \
3387 $ui_diff tag conf d< \
3388 -foreground orange \
3390 $ui_diff tag conf d= \
3391 -foreground orange \
3393 $ui_diff tag conf d> \
3394 -foreground orange \
3397 $ui_diff tag raise sel
3399 # -- Diff Body Context Menu
3402 proc create_common_diff_popup {ctxm} {
3404 -label [mc Refresh] \
3405 -command reshow_diff
3406 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3409 -command {tk_textCopy $ui_diff}
3410 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3412 -label [mc "Select All"] \
3413 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
3414 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3416 -label [mc "Copy All"] \
3418 $ui_diff tag add sel 0.0 end
3419 tk_textCopy $ui_diff
3420 $ui_diff tag remove sel 0.0 end
3422 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3425 -label [mc "Decrease Font Size"] \
3426 -command {incr_font_size font_diff -1}
3427 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3429 -label [mc "Increase Font Size"] \
3430 -command {incr_font_size font_diff 1}
3431 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3435 build_encoding_menu $emenu [list force_diff_encoding]
3437 -label [mc "Encoding"] \
3439 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3441 $ctxm add command -label [mc "Options..."] \
3445 set ctxm .vpane.lower.diff.body.ctxm
3446 menu $ctxm -tearoff 0
3448 -label [mc "Apply/Reverse Hunk"] \
3449 -command {apply_hunk $cursorX $cursorY}
3450 set ui_diff_applyhunk [$ctxm index last]
3451 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
3453 -label [mc "Apply/Reverse Line"] \
3454 -command {apply_range_or_line $cursorX $cursorY; do_rescan}
3455 set ui_diff_applyline [$ctxm index last]
3456 lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
3459 -label [mc "Show Less Context"] \
3460 -command show_less_context
3461 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3463 -label [mc "Show More Context"] \
3464 -command show_more_context
3465 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3467 create_common_diff_popup $ctxm
3469 set ctxmmg .vpane.lower.diff.body.ctxmmg
3470 menu $ctxmmg -tearoff 0
3471 $ctxmmg add command \
3472 -label [mc "Run Merge Tool"] \
3473 -command {merge_resolve_tool}
3474 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3475 $ctxmmg add separator
3476 $ctxmmg add command \
3477 -label [mc "Use Remote Version"] \
3478 -command {merge_resolve_one 3}
3479 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3480 $ctxmmg add command \
3481 -label [mc "Use Local Version"] \
3482 -command {merge_resolve_one 2}
3483 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3484 $ctxmmg add command \
3485 -label [mc "Revert To Base"] \
3486 -command {merge_resolve_one 1}
3487 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3488 $ctxmmg add separator
3489 $ctxmmg add command \
3490 -label [mc "Show Less Context"] \
3491 -command show_less_context
3492 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3493 $ctxmmg add command \
3494 -label [mc "Show More Context"] \
3495 -command show_more_context
3496 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3497 $ctxmmg add separator
3498 create_common_diff_popup $ctxmmg
3500 set ctxmsm .vpane.lower.diff.body.ctxmsm
3501 menu $ctxmsm -tearoff 0
3502 $ctxmsm add command \
3503 -label [mc "Visualize These Changes In The Submodule"] \
3504 -command {do_gitk -- true}
3505 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3506 $ctxmsm add command \
3507 -label [mc "Visualize Current Branch History In The Submodule"] \
3508 -command {do_gitk {} true}
3509 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3510 $ctxmsm add command \
3511 -label [mc "Visualize All Branch History In The Submodule"] \
3512 -command {do_gitk --all true}
3513 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3514 $ctxmsm add separator
3515 $ctxmsm add command \
3516 -label [mc "Start git gui In The Submodule"] \
3517 -command {do_git_gui}
3518 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3519 $ctxmsm add separator
3520 create_common_diff_popup $ctxmsm
3522 proc has_textconv {path} {
3523 if {[is_config_false gui.textconv]} {
3526 set filter [gitattr $path diff set]
3527 set textconv [get_config [join [list diff $filter textconv] .]]
3528 if {$filter ne {set} && $textconv ne {}} {
3535 proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
3536 global current_diff_path file_states
3539 if {[info exists file_states($current_diff_path)]} {
3540 set state [lindex $file_states($current_diff_path) 0]
3544 if {[string first {U} $state] >= 0} {
3545 tk_popup $ctxmmg $X $Y
3546 } elseif {$::is_submodule_diff} {
3547 tk_popup $ctxmsm $X $Y
3549 set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}]
3550 if {$::ui_index eq $::current_diff_side} {
3551 set l [mc "Unstage Hunk From Commit"]
3553 set t [mc "Unstage Lines From Commit"]
3555 set t [mc "Unstage Line From Commit"]
3558 set l [mc "Stage Hunk For Commit"]
3560 set t [mc "Stage Lines For Commit"]
3562 set t [mc "Stage Line For Commit"]
3566 || $current_diff_path eq {}
3569 || [string match {?T} $state]
3570 || [string match {T?} $state]
3571 || [has_textconv $current_diff_path]} {
3576 $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
3577 $ctxm entryconf $::ui_diff_applyline -state $s -label $t
3578 tk_popup $ctxm $X $Y
3581 bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg $ctxmsm %x %y %X %Y]
3585 set main_status [::status_bar::new .status]
3586 pack .status -anchor w -side bottom -fill x
3587 $main_status show [mc "Initializing..."]
3591 proc on_ttk_pane_mapped {w pane pos} {
3593 after 0 [list after idle [list $w sashpos $pane $pos]]
3595 proc on_tk_pane_mapped {w pane x y} {
3597 after 0 [list after idle [list $w sash place $pane $x $y]]
3599 proc on_application_mapped {} {
3600 global repo_config use_ttk
3602 set gm $repo_config(gui.geometry)
3605 [list on_ttk_pane_mapped %W 0 [lindex $gm 1]]
3606 bind .vpane.files <Map> \
3607 [list on_ttk_pane_mapped %W 0 [lindex $gm 2]]
3610 [list on_tk_pane_mapped %W 0 \
3612 [lindex [.vpane sash coord 0] 1]]
3613 bind .vpane.files <Map> \
3614 [list on_tk_pane_mapped %W 0 \
3615 [lindex [.vpane.files sash coord 0] 0] \
3618 wm geometry . [lindex $gm 0]
3620 if {[info exists repo_config(gui.geometry)]} {
3621 bind . <Map> [list on_application_mapped]
3622 wm geometry . [lindex $repo_config(gui.geometry) 0]
3625 # -- Load window state
3627 if {[info exists repo_config(gui.wmstate)]} {
3628 catch {wm state . $repo_config(gui.wmstate)}
3633 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3634 bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
3635 bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
3636 bind $ui_comm <$M1B-Key-u> {do_unstage_selection;break}
3637 bind $ui_comm <$M1B-Key-U> {do_unstage_selection;break}
3638 bind $ui_comm <$M1B-Key-j> {do_revert_selection;break}
3639 bind $ui_comm <$M1B-Key-J> {do_revert_selection;break}
3640 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3641 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3642 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3643 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3644 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3645 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3646 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3647 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3648 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3649 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3650 bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
3651 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
3652 bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
3653 bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
3654 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
3656 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3657 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3658 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3659 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3660 bind $ui_diff <$M1B-Key-v> {break}
3661 bind $ui_diff <$M1B-Key-V> {break}
3662 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3663 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3664 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3665 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3666 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3667 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3668 bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
3669 bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
3670 bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
3671 bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
3672 bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
3673 bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
3674 bind $ui_diff <Button-1> {focus %W}
3676 if {[is_enabled branch]} {
3677 bind . <$M1B-Key-n> branch_create::dialog
3678 bind . <$M1B-Key-N> branch_create::dialog
3679 bind . <$M1B-Key-o> branch_checkout::dialog
3680 bind . <$M1B-Key-O> branch_checkout::dialog
3681 bind . <$M1B-Key-m> merge::dialog
3682 bind . <$M1B-Key-M> merge::dialog
3684 if {[is_enabled transport]} {
3685 bind . <$M1B-Key-p> do_push_anywhere
3686 bind . <$M1B-Key-P> do_push_anywhere
3689 bind . <Key-F5> ui_do_rescan
3690 bind . <$M1B-Key-r> ui_do_rescan
3691 bind . <$M1B-Key-R> ui_do_rescan
3692 bind . <$M1B-Key-s> do_signoff
3693 bind . <$M1B-Key-S> do_signoff
3694 bind . <$M1B-Key-t> do_add_selection
3695 bind . <$M1B-Key-T> do_add_selection
3696 bind . <$M1B-Key-j> do_revert_selection
3697 bind . <$M1B-Key-J> do_revert_selection
3698 bind . <$M1B-Key-i> do_add_all
3699 bind . <$M1B-Key-I> do_add_all
3700 bind . <$M1B-Key-minus> {show_less_context;break}
3701 bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
3702 bind . <$M1B-Key-equal> {show_more_context;break}
3703 bind . <$M1B-Key-plus> {show_more_context;break}
3704 bind . <$M1B-Key-KP_Add> {show_more_context;break}
3705 bind . <$M1B-Key-Return> do_commit
3706 foreach i [list $ui_index $ui_workdir] {
3707 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3708 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3709 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3713 set file_lists($ui_index) [list]
3714 set file_lists($ui_workdir) [list]
3716 wm title . "[appname] ([reponame]) [file normalize $_gitworktree]"
3717 focus -force $ui_comm
3719 # -- Warn the user about environmental problems. Cygwin's Tcl
3720 # does *not* pass its env array onto any processes it spawns.
3721 # This means that git processes get none of our environment.
3726 set msg [mc "Possible environment issues exist.
3728 The following environment variables are probably
3729 going to be ignored by any Git subprocess run
3733 foreach name [array names env] {
3734 switch -regexp -- $name {
3735 {^GIT_INDEX_FILE$} -
3736 {^GIT_OBJECT_DIRECTORY$} -
3737 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3739 {^GIT_EXTERNAL_DIFF$} -
3743 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3744 append msg " - $name\n"
3747 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3748 append msg " - $name\n"
3750 set suggest_user $name
3754 if {$ignored_env > 0} {
3756 This is due to a known issue with the
3757 Tcl binary distributed by Cygwin."]
3759 if {$suggest_user ne {}} {
3762 A good replacement for %s
3763 is placing values for the user.name and
3764 user.email settings into your personal
3770 unset ignored_env msg suggest_user name
3773 # -- Only initialize complex UI if we are going to stay running.
3775 if {[is_enabled transport]} {
3778 set n [.mbar.remote index end]
3779 populate_remotes_menu
3780 set n [expr {[.mbar.remote index end] - $n}]
3782 if {[.mbar.remote type 0] eq "tearoff"} { incr n }
3783 .mbar.remote insert $n separator
3788 if {[winfo exists $ui_comm]} {
3789 set GITGUI_BCK_exists [load_message GITGUI_BCK]
3791 # -- If both our backup and message files exist use the
3792 # newer of the two files to initialize the buffer.
3794 if {$GITGUI_BCK_exists} {
3795 set m [gitdir GITGUI_MSG]
3796 if {[file isfile $m]} {
3797 if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
3798 catch {file delete [gitdir GITGUI_MSG]}
3800 $ui_comm delete 0.0 end
3802 $ui_comm edit modified false
3803 catch {file delete [gitdir GITGUI_BCK]}
3804 set GITGUI_BCK_exists 0
3810 proc backup_commit_buffer {} {
3811 global ui_comm GITGUI_BCK_exists
3813 set m [$ui_comm edit modified]
3814 if {$m || $GITGUI_BCK_exists} {
3815 set msg [string trim [$ui_comm get 0.0 end]]
3816 regsub -all -line {[ \r\t]+$} $msg {} msg
3819 if {$GITGUI_BCK_exists} {
3820 catch {file delete [gitdir GITGUI_BCK]}
3821 set GITGUI_BCK_exists 0
3825 set fd [open [gitdir GITGUI_BCK] w]
3826 puts -nonewline $fd $msg
3828 set GITGUI_BCK_exists 1
3832 $ui_comm edit modified false
3835 set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
3838 backup_commit_buffer
3840 # -- If the user has aspell available we can drive it
3841 # in pipe mode to spellcheck the commit message.
3843 set spell_cmd [list |]
3844 set spell_dict [get_config gui.spellingdictionary]
3845 lappend spell_cmd aspell
3846 if {$spell_dict ne {}} {
3847 lappend spell_cmd --master=$spell_dict
3849 lappend spell_cmd --mode=none
3850 lappend spell_cmd --encoding=utf-8
3851 lappend spell_cmd pipe
3852 if {$spell_dict eq {none}
3853 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
3854 bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
3856 set ui_comm_spell [spellcheck::init \
3862 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3865 lock_index begin-read
3866 if {![winfo ismapped .]} {
3870 if {[is_enabled initialamend]} {
3876 if {[is_enabled nocommitmsg]} {
3877 $ui_comm configure -state disabled -background gray
3880 if {[is_enabled multicommit]} {
3883 if {[is_enabled retcode]} {
3884 bind . <Destroy> {+terminate_me %W}
3886 if {$picked && [is_config_true gui.autoexplore]} {
3892 # indent-tabs-mode: t