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 if { [info exists ::env(GIT_GUI_LIB_DIR) ] } {
53 set oguilib $::env(GIT_GUI_LIB_DIR)
55 set oguilib {@@GITGUI_LIBDIR@@}
57 set oguirel {@@GITGUI_RELATIVE@@}
58 if {$oguirel eq {1}} {
59 set oguilib [file dirname [file normalize $argv0]]
60 if {[file tail $oguilib] eq {git-core}} {
61 set oguilib [file dirname $oguilib]
63 set oguilib [file dirname $oguilib]
64 set oguilib [file join $oguilib share git-gui lib]
65 set oguimsg [file join $oguilib msgs]
66 } elseif {[string match @@* $oguirel]} {
67 set oguilib [file join [file dirname [file normalize $argv0]] lib]
68 set oguimsg [file join [file dirname [file normalize $argv0]] po]
70 set oguimsg [file join $oguilib msgs]
74 ######################################################################
76 ## enable verbose loading?
78 if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
80 rename auto_load real__auto_load
81 proc auto_load {name args} {
82 puts stderr "auto_load $name"
83 return [uplevel 1 real__auto_load $name $args]
85 rename source real__source
87 puts stderr "source $args"
88 uplevel 1 [linsert $args 0 real__source]
90 if {[tk windowingsystem] eq "win32"} { console show }
93 ######################################################################
95 ## Internationalization (i18n) through msgcat and gettext. See
96 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
98 package require msgcat
100 # Check for Windows 7 MUI language pack (missed by msgcat < 1.4.4)
101 if {[tk windowingsystem] eq "win32"
102 && [package vcompare [package provide msgcat] 1.4.4] < 0
104 proc _mc_update_locale {} {
105 set key {HKEY_CURRENT_USER\Control Panel\Desktop}
107 package require registry
108 set uilocale [registry get $key "PreferredUILanguages"]
109 msgcat::ConvertLocale [string map {- _} [lindex $uilocale 0]]
111 if {[string length $uilocale] > 0} {
112 msgcat::mclocale $uilocale
119 proc _mc_trim {fmt} {
120 set cmk [string first @@ $fmt]
122 return [string range $fmt 0 [expr {$cmk - 1}]]
127 proc mc {en_fmt args} {
128 set fmt [_mc_trim [::msgcat::mc $en_fmt]]
129 if {[catch {set msg [eval [list format $fmt] $args]} err]} {
130 set msg [eval [list format [_mc_trim $en_fmt]] $args]
136 return [join $args {}]
139 ::msgcat::mcload $oguimsg
142 ######################################################################
144 ## On Mac, bring the current Wish process window to front
146 if {[tk windowingsystem] eq "aqua"} {
148 exec osascript -e [format {
149 tell application "System Events"
150 set frontmost of processes whose unix id is %d to true
156 ######################################################################
160 set _appname {Git Gui}
169 set _shellpath {@@SHELL_PATH@@}
171 set _trace [lsearch -exact $argv --trace]
173 set argv [lreplace $argv $_trace $_trace]
175 if {[tk windowingsystem] eq "win32"} { console show }
180 # variable for the last merged branch (useful for a default when deleting
182 set _last_merged_branch {}
185 global _shellpath env
186 if {[string match @@* $_shellpath]} {
187 if {[info exists env(SHELL)]} {
206 return [eval [list file join $_gitdir] $args]
209 proc gitexec {args} {
211 if {$_gitexec eq {}} {
212 if {[catch {set _gitexec [git --exec-path]} err]} {
213 error "Git not installed?\n\n$err"
216 set _gitexec [exec cygpath \
221 set _gitexec [file normalize $_gitexec]
227 return [eval [list file join $_gitexec] $args]
230 proc githtmldir {args} {
232 if {$_githtmldir eq {}} {
233 if {[catch {set _githtmldir [git --html-path]}]} {
234 # Git not installed or option not yet supported
238 set _githtmldir [exec cygpath \
243 set _githtmldir [file normalize $_githtmldir]
249 return [eval [list file join $_githtmldir] $args]
257 if {[tk windowingsystem] eq {aqua}} {
264 if {$::tcl_platform(platform) eq {windows}} {
272 if {$_iscygwin eq {}} {
273 if {$::tcl_platform(platform) eq {windows}} {
274 if {[catch {set p [exec cygpath --windir]} err]} {
278 # Handle MSys2 which is only cygwin when MSYSTEM is MSYS.
279 if {[info exists ::env(MSYSTEM)] && $::env(MSYSTEM) ne "MSYS"} {
290 proc is_enabled {option} {
291 global enabled_options
292 if {[catch {set on $enabled_options($option)}]} {return 0}
296 proc enable_option {option} {
297 global enabled_options
298 set enabled_options($option) 1
301 proc disable_option {option} {
302 global enabled_options
303 set enabled_options($option) 0
306 ######################################################################
310 proc is_many_config {name} {
311 switch -glob -- $name {
321 proc is_config_true {name} {
323 if {[catch {set v $repo_config($name)}]} {
326 set v [string tolower $v]
327 if {$v eq {} || $v eq {true} || $v eq {1} || $v eq {yes} || $v eq {on}} {
334 proc is_config_false {name} {
336 if {[catch {set v $repo_config($name)}]} {
339 set v [string tolower $v]
340 if {$v eq {false} || $v eq {0} || $v eq {no} || $v eq {off}} {
347 proc get_config {name} {
349 if {[catch {set v $repo_config($name)}]} {
361 if {$_isbare eq {}} {
363 set _bare [git rev-parse --is-bare-repository]
365 true { set _isbare 1 }
366 false { set _isbare 0}
370 if {[is_config_true core.bare]
371 || ($_gitworktree eq {}
372 && [lindex [file split $_gitdir] end] ne {.git})} {
382 ######################################################################
386 proc _trace_exec {cmd} {
387 if {!$::_trace} return
393 if {[regexp {[ \t\r\n'"$?*]} $v]} {
401 #'" fix poor old emacs font-lock mode
403 proc _git_cmd {name} {
406 if {[catch {set v $_git_cmd_path($name)}]} {
410 --exec-path { return [list $::_git $name] }
413 set p [gitexec git-$name$::_search_exe]
414 if {[file exists $p]} {
416 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
417 # Try to determine what sort of magic will make
418 # git-$name go and do its thing, because native
419 # Tcl on Windows doesn't know it.
421 set p [gitexec git-$name]
426 switch -glob -- [lindex $s 0] {
428 #!*perl { set i perl }
429 #!*python { set i python }
430 default { error "git-$name is not supported: $s" }
434 if {![info exists interp]} {
435 set interp [_which $i]
438 error "git-$name requires $i (not in PATH)"
440 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
442 # Assume it is builtin to git somehow and we
443 # aren't actually able to see a file for it.
445 set v [list $::_git $name]
447 set _git_cmd_path($name) $v
452 proc _which {what args} {
453 global env _search_exe _search_path
455 if {$_search_path eq {}} {
456 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
457 set _search_path [split [exec cygpath \
463 } elseif {[is_Windows]} {
464 set gitguidir [file dirname [info script]]
465 regsub -all ";" $gitguidir "\\;" gitguidir
466 set env(PATH) "$gitguidir;$env(PATH)"
467 set _search_path [split $env(PATH) {;}]
470 set _search_path [split $env(PATH) :]
475 if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
478 set suffix $_search_exe
481 foreach p $_search_path {
482 set p [file join $p $what$suffix]
483 if {[file exists $p]} {
484 return [file normalize $p]
490 # Test a file for a hashbang to identify executable scripts on Windows.
491 proc is_shellscript {filename} {
492 if {![file exists $filename]} {return 0}
493 set f [open $filename r]
494 fconfigure $f -encoding binary
495 set magic [read $f 2]
497 return [expr {$magic eq "#!"}]
500 # Run a command connected via pipes on stdout.
501 # This is for use with textconv filters and uses sh -c "..." to allow it to
502 # contain a command with arguments. On windows we must check for shell
503 # scripts specifically otherwise just call the filter command.
504 proc open_cmd_pipe {cmd path} {
506 if {![file executable [shellpath]]} {
507 set exe [auto_execok [lindex $cmd 0]]
508 if {[is_shellscript [lindex $exe 0]]} {
509 set run [linsert [auto_execok sh] end -c "$cmd \"\$0\"" $path]
511 set run [concat $exe [lrange $cmd 1 end] $path]
514 set run [list [shellpath] -c "$cmd \"\$0\"" $path]
516 return [open |$run r]
519 proc _lappend_nice {cmd_var} {
523 if {![info exists _nice]} {
524 set _nice [_which nice]
525 if {[catch {exec $_nice git version}]} {
527 } elseif {[is_Windows] && [file dirname $_nice] ne [file dirname $::_git]} {
537 set fd [eval [list git_read] $args]
538 fconfigure $fd -translation binary -encoding utf-8
539 set result [string trimright [read $fd] "\n"]
542 puts stderr "< $result"
547 proc _open_stdout_stderr {cmd} {
550 set fd [open [concat [list | ] $cmd] r]
552 if { [lindex $cmd end] eq {2>@1}
553 && $err eq {can not find channel named "1"}
555 # Older versions of Tcl 8.4 don't have this 2>@1 IO
556 # redirect operator. Fallback to |& cat for those.
557 # The command was not actually started, so its safe
558 # to try to start it a second time.
560 set fd [open [concat \
562 [lrange $cmd 0 end-1] \
569 fconfigure $fd -eofchar {}
573 proc git_read {args} {
577 switch -- [lindex $args 0] {
592 set args [lrange $args 1 end]
595 set cmdp [_git_cmd [lindex $args 0]]
596 set args [lrange $args 1 end]
598 return [_open_stdout_stderr [concat $opt $cmdp $args]]
601 proc git_write {args} {
605 switch -- [lindex $args 0] {
616 set args [lrange $args 1 end]
619 set cmdp [_git_cmd [lindex $args 0]]
620 set args [lrange $args 1 end]
622 _trace_exec [concat $opt $cmdp $args]
623 return [open [concat [list | ] $opt $cmdp $args] w]
626 proc githook_read {hook_name args} {
627 set pchook [gitdir hooks $hook_name]
630 # On Windows [file executable] might lie so we need to ask
631 # the shell if the hook is executable. Yes that's annoying.
635 if {![info exists interp]} {
636 set interp [_which sh]
639 error "hook execution requires sh (not in PATH)"
642 set scr {if test -x "$1";then exec "$@";fi}
643 set sh_c [list $interp -c $scr $interp $pchook]
644 return [_open_stdout_stderr [concat $sh_c $args]]
647 if {[file executable $pchook]} {
648 return [_open_stdout_stderr [concat [list $pchook] $args]]
654 proc kill_file_process {fd} {
655 set process [pid $fd]
659 exec taskkill /pid $process
666 proc gitattr {path attr default} {
667 if {[catch {set r [git check-attr $attr -- $path]}]} {
670 set r [join [lrange [split $r :] 2 end] :]
673 if {$r eq {unspecified}} {
680 regsub -all ' $value "'\\''" value
684 proc load_current_branch {} {
685 global current_branch is_detached
687 set fd [open [gitdir HEAD] r]
688 if {[gets $fd ref] < 1} {
693 set pfx {ref: refs/heads/}
694 set len [string length $pfx]
695 if {[string equal -length $len $pfx $ref]} {
696 # We're on a branch. It might not exist. But
697 # HEAD looks good enough to be a branch.
699 set current_branch [string range $ref $len end]
702 # Assume this is a detached head.
704 set current_branch HEAD
709 auto_load tk_optionMenu
710 rename tk_optionMenu real__tkOptionMenu
711 proc tk_optionMenu {w varName args} {
712 set m [eval real__tkOptionMenu $w $varName $args]
713 $m configure -font font_ui
714 $w configure -font font_ui
718 proc rmsel_tag {text} {
720 -background [$text cget -background] \
721 -foreground [$text cget -foreground] \
723 $text tag conf in_sel -background lightgray
724 bind $text <Motion> break
730 bind . <Visibility> {
731 bind . <Visibility> {}
736 wm iconbitmap . -default $oguilib/git-gui.ico
737 set ::tk::AlwaysShowSelection 1
738 bind . <Control-F2> {console show}
740 # Spoof an X11 display for SSH
741 if {![info exists env(DISPLAY)]} {
742 set env(DISPLAY) :9999
746 image create photo gitlogo -width 16 -height 16
748 gitlogo put #33CC33 -to 7 0 9 2
749 gitlogo put #33CC33 -to 4 2 12 4
750 gitlogo put #33CC33 -to 7 4 9 6
751 gitlogo put #CC3333 -to 4 6 12 8
752 gitlogo put gray26 -to 4 9 6 10
753 gitlogo put gray26 -to 3 10 6 12
754 gitlogo put gray26 -to 8 9 13 11
755 gitlogo put gray26 -to 8 11 10 12
756 gitlogo put gray26 -to 11 11 13 14
757 gitlogo put gray26 -to 3 12 5 14
758 gitlogo put gray26 -to 5 13
759 gitlogo put gray26 -to 10 13
760 gitlogo put gray26 -to 4 14 12 15
761 gitlogo put gray26 -to 5 15 11 16
764 image create photo gitlogo32 -width 32 -height 32
765 gitlogo32 copy gitlogo -zoom 2 2
767 wm iconphoto . -default gitlogo gitlogo32
771 ######################################################################
777 if {[lsearch -exact [font names] TkDefaultFont] != -1} {
778 eval [linsert [font actual TkDefaultFont] 0 font configure font_ui]
779 eval [linsert [font actual TkFixedFont] 0 font create font_diff]
781 font create font_diff -family Courier -size 10
784 eval font configure font_ui [font actual [.dummy cget -font]]
789 font create font_uiitalic
790 font create font_uibold
791 font create font_diffbold
792 font create font_diffitalic
794 foreach class {Button Checkbutton Entry Label
795 Labelframe Listbox Message
796 Radiobutton Spinbox Text} {
797 option add *$class.font font_ui
800 option add *Menu.font font_ui
801 option add *Entry.borderWidth 1 startupFile
802 option add *Entry.relief sunken startupFile
803 option add *RadioButton.anchor w startupFile
807 if {[is_Windows] || [is_MacOSX]} {
808 option add *Menu.tearOff 0
819 proc bind_button3 {w cmd} {
820 bind $w <Any-Button-3> $cmd
822 # Mac OS X sends Button-2 on right click through three-button mouse,
823 # or through trackpad right-clicking (two-finger touch + click).
824 bind $w <Any-Button-2> $cmd
825 bind $w <Control-Button-1> $cmd
829 proc apply_config {} {
830 global repo_config font_descs
832 foreach option $font_descs {
833 set name [lindex $option 0]
834 set font [lindex $option 1]
837 foreach {cn cv} $repo_config(gui.$name) {
838 if {$cn eq {-weight}} {
841 font configure $font $cn $cv
844 font configure $font -weight normal
847 error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
849 foreach {cn cv} [font configure $font] {
850 font configure ${font}bold $cn $cv
851 font configure ${font}italic $cn $cv
853 font configure ${font}bold -weight bold
854 font configure ${font}italic -slant italic
860 if {$repo_config(gui.usettk)} {
861 set use_ttk [package vsatisfies [package provide Tk] 8.5]
864 bind [winfo class .] <<ThemeChanged>> [list InitTheme]
870 set default_config(branch.autosetupmerge) true
871 set default_config(merge.tool) {}
872 set default_config(mergetool.keepbackup) true
873 set default_config(merge.diffstat) true
874 set default_config(merge.summary) false
875 set default_config(merge.verbosity) 2
876 set default_config(user.name) {}
877 set default_config(user.email) {}
879 set default_config(gui.encoding) [encoding system]
880 set default_config(gui.matchtrackingbranch) false
881 set default_config(gui.textconv) true
882 set default_config(gui.pruneduringfetch) false
883 set default_config(gui.trustmtime) false
884 set default_config(gui.fastcopyblame) false
885 set default_config(gui.maxrecentrepo) 10
886 set default_config(gui.copyblamethreshold) 40
887 set default_config(gui.blamehistoryctx) 7
888 set default_config(gui.diffcontext) 5
889 set default_config(gui.diffopts) {}
890 set default_config(gui.commitmsgwidth) 75
891 set default_config(gui.newbranchtemplate) {}
892 set default_config(gui.spellingdictionary) {}
893 set default_config(gui.fontui) [font configure font_ui]
894 set default_config(gui.fontdiff) [font configure font_diff]
895 # TODO: this option should be added to the git-config documentation
896 set default_config(gui.maxfilesdisplayed) 5000
897 set default_config(gui.usettk) 1
898 set default_config(gui.warndetachedcommit) 1
899 set default_config(gui.tabsize) 8
901 {fontui font_ui {mc "Main Font"}}
902 {fontdiff font_diff {mc "Diff/Console Font"}}
904 set default_config(gui.stageuntracked) ask
905 set default_config(gui.displayuntracked) true
907 ######################################################################
911 set _git [_which git]
913 catch {wm withdraw .}
917 -title [mc "git-gui: fatal error"] \
918 -message [mc "Cannot find git in PATH."]
922 ######################################################################
926 if {[catch {set _git_version [git --version]} err]} {
927 catch {wm withdraw .}
931 -title [mc "git-gui: fatal error"] \
932 -message "Cannot determine Git version:
936 [appname] requires Git 1.5.0 or later."
939 if {![regsub {^git version } $_git_version {} _git_version]} {
940 catch {wm withdraw .}
944 -title [mc "git-gui: fatal error"] \
945 -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
949 proc get_trimmed_version {s} {
951 foreach x [split $s -._] {
952 if {[string is integer -strict $x]} {
960 set _real_git_version $_git_version
961 set _git_version [get_trimmed_version $_git_version]
963 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
964 catch {wm withdraw .}
969 -title "[appname]: warning" \
970 -message [mc "Git version cannot be determined.
972 %s claims it is version '%s'.
974 %s requires at least Git 1.5.0 or later.
976 Assume '%s' is version 1.5.0?
977 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
978 set _git_version 1.5.0
983 unset _real_git_version
985 proc git-version {args} {
988 switch [llength $args] {
994 set op [lindex $args 0]
995 set vr [lindex $args 1]
996 set cm [package vcompare $_git_version $vr]
997 return [expr $cm $op 0]
1001 set type [lindex $args 0]
1002 set name [lindex $args 1]
1003 set parm [lindex $args 2]
1004 set body [lindex $args 3]
1006 if {($type ne {proc} && $type ne {method})} {
1007 error "Invalid arguments to git-version"
1009 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
1010 error "Last arm of $type $name must be default"
1013 foreach {op vr cb} [lrange $body 0 end-2] {
1014 if {[git-version $op $vr]} {
1015 return [uplevel [list $type $name $parm $cb]]
1019 return [uplevel [list $type $name $parm [lindex $body end]]]
1023 error "git-version >= x"
1029 if {[git-version < 1.5]} {
1030 catch {wm withdraw .}
1034 -title [mc "git-gui: fatal error"] \
1035 -message "[appname] requires Git 1.5.0 or later.
1037 You are using [git-version]:
1043 ######################################################################
1045 ## configure our library
1047 set idx [file join $oguilib tclIndex]
1048 if {[catch {set fd [open $idx r]} err]} {
1049 catch {wm withdraw .}
1053 -title [mc "git-gui: fatal error"] \
1057 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
1059 while {[gets $fd n] >= 0} {
1060 if {$n ne {} && ![string match #* $n]} {
1072 if {[lsearch -exact $loaded $p] >= 0} continue
1073 source [file join $oguilib $p]
1078 set auto_path [concat [list $oguilib] $auto_path]
1080 unset -nocomplain idx fd
1082 ######################################################################
1084 ## config file parsing
1086 git-version proc _parse_config {arr_name args} {
1093 [list git_read config] \
1095 [list --null --list]]
1096 fconfigure $fd_rc -translation binary -encoding utf-8
1097 set buf [read $fd_rc]
1100 foreach line [split $buf "\0"] {
1101 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
1102 if {[is_many_config $name]} {
1103 lappend arr($name) $value
1105 set arr($name) $value
1107 } elseif {[regexp {^([^\n]+)$} $line line name]} {
1108 # no value given, but interpreting them as
1109 # boolean will be handled as true
1118 set fd_rc [eval [list git_read config --list] $args]
1119 while {[gets $fd_rc line] >= 0} {
1120 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
1121 if {[is_many_config $name]} {
1122 lappend arr($name) $value
1124 set arr($name) $value
1126 } elseif {[regexp {^([^=]+)$} $line line name]} {
1127 # no value given, but interpreting them as
1128 # boolean will be handled as true
1137 proc load_config {include_global} {
1138 global repo_config global_config system_config default_config
1140 if {$include_global} {
1141 _parse_config system_config --system
1142 _parse_config global_config --global
1144 _parse_config repo_config
1146 foreach name [array names default_config] {
1147 if {[catch {set v $system_config($name)}]} {
1148 set system_config($name) $default_config($name)
1151 foreach name [array names system_config] {
1152 if {[catch {set v $global_config($name)}]} {
1153 set global_config($name) $system_config($name)
1155 if {[catch {set v $repo_config($name)}]} {
1156 set repo_config($name) $system_config($name)
1161 ######################################################################
1163 ## feature option selection
1165 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1170 if {$subcommand eq {gui.sh}} {
1173 if {$subcommand eq {gui} && [llength $argv] > 0} {
1174 set subcommand [lindex $argv 0]
1175 set argv [lrange $argv 1 end]
1178 enable_option multicommit
1179 enable_option branch
1180 enable_option transport
1183 switch -- $subcommand {
1188 disable_option multicommit
1189 disable_option branch
1190 disable_option transport
1193 enable_option singlecommit
1194 enable_option retcode
1196 disable_option multicommit
1197 disable_option branch
1198 disable_option transport
1200 while {[llength $argv] > 0} {
1201 set a [lindex $argv 0]
1204 enable_option initialamend
1207 enable_option nocommit
1208 enable_option nocommitmsg
1211 disable_option nocommitmsg
1218 set argv [lrange $argv 1 end]
1223 ######################################################################
1225 ## execution environment
1227 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1229 # Suggest our implementation of askpass, if none is set
1230 if {![info exists env(SSH_ASKPASS)]} {
1231 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1234 ######################################################################
1240 set _gitdir $env(GIT_DIR)
1244 # beware that from the .git dir this sets _gitdir to .
1245 # and _prefix to the empty string
1246 set _gitdir [git rev-parse --git-dir]
1247 set _prefix [git rev-parse --show-prefix]
1251 choose_repository::pick
1255 # we expand the _gitdir when it's just a single dot (i.e. when we're being
1256 # run from the .git dir itself) lest the routines to find the worktree
1258 if {$_gitdir eq "."} {
1262 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1263 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1265 if {![file isdirectory $_gitdir]} {
1266 catch {wm withdraw .}
1267 error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
1270 # _gitdir exists, so try loading the config
1274 # v1.7.0 introduced --show-toplevel to return the canonical work-tree
1275 if {[package vcompare $_git_version 1.7.0] >= 0} {
1276 if { [is_Cygwin] } {
1277 catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]}
1279 set _gitworktree [git rev-parse --show-toplevel]
1282 # try to set work tree from environment, core.worktree or use
1283 # cdup to obtain a relative path to the top of the worktree. If
1284 # run from the top, the ./ prefix ensures normalize expands pwd.
1285 if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
1286 set _gitworktree [get_config core.worktree]
1287 if {$_gitworktree eq ""} {
1288 set _gitworktree [file normalize ./[git rev-parse --show-cdup]]
1293 if {$_prefix ne {}} {
1294 if {$_gitworktree eq {}} {
1295 regsub -all {[^/]+/} $_prefix ../ cdup
1297 set cdup $_gitworktree
1299 if {[catch {cd $cdup} err]} {
1300 catch {wm withdraw .}
1301 error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
1304 set _gitworktree [pwd]
1306 } elseif {![is_enabled bare]} {
1308 catch {wm withdraw .}
1309 error_popup [strcat [mc "Cannot use bare repository:"] "\n\n$_gitdir"]
1312 if {$_gitworktree eq {}} {
1313 set _gitworktree [file dirname $_gitdir]
1315 if {[catch {cd $_gitworktree} err]} {
1316 catch {wm withdraw .}
1317 error_popup [strcat [mc "No working directory"] " $_gitworktree:\n\n$err"]
1320 set _gitworktree [pwd]
1322 set _reponame [file split [file normalize $_gitdir]]
1323 if {[lindex $_reponame end] eq {.git}} {
1324 set _reponame [lindex $_reponame end-1]
1326 set _reponame [lindex $_reponame end]
1329 set env(GIT_DIR) $_gitdir
1330 set env(GIT_WORK_TREE) $_gitworktree
1332 ######################################################################
1336 set current_diff_path {}
1337 set current_diff_side {}
1338 set diff_actions [list]
1342 set MERGE_HEAD [list]
1344 set commit_type_is_amend 0
1346 set current_branch {}
1348 set current_diff_path {}
1350 set is_submodule_diff 0
1351 set is_conflict_diff 0
1352 set diff_empty_count 0
1354 set last_revert_enc {}
1356 set nullid "0000000000000000000000000000000000000000"
1357 set nullid2 "0000000000000000000000000000000000000001"
1359 ######################################################################
1367 set disable_on_lock [list]
1368 set index_lock_type none
1370 proc lock_index {type} {
1371 global index_lock_type disable_on_lock
1373 if {$index_lock_type eq {none}} {
1374 set index_lock_type $type
1375 foreach w $disable_on_lock {
1376 uplevel #0 $w disabled
1379 } elseif {$index_lock_type eq "begin-$type"} {
1380 set index_lock_type $type
1386 proc unlock_index {} {
1387 global index_lock_type disable_on_lock
1389 set index_lock_type none
1390 foreach w $disable_on_lock {
1391 uplevel #0 $w normal
1395 ######################################################################
1399 proc repository_state {ctvar hdvar mhvar} {
1400 global current_branch
1401 upvar $ctvar ct $hdvar hd $mhvar mh
1406 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1412 set merge_head [gitdir MERGE_HEAD]
1413 if {[file exists $merge_head]} {
1415 set fd_mh [open $merge_head r]
1416 while {[gets $fd_mh line] >= 0} {
1427 global PARENT empty_tree
1429 set p [lindex $PARENT 0]
1433 if {$empty_tree eq {}} {
1434 set empty_tree [git mktree << {}]
1439 proc force_amend {} {
1440 global commit_type_is_amend
1441 global HEAD PARENT MERGE_HEAD commit_type
1443 repository_state newType newHEAD newMERGE_HEAD
1446 set MERGE_HEAD $newMERGE_HEAD
1447 set commit_type $newType
1449 set commit_type_is_amend 1
1450 do_select_commit_type
1453 proc rescan {after {honor_trustmtime 1}} {
1454 global HEAD PARENT MERGE_HEAD commit_type
1455 global ui_index ui_workdir ui_comm
1456 global rescan_active file_states
1459 if {$rescan_active > 0 || ![lock_index read]} return
1461 repository_state newType newHEAD newMERGE_HEAD
1462 if {[string match amend* $commit_type]
1463 && $newType eq {normal}
1464 && $newHEAD eq $HEAD} {
1468 set MERGE_HEAD $newMERGE_HEAD
1469 set commit_type $newType
1472 array unset file_states
1474 if {!$::GITGUI_BCK_exists &&
1475 (![$ui_comm edit modified]
1476 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1477 if {[string match amend* $commit_type]} {
1478 } elseif {[load_message GITGUI_MSG utf-8]} {
1479 } elseif {[run_prepare_commit_msg_hook]} {
1480 } elseif {[load_message MERGE_MSG]} {
1481 } elseif {[load_message SQUASH_MSG]} {
1484 $ui_comm edit modified false
1487 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1488 rescan_stage2 {} $after
1491 ui_status [mc "Refreshing file status..."]
1492 set fd_rf [git_read update-index \
1498 fconfigure $fd_rf -blocking 0 -translation binary
1499 fileevent $fd_rf readable \
1500 [list rescan_stage2 $fd_rf $after]
1505 set is_git_info_exclude {}
1506 proc have_info_exclude {} {
1507 global is_git_info_exclude
1509 if {$is_git_info_exclude eq {}} {
1510 if {[catch {exec test -f [gitdir info exclude]}]} {
1511 set is_git_info_exclude 0
1513 set is_git_info_exclude 1
1516 return $is_git_info_exclude
1519 proc have_info_exclude {} {
1520 return [file readable [gitdir info exclude]]
1524 proc rescan_stage2 {fd after} {
1525 global rescan_active buf_rdi buf_rdf buf_rlo
1529 if {![eof $fd]} return
1533 if {[package vcompare $::_git_version 1.6.3] >= 0} {
1534 set ls_others [list --exclude-standard]
1536 set ls_others [list --exclude-per-directory=.gitignore]
1537 if {[have_info_exclude]} {
1538 lappend ls_others "--exclude-from=[gitdir info exclude]"
1540 set user_exclude [get_config core.excludesfile]
1541 if {$user_exclude ne {} && [file readable $user_exclude]} {
1542 lappend ls_others "--exclude-from=[file normalize $user_exclude]"
1551 ui_status [mc "Scanning for modified files ..."]
1552 if {[git-version >= "1.7.2"]} {
1553 set fd_di [git_read diff-index --cached --ignore-submodules=dirty -z [PARENT]]
1555 set fd_di [git_read diff-index --cached -z [PARENT]]
1557 set fd_df [git_read diff-files -z]
1559 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1560 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1562 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1563 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1565 if {[is_config_true gui.displayuntracked]} {
1566 set fd_lo [eval git_read ls-files --others -z $ls_others]
1567 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1568 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1573 proc load_message {file {encoding {}}} {
1576 set f [gitdir $file]
1577 if {[file isfile $f]} {
1578 if {[catch {set fd [open $f r]}]} {
1581 fconfigure $fd -eofchar {}
1582 if {$encoding ne {}} {
1583 fconfigure $fd -encoding $encoding
1585 set content [string trim [read $fd]]
1587 regsub -all -line {[ \r\t]+$} $content {} content
1588 $ui_comm delete 0.0 end
1589 $ui_comm insert end $content
1595 proc run_prepare_commit_msg_hook {} {
1598 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1599 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1600 # empty file but existent file.
1602 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1604 if {[file isfile [gitdir MERGE_MSG]]} {
1605 set pcm_source "merge"
1606 set fd_mm [open [gitdir MERGE_MSG] r]
1607 fconfigure $fd_mm -encoding utf-8
1608 puts -nonewline $fd_pcm [read $fd_mm]
1610 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1611 set pcm_source "squash"
1612 set fd_sm [open [gitdir SQUASH_MSG] r]
1613 fconfigure $fd_sm -encoding utf-8
1614 puts -nonewline $fd_pcm [read $fd_sm]
1622 set fd_ph [githook_read prepare-commit-msg \
1623 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1625 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1629 ui_status [mc "Calling prepare-commit-msg hook..."]
1632 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1633 fileevent $fd_ph readable \
1634 [list prepare_commit_msg_hook_wait $fd_ph]
1639 proc prepare_commit_msg_hook_wait {fd_ph} {
1642 append pch_error [read $fd_ph]
1643 fconfigure $fd_ph -blocking 1
1645 if {[catch {close $fd_ph}]} {
1646 ui_status [mc "Commit declined by prepare-commit-msg hook."]
1647 hook_failed_popup prepare-commit-msg $pch_error
1648 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1651 load_message PREPARE_COMMIT_MSG
1654 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1657 fconfigure $fd_ph -blocking 0
1658 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1661 proc read_diff_index {fd after} {
1664 append buf_rdi [read $fd]
1666 set n [string length $buf_rdi]
1668 set z1 [string first "\0" $buf_rdi $c]
1669 if {$z1 == -1} break
1671 set z2 [string first "\0" $buf_rdi $z1]
1672 if {$z2 == -1} break
1675 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1676 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1678 [encoding convertfrom utf-8 $p] \
1680 [list [lindex $i 0] [lindex $i 2]] \
1686 set buf_rdi [string range $buf_rdi $c end]
1691 rescan_done $fd buf_rdi $after
1694 proc read_diff_files {fd after} {
1697 append buf_rdf [read $fd]
1699 set n [string length $buf_rdf]
1701 set z1 [string first "\0" $buf_rdf $c]
1702 if {$z1 == -1} break
1704 set z2 [string first "\0" $buf_rdf $z1]
1705 if {$z2 == -1} break
1708 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1709 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1711 [encoding convertfrom utf-8 $p] \
1714 [list [lindex $i 0] [lindex $i 2]]
1719 set buf_rdf [string range $buf_rdf $c end]
1724 rescan_done $fd buf_rdf $after
1727 proc read_ls_others {fd after} {
1730 append buf_rlo [read $fd]
1731 set pck [split $buf_rlo "\0"]
1732 set buf_rlo [lindex $pck end]
1733 foreach p [lrange $pck 0 end-1] {
1734 set p [encoding convertfrom utf-8 $p]
1735 if {[string index $p end] eq {/}} {
1736 set p [string range $p 0 end-1]
1740 rescan_done $fd buf_rlo $after
1743 proc rescan_done {fd buf after} {
1744 global rescan_active current_diff_path
1745 global file_states repo_config
1748 if {![eof $fd]} return
1751 if {[incr rescan_active -1] > 0} return
1756 if {$current_diff_path ne {}} { reshow_diff $after }
1757 if {$current_diff_path eq {}} { select_first_diff $after }
1760 proc prune_selection {} {
1761 global file_states selected_paths
1763 foreach path [array names selected_paths] {
1764 if {[catch {set still_here $file_states($path)}]} {
1765 unset selected_paths($path)
1770 ######################################################################
1774 proc mapicon {w state path} {
1777 if {[catch {set r $all_icons($state$w)}]} {
1778 puts "error: no icon for $w state={$state} $path"
1784 proc mapdesc {state path} {
1787 if {[catch {set r $all_descs($state)}]} {
1788 puts "error: no desc for state={$state} $path"
1794 proc ui_status {msg} {
1796 if {[info exists main_status]} {
1797 $main_status show $msg
1801 proc ui_ready {{test {}}} {
1803 if {[info exists main_status]} {
1804 $main_status show [mc "Ready."] $test
1808 proc escape_path {path} {
1809 regsub -all {\\} $path "\\\\" path
1810 regsub -all "\n" $path "\\n" path
1814 proc short_path {path} {
1815 return [escape_path [lindex [file split $path] end]]
1819 set null_sha1 [string repeat 0 40]
1821 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1822 global file_states next_icon_id null_sha1
1824 set s0 [string index $new_state 0]
1825 set s1 [string index $new_state 1]
1827 if {[catch {set info $file_states($path)}]} {
1829 set icon n[incr next_icon_id]
1831 set state [lindex $info 0]
1832 set icon [lindex $info 1]
1833 if {$head_info eq {}} {set head_info [lindex $info 2]}
1834 if {$index_info eq {}} {set index_info [lindex $info 3]}
1837 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1838 elseif {$s0 eq {_}} {set s0 _}
1840 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1841 elseif {$s1 eq {_}} {set s1 _}
1843 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1844 set head_info [list 0 $null_sha1]
1845 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1846 && $head_info eq {}} {
1847 set head_info $index_info
1848 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1849 set index_info $head_info
1853 set file_states($path) [list $s0$s1 $icon \
1854 $head_info $index_info \
1859 proc display_file_helper {w path icon_name old_m new_m} {
1862 if {$new_m eq {_}} {
1863 set lno [lsearch -sorted -exact $file_lists($w) $path]
1865 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1867 $w conf -state normal
1868 $w delete $lno.0 [expr {$lno + 1}].0
1869 $w conf -state disabled
1871 } elseif {$old_m eq {_} && $new_m ne {_}} {
1872 lappend file_lists($w) $path
1873 set file_lists($w) [lsort -unique $file_lists($w)]
1874 set lno [lsearch -sorted -exact $file_lists($w) $path]
1876 $w conf -state normal
1877 $w image create $lno.0 \
1878 -align center -padx 5 -pady 1 \
1880 -image [mapicon $w $new_m $path]
1881 $w insert $lno.1 "[escape_path $path]\n"
1882 $w conf -state disabled
1883 } elseif {$old_m ne $new_m} {
1884 $w conf -state normal
1885 $w image conf $icon_name -image [mapicon $w $new_m $path]
1886 $w conf -state disabled
1890 proc display_file {path state} {
1891 global file_states selected_paths
1892 global ui_index ui_workdir
1894 set old_m [merge_state $path $state]
1895 set s $file_states($path)
1896 set new_m [lindex $s 0]
1897 set icon_name [lindex $s 1]
1899 set o [string index $old_m 0]
1900 set n [string index $new_m 0]
1907 display_file_helper $ui_index $path $icon_name $o $n
1909 if {[string index $old_m 0] eq {U}} {
1912 set o [string index $old_m 1]
1914 if {[string index $new_m 0] eq {U}} {
1917 set n [string index $new_m 1]
1919 display_file_helper $ui_workdir $path $icon_name $o $n
1921 if {$new_m eq {__}} {
1922 unset file_states($path)
1923 catch {unset selected_paths($path)}
1927 proc display_all_files_helper {w path icon_name m} {
1930 lappend file_lists($w) $path
1931 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1932 $w image create end \
1933 -align center -padx 5 -pady 1 \
1935 -image [mapicon $w $m $path]
1936 $w insert end "[escape_path $path]\n"
1940 proc display_all_files {} {
1941 global ui_index ui_workdir
1942 global file_states file_lists
1944 global files_warning
1946 $ui_index conf -state normal
1947 $ui_workdir conf -state normal
1949 $ui_index delete 0.0 end
1950 $ui_workdir delete 0.0 end
1953 set file_lists($ui_index) [list]
1954 set file_lists($ui_workdir) [list]
1956 set to_display [lsort [array names file_states]]
1957 set display_limit [get_config gui.maxfilesdisplayed]
1959 foreach path $to_display {
1960 set s $file_states($path)
1962 set icon_name [lindex $s 1]
1964 if {$displayed > $display_limit && [string index $m 1] eq {O} } {
1965 if {!$files_warning} {
1966 # do not repeatedly warn:
1968 info_popup [mc "Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." \
1969 $display_limit [llength $to_display]]
1974 set s [string index $m 0]
1975 if {$s ne {U} && $s ne {_}} {
1976 display_all_files_helper $ui_index $path \
1980 if {[string index $m 0] eq {U}} {
1983 set s [string index $m 1]
1986 display_all_files_helper $ui_workdir $path \
1992 $ui_index conf -state disabled
1993 $ui_workdir conf -state disabled
1996 ######################################################################
2001 #define mask_width 14
2002 #define mask_height 15
2003 static unsigned char mask_bits[] = {
2004 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2005 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2006 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2009 image create bitmap file_plain -background white -foreground black -data {
2010 #define plain_width 14
2011 #define plain_height 15
2012 static unsigned char plain_bits[] = {
2013 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2014 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2015 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2016 } -maskdata $filemask
2018 image create bitmap file_mod -background white -foreground blue -data {
2019 #define mod_width 14
2020 #define mod_height 15
2021 static unsigned char mod_bits[] = {
2022 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2023 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2024 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2025 } -maskdata $filemask
2027 image create bitmap file_fulltick -background white -foreground "#007000" -data {
2028 #define file_fulltick_width 14
2029 #define file_fulltick_height 15
2030 static unsigned char file_fulltick_bits[] = {
2031 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2032 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2033 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2034 } -maskdata $filemask
2036 image create bitmap file_question -background white -foreground black -data {
2037 #define file_question_width 14
2038 #define file_question_height 15
2039 static unsigned char file_question_bits[] = {
2040 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2041 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2042 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2043 } -maskdata $filemask
2045 image create bitmap file_removed -background white -foreground red -data {
2046 #define file_removed_width 14
2047 #define file_removed_height 15
2048 static unsigned char file_removed_bits[] = {
2049 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2050 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2051 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2052 } -maskdata $filemask
2054 image create bitmap file_merge -background white -foreground blue -data {
2055 #define file_merge_width 14
2056 #define file_merge_height 15
2057 static unsigned char file_merge_bits[] = {
2058 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2059 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2060 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2061 } -maskdata $filemask
2063 image create bitmap file_statechange -background white -foreground green -data {
2064 #define file_statechange_width 14
2065 #define file_statechange_height 15
2066 static unsigned char file_statechange_bits[] = {
2067 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
2068 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
2069 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2070 } -maskdata $filemask
2072 set ui_index .vpane.files.index.list
2073 set ui_workdir .vpane.files.workdir.list
2075 set all_icons(_$ui_index) file_plain
2076 set all_icons(A$ui_index) file_plain
2077 set all_icons(M$ui_index) file_fulltick
2078 set all_icons(D$ui_index) file_removed
2079 set all_icons(U$ui_index) file_merge
2080 set all_icons(T$ui_index) file_statechange
2082 set all_icons(_$ui_workdir) file_plain
2083 set all_icons(M$ui_workdir) file_mod
2084 set all_icons(D$ui_workdir) file_question
2085 set all_icons(U$ui_workdir) file_merge
2086 set all_icons(O$ui_workdir) file_plain
2087 set all_icons(T$ui_workdir) file_statechange
2089 set max_status_desc 0
2091 {__ {mc "Unmodified"}}
2093 {_M {mc "Modified, not staged"}}
2094 {M_ {mc "Staged for commit"}}
2095 {MM {mc "Portions staged for commit"}}
2096 {MD {mc "Staged for commit, missing"}}
2098 {_T {mc "File type changed, not staged"}}
2099 {MT {mc "File type changed, old type staged for commit"}}
2100 {AT {mc "File type changed, old type staged for commit"}}
2101 {T_ {mc "File type changed, staged"}}
2102 {TM {mc "File type change staged, modification not staged"}}
2103 {TD {mc "File type change staged, file missing"}}
2105 {_O {mc "Untracked, not staged"}}
2106 {A_ {mc "Staged for commit"}}
2107 {AM {mc "Portions staged for commit"}}
2108 {AD {mc "Staged for commit, missing"}}
2111 {D_ {mc "Staged for removal"}}
2112 {DO {mc "Staged for removal, still present"}}
2114 {_U {mc "Requires merge resolution"}}
2115 {U_ {mc "Requires merge resolution"}}
2116 {UU {mc "Requires merge resolution"}}
2117 {UM {mc "Requires merge resolution"}}
2118 {UD {mc "Requires merge resolution"}}
2119 {UT {mc "Requires merge resolution"}}
2121 set text [eval [lindex $i 1]]
2122 if {$max_status_desc < [string length $text]} {
2123 set max_status_desc [string length $text]
2125 set all_descs([lindex $i 0]) $text
2129 ######################################################################
2133 proc scrollbar2many {list mode args} {
2134 foreach w $list {eval $w $mode $args}
2137 proc many2scrollbar {list mode sb top bottom} {
2138 $sb set $top $bottom
2139 foreach w $list {$w $mode moveto $top}
2142 proc incr_font_size {font {amt 1}} {
2143 set sz [font configure $font -size]
2145 font configure $font -size $sz
2146 font configure ${font}bold -size $sz
2147 font configure ${font}italic -size $sz
2150 ######################################################################
2154 set starting_gitk_msg [mc "Starting gitk... please wait..."]
2156 proc do_gitk {revs {is_submodule false}} {
2157 global current_diff_path file_states current_diff_side ui_index
2158 global _gitdir _gitworktree
2160 # -- Always start gitk through whatever we were loaded with. This
2161 # lets us bypass using shell process on Windows systems.
2163 set exe [_which gitk -script]
2164 set cmd [list [info nameofexecutable] $exe]
2166 error_popup [mc "Couldn't find gitk in PATH"]
2172 if {!$is_submodule} {
2177 cd $current_diff_path
2178 if {$revs eq {--}} {
2179 set s $file_states($current_diff_path)
2182 switch -glob -- [lindex $s 0] {
2183 M_ { set old_sha1 [lindex [lindex $s 2] 1] }
2184 _M { set old_sha1 [lindex [lindex $s 3] 1] }
2186 if {$current_diff_side eq $ui_index} {
2187 set old_sha1 [lindex [lindex $s 2] 1]
2188 set new_sha1 [lindex [lindex $s 3] 1]
2190 set old_sha1 [lindex [lindex $s 3] 1]
2194 set revs $old_sha1...$new_sha1
2196 # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones
2197 # we've been using for the main repository, so unset them.
2198 # TODO we could make life easier (start up faster?) for gitk
2199 # by setting these to the appropriate values to allow gitk
2200 # to skip the heuristics to find their proper value
2202 unset env(GIT_WORK_TREE)
2204 eval exec $cmd $revs "--" "--" &
2206 set env(GIT_DIR) $_gitdir
2207 set env(GIT_WORK_TREE) $_gitworktree
2210 ui_status $::starting_gitk_msg
2212 ui_ready $starting_gitk_msg
2217 proc do_git_gui {} {
2218 global current_diff_path
2220 # -- Always start git gui through whatever we were loaded with. This
2221 # lets us bypass using shell process on Windows systems.
2223 set exe [list [_which git]]
2225 error_popup [mc "Couldn't find git gui in PATH"]
2228 global _gitdir _gitworktree
2230 # see note in do_gitk about unsetting these vars when
2231 # running tools in a submodule
2233 unset env(GIT_WORK_TREE)
2236 cd $current_diff_path
2238 eval exec $exe gui &
2240 set env(GIT_DIR) $_gitdir
2241 set env(GIT_WORK_TREE) $_gitworktree
2244 ui_status $::starting_gitk_msg
2246 ui_ready $starting_gitk_msg
2251 proc do_explore {} {
2254 if {[is_Cygwin] || [is_Windows]} {
2255 set explorer "explorer.exe"
2256 } elseif {[is_MacOSX]} {
2259 # freedesktop.org-conforming system is our best shot
2260 set explorer "xdg-open"
2262 eval exec $explorer [list [file nativename $_gitworktree]] &
2268 proc terminate_me {win} {
2270 if {$win ne {.}} return
2274 proc do_quit {{rc {1}}} {
2275 global ui_comm is_quitting repo_config commit_type
2276 global GITGUI_BCK_exists GITGUI_BCK_i
2277 global ui_comm_spell
2278 global ret_code use_ttk
2280 if {$is_quitting} return
2283 if {[winfo exists $ui_comm]} {
2284 # -- Stash our current commit buffer.
2286 set save [gitdir GITGUI_MSG]
2287 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
2288 file rename -force [gitdir GITGUI_BCK] $save
2289 set GITGUI_BCK_exists 0
2291 set msg [string trim [$ui_comm get 0.0 end]]
2292 regsub -all -line {[ \r\t]+$} $msg {} msg
2293 if {(![string match amend* $commit_type]
2294 || [$ui_comm edit modified])
2297 set fd [open $save w]
2298 fconfigure $fd -encoding utf-8
2299 puts -nonewline $fd $msg
2303 catch {file delete $save}
2307 # -- Cancel our spellchecker if its running.
2309 if {[info exists ui_comm_spell]} {
2313 # -- Remove our editor backup, its not needed.
2315 after cancel $GITGUI_BCK_i
2316 if {$GITGUI_BCK_exists} {
2317 catch {file delete [gitdir GITGUI_BCK]}
2320 # -- Stash our current window geometry into this repository.
2322 set cfg_wmstate [wm state .]
2323 if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} {
2326 if {$cfg_wmstate ne $rc_wmstate} {
2327 catch {git config gui.wmstate $cfg_wmstate}
2329 if {$cfg_wmstate eq {zoomed}} {
2330 # on Windows wm geometry will lie about window
2331 # position (but not size) when window is zoomed
2332 # restore the window before querying wm geometry
2335 set cfg_geometry [list]
2336 lappend cfg_geometry [wm geometry .]
2338 lappend cfg_geometry [.vpane sashpos 0]
2339 lappend cfg_geometry [.vpane.files sashpos 0]
2341 lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
2342 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
2344 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2347 if {$cfg_geometry ne $rc_geometry} {
2348 catch {git config gui.geometry $cfg_geometry}
2354 # Briefly enable send again, working around Tk bug
2355 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2356 tk appname [appname]
2365 proc ui_do_rescan {} {
2366 rescan {force_first_diff ui_ready}
2373 proc next_diff {{after {}}} {
2374 global next_diff_p next_diff_w next_diff_i
2375 show_diff $next_diff_p $next_diff_w {} {} $after
2378 proc find_anchor_pos {lst name} {
2379 set lid [lsearch -sorted -exact $lst $name]
2383 foreach lname $lst {
2384 if {$lname >= $name} break
2392 proc find_file_from {flist idx delta path mmask} {
2395 set len [llength $flist]
2396 while {$idx >= 0 && $idx < $len} {
2397 set name [lindex $flist $idx]
2399 if {$name ne $path && [info exists file_states($name)]} {
2400 set state [lindex $file_states($name) 0]
2402 if {$mmask eq {} || [regexp $mmask $state]} {
2413 proc find_next_diff {w path {lno {}} {mmask {}}} {
2414 global next_diff_p next_diff_w next_diff_i
2415 global file_lists ui_index ui_workdir
2417 set flist $file_lists($w)
2419 set lno [find_anchor_pos $flist $path]
2424 if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} {
2425 if {$w eq $ui_index} {
2428 set mmask "$mmask\$"
2432 set idx [find_file_from $flist $lno 1 $path $mmask]
2435 set idx [find_file_from $flist $lno -1 $path $mmask]
2440 set next_diff_p [lindex $flist $idx]
2441 set next_diff_i [expr {$idx+1}]
2448 proc next_diff_after_action {w path {lno {}} {mmask {}}} {
2449 global current_diff_path
2451 if {$path ne $current_diff_path} {
2453 } elseif {[find_next_diff $w $path $lno $mmask]} {
2456 return {reshow_diff;}
2460 proc select_first_diff {after} {
2463 if {[find_next_diff $ui_workdir {} 1 {^_?U}] ||
2464 [find_next_diff $ui_workdir {} 1 {[^O]$}]} {
2471 proc force_first_diff {after} {
2472 global ui_workdir current_diff_path file_states
2474 if {[info exists file_states($current_diff_path)]} {
2475 set state [lindex $file_states($current_diff_path) 0]
2481 if {[string first {U} $state] >= 0} {
2482 # Already a conflict, do nothing
2483 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} {
2485 } elseif {[string index $state 1] ne {O}} {
2486 # Already a diff & no conflicts, do nothing
2487 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} {
2498 proc toggle_or_diff {mode w args} {
2499 global file_states file_lists current_diff_path ui_index ui_workdir
2500 global last_clicked selected_paths file_lists_last_clicked
2502 if {$mode eq "click"} {
2503 foreach {x y} $args break
2504 set pos [split [$w index @$x,$y] .]
2505 foreach {lno col} $pos break
2507 if {$last_clicked ne {}} {
2508 set lno [lindex $last_clicked 1]
2510 set lno [expr {int([lindex [$w tag ranges in_diff] 0])}]
2512 if {$mode eq "toggle"} {
2515 incr lno [expr {$mode eq "up" ? -1 : 1}]
2520 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2526 set last_clicked [list $w $lno]
2528 array unset selected_paths
2529 $ui_index tag remove in_sel 0.0 end
2530 $ui_workdir tag remove in_sel 0.0 end
2532 set file_lists_last_clicked($w) $path
2534 # Determine the state of the file
2535 if {[info exists file_states($path)]} {
2536 set state [lindex $file_states($path) 0]
2541 # Restage the file, or simply show the diff
2542 if {$col == 0 && $y > 1} {
2543 # Conflicts need special handling
2544 if {[string first {U} $state] >= 0} {
2545 # $w must always be $ui_workdir, but...
2546 if {$w ne $ui_workdir} { set lno {} }
2547 merge_stage_workdir $path $lno
2551 if {[string index $state 1] eq {O}} {
2557 set after [next_diff_after_action $w $path $lno $mmask]
2559 if {$w eq $ui_index} {
2561 "Unstaging [short_path $path] from commit" \
2563 [concat $after [list ui_ready]]
2564 } elseif {$w eq $ui_workdir} {
2566 "Adding [short_path $path]" \
2568 [concat $after [list ui_ready]]
2571 set selected_paths($path) 1
2572 show_diff $path $w $lno
2576 proc add_one_to_selection {w x y} {
2577 global file_lists last_clicked selected_paths
2579 set lno [lindex [split [$w index @$x,$y] .] 0]
2580 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2586 if {$last_clicked ne {}
2587 && [lindex $last_clicked 0] ne $w} {
2588 array unset selected_paths
2589 [lindex $last_clicked 0] tag remove in_sel 0.0 end
2592 set last_clicked [list $w $lno]
2593 if {[catch {set in_sel $selected_paths($path)}]} {
2597 unset selected_paths($path)
2598 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2600 set selected_paths($path) 1
2601 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2605 proc add_range_to_selection {w x y} {
2606 global file_lists last_clicked selected_paths
2608 if {[lindex $last_clicked 0] ne $w} {
2609 toggle_or_diff click $w $x $y
2613 set lno [lindex [split [$w index @$x,$y] .] 0]
2614 set lc [lindex $last_clicked 1]
2623 foreach path [lrange $file_lists($w) \
2624 [expr {$begin - 1}] \
2625 [expr {$end - 1}]] {
2626 set selected_paths($path) 1
2628 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2631 proc show_more_context {} {
2633 if {$repo_config(gui.diffcontext) < 99} {
2634 incr repo_config(gui.diffcontext)
2639 proc show_less_context {} {
2641 if {$repo_config(gui.diffcontext) > 1} {
2642 incr repo_config(gui.diffcontext) -1
2647 proc focus_widget {widget} {
2648 global file_lists last_clicked selected_paths
2649 global file_lists_last_clicked
2651 if {[llength $file_lists($widget)] > 0} {
2652 set path $file_lists_last_clicked($widget)
2653 set index [lsearch -sorted -exact $file_lists($widget) $path]
2656 set path [lindex $file_lists($widget) $index]
2660 set last_clicked [list $widget [expr $index + 1]]
2661 array unset selected_paths
2662 set selected_paths($path) 1
2663 show_diff $path $widget
2667 proc toggle_commit_type {} {
2668 global commit_type_is_amend
2669 set commit_type_is_amend [expr !$commit_type_is_amend]
2670 do_select_commit_type
2673 ######################################################################
2681 menu .mbar -tearoff 0
2683 # -- Apple Menu (Mac OS X only)
2685 .mbar add cascade -label Apple -menu .mbar.apple
2688 .mbar add cascade -label [mc Repository] -menu .mbar.repository
2689 .mbar add cascade -label [mc Edit] -menu .mbar.edit
2690 if {[is_enabled branch]} {
2691 .mbar add cascade -label [mc Branch] -menu .mbar.branch
2693 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2694 .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
2696 if {[is_enabled transport]} {
2697 .mbar add cascade -label [mc Merge] -menu .mbar.merge
2698 .mbar add cascade -label [mc Remote] -menu .mbar.remote
2700 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2701 .mbar add cascade -label [mc Tools] -menu .mbar.tools
2704 # -- Repository Menu
2706 menu .mbar.repository
2709 .mbar.repository add command \
2710 -label [mc "Explore Working Copy"] \
2711 -command {do_explore}
2715 .mbar.repository add command \
2716 -label [mc "Git Bash"] \
2717 -command {eval exec [auto_execok start] \
2718 [list "Git Bash" bash --login -l &]}
2721 if {[is_Windows] || ![is_bare]} {
2722 .mbar.repository add separator
2725 .mbar.repository add command \
2726 -label [mc "Browse Current Branch's Files"] \
2727 -command {browser::new $current_branch}
2728 set ui_browse_current [.mbar.repository index last]
2729 .mbar.repository add command \
2730 -label [mc "Browse Branch Files..."] \
2731 -command browser_open::dialog
2732 .mbar.repository add separator
2734 .mbar.repository add command \
2735 -label [mc "Visualize Current Branch's History"] \
2736 -command {do_gitk $current_branch}
2737 set ui_visualize_current [.mbar.repository index last]
2738 .mbar.repository add command \
2739 -label [mc "Visualize All Branch History"] \
2740 -command {do_gitk --all}
2741 .mbar.repository add separator
2743 proc current_branch_write {args} {
2744 global current_branch
2745 .mbar.repository entryconf $::ui_browse_current \
2746 -label [mc "Browse %s's Files" $current_branch]
2747 .mbar.repository entryconf $::ui_visualize_current \
2748 -label [mc "Visualize %s's History" $current_branch]
2750 trace add variable current_branch write current_branch_write
2752 if {[is_enabled multicommit]} {
2753 .mbar.repository add command -label [mc "Database Statistics"] \
2756 .mbar.repository add command -label [mc "Compress Database"] \
2759 .mbar.repository add command -label [mc "Verify Database"] \
2760 -command do_fsck_objects
2762 .mbar.repository add separator
2765 .mbar.repository add command \
2766 -label [mc "Create Desktop Icon"] \
2767 -command do_cygwin_shortcut
2768 } elseif {[is_Windows]} {
2769 .mbar.repository add command \
2770 -label [mc "Create Desktop Icon"] \
2771 -command do_windows_shortcut
2772 } elseif {[is_MacOSX]} {
2773 .mbar.repository add command \
2774 -label [mc "Create Desktop Icon"] \
2775 -command do_macosx_app
2780 proc ::tk::mac::Quit {args} { do_quit }
2782 .mbar.repository add command -label [mc Quit] \
2790 .mbar.edit add command -label [mc Undo] \
2791 -command {catch {[focus] edit undo}} \
2793 .mbar.edit add command -label [mc Redo] \
2794 -command {catch {[focus] edit redo}} \
2796 .mbar.edit add separator
2797 .mbar.edit add command -label [mc Cut] \
2798 -command {catch {tk_textCut [focus]}} \
2800 .mbar.edit add command -label [mc Copy] \
2801 -command {catch {tk_textCopy [focus]}} \
2803 .mbar.edit add command -label [mc Paste] \
2804 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2806 .mbar.edit add command -label [mc Delete] \
2807 -command {catch {[focus] delete sel.first sel.last}} \
2809 .mbar.edit add separator
2810 .mbar.edit add command -label [mc "Select All"] \
2811 -command {catch {[focus] tag add sel 0.0 end}} \
2816 if {[is_enabled branch]} {
2819 .mbar.branch add command -label [mc "Create..."] \
2820 -command branch_create::dialog \
2822 lappend disable_on_lock [list .mbar.branch entryconf \
2823 [.mbar.branch index last] -state]
2825 .mbar.branch add command -label [mc "Checkout..."] \
2826 -command branch_checkout::dialog \
2828 lappend disable_on_lock [list .mbar.branch entryconf \
2829 [.mbar.branch index last] -state]
2831 .mbar.branch add command -label [mc "Rename..."] \
2832 -command branch_rename::dialog
2833 lappend disable_on_lock [list .mbar.branch entryconf \
2834 [.mbar.branch index last] -state]
2836 .mbar.branch add command -label [mc "Delete..."] \
2837 -command branch_delete::dialog
2838 lappend disable_on_lock [list .mbar.branch entryconf \
2839 [.mbar.branch index last] -state]
2841 .mbar.branch add command -label [mc "Reset..."] \
2842 -command merge::reset_hard
2843 lappend disable_on_lock [list .mbar.branch entryconf \
2844 [.mbar.branch index last] -state]
2849 proc commit_btn_caption {} {
2850 if {[is_enabled nocommit]} {
2853 return [mc Commit@@verb]
2857 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2860 if {![is_enabled nocommit]} {
2861 .mbar.commit add checkbutton \
2862 -label [mc "Amend Last Commit"] \
2863 -accelerator $M1T-E \
2864 -variable commit_type_is_amend \
2865 -command do_select_commit_type
2866 lappend disable_on_lock \
2867 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2869 .mbar.commit add separator
2872 .mbar.commit add command -label [mc Rescan] \
2873 -command ui_do_rescan \
2875 lappend disable_on_lock \
2876 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2878 .mbar.commit add command -label [mc "Stage To Commit"] \
2879 -command do_add_selection \
2881 lappend disable_on_lock \
2882 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2884 .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
2885 -command do_add_all \
2887 lappend disable_on_lock \
2888 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2890 .mbar.commit add command -label [mc "Unstage From Commit"] \
2891 -command do_unstage_selection \
2893 lappend disable_on_lock \
2894 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2896 .mbar.commit add command -label [mc "Revert Changes"] \
2897 -command do_revert_selection \
2899 lappend disable_on_lock \
2900 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2902 .mbar.commit add separator
2904 .mbar.commit add command -label [mc "Show Less Context"] \
2905 -command show_less_context \
2906 -accelerator $M1T-\-
2908 .mbar.commit add command -label [mc "Show More Context"] \
2909 -command show_more_context \
2912 .mbar.commit add separator
2914 if {![is_enabled nocommitmsg]} {
2915 .mbar.commit add command -label [mc "Sign Off"] \
2916 -command do_signoff \
2920 .mbar.commit add command -label [commit_btn_caption] \
2921 -command do_commit \
2922 -accelerator $M1T-Return
2923 lappend disable_on_lock \
2924 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2929 if {[is_enabled branch]} {
2931 .mbar.merge add command -label [mc "Local Merge..."] \
2932 -command merge::dialog \
2934 lappend disable_on_lock \
2935 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2936 .mbar.merge add command -label [mc "Abort Merge..."] \
2937 -command merge::reset_hard
2938 lappend disable_on_lock \
2939 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2944 if {[is_enabled transport]} {
2947 .mbar.remote add command \
2948 -label [mc "Add..."] \
2949 -command remote_add::dialog \
2951 .mbar.remote add command \
2952 -label [mc "Push..."] \
2953 -command do_push_anywhere \
2955 .mbar.remote add command \
2956 -label [mc "Delete Branch..."] \
2957 -command remote_branch_delete::dialog
2961 proc ::tk::mac::ShowPreferences {} {do_options}
2965 .mbar.edit add separator
2966 .mbar.edit add command -label [mc "Options..."] \
2972 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2973 set tools_menubar .mbar.tools
2975 $tools_menubar add separator
2976 $tools_menubar add command -label [mc "Add..."] -command tools_add::dialog
2977 $tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog
2979 if {[array names repo_config guitool.*.cmd] ne {}} {
2986 .mbar add cascade -label [mc Help] -menu .mbar.help
2990 .mbar.apple add command -label [mc "About %s" [appname]] \
2992 .mbar.apple add separator
2994 .mbar.help add command -label [mc "About %s" [appname]] \
2997 . configure -menu .mbar
2999 set doc_path [githtmldir]
3000 if {$doc_path ne {}} {
3001 set doc_path [file join $doc_path index.html]
3004 set doc_path [exec cygpath --mixed $doc_path]
3008 if {[file isfile $doc_path]} {
3009 set doc_url "file:$doc_path"
3011 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
3014 proc start_browser {url} {
3015 git "web--browse" $url
3018 .mbar.help add command -label [mc "Online Documentation"] \
3019 -command [list start_browser $doc_url]
3021 .mbar.help add command -label [mc "Show SSH Key"] \
3024 unset doc_path doc_url
3026 # -- Standard bindings
3028 wm protocol . WM_DELETE_WINDOW do_quit
3029 bind all <$M1B-Key-q> do_quit
3030 bind all <$M1B-Key-Q> do_quit
3031 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3032 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3034 set subcommand_args {}
3036 set s "[mc usage:] $::argv0 $::subcommand $::subcommand_args"
3037 if {[tk windowingsystem] eq "win32"} {
3039 tk_messageBox -icon info -message $s \
3047 proc normalize_relpath {path} {
3049 foreach item [file split $path] {
3050 if {$item eq {.}} continue
3051 if {$item eq {..} && [llength $elements] > 0
3052 && [lindex $elements end] ne {..}} {
3053 set elements [lrange $elements 0 end-1]
3056 lappend elements $item
3058 return [eval file join $elements]
3061 # -- Not a normal commit type invocation? Do that instead!
3063 switch -- $subcommand {
3066 if {$subcommand eq "blame"} {
3067 set subcommand_args {[--line=<num>] rev? path}
3069 set subcommand_args {rev? path}
3071 if {$argv eq {}} usage
3077 set p [file join $_prefix $a]
3079 if {$is_path || [file exists $p]} {
3080 if {$path ne {}} usage
3081 set path [normalize_relpath $p]
3083 } elseif {$a eq {--}} {
3085 if {$head ne {}} usage
3090 } elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
3091 if {$jump_spec ne {} || $head ne {}} usage
3092 set jump_spec [list $lnum]
3093 } elseif {$head eq {}} {
3094 if {$head ne {}} usage
3103 if {$head ne {} && $path eq {}} {
3104 if {[string index $head 0] eq {/}} {
3105 set path [normalize_relpath $head]
3108 set path [normalize_relpath $_prefix$head]
3116 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
3118 set head [git rev-parse --verify $head]
3120 if {[tk windowingsystem] eq "win32"} {
3121 tk_messageBox -icon error -title [mc Error] -message $err
3128 set current_branch $head
3132 switch -- $subcommand {
3134 if {$jump_spec ne {}} usage
3136 if {$path ne {} && [file isdirectory $path]} {
3137 set head $current_branch
3143 browser::new $head $path
3146 if {$head eq {} && ![file exists $path]} {
3147 catch {wm withdraw .}
3151 -title [mc "git-gui: fatal error"] \
3152 -message [mc "fatal: cannot stat path %s: No such file or directory" $path]
3155 blame::new $head $path $jump_spec
3162 if {[llength $argv] != 0} {
3165 # fall through to setup UI for commits
3168 set err "[mc usage:] $argv0 \[{blame|browser|citool}\]"
3169 if {[tk windowingsystem] eq "win32"} {
3171 tk_messageBox -icon error -message $err \
3182 ${NS}::frame .branch
3183 if {!$use_ttk} {.branch configure -borderwidth 1 -relief sunken}
3184 ${NS}::label .branch.l1 \
3185 -text [mc "Current Branch:"] \
3188 ${NS}::label .branch.cb \
3189 -textvariable current_branch \
3192 pack .branch.l1 -side left
3193 pack .branch.cb -side left -fill x
3194 pack .branch -side top -fill x
3196 # -- Main Window Layout
3198 ${NS}::panedwindow .vpane -orient horizontal
3199 ${NS}::panedwindow .vpane.files -orient vertical
3201 .vpane add .vpane.files
3203 .vpane add .vpane.files -sticky nsew -height 100 -width 200
3205 pack .vpane -anchor n -side top -fill both -expand 1
3207 # -- Working Directory File List
3209 textframe .vpane.files.workdir -height 100 -width 200
3210 tlabel .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
3211 -background lightsalmon -foreground black
3212 ttext $ui_workdir -background white -foreground black \
3214 -width 20 -height 10 \
3216 -takefocus 1 -highlightthickness 1\
3217 -cursor $cursor_ptr \
3218 -xscrollcommand {.vpane.files.workdir.sx set} \
3219 -yscrollcommand {.vpane.files.workdir.sy set} \
3221 ${NS}::scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
3222 ${NS}::scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
3223 pack .vpane.files.workdir.title -side top -fill x
3224 pack .vpane.files.workdir.sx -side bottom -fill x
3225 pack .vpane.files.workdir.sy -side right -fill y
3226 pack $ui_workdir -side left -fill both -expand 1
3228 # -- Index File List
3230 textframe .vpane.files.index -height 100 -width 200
3231 tlabel .vpane.files.index.title \
3232 -text [mc "Staged Changes (Will Commit)"] \
3233 -background lightgreen -foreground black
3234 ttext $ui_index -background white -foreground black \
3236 -width 20 -height 10 \
3238 -takefocus 1 -highlightthickness 1\
3239 -cursor $cursor_ptr \
3240 -xscrollcommand {.vpane.files.index.sx set} \
3241 -yscrollcommand {.vpane.files.index.sy set} \
3243 ${NS}::scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
3244 ${NS}::scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
3245 pack .vpane.files.index.title -side top -fill x
3246 pack .vpane.files.index.sx -side bottom -fill x
3247 pack .vpane.files.index.sy -side right -fill y
3248 pack $ui_index -side left -fill both -expand 1
3250 # -- Insert the workdir and index into the panes
3252 .vpane.files add .vpane.files.workdir
3253 .vpane.files add .vpane.files.index
3255 .vpane.files paneconfigure .vpane.files.workdir -sticky news
3256 .vpane.files paneconfigure .vpane.files.index -sticky news
3259 foreach i [list $ui_index $ui_workdir] {
3261 $i tag conf in_diff -background [$i tag cget in_sel -background]
3265 # -- Diff and Commit Area
3268 ${NS}::panedwindow .vpane.lower -orient vertical
3269 ${NS}::frame .vpane.lower.commarea
3270 ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500
3271 .vpane.lower add .vpane.lower.diff
3272 .vpane.lower add .vpane.lower.commarea
3273 .vpane add .vpane.lower
3275 .vpane.lower pane .vpane.lower.diff -weight 1
3276 .vpane.lower pane .vpane.lower.commarea -weight 0
3278 .vpane.lower paneconfigure .vpane.lower.diff -stretch always
3279 .vpane.lower paneconfigure .vpane.lower.commarea -stretch never
3282 frame .vpane.lower -height 300 -width 400
3283 frame .vpane.lower.commarea
3284 frame .vpane.lower.diff -relief sunken -borderwidth 1
3285 pack .vpane.lower.diff -fill both -expand 1
3286 pack .vpane.lower.commarea -side bottom -fill x
3287 .vpane add .vpane.lower
3288 .vpane paneconfigure .vpane.lower -sticky nsew
3291 # -- Commit Area Buttons
3293 ${NS}::frame .vpane.lower.commarea.buttons
3294 ${NS}::label .vpane.lower.commarea.buttons.l -text {} \
3297 pack .vpane.lower.commarea.buttons.l -side top -fill x
3298 pack .vpane.lower.commarea.buttons -side left -fill y
3300 ${NS}::button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
3301 -command ui_do_rescan
3302 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3303 lappend disable_on_lock \
3304 {.vpane.lower.commarea.buttons.rescan conf -state}
3306 ${NS}::button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
3308 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3309 lappend disable_on_lock \
3310 {.vpane.lower.commarea.buttons.incall conf -state}
3312 if {![is_enabled nocommitmsg]} {
3313 ${NS}::button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
3315 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3318 ${NS}::button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
3320 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3321 lappend disable_on_lock \
3322 {.vpane.lower.commarea.buttons.commit conf -state}
3324 if {![is_enabled nocommit]} {
3325 ${NS}::button .vpane.lower.commarea.buttons.push -text [mc Push] \
3326 -command do_push_anywhere
3327 pack .vpane.lower.commarea.buttons.push -side top -fill x
3330 # -- Commit Message Buffer
3332 ${NS}::frame .vpane.lower.commarea.buffer
3333 ${NS}::frame .vpane.lower.commarea.buffer.header
3334 set ui_comm .vpane.lower.commarea.buffer.frame.t
3335 set ui_coml .vpane.lower.commarea.buffer.header.l
3337 if {![is_enabled nocommit]} {
3338 ${NS}::checkbutton .vpane.lower.commarea.buffer.header.amend \
3339 -text [mc "Amend Last Commit"] \
3340 -variable commit_type_is_amend \
3341 -command do_select_commit_type
3342 lappend disable_on_lock \
3343 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3346 ${NS}::label $ui_coml \
3349 proc trace_commit_type {varname args} {
3350 global ui_coml commit_type
3351 switch -glob -- $commit_type {
3352 initial {set txt [mc "Initial Commit Message:"]}
3353 amend {set txt [mc "Amended Commit Message:"]}
3354 amend-initial {set txt [mc "Amended Initial Commit Message:"]}
3355 amend-merge {set txt [mc "Amended Merge Commit Message:"]}
3356 merge {set txt [mc "Merge Commit Message:"]}
3357 * {set txt [mc "Commit Message:"]}
3359 $ui_coml conf -text $txt
3361 trace add variable commit_type write trace_commit_type
3362 pack $ui_coml -side left -fill x
3364 if {![is_enabled nocommit]} {
3365 pack .vpane.lower.commarea.buffer.header.amend -side right
3368 textframe .vpane.lower.commarea.buffer.frame
3369 ttext $ui_comm -background white -foreground black \
3373 -autoseparators true \
3375 -highlightthickness 1 \
3377 -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
3379 -xscrollcommand {.vpane.lower.commarea.buffer.frame.sbx set} \
3380 -yscrollcommand {.vpane.lower.commarea.buffer.frame.sby set}
3381 ${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sbx \
3382 -orient horizontal \
3383 -command [list $ui_comm xview]
3384 ${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sby \
3386 -command [list $ui_comm yview]
3388 pack .vpane.lower.commarea.buffer.frame.sbx -side bottom -fill x
3389 pack .vpane.lower.commarea.buffer.frame.sby -side right -fill y
3390 pack $ui_comm -side left -fill y
3391 pack .vpane.lower.commarea.buffer.header -side top -fill x
3392 pack .vpane.lower.commarea.buffer.frame -side left -fill y
3393 pack .vpane.lower.commarea.buffer -side left -fill y
3395 # -- Commit Message Buffer Context Menu
3397 set ctxm .vpane.lower.commarea.buffer.ctxm
3398 menu $ctxm -tearoff 0
3401 -command {tk_textCut $ui_comm}
3404 -command {tk_textCopy $ui_comm}
3407 -command {tk_textPaste $ui_comm}
3409 -label [mc Delete] \
3410 -command {catch {$ui_comm delete sel.first sel.last}}
3413 -label [mc "Select All"] \
3414 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
3416 -label [mc "Copy All"] \
3418 $ui_comm tag add sel 0.0 end
3419 tk_textCopy $ui_comm
3420 $ui_comm tag remove sel 0.0 end
3424 -label [mc "Sign Off"] \
3426 set ui_comm_ctxm $ctxm
3430 proc trace_current_diff_path {varname args} {
3431 global current_diff_path diff_actions file_states
3432 if {$current_diff_path eq {}} {
3438 set p $current_diff_path
3439 set s [mapdesc [lindex $file_states($p) 0] $p]
3441 set p [escape_path $p]
3445 .vpane.lower.diff.header.status configure -text $s
3446 .vpane.lower.diff.header.file configure -text $f
3447 .vpane.lower.diff.header.path configure -text $p
3448 foreach w $diff_actions {
3452 trace add variable current_diff_path write trace_current_diff_path
3454 gold_frame .vpane.lower.diff.header
3455 tlabel .vpane.lower.diff.header.status \
3458 -width $max_status_desc \
3461 tlabel .vpane.lower.diff.header.file \
3466 tlabel .vpane.lower.diff.header.path \
3471 pack .vpane.lower.diff.header.status -side left
3472 pack .vpane.lower.diff.header.file -side left
3473 pack .vpane.lower.diff.header.path -fill x
3474 set ctxm .vpane.lower.diff.header.ctxm
3475 menu $ctxm -tearoff 0
3483 -- $current_diff_path
3485 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3486 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3490 textframe .vpane.lower.diff.body
3491 set ui_diff .vpane.lower.diff.body.t
3492 ttext $ui_diff -background white -foreground black \
3494 -width 80 -height 5 -wrap none \
3496 -takefocus 1 -highlightthickness 1 \
3497 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3498 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3500 catch {$ui_diff configure -tabstyle wordprocessor}
3501 ${NS}::scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3502 -command [list $ui_diff xview]
3503 ${NS}::scrollbar .vpane.lower.diff.body.sby -orient vertical \
3504 -command [list $ui_diff yview]
3505 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3506 pack .vpane.lower.diff.body.sby -side right -fill y
3507 pack $ui_diff -side left -fill both -expand 1
3508 pack .vpane.lower.diff.header -side top -fill x
3509 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3511 foreach {n c} {0 black 1 red4 2 green4 3 yellow4 4 blue4 5 magenta4 6 cyan4 7 grey60} {
3512 $ui_diff tag configure clr4$n -background $c
3513 $ui_diff tag configure clri4$n -foreground $c
3514 $ui_diff tag configure clr3$n -foreground $c
3515 $ui_diff tag configure clri3$n -background $c
3517 $ui_diff tag configure clr1 -font font_diffbold
3518 $ui_diff tag configure clr4 -underline 1
3520 $ui_diff tag conf d_info -foreground blue -font font_diffbold
3522 $ui_diff tag conf d_cr -elide true
3523 $ui_diff tag conf d_@ -font font_diffbold
3524 $ui_diff tag conf d_+ -foreground {#00a000}
3525 $ui_diff tag conf d_- -foreground red
3527 $ui_diff tag conf d_++ -foreground {#00a000}
3528 $ui_diff tag conf d_-- -foreground red
3529 $ui_diff tag conf d_+s \
3530 -foreground {#00a000} \
3531 -background {#e2effa}
3532 $ui_diff tag conf d_-s \
3534 -background {#e2effa}
3535 $ui_diff tag conf d_s+ \
3536 -foreground {#00a000} \
3538 $ui_diff tag conf d_s- \
3542 $ui_diff tag conf d< \
3543 -foreground orange \
3545 $ui_diff tag conf d= \
3546 -foreground orange \
3548 $ui_diff tag conf d> \
3549 -foreground orange \
3552 $ui_diff tag raise sel
3554 # -- Diff Body Context Menu
3557 proc create_common_diff_popup {ctxm} {
3559 -label [mc Refresh] \
3560 -command reshow_diff
3561 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3564 -command {tk_textCopy $ui_diff}
3565 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3567 -label [mc "Select All"] \
3568 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
3569 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3571 -label [mc "Copy All"] \
3573 $ui_diff tag add sel 0.0 end
3574 tk_textCopy $ui_diff
3575 $ui_diff tag remove sel 0.0 end
3577 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3580 -label [mc "Decrease Font Size"] \
3581 -command {incr_font_size font_diff -1}
3582 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3584 -label [mc "Increase Font Size"] \
3585 -command {incr_font_size font_diff 1}
3586 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3590 build_encoding_menu $emenu [list force_diff_encoding]
3592 -label [mc "Encoding"] \
3594 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3596 $ctxm add command -label [mc "Options..."] \
3600 set ctxm .vpane.lower.diff.body.ctxm
3601 menu $ctxm -tearoff 0
3603 -label [mc "Apply/Reverse Hunk"] \
3604 -command {apply_or_revert_hunk $cursorX $cursorY 0}
3605 set ui_diff_applyhunk [$ctxm index last]
3606 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
3608 -label [mc "Apply/Reverse Line"] \
3609 -command {apply_or_revert_range_or_line $cursorX $cursorY 0; do_rescan}
3610 set ui_diff_applyline [$ctxm index last]
3611 lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
3614 -label [mc "Revert Hunk"] \
3615 -command {apply_or_revert_hunk $cursorX $cursorY 1}
3616 set ui_diff_reverthunk [$ctxm index last]
3617 lappend diff_actions [list $ctxm entryconf $ui_diff_reverthunk -state]
3619 -label [mc "Revert Line"] \
3620 -command {apply_or_revert_range_or_line $cursorX $cursorY 1; do_rescan}
3621 set ui_diff_revertline [$ctxm index last]
3622 lappend diff_actions [list $ctxm entryconf $ui_diff_revertline -state]
3624 -label [mc "Undo Last Revert"] \
3625 -command {undo_last_revert; do_rescan}
3626 set ui_diff_undorevert [$ctxm index last]
3627 lappend diff_actions [list $ctxm entryconf $ui_diff_undorevert -state]
3630 -label [mc "Show Less Context"] \
3631 -command show_less_context
3632 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3634 -label [mc "Show More Context"] \
3635 -command show_more_context
3636 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3638 create_common_diff_popup $ctxm
3640 set ctxmmg .vpane.lower.diff.body.ctxmmg
3641 menu $ctxmmg -tearoff 0
3642 $ctxmmg add command \
3643 -label [mc "Run Merge Tool"] \
3644 -command {merge_resolve_tool}
3645 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3646 $ctxmmg add separator
3647 $ctxmmg add command \
3648 -label [mc "Use Remote Version"] \
3649 -command {merge_resolve_one 3}
3650 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3651 $ctxmmg add command \
3652 -label [mc "Use Local Version"] \
3653 -command {merge_resolve_one 2}
3654 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3655 $ctxmmg add command \
3656 -label [mc "Revert To Base"] \
3657 -command {merge_resolve_one 1}
3658 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3659 $ctxmmg add separator
3660 $ctxmmg add command \
3661 -label [mc "Show Less Context"] \
3662 -command show_less_context
3663 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3664 $ctxmmg add command \
3665 -label [mc "Show More Context"] \
3666 -command show_more_context
3667 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3668 $ctxmmg add separator
3669 create_common_diff_popup $ctxmmg
3671 set ctxmsm .vpane.lower.diff.body.ctxmsm
3672 menu $ctxmsm -tearoff 0
3673 $ctxmsm add command \
3674 -label [mc "Visualize These Changes In The Submodule"] \
3675 -command {do_gitk -- true}
3676 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3677 $ctxmsm add command \
3678 -label [mc "Visualize Current Branch History In The Submodule"] \
3679 -command {do_gitk {} true}
3680 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3681 $ctxmsm add command \
3682 -label [mc "Visualize All Branch History In The Submodule"] \
3683 -command {do_gitk --all true}
3684 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3685 $ctxmsm add separator
3686 $ctxmsm add command \
3687 -label [mc "Start git gui In The Submodule"] \
3688 -command {do_git_gui}
3689 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3690 $ctxmsm add separator
3691 create_common_diff_popup $ctxmsm
3693 proc has_textconv {path} {
3694 if {[is_config_false gui.textconv]} {
3697 set filter [gitattr $path diff set]
3698 set textconv [get_config [join [list diff $filter textconv] .]]
3699 if {$filter ne {set} && $textconv ne {}} {
3706 proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
3707 global current_diff_path file_states last_revert
3710 if {[info exists file_states($current_diff_path)]} {
3711 set state [lindex $file_states($current_diff_path) 0]
3715 if {[string first {U} $state] >= 0} {
3716 tk_popup $ctxmmg $X $Y
3717 } elseif {$::is_submodule_diff} {
3718 tk_popup $ctxmsm $X $Y
3720 set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}]
3721 set u [mc "Undo Last Revert"]
3722 if {$::ui_index eq $::current_diff_side} {
3723 set l [mc "Unstage Hunk From Commit"]
3724 set h [mc "Revert Hunk"]
3727 set t [mc "Unstage Lines From Commit"]
3728 set r [mc "Revert Lines"]
3730 set t [mc "Unstage Line From Commit"]
3731 set r [mc "Revert Line"]
3734 set l [mc "Stage Hunk For Commit"]
3735 set h [mc "Revert Hunk"]
3738 set t [mc "Stage Lines For Commit"]
3739 set r [mc "Revert Lines"]
3741 set t [mc "Stage Line For Commit"]
3742 set r [mc "Revert Line"]
3746 || $current_diff_path eq {}
3749 || [string match {?T} $state]
3750 || [string match {T?} $state]
3751 || [has_textconv $current_diff_path]} {
3753 set revert_state disabled
3757 # Only allow reverting changes in the working tree. If
3758 # the user wants to revert changes in the index, they
3759 # need to unstage those first.
3760 if {$::ui_workdir eq $::current_diff_side} {
3761 set revert_state normal
3763 set revert_state disabled
3767 if {$last_revert eq {}} {
3768 set undo_state disabled
3770 set undo_state normal
3773 $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
3774 $ctxm entryconf $::ui_diff_applyline -state $s -label $t
3775 $ctxm entryconf $::ui_diff_revertline -state $revert_state \
3777 $ctxm entryconf $::ui_diff_reverthunk -state $revert_state \
3779 $ctxm entryconf $::ui_diff_undorevert -state $undo_state \
3782 tk_popup $ctxm $X $Y
3785 bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg $ctxmsm %x %y %X %Y]
3789 set main_status [::status_bar::new .status]
3790 pack .status -anchor w -side bottom -fill x
3791 $main_status show [mc "Initializing..."]
3795 proc on_ttk_pane_mapped {w pane pos} {
3797 after 0 [list after idle [list $w sashpos $pane $pos]]
3799 proc on_tk_pane_mapped {w pane x y} {
3801 after 0 [list after idle [list $w sash place $pane $x $y]]
3803 proc on_application_mapped {} {
3804 global repo_config use_ttk
3806 set gm $repo_config(gui.geometry)
3809 [list on_ttk_pane_mapped %W 0 [lindex $gm 1]]
3810 bind .vpane.files <Map> \
3811 [list on_ttk_pane_mapped %W 0 [lindex $gm 2]]
3814 [list on_tk_pane_mapped %W 0 \
3816 [lindex [.vpane sash coord 0] 1]]
3817 bind .vpane.files <Map> \
3818 [list on_tk_pane_mapped %W 0 \
3819 [lindex [.vpane.files sash coord 0] 0] \
3822 wm geometry . [lindex $gm 0]
3824 if {[info exists repo_config(gui.geometry)]} {
3825 bind . <Map> [list on_application_mapped]
3826 wm geometry . [lindex $repo_config(gui.geometry) 0]
3829 # -- Load window state
3831 if {[info exists repo_config(gui.wmstate)]} {
3832 catch {wm state . $repo_config(gui.wmstate)}
3837 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3838 bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
3839 bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
3840 bind $ui_comm <$M1B-Key-u> {do_unstage_selection;break}
3841 bind $ui_comm <$M1B-Key-U> {do_unstage_selection;break}
3842 bind $ui_comm <$M1B-Key-j> {do_revert_selection;break}
3843 bind $ui_comm <$M1B-Key-J> {do_revert_selection;break}
3844 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3845 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3846 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3847 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3848 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3849 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3850 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3851 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3852 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3853 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3854 bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
3855 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
3856 bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
3857 bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
3858 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
3860 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3861 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3862 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3863 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3864 bind $ui_diff <$M1B-Key-v> {break}
3865 bind $ui_diff <$M1B-Key-V> {break}
3866 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3867 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3868 bind $ui_diff <$M1B-Key-j> {do_revert_selection;break}
3869 bind $ui_diff <$M1B-Key-J> {do_revert_selection;break}
3870 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3871 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3872 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3873 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3874 bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
3875 bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
3876 bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
3877 bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
3878 bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
3879 bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
3880 bind $ui_diff <Button-1> {focus %W}
3882 if {[is_enabled branch]} {
3883 bind . <$M1B-Key-n> branch_create::dialog
3884 bind . <$M1B-Key-N> branch_create::dialog
3885 bind . <$M1B-Key-o> branch_checkout::dialog
3886 bind . <$M1B-Key-O> branch_checkout::dialog
3887 bind . <$M1B-Key-m> merge::dialog
3888 bind . <$M1B-Key-M> merge::dialog
3890 if {[is_enabled transport]} {
3891 bind . <$M1B-Key-p> do_push_anywhere
3892 bind . <$M1B-Key-P> do_push_anywhere
3895 bind . <Key-F5> ui_do_rescan
3896 bind . <$M1B-Key-r> ui_do_rescan
3897 bind . <$M1B-Key-R> ui_do_rescan
3898 bind . <$M1B-Key-s> do_signoff
3899 bind . <$M1B-Key-S> do_signoff
3900 bind . <$M1B-Key-t> { toggle_or_diff toggle %W }
3901 bind . <$M1B-Key-T> { toggle_or_diff toggle %W }
3902 bind . <$M1B-Key-u> { toggle_or_diff toggle %W }
3903 bind . <$M1B-Key-U> { toggle_or_diff toggle %W }
3904 bind . <$M1B-Key-j> do_revert_selection
3905 bind . <$M1B-Key-J> do_revert_selection
3906 bind . <$M1B-Key-i> do_add_all
3907 bind . <$M1B-Key-I> do_add_all
3908 bind . <$M1B-Key-e> toggle_commit_type
3909 bind . <$M1B-Key-E> toggle_commit_type
3910 bind . <$M1B-Key-minus> {show_less_context;break}
3911 bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
3912 bind . <$M1B-Key-equal> {show_more_context;break}
3913 bind . <$M1B-Key-plus> {show_more_context;break}
3914 bind . <$M1B-Key-KP_Add> {show_more_context;break}
3915 bind . <$M1B-Key-Return> do_commit
3916 foreach i [list $ui_index $ui_workdir] {
3917 bind $i <Button-1> { toggle_or_diff click %W %x %y; break }
3918 bind $i <$M1B-Button-1> { add_one_to_selection %W %x %y; break }
3919 bind $i <Shift-Button-1> { add_range_to_selection %W %x %y; break }
3920 bind $i <Key-Up> { toggle_or_diff up %W; break }
3921 bind $i <Key-Down> { toggle_or_diff down %W; break }
3925 bind . <Alt-Key-1> {focus_widget $::ui_workdir}
3926 bind . <Alt-Key-2> {focus_widget $::ui_index}
3927 bind . <Alt-Key-3> {focus $::ui_diff}
3928 bind . <Alt-Key-4> {focus $::ui_comm}
3930 set file_lists_last_clicked($ui_index) {}
3931 set file_lists_last_clicked($ui_workdir) {}
3933 set file_lists($ui_index) [list]
3934 set file_lists($ui_workdir) [list]
3936 wm title . "[appname] ([reponame]) [file normalize $_gitworktree]"
3937 focus -force $ui_comm
3939 # -- Warn the user about environmental problems. Cygwin's Tcl
3940 # does *not* pass its env array onto any processes it spawns.
3941 # This means that git processes get none of our environment.
3946 set msg [mc "Possible environment issues exist.
3948 The following environment variables are probably
3949 going to be ignored by any Git subprocess run
3953 foreach name [array names env] {
3954 switch -regexp -- $name {
3955 {^GIT_INDEX_FILE$} -
3956 {^GIT_OBJECT_DIRECTORY$} -
3957 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3959 {^GIT_EXTERNAL_DIFF$} -
3963 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3964 append msg " - $name\n"
3967 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3968 append msg " - $name\n"
3970 set suggest_user $name
3974 if {$ignored_env > 0} {
3976 This is due to a known issue with the
3977 Tcl binary distributed by Cygwin."]
3979 if {$suggest_user ne {}} {
3982 A good replacement for %s
3983 is placing values for the user.name and
3984 user.email settings into your personal
3990 unset ignored_env msg suggest_user name
3993 # -- Only initialize complex UI if we are going to stay running.
3995 if {[is_enabled transport]} {
3998 set n [.mbar.remote index end]
3999 populate_remotes_menu
4000 set n [expr {[.mbar.remote index end] - $n}]
4002 if {[.mbar.remote type 0] eq "tearoff"} { incr n }
4003 .mbar.remote insert $n separator
4008 if {[winfo exists $ui_comm]} {
4009 set GITGUI_BCK_exists [load_message GITGUI_BCK utf-8]
4011 # -- If both our backup and message files exist use the
4012 # newer of the two files to initialize the buffer.
4014 if {$GITGUI_BCK_exists} {
4015 set m [gitdir GITGUI_MSG]
4016 if {[file isfile $m]} {
4017 if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
4018 catch {file delete [gitdir GITGUI_MSG]}
4020 $ui_comm delete 0.0 end
4022 $ui_comm edit modified false
4023 catch {file delete [gitdir GITGUI_BCK]}
4024 set GITGUI_BCK_exists 0
4030 proc backup_commit_buffer {} {
4031 global ui_comm GITGUI_BCK_exists
4033 set m [$ui_comm edit modified]
4034 if {$m || $GITGUI_BCK_exists} {
4035 set msg [string trim [$ui_comm get 0.0 end]]
4036 regsub -all -line {[ \r\t]+$} $msg {} msg
4039 if {$GITGUI_BCK_exists} {
4040 catch {file delete [gitdir GITGUI_BCK]}
4041 set GITGUI_BCK_exists 0
4045 set fd [open [gitdir GITGUI_BCK] w]
4046 fconfigure $fd -encoding utf-8
4047 puts -nonewline $fd $msg
4049 set GITGUI_BCK_exists 1
4053 $ui_comm edit modified false
4056 set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
4059 backup_commit_buffer
4061 # -- If the user has aspell available we can drive it
4062 # in pipe mode to spellcheck the commit message.
4064 set spell_cmd [list |]
4065 set spell_dict [get_config gui.spellingdictionary]
4066 lappend spell_cmd aspell
4067 if {$spell_dict ne {}} {
4068 lappend spell_cmd --master=$spell_dict
4070 lappend spell_cmd --mode=none
4071 lappend spell_cmd --encoding=utf-8
4072 lappend spell_cmd pipe
4073 if {$spell_dict eq {none}
4074 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
4075 bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
4077 set ui_comm_spell [spellcheck::init \
4083 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
4086 lock_index begin-read
4087 if {![winfo ismapped .]} {
4091 if {[is_enabled initialamend]} {
4097 if {[is_enabled nocommitmsg]} {
4098 $ui_comm configure -state disabled -background gray
4101 if {[is_enabled multicommit] && ![is_config_false gui.gcwarning]} {
4104 if {[is_enabled retcode]} {
4105 bind . <Destroy> {+terminate_me %W}
4107 if {$picked && [is_config_true gui.autoexplore]} {
4113 # indent-tabs-mode: t