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 [encoding convertfrom utf-8 {
14 Copyright © 2006, 2007 Shawn Pearce, et. al.
16 This program is free software; you can redistribute it and/or modify
17 it under the terms of the GNU General Public License as published by
18 the Free Software Foundation; either version 2 of the License, or
19 (at your option) any later version.
21 This program is distributed in the hope that it will be useful,
22 but WITHOUT ANY WARRANTY; without even the implied warranty of
23 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24 GNU General Public License for more details.
26 You should have received a copy of the GNU General Public License
27 along with this program; if not, write to the Free Software
28 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}]
30 ######################################################################
32 ## Tcl/Tk sanity check
34 if {[catch {package require Tcl 8.4} err]
35 || [catch {package require Tk 8.4} err]
41 -title [mc "git-gui: fatal error"] \
46 catch {rename send {}} ; # What an evil concept...
48 ######################################################################
52 set oguilib {@@GITGUI_LIBDIR@@}
53 set oguirel {@@GITGUI_RELATIVE@@}
54 if {$oguirel eq {1}} {
55 set oguilib [file dirname [file normalize $argv0]]
56 if {[file tail $oguilib] eq {git-core}} {
57 set oguilib [file dirname $oguilib]
59 set oguilib [file dirname $oguilib]
60 set oguilib [file join $oguilib share git-gui lib]
61 set oguimsg [file join $oguilib msgs]
62 } elseif {[string match @@* $oguirel]} {
63 set oguilib [file join [file dirname [file normalize $argv0]] lib]
64 set oguimsg [file join [file dirname [file normalize $argv0]] po]
66 set oguimsg [file join $oguilib msgs]
70 ######################################################################
72 ## enable verbose loading?
74 if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
76 rename auto_load real__auto_load
77 proc auto_load {name args} {
78 puts stderr "auto_load $name"
79 return [uplevel 1 real__auto_load $name $args]
81 rename source real__source
83 puts stderr "source $name"
84 uplevel 1 real__source $name
88 ######################################################################
90 ## Internationalization (i18n) through msgcat and gettext. See
91 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
93 package require msgcat
96 set cmk [string first @@ $fmt]
98 return [string range $fmt 0 [expr {$cmk - 1}]]
103 proc mc {en_fmt args} {
104 set fmt [_mc_trim [::msgcat::mc $en_fmt]]
105 if {[catch {set msg [eval [list format $fmt] $args]} err]} {
106 set msg [eval [list format [_mc_trim $en_fmt]] $args]
112 return [join $args {}]
115 ::msgcat::mcload $oguimsg
118 ######################################################################
122 set _appname {Git Gui}
132 set _trace [lsearch -exact $argv --trace]
134 set argv [lreplace $argv $_trace $_trace]
150 return [eval [list file join $_gitdir] $args]
153 proc gitexec {args} {
155 if {$_gitexec eq {}} {
156 if {[catch {set _gitexec [git --exec-path]} err]} {
157 error "Git not installed?\n\n$err"
160 set _gitexec [exec cygpath \
165 set _gitexec [file normalize $_gitexec]
171 return [eval [list file join $_gitexec] $args]
174 proc githtmldir {args} {
176 if {$_githtmldir eq {}} {
177 if {[catch {set _githtmldir [git --html-path]}]} {
178 # Git not installed or option not yet supported
182 set _githtmldir [exec cygpath \
187 set _githtmldir [file normalize $_githtmldir]
193 return [eval [list file join $_githtmldir] $args]
201 if {[tk windowingsystem] eq {aqua}} {
208 if {$::tcl_platform(platform) eq {windows}} {
216 if {$_iscygwin eq {}} {
217 if {$::tcl_platform(platform) eq {windows}} {
218 if {[catch {set p [exec cygpath --windir]} err]} {
230 proc is_enabled {option} {
231 global enabled_options
232 if {[catch {set on $enabled_options($option)}]} {return 0}
236 proc enable_option {option} {
237 global enabled_options
238 set enabled_options($option) 1
241 proc disable_option {option} {
242 global enabled_options
243 set enabled_options($option) 0
246 ######################################################################
250 proc is_many_config {name} {
251 switch -glob -- $name {
261 proc is_config_true {name} {
263 if {[catch {set v $repo_config($name)}]} {
265 } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
272 proc get_config {name} {
274 if {[catch {set v $repo_config($name)}]} {
286 if {$_isbare eq {}} {
288 set _bare [git rev-parse --is-bare-repository]
290 true { set _isbare 1 }
291 false { set _isbare 0}
295 if {[is_config_true core.bare]
296 || ($_gitworktree eq {}
297 && [lindex [file split $_gitdir] end] ne {.git})} {
307 ######################################################################
311 proc _trace_exec {cmd} {
312 if {!$::_trace} return
318 if {[regexp {[ \t\r\n'"$?*]} $v]} {
326 proc _git_cmd {name} {
329 if {[catch {set v $_git_cmd_path($name)}]} {
333 --exec-path { return [list $::_git $name] }
336 set p [gitexec git-$name$::_search_exe]
337 if {[file exists $p]} {
339 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
340 # Try to determine what sort of magic will make
341 # git-$name go and do its thing, because native
342 # Tcl on Windows doesn't know it.
344 set p [gitexec git-$name]
349 switch -glob -- [lindex $s 0] {
351 #!*perl { set i perl }
352 #!*python { set i python }
353 default { error "git-$name is not supported: $s" }
357 if {![info exists interp]} {
358 set interp [_which $i]
361 error "git-$name requires $i (not in PATH)"
363 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
365 # Assume it is builtin to git somehow and we
366 # aren't actually able to see a file for it.
368 set v [list $::_git $name]
370 set _git_cmd_path($name) $v
375 proc _which {what args} {
376 global env _search_exe _search_path
378 if {$_search_path eq {}} {
379 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
380 set _search_path [split [exec cygpath \
386 } elseif {[is_Windows]} {
387 set gitguidir [file dirname [info script]]
388 regsub -all ";" $gitguidir "\\;" gitguidir
389 set env(PATH) "$gitguidir;$env(PATH)"
390 set _search_path [split $env(PATH) {;}]
393 set _search_path [split $env(PATH) :]
398 if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
401 set suffix $_search_exe
404 foreach p $_search_path {
405 set p [file join $p $what$suffix]
406 if {[file exists $p]} {
407 return [file normalize $p]
413 proc _lappend_nice {cmd_var} {
417 if {![info exists _nice]} {
418 set _nice [_which nice]
429 switch -- [lindex $args 0] {
440 set args [lrange $args 1 end]
443 set cmdp [_git_cmd [lindex $args 0]]
444 set args [lrange $args 1 end]
446 _trace_exec [concat $opt $cmdp $args]
447 set result [eval exec $opt $cmdp $args]
449 puts stderr "< $result"
454 proc _open_stdout_stderr {cmd} {
457 set fd [open [concat [list | ] $cmd] r]
459 if { [lindex $cmd end] eq {2>@1}
460 && $err eq {can not find channel named "1"}
462 # Older versions of Tcl 8.4 don't have this 2>@1 IO
463 # redirect operator. Fallback to |& cat for those.
464 # The command was not actually started, so its safe
465 # to try to start it a second time.
467 set fd [open [concat \
469 [lrange $cmd 0 end-1] \
476 fconfigure $fd -eofchar {}
480 proc git_read {args} {
484 switch -- [lindex $args 0] {
499 set args [lrange $args 1 end]
502 set cmdp [_git_cmd [lindex $args 0]]
503 set args [lrange $args 1 end]
505 return [_open_stdout_stderr [concat $opt $cmdp $args]]
508 proc git_write {args} {
512 switch -- [lindex $args 0] {
523 set args [lrange $args 1 end]
526 set cmdp [_git_cmd [lindex $args 0]]
527 set args [lrange $args 1 end]
529 _trace_exec [concat $opt $cmdp $args]
530 return [open [concat [list | ] $opt $cmdp $args] w]
533 proc githook_read {hook_name args} {
534 set pchook [gitdir hooks $hook_name]
537 # On Windows [file executable] might lie so we need to ask
538 # the shell if the hook is executable. Yes that's annoying.
542 if {![info exists interp]} {
543 set interp [_which sh]
546 error "hook execution requires sh (not in PATH)"
549 set scr {if test -x "$1";then exec "$@";fi}
550 set sh_c [list $interp -c $scr $interp $pchook]
551 return [_open_stdout_stderr [concat $sh_c $args]]
554 if {[file executable $pchook]} {
555 return [_open_stdout_stderr [concat [list $pchook] $args]]
561 proc kill_file_process {fd} {
562 set process [pid $fd]
566 # Use a Cygwin-specific flag to allow killing
567 # native Windows processes
568 exec kill -f $process
575 proc gitattr {path attr default} {
576 if {[catch {set r [git check-attr $attr -- $path]}]} {
579 set r [join [lrange [split $r :] 2 end] :]
582 if {$r eq {unspecified}} {
589 regsub -all ' $value "'\\''" value
593 proc load_current_branch {} {
594 global current_branch is_detached
596 set fd [open [gitdir HEAD] r]
597 if {[gets $fd ref] < 1} {
602 set pfx {ref: refs/heads/}
603 set len [string length $pfx]
604 if {[string equal -length $len $pfx $ref]} {
605 # We're on a branch. It might not exist. But
606 # HEAD looks good enough to be a branch.
608 set current_branch [string range $ref $len end]
611 # Assume this is a detached head.
613 set current_branch HEAD
618 auto_load tk_optionMenu
619 rename tk_optionMenu real__tkOptionMenu
620 proc tk_optionMenu {w varName args} {
621 set m [eval real__tkOptionMenu $w $varName $args]
622 $m configure -font font_ui
623 $w configure -font font_ui
627 proc rmsel_tag {text} {
629 -background [$text cget -background] \
630 -foreground [$text cget -foreground] \
632 $text tag conf in_sel -background lightgray
633 bind $text <Motion> break
638 bind . <Visibility> {
639 bind . <Visibility> {}
644 wm iconbitmap . -default $oguilib/git-gui.ico
645 set ::tk::AlwaysShowSelection 1
647 # Spoof an X11 display for SSH
648 if {![info exists env(DISPLAY)]} {
649 set env(DISPLAY) :9999
653 image create photo gitlogo -width 16 -height 16
655 gitlogo put #33CC33 -to 7 0 9 2
656 gitlogo put #33CC33 -to 4 2 12 4
657 gitlogo put #33CC33 -to 7 4 9 6
658 gitlogo put #CC3333 -to 4 6 12 8
659 gitlogo put gray26 -to 4 9 6 10
660 gitlogo put gray26 -to 3 10 6 12
661 gitlogo put gray26 -to 8 9 13 11
662 gitlogo put gray26 -to 8 11 10 12
663 gitlogo put gray26 -to 11 11 13 14
664 gitlogo put gray26 -to 3 12 5 14
665 gitlogo put gray26 -to 5 13
666 gitlogo put gray26 -to 10 13
667 gitlogo put gray26 -to 4 14 12 15
668 gitlogo put gray26 -to 5 15 11 16
671 wm iconphoto . -default gitlogo
675 ######################################################################
680 font create font_diff -family Courier -size 10
684 eval font configure font_ui [font actual [.dummy cget -font]]
688 font create font_uiitalic
689 font create font_uibold
690 font create font_diffbold
691 font create font_diffitalic
693 foreach class {Button Checkbutton Entry Label
694 Labelframe Listbox Message
695 Radiobutton Spinbox Text} {
696 option add *$class.font font_ui
699 option add *Menu.font font_ui
703 if {[is_Windows] || [is_MacOSX]} {
704 option add *Menu.tearOff 0
715 proc bind_button3 {w cmd} {
716 bind $w <Any-Button-3> $cmd
718 # Mac OS X sends Button-2 on right click through three-button mouse,
719 # or through trackpad right-clicking (two-finger touch + click).
720 bind $w <Any-Button-2> $cmd
721 bind $w <Control-Button-1> $cmd
725 proc apply_config {} {
726 global repo_config font_descs
728 foreach option $font_descs {
729 set name [lindex $option 0]
730 set font [lindex $option 1]
733 foreach {cn cv} $repo_config(gui.$name) {
734 if {$cn eq {-weight}} {
737 font configure $font $cn $cv
740 font configure $font -weight normal
743 error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
745 foreach {cn cv} [font configure $font] {
746 font configure ${font}bold $cn $cv
747 font configure ${font}italic $cn $cv
749 font configure ${font}bold -weight bold
750 font configure ${font}italic -slant italic
754 set default_config(branch.autosetupmerge) true
755 set default_config(merge.tool) {}
756 set default_config(mergetool.keepbackup) true
757 set default_config(merge.diffstat) true
758 set default_config(merge.summary) false
759 set default_config(merge.verbosity) 2
760 set default_config(user.name) {}
761 set default_config(user.email) {}
763 set default_config(gui.encoding) [encoding system]
764 set default_config(gui.matchtrackingbranch) false
765 set default_config(gui.pruneduringfetch) false
766 set default_config(gui.trustmtime) false
767 set default_config(gui.fastcopyblame) false
768 set default_config(gui.copyblamethreshold) 40
769 set default_config(gui.blamehistoryctx) 7
770 set default_config(gui.diffcontext) 5
771 set default_config(gui.commitmsgwidth) 75
772 set default_config(gui.newbranchtemplate) {}
773 set default_config(gui.spellingdictionary) {}
774 set default_config(gui.fontui) [font configure font_ui]
775 set default_config(gui.fontdiff) [font configure font_diff]
776 # TODO: this option should be added to the git-config documentation
777 set default_config(gui.maxfilesdisplayed) 5000
779 {fontui font_ui {mc "Main Font"}}
780 {fontdiff font_diff {mc "Diff/Console Font"}}
783 ######################################################################
787 set _git [_which git]
789 catch {wm withdraw .}
793 -title [mc "git-gui: fatal error"] \
794 -message [mc "Cannot find git in PATH."]
798 ######################################################################
802 if {[catch {set _git_version [git --version]} err]} {
803 catch {wm withdraw .}
807 -title [mc "git-gui: fatal error"] \
808 -message "Cannot determine Git version:
812 [appname] requires Git 1.5.0 or later."
815 if {![regsub {^git version } $_git_version {} _git_version]} {
816 catch {wm withdraw .}
820 -title [mc "git-gui: fatal error"] \
821 -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
825 set _real_git_version $_git_version
826 regsub -- {[\-\.]dirty$} $_git_version {} _git_version
827 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
828 regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
829 regsub {\.GIT$} $_git_version {} _git_version
830 regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
832 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
833 catch {wm withdraw .}
838 -title "[appname]: warning" \
839 -message [mc "Git version cannot be determined.
841 %s claims it is version '%s'.
843 %s requires at least Git 1.5.0 or later.
845 Assume '%s' is version 1.5.0?
846 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
847 set _git_version 1.5.0
852 unset _real_git_version
854 proc git-version {args} {
857 switch [llength $args] {
863 set op [lindex $args 0]
864 set vr [lindex $args 1]
865 set cm [package vcompare $_git_version $vr]
866 return [expr $cm $op 0]
870 set type [lindex $args 0]
871 set name [lindex $args 1]
872 set parm [lindex $args 2]
873 set body [lindex $args 3]
875 if {($type ne {proc} && $type ne {method})} {
876 error "Invalid arguments to git-version"
878 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
879 error "Last arm of $type $name must be default"
882 foreach {op vr cb} [lrange $body 0 end-2] {
883 if {[git-version $op $vr]} {
884 return [uplevel [list $type $name $parm $cb]]
888 return [uplevel [list $type $name $parm [lindex $body end]]]
892 error "git-version >= x"
898 if {[git-version < 1.5]} {
899 catch {wm withdraw .}
903 -title [mc "git-gui: fatal error"] \
904 -message "[appname] requires Git 1.5.0 or later.
906 You are using [git-version]:
912 ######################################################################
914 ## configure our library
916 set idx [file join $oguilib tclIndex]
917 if {[catch {set fd [open $idx r]} err]} {
918 catch {wm withdraw .}
922 -title [mc "git-gui: fatal error"] \
926 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
928 while {[gets $fd n] >= 0} {
929 if {$n ne {} && ![string match #* $n]} {
941 if {[lsearch -exact $loaded $p] >= 0} continue
942 source [file join $oguilib $p]
947 set auto_path [concat [list $oguilib] $auto_path]
949 unset -nocomplain idx fd
951 ######################################################################
953 ## config file parsing
955 git-version proc _parse_config {arr_name args} {
962 [list git_read config] \
964 [list --null --list]]
965 fconfigure $fd_rc -translation binary
966 set buf [read $fd_rc]
969 foreach line [split $buf "\0"] {
970 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
971 if {[is_many_config $name]} {
972 lappend arr($name) $value
974 set arr($name) $value
983 set fd_rc [eval [list git_read config --list] $args]
984 while {[gets $fd_rc line] >= 0} {
985 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
986 if {[is_many_config $name]} {
987 lappend arr($name) $value
989 set arr($name) $value
998 proc load_config {include_global} {
999 global repo_config global_config system_config default_config
1001 if {$include_global} {
1002 _parse_config system_config --system
1003 _parse_config global_config --global
1005 _parse_config repo_config
1007 foreach name [array names default_config] {
1008 if {[catch {set v $system_config($name)}]} {
1009 set system_config($name) $default_config($name)
1012 foreach name [array names system_config] {
1013 if {[catch {set v $global_config($name)}]} {
1014 set global_config($name) $system_config($name)
1016 if {[catch {set v $repo_config($name)}]} {
1017 set repo_config($name) $system_config($name)
1022 ######################################################################
1024 ## feature option selection
1026 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1031 if {$subcommand eq {gui.sh}} {
1034 if {$subcommand eq {gui} && [llength $argv] > 0} {
1035 set subcommand [lindex $argv 0]
1036 set argv [lrange $argv 1 end]
1039 enable_option multicommit
1040 enable_option branch
1041 enable_option transport
1044 switch -- $subcommand {
1049 disable_option multicommit
1050 disable_option branch
1051 disable_option transport
1054 enable_option singlecommit
1055 enable_option retcode
1057 disable_option multicommit
1058 disable_option branch
1059 disable_option transport
1061 while {[llength $argv] > 0} {
1062 set a [lindex $argv 0]
1065 enable_option initialamend
1068 enable_option nocommit
1069 enable_option nocommitmsg
1072 disable_option nocommitmsg
1079 set argv [lrange $argv 1 end]
1084 ######################################################################
1086 ## execution environment
1088 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1090 # Suggest our implementation of askpass, if none is set
1091 if {![info exists env(SSH_ASKPASS)]} {
1092 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1095 ######################################################################
1101 set _gitdir $env(GIT_DIR)
1105 # beware that from the .git dir this sets _gitdir to .
1106 # and _prefix to the empty string
1107 set _gitdir [git rev-parse --git-dir]
1108 set _prefix [git rev-parse --show-prefix]
1112 choose_repository::pick
1116 # we expand the _gitdir when it's just a single dot (i.e. when we're being
1117 # run from the .git dir itself) lest the routines to find the worktree
1119 if {$_gitdir eq "."} {
1123 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1124 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1126 if {![file isdirectory $_gitdir]} {
1127 catch {wm withdraw .}
1128 error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
1131 # _gitdir exists, so try loading the config
1134 # try to set work tree from environment, falling back to core.worktree
1135 if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
1136 set _gitworktree [get_config core.worktree]
1138 if {$_prefix ne {}} {
1139 if {$_gitworktree eq {}} {
1140 regsub -all {[^/]+/} $_prefix ../ cdup
1142 set cdup $_gitworktree
1144 if {[catch {cd $cdup} err]} {
1145 catch {wm withdraw .}
1146 error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
1149 set _gitworktree [pwd]
1151 } elseif {![is_enabled bare]} {
1153 catch {wm withdraw .}
1154 error_popup [strcat [mc "Cannot use bare repository:"] "\n\n$_gitdir"]
1157 if {$_gitworktree eq {}} {
1158 set _gitworktree [file dirname $_gitdir]
1160 if {[catch {cd $_gitworktree} err]} {
1161 catch {wm withdraw .}
1162 error_popup [strcat [mc "No working directory"] " $_gitworktree:\n\n$err"]
1165 set _gitworktree [pwd]
1167 set _reponame [file split [file normalize $_gitdir]]
1168 if {[lindex $_reponame end] eq {.git}} {
1169 set _reponame [lindex $_reponame end-1]
1171 set _reponame [lindex $_reponame end]
1174 set env(GIT_DIR) $_gitdir
1175 set env(GIT_WORK_TREE) $_gitworktree
1177 ######################################################################
1181 set current_diff_path {}
1182 set current_diff_side {}
1183 set diff_actions [list]
1187 set MERGE_HEAD [list]
1190 set current_branch {}
1192 set current_diff_path {}
1194 set is_submodule_diff 0
1195 set is_conflict_diff 0
1196 set selected_commit_type new
1197 set diff_empty_count 0
1199 set nullid "0000000000000000000000000000000000000000"
1200 set nullid2 "0000000000000000000000000000000000000001"
1202 ######################################################################
1210 set disable_on_lock [list]
1211 set index_lock_type none
1213 proc lock_index {type} {
1214 global index_lock_type disable_on_lock
1216 if {$index_lock_type eq {none}} {
1217 set index_lock_type $type
1218 foreach w $disable_on_lock {
1219 uplevel #0 $w disabled
1222 } elseif {$index_lock_type eq "begin-$type"} {
1223 set index_lock_type $type
1229 proc unlock_index {} {
1230 global index_lock_type disable_on_lock
1232 set index_lock_type none
1233 foreach w $disable_on_lock {
1234 uplevel #0 $w normal
1238 ######################################################################
1242 proc repository_state {ctvar hdvar mhvar} {
1243 global current_branch
1244 upvar $ctvar ct $hdvar hd $mhvar mh
1249 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1255 set merge_head [gitdir MERGE_HEAD]
1256 if {[file exists $merge_head]} {
1258 set fd_mh [open $merge_head r]
1259 while {[gets $fd_mh line] >= 0} {
1270 global PARENT empty_tree
1272 set p [lindex $PARENT 0]
1276 if {$empty_tree eq {}} {
1277 set empty_tree [git mktree << {}]
1282 proc force_amend {} {
1283 global selected_commit_type
1284 global HEAD PARENT MERGE_HEAD commit_type
1286 repository_state newType newHEAD newMERGE_HEAD
1289 set MERGE_HEAD $newMERGE_HEAD
1290 set commit_type $newType
1292 set selected_commit_type amend
1293 do_select_commit_type
1296 proc rescan {after {honor_trustmtime 1}} {
1297 global HEAD PARENT MERGE_HEAD commit_type
1298 global ui_index ui_workdir ui_comm
1299 global rescan_active file_states
1302 if {$rescan_active > 0 || ![lock_index read]} return
1304 repository_state newType newHEAD newMERGE_HEAD
1305 if {[string match amend* $commit_type]
1306 && $newType eq {normal}
1307 && $newHEAD eq $HEAD} {
1311 set MERGE_HEAD $newMERGE_HEAD
1312 set commit_type $newType
1315 array unset file_states
1317 if {!$::GITGUI_BCK_exists &&
1318 (![$ui_comm edit modified]
1319 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1320 if {[string match amend* $commit_type]} {
1321 } elseif {[load_message GITGUI_MSG]} {
1322 } elseif {[run_prepare_commit_msg_hook]} {
1323 } elseif {[load_message MERGE_MSG]} {
1324 } elseif {[load_message SQUASH_MSG]} {
1327 $ui_comm edit modified false
1330 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1331 rescan_stage2 {} $after
1334 ui_status [mc "Refreshing file status..."]
1335 set fd_rf [git_read update-index \
1341 fconfigure $fd_rf -blocking 0 -translation binary
1342 fileevent $fd_rf readable \
1343 [list rescan_stage2 $fd_rf $after]
1348 set is_git_info_exclude {}
1349 proc have_info_exclude {} {
1350 global is_git_info_exclude
1352 if {$is_git_info_exclude eq {}} {
1353 if {[catch {exec test -f [gitdir info exclude]}]} {
1354 set is_git_info_exclude 0
1356 set is_git_info_exclude 1
1359 return $is_git_info_exclude
1362 proc have_info_exclude {} {
1363 return [file readable [gitdir info exclude]]
1367 proc rescan_stage2 {fd after} {
1368 global rescan_active buf_rdi buf_rdf buf_rlo
1372 if {![eof $fd]} return
1376 set ls_others [list --exclude-per-directory=.gitignore]
1377 if {[have_info_exclude]} {
1378 lappend ls_others "--exclude-from=[gitdir info exclude]"
1380 set user_exclude [get_config core.excludesfile]
1381 if {$user_exclude ne {} && [file readable $user_exclude]} {
1382 lappend ls_others "--exclude-from=$user_exclude"
1390 ui_status [mc "Scanning for modified files ..."]
1391 set fd_di [git_read diff-index --cached -z [PARENT]]
1392 set fd_df [git_read diff-files -z]
1393 set fd_lo [eval git_read ls-files --others -z $ls_others]
1395 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1396 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1397 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1398 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1399 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1400 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1403 proc load_message {file} {
1406 set f [gitdir $file]
1407 if {[file isfile $f]} {
1408 if {[catch {set fd [open $f r]}]} {
1411 fconfigure $fd -eofchar {}
1412 set content [string trim [read $fd]]
1414 regsub -all -line {[ \r\t]+$} $content {} content
1415 $ui_comm delete 0.0 end
1416 $ui_comm insert end $content
1422 proc run_prepare_commit_msg_hook {} {
1425 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1426 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1427 # empty file but existant file.
1429 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1431 if {[file isfile [gitdir MERGE_MSG]]} {
1432 set pcm_source "merge"
1433 set fd_mm [open [gitdir MERGE_MSG] r]
1434 puts -nonewline $fd_pcm [read $fd_mm]
1436 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1437 set pcm_source "squash"
1438 set fd_sm [open [gitdir SQUASH_MSG] r]
1439 puts -nonewline $fd_pcm [read $fd_sm]
1447 set fd_ph [githook_read prepare-commit-msg \
1448 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1450 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1454 ui_status [mc "Calling prepare-commit-msg hook..."]
1457 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1458 fileevent $fd_ph readable \
1459 [list prepare_commit_msg_hook_wait $fd_ph]
1464 proc prepare_commit_msg_hook_wait {fd_ph} {
1467 append pch_error [read $fd_ph]
1468 fconfigure $fd_ph -blocking 1
1470 if {[catch {close $fd_ph}]} {
1471 ui_status [mc "Commit declined by prepare-commit-msg hook."]
1472 hook_failed_popup prepare-commit-msg $pch_error
1473 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1476 load_message PREPARE_COMMIT_MSG
1479 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1482 fconfigure $fd_ph -blocking 0
1483 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1486 proc read_diff_index {fd after} {
1489 append buf_rdi [read $fd]
1491 set n [string length $buf_rdi]
1493 set z1 [string first "\0" $buf_rdi $c]
1494 if {$z1 == -1} break
1496 set z2 [string first "\0" $buf_rdi $z1]
1497 if {$z2 == -1} break
1500 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1501 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1503 [encoding convertfrom $p] \
1505 [list [lindex $i 0] [lindex $i 2]] \
1511 set buf_rdi [string range $buf_rdi $c end]
1516 rescan_done $fd buf_rdi $after
1519 proc read_diff_files {fd after} {
1522 append buf_rdf [read $fd]
1524 set n [string length $buf_rdf]
1526 set z1 [string first "\0" $buf_rdf $c]
1527 if {$z1 == -1} break
1529 set z2 [string first "\0" $buf_rdf $z1]
1530 if {$z2 == -1} break
1533 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1534 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1536 [encoding convertfrom $p] \
1539 [list [lindex $i 0] [lindex $i 2]]
1544 set buf_rdf [string range $buf_rdf $c end]
1549 rescan_done $fd buf_rdf $after
1552 proc read_ls_others {fd after} {
1555 append buf_rlo [read $fd]
1556 set pck [split $buf_rlo "\0"]
1557 set buf_rlo [lindex $pck end]
1558 foreach p [lrange $pck 0 end-1] {
1559 set p [encoding convertfrom $p]
1560 if {[string index $p end] eq {/}} {
1561 set p [string range $p 0 end-1]
1565 rescan_done $fd buf_rlo $after
1568 proc rescan_done {fd buf after} {
1569 global rescan_active current_diff_path
1570 global file_states repo_config
1573 if {![eof $fd]} return
1576 if {[incr rescan_active -1] > 0} return
1581 if {$current_diff_path ne {}} { reshow_diff $after }
1582 if {$current_diff_path eq {}} { select_first_diff $after }
1585 proc prune_selection {} {
1586 global file_states selected_paths
1588 foreach path [array names selected_paths] {
1589 if {[catch {set still_here $file_states($path)}]} {
1590 unset selected_paths($path)
1595 ######################################################################
1599 proc mapicon {w state path} {
1602 if {[catch {set r $all_icons($state$w)}]} {
1603 puts "error: no icon for $w state={$state} $path"
1609 proc mapdesc {state path} {
1612 if {[catch {set r $all_descs($state)}]} {
1613 puts "error: no desc for state={$state} $path"
1619 proc ui_status {msg} {
1621 if {[info exists main_status]} {
1622 $main_status show $msg
1626 proc ui_ready {{test {}}} {
1628 if {[info exists main_status]} {
1629 $main_status show [mc "Ready."] $test
1633 proc escape_path {path} {
1634 regsub -all {\\} $path "\\\\" path
1635 regsub -all "\n" $path "\\n" path
1639 proc short_path {path} {
1640 return [escape_path [lindex [file split $path] end]]
1644 set null_sha1 [string repeat 0 40]
1646 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1647 global file_states next_icon_id null_sha1
1649 set s0 [string index $new_state 0]
1650 set s1 [string index $new_state 1]
1652 if {[catch {set info $file_states($path)}]} {
1654 set icon n[incr next_icon_id]
1656 set state [lindex $info 0]
1657 set icon [lindex $info 1]
1658 if {$head_info eq {}} {set head_info [lindex $info 2]}
1659 if {$index_info eq {}} {set index_info [lindex $info 3]}
1662 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1663 elseif {$s0 eq {_}} {set s0 _}
1665 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1666 elseif {$s1 eq {_}} {set s1 _}
1668 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1669 set head_info [list 0 $null_sha1]
1670 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1671 && $head_info eq {}} {
1672 set head_info $index_info
1673 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1674 set index_info $head_info
1678 set file_states($path) [list $s0$s1 $icon \
1679 $head_info $index_info \
1684 proc display_file_helper {w path icon_name old_m new_m} {
1687 if {$new_m eq {_}} {
1688 set lno [lsearch -sorted -exact $file_lists($w) $path]
1690 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1692 $w conf -state normal
1693 $w delete $lno.0 [expr {$lno + 1}].0
1694 $w conf -state disabled
1696 } elseif {$old_m eq {_} && $new_m ne {_}} {
1697 lappend file_lists($w) $path
1698 set file_lists($w) [lsort -unique $file_lists($w)]
1699 set lno [lsearch -sorted -exact $file_lists($w) $path]
1701 $w conf -state normal
1702 $w image create $lno.0 \
1703 -align center -padx 5 -pady 1 \
1705 -image [mapicon $w $new_m $path]
1706 $w insert $lno.1 "[escape_path $path]\n"
1707 $w conf -state disabled
1708 } elseif {$old_m ne $new_m} {
1709 $w conf -state normal
1710 $w image conf $icon_name -image [mapicon $w $new_m $path]
1711 $w conf -state disabled
1715 proc display_file {path state} {
1716 global file_states selected_paths
1717 global ui_index ui_workdir
1719 set old_m [merge_state $path $state]
1720 set s $file_states($path)
1721 set new_m [lindex $s 0]
1722 set icon_name [lindex $s 1]
1724 set o [string index $old_m 0]
1725 set n [string index $new_m 0]
1732 display_file_helper $ui_index $path $icon_name $o $n
1734 if {[string index $old_m 0] eq {U}} {
1737 set o [string index $old_m 1]
1739 if {[string index $new_m 0] eq {U}} {
1742 set n [string index $new_m 1]
1744 display_file_helper $ui_workdir $path $icon_name $o $n
1746 if {$new_m eq {__}} {
1747 unset file_states($path)
1748 catch {unset selected_paths($path)}
1752 proc display_all_files_helper {w path icon_name m} {
1755 lappend file_lists($w) $path
1756 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1757 $w image create end \
1758 -align center -padx 5 -pady 1 \
1760 -image [mapicon $w $m $path]
1761 $w insert end "[escape_path $path]\n"
1765 proc display_all_files {} {
1766 global ui_index ui_workdir
1767 global file_states file_lists
1769 global files_warning
1771 $ui_index conf -state normal
1772 $ui_workdir conf -state normal
1774 $ui_index delete 0.0 end
1775 $ui_workdir delete 0.0 end
1778 set file_lists($ui_index) [list]
1779 set file_lists($ui_workdir) [list]
1781 set to_display [lsort [array names file_states]]
1782 set display_limit [get_config gui.maxfilesdisplayed]
1783 if {[llength $to_display] > $display_limit} {
1784 if {!$files_warning} {
1785 # do not repeatedly warn:
1787 info_popup [mc "Displaying only %s of %s files." \
1788 $display_limit [llength $to_display]]
1790 set to_display [lrange $to_display 0 [expr {$display_limit-1}]]
1792 foreach path $to_display {
1793 set s $file_states($path)
1795 set icon_name [lindex $s 1]
1797 set s [string index $m 0]
1798 if {$s ne {U} && $s ne {_}} {
1799 display_all_files_helper $ui_index $path \
1803 if {[string index $m 0] eq {U}} {
1806 set s [string index $m 1]
1809 display_all_files_helper $ui_workdir $path \
1814 $ui_index conf -state disabled
1815 $ui_workdir conf -state disabled
1818 ######################################################################
1823 #define mask_width 14
1824 #define mask_height 15
1825 static unsigned char mask_bits[] = {
1826 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1827 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1828 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1831 image create bitmap file_plain -background white -foreground black -data {
1832 #define plain_width 14
1833 #define plain_height 15
1834 static unsigned char plain_bits[] = {
1835 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1836 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1837 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1838 } -maskdata $filemask
1840 image create bitmap file_mod -background white -foreground blue -data {
1841 #define mod_width 14
1842 #define mod_height 15
1843 static unsigned char mod_bits[] = {
1844 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1845 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1846 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1847 } -maskdata $filemask
1849 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1850 #define file_fulltick_width 14
1851 #define file_fulltick_height 15
1852 static unsigned char file_fulltick_bits[] = {
1853 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1854 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1855 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1856 } -maskdata $filemask
1858 image create bitmap file_question -background white -foreground black -data {
1859 #define file_question_width 14
1860 #define file_question_height 15
1861 static unsigned char file_question_bits[] = {
1862 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1863 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1864 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1865 } -maskdata $filemask
1867 image create bitmap file_removed -background white -foreground red -data {
1868 #define file_removed_width 14
1869 #define file_removed_height 15
1870 static unsigned char file_removed_bits[] = {
1871 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1872 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1873 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1874 } -maskdata $filemask
1876 image create bitmap file_merge -background white -foreground blue -data {
1877 #define file_merge_width 14
1878 #define file_merge_height 15
1879 static unsigned char file_merge_bits[] = {
1880 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1881 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1882 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1883 } -maskdata $filemask
1885 image create bitmap file_statechange -background white -foreground green -data {
1886 #define file_merge_width 14
1887 #define file_merge_height 15
1888 static unsigned char file_statechange_bits[] = {
1889 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
1890 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
1891 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1892 } -maskdata $filemask
1894 set ui_index .vpane.files.index.list
1895 set ui_workdir .vpane.files.workdir.list
1897 set all_icons(_$ui_index) file_plain
1898 set all_icons(A$ui_index) file_plain
1899 set all_icons(M$ui_index) file_fulltick
1900 set all_icons(D$ui_index) file_removed
1901 set all_icons(U$ui_index) file_merge
1902 set all_icons(T$ui_index) file_statechange
1904 set all_icons(_$ui_workdir) file_plain
1905 set all_icons(M$ui_workdir) file_mod
1906 set all_icons(D$ui_workdir) file_question
1907 set all_icons(U$ui_workdir) file_merge
1908 set all_icons(O$ui_workdir) file_plain
1909 set all_icons(T$ui_workdir) file_statechange
1911 set max_status_desc 0
1913 {__ {mc "Unmodified"}}
1915 {_M {mc "Modified, not staged"}}
1916 {M_ {mc "Staged for commit"}}
1917 {MM {mc "Portions staged for commit"}}
1918 {MD {mc "Staged for commit, missing"}}
1920 {_T {mc "File type changed, not staged"}}
1921 {T_ {mc "File type changed, staged"}}
1923 {_O {mc "Untracked, not staged"}}
1924 {A_ {mc "Staged for commit"}}
1925 {AM {mc "Portions staged for commit"}}
1926 {AD {mc "Staged for commit, missing"}}
1929 {D_ {mc "Staged for removal"}}
1930 {DO {mc "Staged for removal, still present"}}
1932 {_U {mc "Requires merge resolution"}}
1933 {U_ {mc "Requires merge resolution"}}
1934 {UU {mc "Requires merge resolution"}}
1935 {UM {mc "Requires merge resolution"}}
1936 {UD {mc "Requires merge resolution"}}
1937 {UT {mc "Requires merge resolution"}}
1939 set text [eval [lindex $i 1]]
1940 if {$max_status_desc < [string length $text]} {
1941 set max_status_desc [string length $text]
1943 set all_descs([lindex $i 0]) $text
1947 ######################################################################
1951 proc scrollbar2many {list mode args} {
1952 foreach w $list {eval $w $mode $args}
1955 proc many2scrollbar {list mode sb top bottom} {
1956 $sb set $top $bottom
1957 foreach w $list {$w $mode moveto $top}
1960 proc incr_font_size {font {amt 1}} {
1961 set sz [font configure $font -size]
1963 font configure $font -size $sz
1964 font configure ${font}bold -size $sz
1965 font configure ${font}italic -size $sz
1968 ######################################################################
1972 set starting_gitk_msg [mc "Starting gitk... please wait..."]
1974 proc do_gitk {revs {is_submodule false}} {
1975 global current_diff_path file_states current_diff_side ui_index
1976 global _gitdir _gitworktree
1978 # -- Always start gitk through whatever we were loaded with. This
1979 # lets us bypass using shell process on Windows systems.
1981 set exe [_which gitk -script]
1982 set cmd [list [info nameofexecutable] $exe]
1984 error_popup [mc "Couldn't find gitk in PATH"]
1990 if {!$is_submodule} {
1995 cd $current_diff_path
1996 if {$revs eq {--}} {
1997 set s $file_states($current_diff_path)
2000 switch -glob -- [lindex $s 0] {
2001 M_ { set old_sha1 [lindex [lindex $s 2] 1] }
2002 _M { set old_sha1 [lindex [lindex $s 3] 1] }
2004 if {$current_diff_side eq $ui_index} {
2005 set old_sha1 [lindex [lindex $s 2] 1]
2006 set new_sha1 [lindex [lindex $s 3] 1]
2008 set old_sha1 [lindex [lindex $s 3] 1]
2012 set revs $old_sha1...$new_sha1
2014 # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones
2015 # we've been using for the main repository, so unset them.
2016 # TODO we could make life easier (start up faster?) for gitk
2017 # by setting these to the appropriate values to allow gitk
2018 # to skip the heuristics to find their proper value
2020 unset env(GIT_WORK_TREE)
2022 eval exec $cmd $revs "--" "--" &
2024 set env(GIT_DIR) $_gitdir
2025 set env(GIT_WORK_TREE) $_gitworktree
2028 ui_status $::starting_gitk_msg
2030 ui_ready $starting_gitk_msg
2035 proc do_git_gui {} {
2036 global current_diff_path
2038 # -- Always start git gui through whatever we were loaded with. This
2039 # lets us bypass using shell process on Windows systems.
2041 set exe [_which git]
2043 error_popup [mc "Couldn't find git gui in PATH"]
2046 global _gitdir _gitworktree
2048 # see note in do_gitk about unsetting these vars when
2049 # running tools in a submodule
2051 unset env(GIT_WORK_TREE)
2054 cd $current_diff_path
2056 eval exec $exe gui &
2058 set env(GIT_DIR) $_gitdir
2059 set env(GIT_WORK_TREE) $_gitworktree
2062 ui_status $::starting_gitk_msg
2064 ui_ready $starting_gitk_msg
2069 proc do_explore {} {
2072 if {[is_Cygwin] || [is_Windows]} {
2073 set explorer "explorer.exe"
2074 } elseif {[is_MacOSX]} {
2077 # freedesktop.org-conforming system is our best shot
2078 set explorer "xdg-open"
2080 eval exec $explorer $_gitworktree &
2086 proc terminate_me {win} {
2088 if {$win ne {.}} return
2092 proc do_quit {{rc {1}}} {
2093 global ui_comm is_quitting repo_config commit_type
2094 global GITGUI_BCK_exists GITGUI_BCK_i
2095 global ui_comm_spell
2098 if {$is_quitting} return
2101 if {[winfo exists $ui_comm]} {
2102 # -- Stash our current commit buffer.
2104 set save [gitdir GITGUI_MSG]
2105 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
2106 file rename -force [gitdir GITGUI_BCK] $save
2107 set GITGUI_BCK_exists 0
2109 set msg [string trim [$ui_comm get 0.0 end]]
2110 regsub -all -line {[ \r\t]+$} $msg {} msg
2111 if {(![string match amend* $commit_type]
2112 || [$ui_comm edit modified])
2115 set fd [open $save w]
2116 puts -nonewline $fd $msg
2120 catch {file delete $save}
2124 # -- Cancel our spellchecker if its running.
2126 if {[info exists ui_comm_spell]} {
2130 # -- Remove our editor backup, its not needed.
2132 after cancel $GITGUI_BCK_i
2133 if {$GITGUI_BCK_exists} {
2134 catch {file delete [gitdir GITGUI_BCK]}
2137 # -- Stash our current window geometry into this repository.
2139 set cfg_wmstate [wm state .]
2140 if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} {
2143 if {$cfg_wmstate ne $rc_wmstate} {
2144 catch {git config gui.wmstate $cfg_wmstate}
2146 if {$cfg_wmstate eq {zoomed}} {
2147 # on Windows wm geometry will lie about window
2148 # position (but not size) when window is zoomed
2149 # restore the window before querying wm geometry
2152 set cfg_geometry [list]
2153 lappend cfg_geometry [wm geometry .]
2154 lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
2155 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
2156 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2159 if {$cfg_geometry ne $rc_geometry} {
2160 catch {git config gui.geometry $cfg_geometry}
2166 # Briefly enable send again, working around Tk bug
2167 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2168 tk appname [appname]
2177 proc ui_do_rescan {} {
2178 rescan {force_first_diff ui_ready}
2185 proc next_diff {{after {}}} {
2186 global next_diff_p next_diff_w next_diff_i
2187 show_diff $next_diff_p $next_diff_w {} {} $after
2190 proc find_anchor_pos {lst name} {
2191 set lid [lsearch -sorted -exact $lst $name]
2195 foreach lname $lst {
2196 if {$lname >= $name} break
2204 proc find_file_from {flist idx delta path mmask} {
2207 set len [llength $flist]
2208 while {$idx >= 0 && $idx < $len} {
2209 set name [lindex $flist $idx]
2211 if {$name ne $path && [info exists file_states($name)]} {
2212 set state [lindex $file_states($name) 0]
2214 if {$mmask eq {} || [regexp $mmask $state]} {
2225 proc find_next_diff {w path {lno {}} {mmask {}}} {
2226 global next_diff_p next_diff_w next_diff_i
2227 global file_lists ui_index ui_workdir
2229 set flist $file_lists($w)
2231 set lno [find_anchor_pos $flist $path]
2236 if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} {
2237 if {$w eq $ui_index} {
2240 set mmask "$mmask\$"
2244 set idx [find_file_from $flist $lno 1 $path $mmask]
2247 set idx [find_file_from $flist $lno -1 $path $mmask]
2252 set next_diff_p [lindex $flist $idx]
2253 set next_diff_i [expr {$idx+1}]
2260 proc next_diff_after_action {w path {lno {}} {mmask {}}} {
2261 global current_diff_path
2263 if {$path ne $current_diff_path} {
2265 } elseif {[find_next_diff $w $path $lno $mmask]} {
2268 return {reshow_diff;}
2272 proc select_first_diff {after} {
2275 if {[find_next_diff $ui_workdir {} 1 {^_?U}] ||
2276 [find_next_diff $ui_workdir {} 1 {[^O]$}]} {
2283 proc force_first_diff {after} {
2284 global ui_workdir current_diff_path file_states
2286 if {[info exists file_states($current_diff_path)]} {
2287 set state [lindex $file_states($current_diff_path) 0]
2293 if {[string first {U} $state] >= 0} {
2294 # Already a conflict, do nothing
2295 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} {
2297 } elseif {[string index $state 1] ne {O}} {
2298 # Already a diff & no conflicts, do nothing
2299 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} {
2310 proc toggle_or_diff {w x y} {
2311 global file_states file_lists current_diff_path ui_index ui_workdir
2312 global last_clicked selected_paths
2314 set pos [split [$w index @$x,$y] .]
2315 set lno [lindex $pos 0]
2316 set col [lindex $pos 1]
2317 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2323 set last_clicked [list $w $lno]
2324 array unset selected_paths
2325 $ui_index tag remove in_sel 0.0 end
2326 $ui_workdir tag remove in_sel 0.0 end
2328 # Determine the state of the file
2329 if {[info exists file_states($path)]} {
2330 set state [lindex $file_states($path) 0]
2335 # Restage the file, or simply show the diff
2336 if {$col == 0 && $y > 1} {
2337 # Conflicts need special handling
2338 if {[string first {U} $state] >= 0} {
2339 # $w must always be $ui_workdir, but...
2340 if {$w ne $ui_workdir} { set lno {} }
2341 merge_stage_workdir $path $lno
2345 if {[string index $state 1] eq {O}} {
2351 set after [next_diff_after_action $w $path $lno $mmask]
2353 if {$w eq $ui_index} {
2355 "Unstaging [short_path $path] from commit" \
2357 [concat $after [list ui_ready]]
2358 } elseif {$w eq $ui_workdir} {
2360 "Adding [short_path $path]" \
2362 [concat $after [list ui_ready]]
2365 show_diff $path $w $lno
2369 proc add_one_to_selection {w x y} {
2370 global file_lists last_clicked selected_paths
2372 set lno [lindex [split [$w index @$x,$y] .] 0]
2373 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2379 if {$last_clicked ne {}
2380 && [lindex $last_clicked 0] ne $w} {
2381 array unset selected_paths
2382 [lindex $last_clicked 0] tag remove in_sel 0.0 end
2385 set last_clicked [list $w $lno]
2386 if {[catch {set in_sel $selected_paths($path)}]} {
2390 unset selected_paths($path)
2391 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2393 set selected_paths($path) 1
2394 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2398 proc add_range_to_selection {w x y} {
2399 global file_lists last_clicked selected_paths
2401 if {[lindex $last_clicked 0] ne $w} {
2402 toggle_or_diff $w $x $y
2406 set lno [lindex [split [$w index @$x,$y] .] 0]
2407 set lc [lindex $last_clicked 1]
2416 foreach path [lrange $file_lists($w) \
2417 [expr {$begin - 1}] \
2418 [expr {$end - 1}]] {
2419 set selected_paths($path) 1
2421 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2424 proc show_more_context {} {
2426 if {$repo_config(gui.diffcontext) < 99} {
2427 incr repo_config(gui.diffcontext)
2432 proc show_less_context {} {
2434 if {$repo_config(gui.diffcontext) > 1} {
2435 incr repo_config(gui.diffcontext) -1
2440 ######################################################################
2448 menu .mbar -tearoff 0
2450 # -- Apple Menu (Mac OS X only)
2452 .mbar add cascade -label Apple -menu .mbar.apple
2455 .mbar add cascade -label [mc Repository] -menu .mbar.repository
2456 .mbar add cascade -label [mc Edit] -menu .mbar.edit
2457 if {[is_enabled branch]} {
2458 .mbar add cascade -label [mc Branch] -menu .mbar.branch
2460 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2461 .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
2463 if {[is_enabled transport]} {
2464 .mbar add cascade -label [mc Merge] -menu .mbar.merge
2465 .mbar add cascade -label [mc Remote] -menu .mbar.remote
2467 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2468 .mbar add cascade -label [mc Tools] -menu .mbar.tools
2471 # -- Repository Menu
2473 menu .mbar.repository
2476 .mbar.repository add command \
2477 -label [mc "Explore Working Copy"] \
2478 -command {do_explore}
2479 .mbar.repository add separator
2482 .mbar.repository add command \
2483 -label [mc "Browse Current Branch's Files"] \
2484 -command {browser::new $current_branch}
2485 set ui_browse_current [.mbar.repository index last]
2486 .mbar.repository add command \
2487 -label [mc "Browse Branch Files..."] \
2488 -command browser_open::dialog
2489 .mbar.repository add separator
2491 .mbar.repository add command \
2492 -label [mc "Visualize Current Branch's History"] \
2493 -command {do_gitk $current_branch}
2494 set ui_visualize_current [.mbar.repository index last]
2495 .mbar.repository add command \
2496 -label [mc "Visualize All Branch History"] \
2497 -command {do_gitk --all}
2498 .mbar.repository add separator
2500 proc current_branch_write {args} {
2501 global current_branch
2502 .mbar.repository entryconf $::ui_browse_current \
2503 -label [mc "Browse %s's Files" $current_branch]
2504 .mbar.repository entryconf $::ui_visualize_current \
2505 -label [mc "Visualize %s's History" $current_branch]
2507 trace add variable current_branch write current_branch_write
2509 if {[is_enabled multicommit]} {
2510 .mbar.repository add command -label [mc "Database Statistics"] \
2513 .mbar.repository add command -label [mc "Compress Database"] \
2516 .mbar.repository add command -label [mc "Verify Database"] \
2517 -command do_fsck_objects
2519 .mbar.repository add separator
2522 .mbar.repository add command \
2523 -label [mc "Create Desktop Icon"] \
2524 -command do_cygwin_shortcut
2525 } elseif {[is_Windows]} {
2526 .mbar.repository add command \
2527 -label [mc "Create Desktop Icon"] \
2528 -command do_windows_shortcut
2529 } elseif {[is_MacOSX]} {
2530 .mbar.repository add command \
2531 -label [mc "Create Desktop Icon"] \
2532 -command do_macosx_app
2537 proc ::tk::mac::Quit {args} { do_quit }
2539 .mbar.repository add command -label [mc Quit] \
2547 .mbar.edit add command -label [mc Undo] \
2548 -command {catch {[focus] edit undo}} \
2550 .mbar.edit add command -label [mc Redo] \
2551 -command {catch {[focus] edit redo}} \
2553 .mbar.edit add separator
2554 .mbar.edit add command -label [mc Cut] \
2555 -command {catch {tk_textCut [focus]}} \
2557 .mbar.edit add command -label [mc Copy] \
2558 -command {catch {tk_textCopy [focus]}} \
2560 .mbar.edit add command -label [mc Paste] \
2561 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2563 .mbar.edit add command -label [mc Delete] \
2564 -command {catch {[focus] delete sel.first sel.last}} \
2566 .mbar.edit add separator
2567 .mbar.edit add command -label [mc "Select All"] \
2568 -command {catch {[focus] tag add sel 0.0 end}} \
2573 if {[is_enabled branch]} {
2576 .mbar.branch add command -label [mc "Create..."] \
2577 -command branch_create::dialog \
2579 lappend disable_on_lock [list .mbar.branch entryconf \
2580 [.mbar.branch index last] -state]
2582 .mbar.branch add command -label [mc "Checkout..."] \
2583 -command branch_checkout::dialog \
2585 lappend disable_on_lock [list .mbar.branch entryconf \
2586 [.mbar.branch index last] -state]
2588 .mbar.branch add command -label [mc "Rename..."] \
2589 -command branch_rename::dialog
2590 lappend disable_on_lock [list .mbar.branch entryconf \
2591 [.mbar.branch index last] -state]
2593 .mbar.branch add command -label [mc "Delete..."] \
2594 -command branch_delete::dialog
2595 lappend disable_on_lock [list .mbar.branch entryconf \
2596 [.mbar.branch index last] -state]
2598 .mbar.branch add command -label [mc "Reset..."] \
2599 -command merge::reset_hard
2600 lappend disable_on_lock [list .mbar.branch entryconf \
2601 [.mbar.branch index last] -state]
2606 proc commit_btn_caption {} {
2607 if {[is_enabled nocommit]} {
2610 return [mc Commit@@verb]
2614 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2617 if {![is_enabled nocommit]} {
2618 .mbar.commit add radiobutton \
2619 -label [mc "New Commit"] \
2620 -command do_select_commit_type \
2621 -variable selected_commit_type \
2623 lappend disable_on_lock \
2624 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2626 .mbar.commit add radiobutton \
2627 -label [mc "Amend Last Commit"] \
2628 -command do_select_commit_type \
2629 -variable selected_commit_type \
2631 lappend disable_on_lock \
2632 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2634 .mbar.commit add separator
2637 .mbar.commit add command -label [mc Rescan] \
2638 -command ui_do_rescan \
2640 lappend disable_on_lock \
2641 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2643 .mbar.commit add command -label [mc "Stage To Commit"] \
2644 -command do_add_selection \
2646 lappend disable_on_lock \
2647 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2649 .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
2650 -command do_add_all \
2652 lappend disable_on_lock \
2653 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2655 .mbar.commit add command -label [mc "Unstage From Commit"] \
2656 -command do_unstage_selection \
2658 lappend disable_on_lock \
2659 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2661 .mbar.commit add command -label [mc "Revert Changes"] \
2662 -command do_revert_selection \
2664 lappend disable_on_lock \
2665 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2667 .mbar.commit add separator
2669 .mbar.commit add command -label [mc "Show Less Context"] \
2670 -command show_less_context \
2671 -accelerator $M1T-\-
2673 .mbar.commit add command -label [mc "Show More Context"] \
2674 -command show_more_context \
2677 .mbar.commit add separator
2679 if {![is_enabled nocommitmsg]} {
2680 .mbar.commit add command -label [mc "Sign Off"] \
2681 -command do_signoff \
2685 .mbar.commit add command -label [commit_btn_caption] \
2686 -command do_commit \
2687 -accelerator $M1T-Return
2688 lappend disable_on_lock \
2689 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2694 if {[is_enabled branch]} {
2696 .mbar.merge add command -label [mc "Local Merge..."] \
2697 -command merge::dialog \
2699 lappend disable_on_lock \
2700 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2701 .mbar.merge add command -label [mc "Abort Merge..."] \
2702 -command merge::reset_hard
2703 lappend disable_on_lock \
2704 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2709 if {[is_enabled transport]} {
2712 .mbar.remote add command \
2713 -label [mc "Add..."] \
2714 -command remote_add::dialog \
2716 .mbar.remote add command \
2717 -label [mc "Push..."] \
2718 -command do_push_anywhere \
2720 .mbar.remote add command \
2721 -label [mc "Delete Branch..."] \
2722 -command remote_branch_delete::dialog
2726 proc ::tk::mac::ShowPreferences {} {do_options}
2730 .mbar.edit add separator
2731 .mbar.edit add command -label [mc "Options..."] \
2737 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2738 set tools_menubar .mbar.tools
2740 $tools_menubar add separator
2741 $tools_menubar add command -label [mc "Add..."] -command tools_add::dialog
2742 $tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog
2744 if {[array names repo_config guitool.*.cmd] ne {}} {
2751 .mbar add cascade -label [mc Help] -menu .mbar.help
2755 .mbar.apple add command -label [mc "About %s" [appname]] \
2757 .mbar.apple add separator
2759 .mbar.help add command -label [mc "About %s" [appname]] \
2762 . configure -menu .mbar
2764 set doc_path [githtmldir]
2765 if {$doc_path ne {}} {
2766 set doc_path [file join $doc_path index.html]
2769 set doc_path [exec cygpath --mixed $doc_path]
2773 if {[file isfile $doc_path]} {
2774 set doc_url "file:$doc_path"
2776 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
2779 proc start_browser {url} {
2780 git "web--browse" $url
2783 .mbar.help add command -label [mc "Online Documentation"] \
2784 -command [list start_browser $doc_url]
2786 .mbar.help add command -label [mc "Show SSH Key"] \
2789 unset doc_path doc_url
2791 # -- Standard bindings
2793 wm protocol . WM_DELETE_WINDOW do_quit
2794 bind all <$M1B-Key-q> do_quit
2795 bind all <$M1B-Key-Q> do_quit
2796 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2797 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
2799 set subcommand_args {}
2801 puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
2805 proc normalize_relpath {path} {
2807 foreach item [file split $path] {
2808 if {$item eq {.}} continue
2809 if {$item eq {..} && [llength $elements] > 0
2810 && [lindex $elements end] ne {..}} {
2811 set elements [lrange $elements 0 end-1]
2814 lappend elements $item
2816 return [eval file join $elements]
2819 # -- Not a normal commit type invocation? Do that instead!
2821 switch -- $subcommand {
2824 if {$subcommand eq "blame"} {
2825 set subcommand_args {[--line=<num>] rev? path}
2827 set subcommand_args {rev? path}
2829 if {$argv eq {}} usage
2835 if {$is_path || [file exists $_prefix$a]} {
2836 if {$path ne {}} usage
2837 set path [normalize_relpath $_prefix$a]
2839 } elseif {$a eq {--}} {
2841 if {$head ne {}} usage
2846 } elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
2847 if {$jump_spec ne {} || $head ne {}} usage
2848 set jump_spec [list $lnum]
2849 } elseif {$head eq {}} {
2850 if {$head ne {}} usage
2859 if {$head ne {} && $path eq {}} {
2860 set path [normalize_relpath $_prefix$head]
2867 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
2869 set head [git rev-parse --verify $head]
2875 set current_branch $head
2878 switch -- $subcommand {
2880 if {$jump_spec ne {}} usage
2882 if {$path ne {} && [file isdirectory $path]} {
2883 set head $current_branch
2889 browser::new $head $path
2892 if {$head eq {} && ![file exists $path]} {
2893 puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
2896 blame::new $head $path $jump_spec
2903 if {[llength $argv] != 0} {
2904 puts -nonewline stderr "usage: $argv0"
2905 if {$subcommand ne {gui}
2906 && [file tail $argv0] ne "git-$subcommand"} {
2907 puts -nonewline stderr " $subcommand"
2912 # fall through to setup UI for commits
2915 puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
2926 -text [mc "Current Branch:"] \
2930 -textvariable current_branch \
2933 pack .branch.l1 -side left
2934 pack .branch.cb -side left -fill x
2935 pack .branch -side top -fill x
2937 # -- Main Window Layout
2939 panedwindow .vpane -orient horizontal
2940 panedwindow .vpane.files -orient vertical
2941 .vpane add .vpane.files -sticky nsew -height 100 -width 200
2942 pack .vpane -anchor n -side top -fill both -expand 1
2944 # -- Index File List
2946 frame .vpane.files.index -height 100 -width 200
2947 label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \
2948 -background lightgreen -foreground black
2949 text $ui_index -background white -foreground black \
2951 -width 20 -height 10 \
2953 -cursor $cursor_ptr \
2954 -xscrollcommand {.vpane.files.index.sx set} \
2955 -yscrollcommand {.vpane.files.index.sy set} \
2957 scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
2958 scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
2959 pack .vpane.files.index.title -side top -fill x
2960 pack .vpane.files.index.sx -side bottom -fill x
2961 pack .vpane.files.index.sy -side right -fill y
2962 pack $ui_index -side left -fill both -expand 1
2964 # -- Working Directory File List
2966 frame .vpane.files.workdir -height 100 -width 200
2967 label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
2968 -background lightsalmon -foreground black
2969 text $ui_workdir -background white -foreground black \
2971 -width 20 -height 10 \
2973 -cursor $cursor_ptr \
2974 -xscrollcommand {.vpane.files.workdir.sx set} \
2975 -yscrollcommand {.vpane.files.workdir.sy set} \
2977 scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
2978 scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
2979 pack .vpane.files.workdir.title -side top -fill x
2980 pack .vpane.files.workdir.sx -side bottom -fill x
2981 pack .vpane.files.workdir.sy -side right -fill y
2982 pack $ui_workdir -side left -fill both -expand 1
2984 .vpane.files add .vpane.files.workdir -sticky nsew
2985 .vpane.files add .vpane.files.index -sticky nsew
2987 foreach i [list $ui_index $ui_workdir] {
2989 $i tag conf in_diff -background [$i tag cget in_sel -background]
2993 # -- Diff and Commit Area
2995 frame .vpane.lower -height 300 -width 400
2996 frame .vpane.lower.commarea
2997 frame .vpane.lower.diff -relief sunken -borderwidth 1
2998 pack .vpane.lower.diff -fill both -expand 1
2999 pack .vpane.lower.commarea -side bottom -fill x
3000 .vpane add .vpane.lower -sticky nsew
3002 # -- Commit Area Buttons
3004 frame .vpane.lower.commarea.buttons
3005 label .vpane.lower.commarea.buttons.l -text {} \
3008 pack .vpane.lower.commarea.buttons.l -side top -fill x
3009 pack .vpane.lower.commarea.buttons -side left -fill y
3011 button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
3012 -command ui_do_rescan
3013 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3014 lappend disable_on_lock \
3015 {.vpane.lower.commarea.buttons.rescan conf -state}
3017 button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
3019 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3020 lappend disable_on_lock \
3021 {.vpane.lower.commarea.buttons.incall conf -state}
3023 if {![is_enabled nocommitmsg]} {
3024 button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
3026 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3029 button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
3031 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3032 lappend disable_on_lock \
3033 {.vpane.lower.commarea.buttons.commit conf -state}
3035 if {![is_enabled nocommit]} {
3036 button .vpane.lower.commarea.buttons.push -text [mc Push] \
3037 -command do_push_anywhere
3038 pack .vpane.lower.commarea.buttons.push -side top -fill x
3041 # -- Commit Message Buffer
3043 frame .vpane.lower.commarea.buffer
3044 frame .vpane.lower.commarea.buffer.header
3045 set ui_comm .vpane.lower.commarea.buffer.t
3046 set ui_coml .vpane.lower.commarea.buffer.header.l
3048 if {![is_enabled nocommit]} {
3049 radiobutton .vpane.lower.commarea.buffer.header.new \
3050 -text [mc "New Commit"] \
3051 -command do_select_commit_type \
3052 -variable selected_commit_type \
3054 lappend disable_on_lock \
3055 [list .vpane.lower.commarea.buffer.header.new conf -state]
3056 radiobutton .vpane.lower.commarea.buffer.header.amend \
3057 -text [mc "Amend Last Commit"] \
3058 -command do_select_commit_type \
3059 -variable selected_commit_type \
3061 lappend disable_on_lock \
3062 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3068 proc trace_commit_type {varname args} {
3069 global ui_coml commit_type
3070 switch -glob -- $commit_type {
3071 initial {set txt [mc "Initial Commit Message:"]}
3072 amend {set txt [mc "Amended Commit Message:"]}
3073 amend-initial {set txt [mc "Amended Initial Commit Message:"]}
3074 amend-merge {set txt [mc "Amended Merge Commit Message:"]}
3075 merge {set txt [mc "Merge Commit Message:"]}
3076 * {set txt [mc "Commit Message:"]}
3078 $ui_coml conf -text $txt
3080 trace add variable commit_type write trace_commit_type
3081 pack $ui_coml -side left -fill x
3083 if {![is_enabled nocommit]} {
3084 pack .vpane.lower.commarea.buffer.header.amend -side right
3085 pack .vpane.lower.commarea.buffer.header.new -side right
3088 text $ui_comm -background white -foreground black \
3092 -autoseparators true \
3094 -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
3096 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3097 scrollbar .vpane.lower.commarea.buffer.sby \
3098 -command [list $ui_comm yview]
3099 pack .vpane.lower.commarea.buffer.header -side top -fill x
3100 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3101 pack $ui_comm -side left -fill y
3102 pack .vpane.lower.commarea.buffer -side left -fill y
3104 # -- Commit Message Buffer Context Menu
3106 set ctxm .vpane.lower.commarea.buffer.ctxm
3107 menu $ctxm -tearoff 0
3110 -command {tk_textCut $ui_comm}
3113 -command {tk_textCopy $ui_comm}
3116 -command {tk_textPaste $ui_comm}
3118 -label [mc Delete] \
3119 -command {catch {$ui_comm delete sel.first sel.last}}
3122 -label [mc "Select All"] \
3123 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
3125 -label [mc "Copy All"] \
3127 $ui_comm tag add sel 0.0 end
3128 tk_textCopy $ui_comm
3129 $ui_comm tag remove sel 0.0 end
3133 -label [mc "Sign Off"] \
3135 set ui_comm_ctxm $ctxm
3139 proc trace_current_diff_path {varname args} {
3140 global current_diff_path diff_actions file_states
3141 if {$current_diff_path eq {}} {
3147 set p $current_diff_path
3148 set s [mapdesc [lindex $file_states($p) 0] $p]
3150 set p [escape_path $p]
3154 .vpane.lower.diff.header.status configure -text $s
3155 .vpane.lower.diff.header.file configure -text $f
3156 .vpane.lower.diff.header.path configure -text $p
3157 foreach w $diff_actions {
3161 trace add variable current_diff_path write trace_current_diff_path
3163 frame .vpane.lower.diff.header -background gold
3164 label .vpane.lower.diff.header.status \
3167 -width $max_status_desc \
3170 label .vpane.lower.diff.header.file \
3175 label .vpane.lower.diff.header.path \
3180 pack .vpane.lower.diff.header.status -side left
3181 pack .vpane.lower.diff.header.file -side left
3182 pack .vpane.lower.diff.header.path -fill x
3183 set ctxm .vpane.lower.diff.header.ctxm
3184 menu $ctxm -tearoff 0
3192 -- $current_diff_path
3194 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3195 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3199 frame .vpane.lower.diff.body
3200 set ui_diff .vpane.lower.diff.body.t
3201 text $ui_diff -background white -foreground black \
3203 -width 80 -height 5 -wrap none \
3205 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3206 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3208 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3209 -command [list $ui_diff xview]
3210 scrollbar .vpane.lower.diff.body.sby -orient vertical \
3211 -command [list $ui_diff yview]
3212 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3213 pack .vpane.lower.diff.body.sby -side right -fill y
3214 pack $ui_diff -side left -fill both -expand 1
3215 pack .vpane.lower.diff.header -side top -fill x
3216 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3218 $ui_diff tag conf d_cr -elide true
3219 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
3220 $ui_diff tag conf d_+ -foreground {#00a000}
3221 $ui_diff tag conf d_- -foreground red
3223 $ui_diff tag conf d_++ -foreground {#00a000}
3224 $ui_diff tag conf d_-- -foreground red
3225 $ui_diff tag conf d_+s \
3226 -foreground {#00a000} \
3227 -background {#e2effa}
3228 $ui_diff tag conf d_-s \
3230 -background {#e2effa}
3231 $ui_diff tag conf d_s+ \
3232 -foreground {#00a000} \
3234 $ui_diff tag conf d_s- \
3238 $ui_diff tag conf d<<<<<<< \
3239 -foreground orange \
3241 $ui_diff tag conf d======= \
3242 -foreground orange \
3244 $ui_diff tag conf d>>>>>>> \
3245 -foreground orange \
3248 $ui_diff tag raise sel
3250 # -- Diff Body Context Menu
3253 proc create_common_diff_popup {ctxm} {
3255 -label [mc Refresh] \
3256 -command reshow_diff
3257 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3260 -command {tk_textCopy $ui_diff}
3261 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3263 -label [mc "Select All"] \
3264 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
3265 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3267 -label [mc "Copy All"] \
3269 $ui_diff tag add sel 0.0 end
3270 tk_textCopy $ui_diff
3271 $ui_diff tag remove sel 0.0 end
3273 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3276 -label [mc "Decrease Font Size"] \
3277 -command {incr_font_size font_diff -1}
3278 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3280 -label [mc "Increase Font Size"] \
3281 -command {incr_font_size font_diff 1}
3282 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3286 build_encoding_menu $emenu [list force_diff_encoding]
3288 -label [mc "Encoding"] \
3290 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3292 $ctxm add command -label [mc "Options..."] \
3296 set ctxm .vpane.lower.diff.body.ctxm
3297 menu $ctxm -tearoff 0
3299 -label [mc "Apply/Reverse Hunk"] \
3300 -command {apply_hunk $cursorX $cursorY}
3301 set ui_diff_applyhunk [$ctxm index last]
3302 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
3304 -label [mc "Apply/Reverse Line"] \
3305 -command {apply_range_or_line $cursorX $cursorY; do_rescan}
3306 set ui_diff_applyline [$ctxm index last]
3307 lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
3310 -label [mc "Show Less Context"] \
3311 -command show_less_context
3312 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3314 -label [mc "Show More Context"] \
3315 -command show_more_context
3316 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3318 create_common_diff_popup $ctxm
3320 set ctxmmg .vpane.lower.diff.body.ctxmmg
3321 menu $ctxmmg -tearoff 0
3322 $ctxmmg add command \
3323 -label [mc "Run Merge Tool"] \
3324 -command {merge_resolve_tool}
3325 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3326 $ctxmmg add separator
3327 $ctxmmg add command \
3328 -label [mc "Use Remote Version"] \
3329 -command {merge_resolve_one 3}
3330 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3331 $ctxmmg add command \
3332 -label [mc "Use Local Version"] \
3333 -command {merge_resolve_one 2}
3334 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3335 $ctxmmg add command \
3336 -label [mc "Revert To Base"] \
3337 -command {merge_resolve_one 1}
3338 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3339 $ctxmmg add separator
3340 $ctxmmg add command \
3341 -label [mc "Show Less Context"] \
3342 -command show_less_context
3343 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3344 $ctxmmg add command \
3345 -label [mc "Show More Context"] \
3346 -command show_more_context
3347 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3348 $ctxmmg add separator
3349 create_common_diff_popup $ctxmmg
3351 set ctxmsm .vpane.lower.diff.body.ctxmsm
3352 menu $ctxmsm -tearoff 0
3353 $ctxmsm add command \
3354 -label [mc "Visualize These Changes In The Submodule"] \
3355 -command {do_gitk -- true}
3356 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3357 $ctxmsm add command \
3358 -label [mc "Visualize Current Branch History In The Submodule"] \
3359 -command {do_gitk {} true}
3360 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3361 $ctxmsm add command \
3362 -label [mc "Visualize All Branch History In The Submodule"] \
3363 -command {do_gitk --all true}
3364 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3365 $ctxmsm add separator
3366 $ctxmsm add command \
3367 -label [mc "Start git gui In The Submodule"] \
3368 -command {do_git_gui}
3369 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3370 $ctxmsm add separator
3371 create_common_diff_popup $ctxmsm
3373 proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
3374 global current_diff_path file_states
3377 if {[info exists file_states($current_diff_path)]} {
3378 set state [lindex $file_states($current_diff_path) 0]
3382 if {[string first {U} $state] >= 0} {
3383 tk_popup $ctxmmg $X $Y
3384 } elseif {$::is_submodule_diff} {
3385 tk_popup $ctxmsm $X $Y
3387 set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}]
3388 if {$::ui_index eq $::current_diff_side} {
3389 set l [mc "Unstage Hunk From Commit"]
3391 set t [mc "Unstage Lines From Commit"]
3393 set t [mc "Unstage Line From Commit"]
3396 set l [mc "Stage Hunk For Commit"]
3398 set t [mc "Stage Lines For Commit"]
3400 set t [mc "Stage Line For Commit"]
3404 || $current_diff_path eq {}
3408 || {T_} eq $state} {
3413 $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
3414 $ctxm entryconf $::ui_diff_applyline -state $s -label $t
3415 tk_popup $ctxm $X $Y
3418 bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg $ctxmsm %x %y %X %Y]
3422 set main_status [::status_bar::new .status]
3423 pack .status -anchor w -side bottom -fill x
3424 $main_status show [mc "Initializing..."]
3429 set gm $repo_config(gui.geometry)
3430 wm geometry . [lindex $gm 0]
3431 .vpane sash place 0 \
3433 [lindex [.vpane sash coord 0] 1]
3434 .vpane.files sash place 0 \
3435 [lindex [.vpane.files sash coord 0] 0] \
3440 # -- Load window state
3443 set gws $repo_config(gui.wmstate)
3450 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3451 bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
3452 bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
3453 bind $ui_comm <$M1B-Key-u> {do_unstage_selection;break}
3454 bind $ui_comm <$M1B-Key-U> {do_unstage_selection;break}
3455 bind $ui_comm <$M1B-Key-j> {do_revert_selection;break}
3456 bind $ui_comm <$M1B-Key-J> {do_revert_selection;break}
3457 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3458 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3459 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3460 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3461 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3462 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3463 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3464 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3465 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3466 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3467 bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
3468 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
3469 bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
3470 bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
3471 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
3473 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3474 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3475 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3476 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3477 bind $ui_diff <$M1B-Key-v> {break}
3478 bind $ui_diff <$M1B-Key-V> {break}
3479 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3480 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3481 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3482 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3483 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3484 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3485 bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
3486 bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
3487 bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
3488 bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
3489 bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
3490 bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
3491 bind $ui_diff <Button-1> {focus %W}
3493 if {[is_enabled branch]} {
3494 bind . <$M1B-Key-n> branch_create::dialog
3495 bind . <$M1B-Key-N> branch_create::dialog
3496 bind . <$M1B-Key-o> branch_checkout::dialog
3497 bind . <$M1B-Key-O> branch_checkout::dialog
3498 bind . <$M1B-Key-m> merge::dialog
3499 bind . <$M1B-Key-M> merge::dialog
3501 if {[is_enabled transport]} {
3502 bind . <$M1B-Key-p> do_push_anywhere
3503 bind . <$M1B-Key-P> do_push_anywhere
3506 bind . <Key-F5> ui_do_rescan
3507 bind . <$M1B-Key-r> ui_do_rescan
3508 bind . <$M1B-Key-R> ui_do_rescan
3509 bind . <$M1B-Key-s> do_signoff
3510 bind . <$M1B-Key-S> do_signoff
3511 bind . <$M1B-Key-t> do_add_selection
3512 bind . <$M1B-Key-T> do_add_selection
3513 bind . <$M1B-Key-i> do_add_all
3514 bind . <$M1B-Key-I> do_add_all
3515 bind . <$M1B-Key-minus> {show_less_context;break}
3516 bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
3517 bind . <$M1B-Key-equal> {show_more_context;break}
3518 bind . <$M1B-Key-plus> {show_more_context;break}
3519 bind . <$M1B-Key-KP_Add> {show_more_context;break}
3520 bind . <$M1B-Key-Return> do_commit
3521 foreach i [list $ui_index $ui_workdir] {
3522 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3523 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3524 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3528 set file_lists($ui_index) [list]
3529 set file_lists($ui_workdir) [list]
3531 wm title . "[appname] ([reponame]) [file normalize $_gitworktree]"
3532 focus -force $ui_comm
3534 # -- Warn the user about environmental problems. Cygwin's Tcl
3535 # does *not* pass its env array onto any processes it spawns.
3536 # This means that git processes get none of our environment.
3541 set msg [mc "Possible environment issues exist.
3543 The following environment variables are probably
3544 going to be ignored by any Git subprocess run
3548 foreach name [array names env] {
3549 switch -regexp -- $name {
3550 {^GIT_INDEX_FILE$} -
3551 {^GIT_OBJECT_DIRECTORY$} -
3552 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3554 {^GIT_EXTERNAL_DIFF$} -
3558 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3559 append msg " - $name\n"
3562 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3563 append msg " - $name\n"
3565 set suggest_user $name
3569 if {$ignored_env > 0} {
3571 This is due to a known issue with the
3572 Tcl binary distributed by Cygwin."]
3574 if {$suggest_user ne {}} {
3577 A good replacement for %s
3578 is placing values for the user.name and
3579 user.email settings into your personal
3585 unset ignored_env msg suggest_user name
3588 # -- Only initialize complex UI if we are going to stay running.
3590 if {[is_enabled transport]} {
3593 set n [.mbar.remote index end]
3594 populate_remotes_menu
3595 set n [expr {[.mbar.remote index end] - $n}]
3597 if {[.mbar.remote type 0] eq "tearoff"} { incr n }
3598 .mbar.remote insert $n separator
3603 if {[winfo exists $ui_comm]} {
3604 set GITGUI_BCK_exists [load_message GITGUI_BCK]
3606 # -- If both our backup and message files exist use the
3607 # newer of the two files to initialize the buffer.
3609 if {$GITGUI_BCK_exists} {
3610 set m [gitdir GITGUI_MSG]
3611 if {[file isfile $m]} {
3612 if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
3613 catch {file delete [gitdir GITGUI_MSG]}
3615 $ui_comm delete 0.0 end
3617 $ui_comm edit modified false
3618 catch {file delete [gitdir GITGUI_BCK]}
3619 set GITGUI_BCK_exists 0
3625 proc backup_commit_buffer {} {
3626 global ui_comm GITGUI_BCK_exists
3628 set m [$ui_comm edit modified]
3629 if {$m || $GITGUI_BCK_exists} {
3630 set msg [string trim [$ui_comm get 0.0 end]]
3631 regsub -all -line {[ \r\t]+$} $msg {} msg
3634 if {$GITGUI_BCK_exists} {
3635 catch {file delete [gitdir GITGUI_BCK]}
3636 set GITGUI_BCK_exists 0
3640 set fd [open [gitdir GITGUI_BCK] w]
3641 puts -nonewline $fd $msg
3643 set GITGUI_BCK_exists 1
3647 $ui_comm edit modified false
3650 set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
3653 backup_commit_buffer
3655 # -- If the user has aspell available we can drive it
3656 # in pipe mode to spellcheck the commit message.
3658 set spell_cmd [list |]
3659 set spell_dict [get_config gui.spellingdictionary]
3660 lappend spell_cmd aspell
3661 if {$spell_dict ne {}} {
3662 lappend spell_cmd --master=$spell_dict
3664 lappend spell_cmd --mode=none
3665 lappend spell_cmd --encoding=utf-8
3666 lappend spell_cmd pipe
3667 if {$spell_dict eq {none}
3668 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
3669 bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
3671 set ui_comm_spell [spellcheck::init \
3677 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3680 lock_index begin-read
3681 if {![winfo ismapped .]} {
3685 if {[is_enabled initialamend]} {
3691 if {[is_enabled nocommitmsg]} {
3692 $ui_comm configure -state disabled -background gray
3695 if {[is_enabled multicommit]} {
3698 if {[is_enabled retcode]} {
3699 bind . <Destroy> {+terminate_me %W}
3701 if {$picked && [is_config_true gui.autoexplore]} {