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 ######################################################################
681 if {[lsearch -exact [font names] TkDefaultFont] != -1} {
682 eval [linsert [font actual TkDefaultFont] 0 font configure font_ui]
683 eval [linsert [font actual TkFixedFont] 0 font create font_diff]
685 font create font_diff -family Courier -size 10
688 eval font configure font_ui [font actual [.dummy cget -font]]
693 font create font_uiitalic
694 font create font_uibold
695 font create font_diffbold
696 font create font_diffitalic
698 foreach class {Button Checkbutton Entry Label
699 Labelframe Listbox Message
700 Radiobutton Spinbox Text} {
701 option add *$class.font font_ui
704 option add *Menu.font font_ui
705 option add *Entry.borderWidth 1 startupFile
706 option add *Entry.relief sunken startupFile
707 option add *RadioButton.anchor w startupFile
711 if {[is_Windows] || [is_MacOSX]} {
712 option add *Menu.tearOff 0
723 proc bind_button3 {w cmd} {
724 bind $w <Any-Button-3> $cmd
726 # Mac OS X sends Button-2 on right click through three-button mouse,
727 # or through trackpad right-clicking (two-finger touch + click).
728 bind $w <Any-Button-2> $cmd
729 bind $w <Control-Button-1> $cmd
733 proc apply_config {} {
734 global repo_config font_descs
736 foreach option $font_descs {
737 set name [lindex $option 0]
738 set font [lindex $option 1]
741 foreach {cn cv} $repo_config(gui.$name) {
742 if {$cn eq {-weight}} {
745 font configure $font $cn $cv
748 font configure $font -weight normal
751 error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
753 foreach {cn cv} [font configure $font] {
754 font configure ${font}bold $cn $cv
755 font configure ${font}italic $cn $cv
757 font configure ${font}bold -weight bold
758 font configure ${font}italic -slant italic
764 if {$repo_config(gui.usettk)} {
765 set use_ttk [package vsatisfies [package provide Tk] 8.5]
768 bind [winfo class .] <<ThemeChanged>> [list InitTheme]
774 set default_config(branch.autosetupmerge) true
775 set default_config(merge.tool) {}
776 set default_config(mergetool.keepbackup) true
777 set default_config(merge.diffstat) true
778 set default_config(merge.summary) false
779 set default_config(merge.verbosity) 2
780 set default_config(user.name) {}
781 set default_config(user.email) {}
783 set default_config(gui.encoding) [encoding system]
784 set default_config(gui.matchtrackingbranch) false
785 set default_config(gui.pruneduringfetch) false
786 set default_config(gui.trustmtime) false
787 set default_config(gui.fastcopyblame) false
788 set default_config(gui.copyblamethreshold) 40
789 set default_config(gui.blamehistoryctx) 7
790 set default_config(gui.diffcontext) 5
791 set default_config(gui.commitmsgwidth) 75
792 set default_config(gui.newbranchtemplate) {}
793 set default_config(gui.spellingdictionary) {}
794 set default_config(gui.fontui) [font configure font_ui]
795 set default_config(gui.fontdiff) [font configure font_diff]
796 # TODO: this option should be added to the git-config documentation
797 set default_config(gui.maxfilesdisplayed) 5000
798 set default_config(gui.usettk) 1
800 {fontui font_ui {mc "Main Font"}}
801 {fontdiff font_diff {mc "Diff/Console Font"}}
804 ######################################################################
808 set _git [_which git]
810 catch {wm withdraw .}
814 -title [mc "git-gui: fatal error"] \
815 -message [mc "Cannot find git in PATH."]
819 ######################################################################
823 if {[catch {set _git_version [git --version]} err]} {
824 catch {wm withdraw .}
828 -title [mc "git-gui: fatal error"] \
829 -message "Cannot determine Git version:
833 [appname] requires Git 1.5.0 or later."
836 if {![regsub {^git version } $_git_version {} _git_version]} {
837 catch {wm withdraw .}
841 -title [mc "git-gui: fatal error"] \
842 -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
846 set _real_git_version $_git_version
847 regsub -- {[\-\.]dirty$} $_git_version {} _git_version
848 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
849 regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
850 regsub {\.GIT$} $_git_version {} _git_version
851 regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
853 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
854 catch {wm withdraw .}
859 -title "[appname]: warning" \
860 -message [mc "Git version cannot be determined.
862 %s claims it is version '%s'.
864 %s requires at least Git 1.5.0 or later.
866 Assume '%s' is version 1.5.0?
867 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
868 set _git_version 1.5.0
873 unset _real_git_version
875 proc git-version {args} {
878 switch [llength $args] {
884 set op [lindex $args 0]
885 set vr [lindex $args 1]
886 set cm [package vcompare $_git_version $vr]
887 return [expr $cm $op 0]
891 set type [lindex $args 0]
892 set name [lindex $args 1]
893 set parm [lindex $args 2]
894 set body [lindex $args 3]
896 if {($type ne {proc} && $type ne {method})} {
897 error "Invalid arguments to git-version"
899 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
900 error "Last arm of $type $name must be default"
903 foreach {op vr cb} [lrange $body 0 end-2] {
904 if {[git-version $op $vr]} {
905 return [uplevel [list $type $name $parm $cb]]
909 return [uplevel [list $type $name $parm [lindex $body end]]]
913 error "git-version >= x"
919 if {[git-version < 1.5]} {
920 catch {wm withdraw .}
924 -title [mc "git-gui: fatal error"] \
925 -message "[appname] requires Git 1.5.0 or later.
927 You are using [git-version]:
933 ######################################################################
935 ## configure our library
937 set idx [file join $oguilib tclIndex]
938 if {[catch {set fd [open $idx r]} err]} {
939 catch {wm withdraw .}
943 -title [mc "git-gui: fatal error"] \
947 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
949 while {[gets $fd n] >= 0} {
950 if {$n ne {} && ![string match #* $n]} {
962 if {[lsearch -exact $loaded $p] >= 0} continue
963 source [file join $oguilib $p]
968 set auto_path [concat [list $oguilib] $auto_path]
970 unset -nocomplain idx fd
972 ######################################################################
974 ## config file parsing
976 git-version proc _parse_config {arr_name args} {
983 [list git_read config] \
985 [list --null --list]]
986 fconfigure $fd_rc -translation binary
987 set buf [read $fd_rc]
990 foreach line [split $buf "\0"] {
991 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
992 if {[is_many_config $name]} {
993 lappend arr($name) $value
995 set arr($name) $value
1004 set fd_rc [eval [list git_read config --list] $args]
1005 while {[gets $fd_rc line] >= 0} {
1006 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
1007 if {[is_many_config $name]} {
1008 lappend arr($name) $value
1010 set arr($name) $value
1019 proc load_config {include_global} {
1020 global repo_config global_config system_config default_config
1022 if {$include_global} {
1023 _parse_config system_config --system
1024 _parse_config global_config --global
1026 _parse_config repo_config
1028 foreach name [array names default_config] {
1029 if {[catch {set v $system_config($name)}]} {
1030 set system_config($name) $default_config($name)
1033 foreach name [array names system_config] {
1034 if {[catch {set v $global_config($name)}]} {
1035 set global_config($name) $system_config($name)
1037 if {[catch {set v $repo_config($name)}]} {
1038 set repo_config($name) $system_config($name)
1043 ######################################################################
1045 ## feature option selection
1047 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1052 if {$subcommand eq {gui.sh}} {
1055 if {$subcommand eq {gui} && [llength $argv] > 0} {
1056 set subcommand [lindex $argv 0]
1057 set argv [lrange $argv 1 end]
1060 enable_option multicommit
1061 enable_option branch
1062 enable_option transport
1065 switch -- $subcommand {
1070 disable_option multicommit
1071 disable_option branch
1072 disable_option transport
1075 enable_option singlecommit
1076 enable_option retcode
1078 disable_option multicommit
1079 disable_option branch
1080 disable_option transport
1082 while {[llength $argv] > 0} {
1083 set a [lindex $argv 0]
1086 enable_option initialamend
1089 enable_option nocommit
1090 enable_option nocommitmsg
1093 disable_option nocommitmsg
1100 set argv [lrange $argv 1 end]
1105 ######################################################################
1107 ## execution environment
1109 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1111 # Suggest our implementation of askpass, if none is set
1112 if {![info exists env(SSH_ASKPASS)]} {
1113 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1116 ######################################################################
1122 set _gitdir $env(GIT_DIR)
1126 # beware that from the .git dir this sets _gitdir to .
1127 # and _prefix to the empty string
1128 set _gitdir [git rev-parse --git-dir]
1129 set _prefix [git rev-parse --show-prefix]
1133 choose_repository::pick
1137 # we expand the _gitdir when it's just a single dot (i.e. when we're being
1138 # run from the .git dir itself) lest the routines to find the worktree
1140 if {$_gitdir eq "."} {
1144 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1145 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1147 if {![file isdirectory $_gitdir]} {
1148 catch {wm withdraw .}
1149 error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
1152 # _gitdir exists, so try loading the config
1155 # try to set work tree from environment, falling back to core.worktree
1156 if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
1157 set _gitworktree [get_config core.worktree]
1159 if {$_prefix ne {}} {
1160 if {$_gitworktree eq {}} {
1161 regsub -all {[^/]+/} $_prefix ../ cdup
1163 set cdup $_gitworktree
1165 if {[catch {cd $cdup} err]} {
1166 catch {wm withdraw .}
1167 error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
1170 set _gitworktree [pwd]
1172 } elseif {[is_bare]} {
1173 if {![is_enabled bare]} {
1174 catch {wm withdraw .}
1175 error_popup [strcat [mc "Cannot use bare repository:"] "\n\n$_gitdir"]
1179 if {$_gitworktree eq {}} {
1180 set _gitworktree [file dirname $_gitdir]
1182 if {[catch {cd $_gitworktree} err]} {
1183 catch {wm withdraw .}
1184 error_popup [strcat [mc "No working directory"] " $_gitworktree:\n\n$err"]
1187 set _gitworktree [pwd]
1189 set _reponame [file split [file normalize $_gitdir]]
1190 if {[lindex $_reponame end] eq {.git}} {
1191 set _reponame [lindex $_reponame end-1]
1193 set _reponame [lindex $_reponame end]
1196 set env(GIT_DIR) $_gitdir
1197 set env(GIT_WORK_TREE) $_gitworktree
1199 ######################################################################
1203 set current_diff_path {}
1204 set current_diff_side {}
1205 set diff_actions [list]
1209 set MERGE_HEAD [list]
1212 set current_branch {}
1214 set current_diff_path {}
1216 set is_submodule_diff 0
1217 set is_conflict_diff 0
1218 set selected_commit_type new
1219 set diff_empty_count 0
1221 set nullid "0000000000000000000000000000000000000000"
1222 set nullid2 "0000000000000000000000000000000000000001"
1224 ######################################################################
1232 set disable_on_lock [list]
1233 set index_lock_type none
1235 proc lock_index {type} {
1236 global index_lock_type disable_on_lock
1238 if {$index_lock_type eq {none}} {
1239 set index_lock_type $type
1240 foreach w $disable_on_lock {
1241 uplevel #0 $w disabled
1244 } elseif {$index_lock_type eq "begin-$type"} {
1245 set index_lock_type $type
1251 proc unlock_index {} {
1252 global index_lock_type disable_on_lock
1254 set index_lock_type none
1255 foreach w $disable_on_lock {
1256 uplevel #0 $w normal
1260 ######################################################################
1264 proc repository_state {ctvar hdvar mhvar} {
1265 global current_branch
1266 upvar $ctvar ct $hdvar hd $mhvar mh
1271 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1277 set merge_head [gitdir MERGE_HEAD]
1278 if {[file exists $merge_head]} {
1280 set fd_mh [open $merge_head r]
1281 while {[gets $fd_mh line] >= 0} {
1292 global PARENT empty_tree
1294 set p [lindex $PARENT 0]
1298 if {$empty_tree eq {}} {
1299 set empty_tree [git mktree << {}]
1304 proc force_amend {} {
1305 global selected_commit_type
1306 global HEAD PARENT MERGE_HEAD commit_type
1308 repository_state newType newHEAD newMERGE_HEAD
1311 set MERGE_HEAD $newMERGE_HEAD
1312 set commit_type $newType
1314 set selected_commit_type amend
1315 do_select_commit_type
1318 proc rescan {after {honor_trustmtime 1}} {
1319 global HEAD PARENT MERGE_HEAD commit_type
1320 global ui_index ui_workdir ui_comm
1321 global rescan_active file_states
1324 if {$rescan_active > 0 || ![lock_index read]} return
1326 repository_state newType newHEAD newMERGE_HEAD
1327 if {[string match amend* $commit_type]
1328 && $newType eq {normal}
1329 && $newHEAD eq $HEAD} {
1333 set MERGE_HEAD $newMERGE_HEAD
1334 set commit_type $newType
1337 array unset file_states
1339 if {!$::GITGUI_BCK_exists &&
1340 (![$ui_comm edit modified]
1341 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1342 if {[string match amend* $commit_type]} {
1343 } elseif {[load_message GITGUI_MSG]} {
1344 } elseif {[run_prepare_commit_msg_hook]} {
1345 } elseif {[load_message MERGE_MSG]} {
1346 } elseif {[load_message SQUASH_MSG]} {
1349 $ui_comm edit modified false
1352 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1353 rescan_stage2 {} $after
1356 ui_status [mc "Refreshing file status..."]
1357 set fd_rf [git_read update-index \
1363 fconfigure $fd_rf -blocking 0 -translation binary
1364 fileevent $fd_rf readable \
1365 [list rescan_stage2 $fd_rf $after]
1370 set is_git_info_exclude {}
1371 proc have_info_exclude {} {
1372 global is_git_info_exclude
1374 if {$is_git_info_exclude eq {}} {
1375 if {[catch {exec test -f [gitdir info exclude]}]} {
1376 set is_git_info_exclude 0
1378 set is_git_info_exclude 1
1381 return $is_git_info_exclude
1384 proc have_info_exclude {} {
1385 return [file readable [gitdir info exclude]]
1389 proc rescan_stage2 {fd after} {
1390 global rescan_active buf_rdi buf_rdf buf_rlo
1394 if {![eof $fd]} return
1398 set ls_others [list --exclude-per-directory=.gitignore]
1399 if {[have_info_exclude]} {
1400 lappend ls_others "--exclude-from=[gitdir info exclude]"
1402 set user_exclude [get_config core.excludesfile]
1403 if {$user_exclude ne {} && [file readable $user_exclude]} {
1404 lappend ls_others "--exclude-from=$user_exclude"
1412 ui_status [mc "Scanning for modified files ..."]
1413 set fd_di [git_read diff-index --cached -z [PARENT]]
1414 set fd_df [git_read diff-files -z]
1415 set fd_lo [eval git_read ls-files --others -z $ls_others]
1417 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1418 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1419 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1420 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1421 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1422 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1425 proc load_message {file} {
1428 set f [gitdir $file]
1429 if {[file isfile $f]} {
1430 if {[catch {set fd [open $f r]}]} {
1433 fconfigure $fd -eofchar {}
1434 set content [string trim [read $fd]]
1436 regsub -all -line {[ \r\t]+$} $content {} content
1437 $ui_comm delete 0.0 end
1438 $ui_comm insert end $content
1444 proc run_prepare_commit_msg_hook {} {
1447 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1448 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1449 # empty file but existant file.
1451 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1453 if {[file isfile [gitdir MERGE_MSG]]} {
1454 set pcm_source "merge"
1455 set fd_mm [open [gitdir MERGE_MSG] r]
1456 puts -nonewline $fd_pcm [read $fd_mm]
1458 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1459 set pcm_source "squash"
1460 set fd_sm [open [gitdir SQUASH_MSG] r]
1461 puts -nonewline $fd_pcm [read $fd_sm]
1469 set fd_ph [githook_read prepare-commit-msg \
1470 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1472 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1476 ui_status [mc "Calling prepare-commit-msg hook..."]
1479 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1480 fileevent $fd_ph readable \
1481 [list prepare_commit_msg_hook_wait $fd_ph]
1486 proc prepare_commit_msg_hook_wait {fd_ph} {
1489 append pch_error [read $fd_ph]
1490 fconfigure $fd_ph -blocking 1
1492 if {[catch {close $fd_ph}]} {
1493 ui_status [mc "Commit declined by prepare-commit-msg hook."]
1494 hook_failed_popup prepare-commit-msg $pch_error
1495 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1498 load_message PREPARE_COMMIT_MSG
1501 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1504 fconfigure $fd_ph -blocking 0
1505 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1508 proc read_diff_index {fd after} {
1511 append buf_rdi [read $fd]
1513 set n [string length $buf_rdi]
1515 set z1 [string first "\0" $buf_rdi $c]
1516 if {$z1 == -1} break
1518 set z2 [string first "\0" $buf_rdi $z1]
1519 if {$z2 == -1} break
1522 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1523 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1525 [encoding convertfrom $p] \
1527 [list [lindex $i 0] [lindex $i 2]] \
1533 set buf_rdi [string range $buf_rdi $c end]
1538 rescan_done $fd buf_rdi $after
1541 proc read_diff_files {fd after} {
1544 append buf_rdf [read $fd]
1546 set n [string length $buf_rdf]
1548 set z1 [string first "\0" $buf_rdf $c]
1549 if {$z1 == -1} break
1551 set z2 [string first "\0" $buf_rdf $z1]
1552 if {$z2 == -1} break
1555 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1556 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1558 [encoding convertfrom $p] \
1561 [list [lindex $i 0] [lindex $i 2]]
1566 set buf_rdf [string range $buf_rdf $c end]
1571 rescan_done $fd buf_rdf $after
1574 proc read_ls_others {fd after} {
1577 append buf_rlo [read $fd]
1578 set pck [split $buf_rlo "\0"]
1579 set buf_rlo [lindex $pck end]
1580 foreach p [lrange $pck 0 end-1] {
1581 set p [encoding convertfrom $p]
1582 if {[string index $p end] eq {/}} {
1583 set p [string range $p 0 end-1]
1587 rescan_done $fd buf_rlo $after
1590 proc rescan_done {fd buf after} {
1591 global rescan_active current_diff_path
1592 global file_states repo_config
1595 if {![eof $fd]} return
1598 if {[incr rescan_active -1] > 0} return
1603 if {$current_diff_path ne {}} { reshow_diff $after }
1604 if {$current_diff_path eq {}} { select_first_diff $after }
1607 proc prune_selection {} {
1608 global file_states selected_paths
1610 foreach path [array names selected_paths] {
1611 if {[catch {set still_here $file_states($path)}]} {
1612 unset selected_paths($path)
1617 ######################################################################
1621 proc mapicon {w state path} {
1624 if {[catch {set r $all_icons($state$w)}]} {
1625 puts "error: no icon for $w state={$state} $path"
1631 proc mapdesc {state path} {
1634 if {[catch {set r $all_descs($state)}]} {
1635 puts "error: no desc for state={$state} $path"
1641 proc ui_status {msg} {
1643 if {[info exists main_status]} {
1644 $main_status show $msg
1648 proc ui_ready {{test {}}} {
1650 if {[info exists main_status]} {
1651 $main_status show [mc "Ready."] $test
1655 proc escape_path {path} {
1656 regsub -all {\\} $path "\\\\" path
1657 regsub -all "\n" $path "\\n" path
1661 proc short_path {path} {
1662 return [escape_path [lindex [file split $path] end]]
1666 set null_sha1 [string repeat 0 40]
1668 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1669 global file_states next_icon_id null_sha1
1671 set s0 [string index $new_state 0]
1672 set s1 [string index $new_state 1]
1674 if {[catch {set info $file_states($path)}]} {
1676 set icon n[incr next_icon_id]
1678 set state [lindex $info 0]
1679 set icon [lindex $info 1]
1680 if {$head_info eq {}} {set head_info [lindex $info 2]}
1681 if {$index_info eq {}} {set index_info [lindex $info 3]}
1684 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1685 elseif {$s0 eq {_}} {set s0 _}
1687 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1688 elseif {$s1 eq {_}} {set s1 _}
1690 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1691 set head_info [list 0 $null_sha1]
1692 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1693 && $head_info eq {}} {
1694 set head_info $index_info
1695 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1696 set index_info $head_info
1700 set file_states($path) [list $s0$s1 $icon \
1701 $head_info $index_info \
1706 proc display_file_helper {w path icon_name old_m new_m} {
1709 if {$new_m eq {_}} {
1710 set lno [lsearch -sorted -exact $file_lists($w) $path]
1712 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1714 $w conf -state normal
1715 $w delete $lno.0 [expr {$lno + 1}].0
1716 $w conf -state disabled
1718 } elseif {$old_m eq {_} && $new_m ne {_}} {
1719 lappend file_lists($w) $path
1720 set file_lists($w) [lsort -unique $file_lists($w)]
1721 set lno [lsearch -sorted -exact $file_lists($w) $path]
1723 $w conf -state normal
1724 $w image create $lno.0 \
1725 -align center -padx 5 -pady 1 \
1727 -image [mapicon $w $new_m $path]
1728 $w insert $lno.1 "[escape_path $path]\n"
1729 $w conf -state disabled
1730 } elseif {$old_m ne $new_m} {
1731 $w conf -state normal
1732 $w image conf $icon_name -image [mapicon $w $new_m $path]
1733 $w conf -state disabled
1737 proc display_file {path state} {
1738 global file_states selected_paths
1739 global ui_index ui_workdir
1741 set old_m [merge_state $path $state]
1742 set s $file_states($path)
1743 set new_m [lindex $s 0]
1744 set icon_name [lindex $s 1]
1746 set o [string index $old_m 0]
1747 set n [string index $new_m 0]
1754 display_file_helper $ui_index $path $icon_name $o $n
1756 if {[string index $old_m 0] eq {U}} {
1759 set o [string index $old_m 1]
1761 if {[string index $new_m 0] eq {U}} {
1764 set n [string index $new_m 1]
1766 display_file_helper $ui_workdir $path $icon_name $o $n
1768 if {$new_m eq {__}} {
1769 unset file_states($path)
1770 catch {unset selected_paths($path)}
1774 proc display_all_files_helper {w path icon_name m} {
1777 lappend file_lists($w) $path
1778 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1779 $w image create end \
1780 -align center -padx 5 -pady 1 \
1782 -image [mapicon $w $m $path]
1783 $w insert end "[escape_path $path]\n"
1787 proc display_all_files {} {
1788 global ui_index ui_workdir
1789 global file_states file_lists
1791 global files_warning
1793 $ui_index conf -state normal
1794 $ui_workdir conf -state normal
1796 $ui_index delete 0.0 end
1797 $ui_workdir delete 0.0 end
1800 set file_lists($ui_index) [list]
1801 set file_lists($ui_workdir) [list]
1803 set to_display [lsort [array names file_states]]
1804 set display_limit [get_config gui.maxfilesdisplayed]
1805 if {[llength $to_display] > $display_limit} {
1806 if {!$files_warning} {
1807 # do not repeatedly warn:
1809 info_popup [mc "Displaying only %s of %s files." \
1810 $display_limit [llength $to_display]]
1812 set to_display [lrange $to_display 0 [expr {$display_limit-1}]]
1814 foreach path $to_display {
1815 set s $file_states($path)
1817 set icon_name [lindex $s 1]
1819 set s [string index $m 0]
1820 if {$s ne {U} && $s ne {_}} {
1821 display_all_files_helper $ui_index $path \
1825 if {[string index $m 0] eq {U}} {
1828 set s [string index $m 1]
1831 display_all_files_helper $ui_workdir $path \
1836 $ui_index conf -state disabled
1837 $ui_workdir conf -state disabled
1840 ######################################################################
1845 #define mask_width 14
1846 #define mask_height 15
1847 static unsigned char mask_bits[] = {
1848 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1849 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1850 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1853 image create bitmap file_plain -background white -foreground black -data {
1854 #define plain_width 14
1855 #define plain_height 15
1856 static unsigned char plain_bits[] = {
1857 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1858 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1859 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1860 } -maskdata $filemask
1862 image create bitmap file_mod -background white -foreground blue -data {
1863 #define mod_width 14
1864 #define mod_height 15
1865 static unsigned char mod_bits[] = {
1866 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1867 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1868 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1869 } -maskdata $filemask
1871 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1872 #define file_fulltick_width 14
1873 #define file_fulltick_height 15
1874 static unsigned char file_fulltick_bits[] = {
1875 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1876 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1877 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1878 } -maskdata $filemask
1880 image create bitmap file_question -background white -foreground black -data {
1881 #define file_question_width 14
1882 #define file_question_height 15
1883 static unsigned char file_question_bits[] = {
1884 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1885 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1886 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1887 } -maskdata $filemask
1889 image create bitmap file_removed -background white -foreground red -data {
1890 #define file_removed_width 14
1891 #define file_removed_height 15
1892 static unsigned char file_removed_bits[] = {
1893 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1894 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1895 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1896 } -maskdata $filemask
1898 image create bitmap file_merge -background white -foreground blue -data {
1899 #define file_merge_width 14
1900 #define file_merge_height 15
1901 static unsigned char file_merge_bits[] = {
1902 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1903 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1904 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1905 } -maskdata $filemask
1907 image create bitmap file_statechange -background white -foreground green -data {
1908 #define file_merge_width 14
1909 #define file_merge_height 15
1910 static unsigned char file_statechange_bits[] = {
1911 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
1912 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
1913 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1914 } -maskdata $filemask
1916 set ui_index .vpane.files.index.list
1917 set ui_workdir .vpane.files.workdir.list
1919 set all_icons(_$ui_index) file_plain
1920 set all_icons(A$ui_index) file_plain
1921 set all_icons(M$ui_index) file_fulltick
1922 set all_icons(D$ui_index) file_removed
1923 set all_icons(U$ui_index) file_merge
1924 set all_icons(T$ui_index) file_statechange
1926 set all_icons(_$ui_workdir) file_plain
1927 set all_icons(M$ui_workdir) file_mod
1928 set all_icons(D$ui_workdir) file_question
1929 set all_icons(U$ui_workdir) file_merge
1930 set all_icons(O$ui_workdir) file_plain
1931 set all_icons(T$ui_workdir) file_statechange
1933 set max_status_desc 0
1935 {__ {mc "Unmodified"}}
1937 {_M {mc "Modified, not staged"}}
1938 {M_ {mc "Staged for commit"}}
1939 {MM {mc "Portions staged for commit"}}
1940 {MD {mc "Staged for commit, missing"}}
1942 {_T {mc "File type changed, not staged"}}
1943 {T_ {mc "File type changed, staged"}}
1945 {_O {mc "Untracked, not staged"}}
1946 {A_ {mc "Staged for commit"}}
1947 {AM {mc "Portions staged for commit"}}
1948 {AD {mc "Staged for commit, missing"}}
1951 {D_ {mc "Staged for removal"}}
1952 {DO {mc "Staged for removal, still present"}}
1954 {_U {mc "Requires merge resolution"}}
1955 {U_ {mc "Requires merge resolution"}}
1956 {UU {mc "Requires merge resolution"}}
1957 {UM {mc "Requires merge resolution"}}
1958 {UD {mc "Requires merge resolution"}}
1959 {UT {mc "Requires merge resolution"}}
1961 set text [eval [lindex $i 1]]
1962 if {$max_status_desc < [string length $text]} {
1963 set max_status_desc [string length $text]
1965 set all_descs([lindex $i 0]) $text
1969 ######################################################################
1973 proc scrollbar2many {list mode args} {
1974 foreach w $list {eval $w $mode $args}
1977 proc many2scrollbar {list mode sb top bottom} {
1978 $sb set $top $bottom
1979 foreach w $list {$w $mode moveto $top}
1982 proc incr_font_size {font {amt 1}} {
1983 set sz [font configure $font -size]
1985 font configure $font -size $sz
1986 font configure ${font}bold -size $sz
1987 font configure ${font}italic -size $sz
1990 ######################################################################
1994 set starting_gitk_msg [mc "Starting gitk... please wait..."]
1996 proc do_gitk {revs {is_submodule false}} {
1997 global current_diff_path file_states current_diff_side ui_index
1998 global _gitdir _gitworktree
2000 # -- Always start gitk through whatever we were loaded with. This
2001 # lets us bypass using shell process on Windows systems.
2003 set exe [_which gitk -script]
2004 set cmd [list [info nameofexecutable] $exe]
2006 error_popup [mc "Couldn't find gitk in PATH"]
2012 if {!$is_submodule} {
2017 cd $current_diff_path
2018 if {$revs eq {--}} {
2019 set s $file_states($current_diff_path)
2022 switch -glob -- [lindex $s 0] {
2023 M_ { set old_sha1 [lindex [lindex $s 2] 1] }
2024 _M { set old_sha1 [lindex [lindex $s 3] 1] }
2026 if {$current_diff_side eq $ui_index} {
2027 set old_sha1 [lindex [lindex $s 2] 1]
2028 set new_sha1 [lindex [lindex $s 3] 1]
2030 set old_sha1 [lindex [lindex $s 3] 1]
2034 set revs $old_sha1...$new_sha1
2036 # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones
2037 # we've been using for the main repository, so unset them.
2038 # TODO we could make life easier (start up faster?) for gitk
2039 # by setting these to the appropriate values to allow gitk
2040 # to skip the heuristics to find their proper value
2042 unset env(GIT_WORK_TREE)
2044 eval exec $cmd $revs "--" "--" &
2046 set env(GIT_DIR) $_gitdir
2047 set env(GIT_WORK_TREE) $_gitworktree
2050 ui_status $::starting_gitk_msg
2052 ui_ready $starting_gitk_msg
2057 proc do_git_gui {} {
2058 global current_diff_path
2060 # -- Always start git gui through whatever we were loaded with. This
2061 # lets us bypass using shell process on Windows systems.
2063 set exe [list [_which git]]
2065 error_popup [mc "Couldn't find git gui in PATH"]
2068 global _gitdir _gitworktree
2070 # see note in do_gitk about unsetting these vars when
2071 # running tools in a submodule
2073 unset env(GIT_WORK_TREE)
2076 cd $current_diff_path
2078 eval exec $exe gui &
2080 set env(GIT_DIR) $_gitdir
2081 set env(GIT_WORK_TREE) $_gitworktree
2084 ui_status $::starting_gitk_msg
2086 ui_ready $starting_gitk_msg
2091 proc do_explore {} {
2094 if {[is_Cygwin] || [is_Windows]} {
2095 set explorer "explorer.exe"
2096 } elseif {[is_MacOSX]} {
2099 # freedesktop.org-conforming system is our best shot
2100 set explorer "xdg-open"
2102 eval exec $explorer $_gitworktree &
2108 proc terminate_me {win} {
2110 if {$win ne {.}} return
2114 proc do_quit {{rc {1}}} {
2115 global ui_comm is_quitting repo_config commit_type
2116 global GITGUI_BCK_exists GITGUI_BCK_i
2117 global ui_comm_spell
2118 global ret_code use_ttk
2120 if {$is_quitting} return
2123 if {[winfo exists $ui_comm]} {
2124 # -- Stash our current commit buffer.
2126 set save [gitdir GITGUI_MSG]
2127 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
2128 file rename -force [gitdir GITGUI_BCK] $save
2129 set GITGUI_BCK_exists 0
2131 set msg [string trim [$ui_comm get 0.0 end]]
2132 regsub -all -line {[ \r\t]+$} $msg {} msg
2133 if {(![string match amend* $commit_type]
2134 || [$ui_comm edit modified])
2137 set fd [open $save w]
2138 puts -nonewline $fd $msg
2142 catch {file delete $save}
2146 # -- Cancel our spellchecker if its running.
2148 if {[info exists ui_comm_spell]} {
2152 # -- Remove our editor backup, its not needed.
2154 after cancel $GITGUI_BCK_i
2155 if {$GITGUI_BCK_exists} {
2156 catch {file delete [gitdir GITGUI_BCK]}
2159 # -- Stash our current window geometry into this repository.
2161 set cfg_wmstate [wm state .]
2162 if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} {
2165 if {$cfg_wmstate ne $rc_wmstate} {
2166 catch {git config gui.wmstate $cfg_wmstate}
2168 if {$cfg_wmstate eq {zoomed}} {
2169 # on Windows wm geometry will lie about window
2170 # position (but not size) when window is zoomed
2171 # restore the window before querying wm geometry
2174 set cfg_geometry [list]
2175 lappend cfg_geometry [wm geometry .]
2177 lappend cfg_geometry [.vpane sashpos 0]
2178 lappend cfg_geometry [.vpane.files sashpos 0]
2180 lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
2181 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
2183 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2186 if {$cfg_geometry ne $rc_geometry} {
2187 catch {git config gui.geometry $cfg_geometry}
2193 # Briefly enable send again, working around Tk bug
2194 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2195 tk appname [appname]
2204 proc ui_do_rescan {} {
2205 rescan {force_first_diff ui_ready}
2212 proc next_diff {{after {}}} {
2213 global next_diff_p next_diff_w next_diff_i
2214 show_diff $next_diff_p $next_diff_w {} {} $after
2217 proc find_anchor_pos {lst name} {
2218 set lid [lsearch -sorted -exact $lst $name]
2222 foreach lname $lst {
2223 if {$lname >= $name} break
2231 proc find_file_from {flist idx delta path mmask} {
2234 set len [llength $flist]
2235 while {$idx >= 0 && $idx < $len} {
2236 set name [lindex $flist $idx]
2238 if {$name ne $path && [info exists file_states($name)]} {
2239 set state [lindex $file_states($name) 0]
2241 if {$mmask eq {} || [regexp $mmask $state]} {
2252 proc find_next_diff {w path {lno {}} {mmask {}}} {
2253 global next_diff_p next_diff_w next_diff_i
2254 global file_lists ui_index ui_workdir
2256 set flist $file_lists($w)
2258 set lno [find_anchor_pos $flist $path]
2263 if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} {
2264 if {$w eq $ui_index} {
2267 set mmask "$mmask\$"
2271 set idx [find_file_from $flist $lno 1 $path $mmask]
2274 set idx [find_file_from $flist $lno -1 $path $mmask]
2279 set next_diff_p [lindex $flist $idx]
2280 set next_diff_i [expr {$idx+1}]
2287 proc next_diff_after_action {w path {lno {}} {mmask {}}} {
2288 global current_diff_path
2290 if {$path ne $current_diff_path} {
2292 } elseif {[find_next_diff $w $path $lno $mmask]} {
2295 return {reshow_diff;}
2299 proc select_first_diff {after} {
2302 if {[find_next_diff $ui_workdir {} 1 {^_?U}] ||
2303 [find_next_diff $ui_workdir {} 1 {[^O]$}]} {
2310 proc force_first_diff {after} {
2311 global ui_workdir current_diff_path file_states
2313 if {[info exists file_states($current_diff_path)]} {
2314 set state [lindex $file_states($current_diff_path) 0]
2320 if {[string first {U} $state] >= 0} {
2321 # Already a conflict, do nothing
2322 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} {
2324 } elseif {[string index $state 1] ne {O}} {
2325 # Already a diff & no conflicts, do nothing
2326 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} {
2337 proc toggle_or_diff {w x y} {
2338 global file_states file_lists current_diff_path ui_index ui_workdir
2339 global last_clicked selected_paths
2341 set pos [split [$w index @$x,$y] .]
2342 set lno [lindex $pos 0]
2343 set col [lindex $pos 1]
2344 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2350 set last_clicked [list $w $lno]
2351 array unset selected_paths
2352 $ui_index tag remove in_sel 0.0 end
2353 $ui_workdir tag remove in_sel 0.0 end
2355 # Determine the state of the file
2356 if {[info exists file_states($path)]} {
2357 set state [lindex $file_states($path) 0]
2362 # Restage the file, or simply show the diff
2363 if {$col == 0 && $y > 1} {
2364 # Conflicts need special handling
2365 if {[string first {U} $state] >= 0} {
2366 # $w must always be $ui_workdir, but...
2367 if {$w ne $ui_workdir} { set lno {} }
2368 merge_stage_workdir $path $lno
2372 if {[string index $state 1] eq {O}} {
2378 set after [next_diff_after_action $w $path $lno $mmask]
2380 if {$w eq $ui_index} {
2382 "Unstaging [short_path $path] from commit" \
2384 [concat $after [list ui_ready]]
2385 } elseif {$w eq $ui_workdir} {
2387 "Adding [short_path $path]" \
2389 [concat $after [list ui_ready]]
2392 show_diff $path $w $lno
2396 proc add_one_to_selection {w x y} {
2397 global file_lists last_clicked selected_paths
2399 set lno [lindex [split [$w index @$x,$y] .] 0]
2400 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2406 if {$last_clicked ne {}
2407 && [lindex $last_clicked 0] ne $w} {
2408 array unset selected_paths
2409 [lindex $last_clicked 0] tag remove in_sel 0.0 end
2412 set last_clicked [list $w $lno]
2413 if {[catch {set in_sel $selected_paths($path)}]} {
2417 unset selected_paths($path)
2418 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2420 set selected_paths($path) 1
2421 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2425 proc add_range_to_selection {w x y} {
2426 global file_lists last_clicked selected_paths
2428 if {[lindex $last_clicked 0] ne $w} {
2429 toggle_or_diff $w $x $y
2433 set lno [lindex [split [$w index @$x,$y] .] 0]
2434 set lc [lindex $last_clicked 1]
2443 foreach path [lrange $file_lists($w) \
2444 [expr {$begin - 1}] \
2445 [expr {$end - 1}]] {
2446 set selected_paths($path) 1
2448 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2451 proc show_more_context {} {
2453 if {$repo_config(gui.diffcontext) < 99} {
2454 incr repo_config(gui.diffcontext)
2459 proc show_less_context {} {
2461 if {$repo_config(gui.diffcontext) > 1} {
2462 incr repo_config(gui.diffcontext) -1
2467 ######################################################################
2475 menu .mbar -tearoff 0
2477 # -- Apple Menu (Mac OS X only)
2479 .mbar add cascade -label Apple -menu .mbar.apple
2482 .mbar add cascade -label [mc Repository] -menu .mbar.repository
2483 .mbar add cascade -label [mc Edit] -menu .mbar.edit
2484 if {[is_enabled branch]} {
2485 .mbar add cascade -label [mc Branch] -menu .mbar.branch
2487 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2488 .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
2490 if {[is_enabled transport]} {
2491 .mbar add cascade -label [mc Merge] -menu .mbar.merge
2492 .mbar add cascade -label [mc Remote] -menu .mbar.remote
2494 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2495 .mbar add cascade -label [mc Tools] -menu .mbar.tools
2498 # -- Repository Menu
2500 menu .mbar.repository
2503 .mbar.repository add command \
2504 -label [mc "Explore Working Copy"] \
2505 -command {do_explore}
2506 .mbar.repository add separator
2509 .mbar.repository add command \
2510 -label [mc "Browse Current Branch's Files"] \
2511 -command {browser::new $current_branch}
2512 set ui_browse_current [.mbar.repository index last]
2513 .mbar.repository add command \
2514 -label [mc "Browse Branch Files..."] \
2515 -command browser_open::dialog
2516 .mbar.repository add separator
2518 .mbar.repository add command \
2519 -label [mc "Visualize Current Branch's History"] \
2520 -command {do_gitk $current_branch}
2521 set ui_visualize_current [.mbar.repository index last]
2522 .mbar.repository add command \
2523 -label [mc "Visualize All Branch History"] \
2524 -command {do_gitk --all}
2525 .mbar.repository add separator
2527 proc current_branch_write {args} {
2528 global current_branch
2529 .mbar.repository entryconf $::ui_browse_current \
2530 -label [mc "Browse %s's Files" $current_branch]
2531 .mbar.repository entryconf $::ui_visualize_current \
2532 -label [mc "Visualize %s's History" $current_branch]
2534 trace add variable current_branch write current_branch_write
2536 if {[is_enabled multicommit]} {
2537 .mbar.repository add command -label [mc "Database Statistics"] \
2540 .mbar.repository add command -label [mc "Compress Database"] \
2543 .mbar.repository add command -label [mc "Verify Database"] \
2544 -command do_fsck_objects
2546 .mbar.repository add separator
2549 .mbar.repository add command \
2550 -label [mc "Create Desktop Icon"] \
2551 -command do_cygwin_shortcut
2552 } elseif {[is_Windows]} {
2553 .mbar.repository add command \
2554 -label [mc "Create Desktop Icon"] \
2555 -command do_windows_shortcut
2556 } elseif {[is_MacOSX]} {
2557 .mbar.repository add command \
2558 -label [mc "Create Desktop Icon"] \
2559 -command do_macosx_app
2564 proc ::tk::mac::Quit {args} { do_quit }
2566 .mbar.repository add command -label [mc Quit] \
2574 .mbar.edit add command -label [mc Undo] \
2575 -command {catch {[focus] edit undo}} \
2577 .mbar.edit add command -label [mc Redo] \
2578 -command {catch {[focus] edit redo}} \
2580 .mbar.edit add separator
2581 .mbar.edit add command -label [mc Cut] \
2582 -command {catch {tk_textCut [focus]}} \
2584 .mbar.edit add command -label [mc Copy] \
2585 -command {catch {tk_textCopy [focus]}} \
2587 .mbar.edit add command -label [mc Paste] \
2588 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2590 .mbar.edit add command -label [mc Delete] \
2591 -command {catch {[focus] delete sel.first sel.last}} \
2593 .mbar.edit add separator
2594 .mbar.edit add command -label [mc "Select All"] \
2595 -command {catch {[focus] tag add sel 0.0 end}} \
2600 if {[is_enabled branch]} {
2603 .mbar.branch add command -label [mc "Create..."] \
2604 -command branch_create::dialog \
2606 lappend disable_on_lock [list .mbar.branch entryconf \
2607 [.mbar.branch index last] -state]
2609 .mbar.branch add command -label [mc "Checkout..."] \
2610 -command branch_checkout::dialog \
2612 lappend disable_on_lock [list .mbar.branch entryconf \
2613 [.mbar.branch index last] -state]
2615 .mbar.branch add command -label [mc "Rename..."] \
2616 -command branch_rename::dialog
2617 lappend disable_on_lock [list .mbar.branch entryconf \
2618 [.mbar.branch index last] -state]
2620 .mbar.branch add command -label [mc "Delete..."] \
2621 -command branch_delete::dialog
2622 lappend disable_on_lock [list .mbar.branch entryconf \
2623 [.mbar.branch index last] -state]
2625 .mbar.branch add command -label [mc "Reset..."] \
2626 -command merge::reset_hard
2627 lappend disable_on_lock [list .mbar.branch entryconf \
2628 [.mbar.branch index last] -state]
2633 proc commit_btn_caption {} {
2634 if {[is_enabled nocommit]} {
2637 return [mc Commit@@verb]
2641 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2644 if {![is_enabled nocommit]} {
2645 .mbar.commit add radiobutton \
2646 -label [mc "New Commit"] \
2647 -command do_select_commit_type \
2648 -variable selected_commit_type \
2650 lappend disable_on_lock \
2651 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2653 .mbar.commit add radiobutton \
2654 -label [mc "Amend Last Commit"] \
2655 -command do_select_commit_type \
2656 -variable selected_commit_type \
2658 lappend disable_on_lock \
2659 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2661 .mbar.commit add separator
2664 .mbar.commit add command -label [mc Rescan] \
2665 -command ui_do_rescan \
2667 lappend disable_on_lock \
2668 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2670 .mbar.commit add command -label [mc "Stage To Commit"] \
2671 -command do_add_selection \
2673 lappend disable_on_lock \
2674 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2676 .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
2677 -command do_add_all \
2679 lappend disable_on_lock \
2680 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2682 .mbar.commit add command -label [mc "Unstage From Commit"] \
2683 -command do_unstage_selection \
2685 lappend disable_on_lock \
2686 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2688 .mbar.commit add command -label [mc "Revert Changes"] \
2689 -command do_revert_selection \
2691 lappend disable_on_lock \
2692 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2694 .mbar.commit add separator
2696 .mbar.commit add command -label [mc "Show Less Context"] \
2697 -command show_less_context \
2698 -accelerator $M1T-\-
2700 .mbar.commit add command -label [mc "Show More Context"] \
2701 -command show_more_context \
2704 .mbar.commit add separator
2706 if {![is_enabled nocommitmsg]} {
2707 .mbar.commit add command -label [mc "Sign Off"] \
2708 -command do_signoff \
2712 .mbar.commit add command -label [commit_btn_caption] \
2713 -command do_commit \
2714 -accelerator $M1T-Return
2715 lappend disable_on_lock \
2716 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2721 if {[is_enabled branch]} {
2723 .mbar.merge add command -label [mc "Local Merge..."] \
2724 -command merge::dialog \
2726 lappend disable_on_lock \
2727 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2728 .mbar.merge add command -label [mc "Abort Merge..."] \
2729 -command merge::reset_hard
2730 lappend disable_on_lock \
2731 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2736 if {[is_enabled transport]} {
2739 .mbar.remote add command \
2740 -label [mc "Add..."] \
2741 -command remote_add::dialog \
2743 .mbar.remote add command \
2744 -label [mc "Push..."] \
2745 -command do_push_anywhere \
2747 .mbar.remote add command \
2748 -label [mc "Delete Branch..."] \
2749 -command remote_branch_delete::dialog
2753 proc ::tk::mac::ShowPreferences {} {do_options}
2757 .mbar.edit add separator
2758 .mbar.edit add command -label [mc "Options..."] \
2764 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2765 set tools_menubar .mbar.tools
2767 $tools_menubar add separator
2768 $tools_menubar add command -label [mc "Add..."] -command tools_add::dialog
2769 $tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog
2771 if {[array names repo_config guitool.*.cmd] ne {}} {
2778 .mbar add cascade -label [mc Help] -menu .mbar.help
2782 .mbar.apple add command -label [mc "About %s" [appname]] \
2784 .mbar.apple add separator
2786 .mbar.help add command -label [mc "About %s" [appname]] \
2789 . configure -menu .mbar
2791 set doc_path [githtmldir]
2792 if {$doc_path ne {}} {
2793 set doc_path [file join $doc_path index.html]
2796 set doc_path [exec cygpath --mixed $doc_path]
2800 if {[file isfile $doc_path]} {
2801 set doc_url "file:$doc_path"
2803 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
2806 proc start_browser {url} {
2807 git "web--browse" $url
2810 .mbar.help add command -label [mc "Online Documentation"] \
2811 -command [list start_browser $doc_url]
2813 .mbar.help add command -label [mc "Show SSH Key"] \
2816 unset doc_path doc_url
2818 # -- Standard bindings
2820 wm protocol . WM_DELETE_WINDOW do_quit
2821 bind all <$M1B-Key-q> do_quit
2822 bind all <$M1B-Key-Q> do_quit
2823 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2824 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
2826 set subcommand_args {}
2828 puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
2832 proc normalize_relpath {path} {
2834 foreach item [file split $path] {
2835 if {$item eq {.}} continue
2836 if {$item eq {..} && [llength $elements] > 0
2837 && [lindex $elements end] ne {..}} {
2838 set elements [lrange $elements 0 end-1]
2841 lappend elements $item
2843 return [eval file join $elements]
2846 # -- Not a normal commit type invocation? Do that instead!
2848 switch -- $subcommand {
2851 if {$subcommand eq "blame"} {
2852 set subcommand_args {[--line=<num>] rev? path}
2854 set subcommand_args {rev? path}
2856 if {$argv eq {}} usage
2862 if {$is_path || [file exists $_prefix$a]} {
2863 if {$path ne {}} usage
2864 set path [normalize_relpath $_prefix$a]
2866 } elseif {$a eq {--}} {
2868 if {$head ne {}} usage
2873 } elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
2874 if {$jump_spec ne {} || $head ne {}} usage
2875 set jump_spec [list $lnum]
2876 } elseif {$head eq {}} {
2877 if {$head ne {}} usage
2886 if {$head ne {} && $path eq {}} {
2887 set path [normalize_relpath $_prefix$head]
2894 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
2896 set head [git rev-parse --verify $head]
2902 set current_branch $head
2905 switch -- $subcommand {
2907 if {$jump_spec ne {}} usage
2909 if {$path ne {} && [file isdirectory $path]} {
2910 set head $current_branch
2916 browser::new $head $path
2919 if {$head eq {} && ![file exists $path]} {
2920 puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
2923 blame::new $head $path $jump_spec
2930 if {[llength $argv] != 0} {
2931 puts -nonewline stderr "usage: $argv0"
2932 if {$subcommand ne {gui}
2933 && [file tail $argv0] ne "git-$subcommand"} {
2934 puts -nonewline stderr " $subcommand"
2939 # fall through to setup UI for commits
2942 puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
2949 ${NS}::frame .branch
2950 if {!$use_ttk} {.branch configure -borderwidth 1 -relief sunken}
2951 ${NS}::label .branch.l1 \
2952 -text [mc "Current Branch:"] \
2955 ${NS}::label .branch.cb \
2956 -textvariable current_branch \
2959 pack .branch.l1 -side left
2960 pack .branch.cb -side left -fill x
2961 pack .branch -side top -fill x
2963 # -- Main Window Layout
2965 ${NS}::panedwindow .vpane -orient horizontal
2966 ${NS}::panedwindow .vpane.files -orient vertical
2968 .vpane add .vpane.files
2970 .vpane add .vpane.files -sticky nsew -height 100 -width 200
2972 pack .vpane -anchor n -side top -fill both -expand 1
2974 # -- Index File List
2976 ${NS}::frame .vpane.files.index -height 100 -width 200
2977 tlabel .vpane.files.index.title \
2978 -text [mc "Staged Changes (Will Commit)"] \
2979 -background lightgreen -foreground black
2980 text $ui_index -background white -foreground black \
2982 -width 20 -height 10 \
2984 -cursor $cursor_ptr \
2985 -xscrollcommand {.vpane.files.index.sx set} \
2986 -yscrollcommand {.vpane.files.index.sy set} \
2988 ${NS}::scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
2989 ${NS}::scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
2990 pack .vpane.files.index.title -side top -fill x
2991 pack .vpane.files.index.sx -side bottom -fill x
2992 pack .vpane.files.index.sy -side right -fill y
2993 pack $ui_index -side left -fill both -expand 1
2995 # -- Working Directory File List
2997 ${NS}::frame .vpane.files.workdir -height 100 -width 200
2998 tlabel .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
2999 -background lightsalmon -foreground black
3000 text $ui_workdir -background white -foreground black \
3002 -width 20 -height 10 \
3004 -cursor $cursor_ptr \
3005 -xscrollcommand {.vpane.files.workdir.sx set} \
3006 -yscrollcommand {.vpane.files.workdir.sy set} \
3008 ${NS}::scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
3009 ${NS}::scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
3010 pack .vpane.files.workdir.title -side top -fill x
3011 pack .vpane.files.workdir.sx -side bottom -fill x
3012 pack .vpane.files.workdir.sy -side right -fill y
3013 pack $ui_workdir -side left -fill both -expand 1
3015 .vpane.files add .vpane.files.workdir
3016 .vpane.files add .vpane.files.index
3018 .vpane.files paneconfigure .vpane.files.workdir -sticky news
3019 .vpane.files paneconfigure .vpane.files.index -sticky news
3022 foreach i [list $ui_index $ui_workdir] {
3024 $i tag conf in_diff -background [$i tag cget in_sel -background]
3028 # -- Diff and Commit Area
3030 ${NS}::frame .vpane.lower -height 300 -width 400
3031 ${NS}::frame .vpane.lower.commarea
3032 ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1
3033 pack .vpane.lower.diff -fill both -expand 1
3034 pack .vpane.lower.commarea -side bottom -fill x
3035 .vpane add .vpane.lower
3036 if {!$use_ttk} {.vpane paneconfigure .vpane.lower -sticky nsew}
3038 # -- Commit Area Buttons
3040 ${NS}::frame .vpane.lower.commarea.buttons
3041 ${NS}::label .vpane.lower.commarea.buttons.l -text {} \
3044 pack .vpane.lower.commarea.buttons.l -side top -fill x
3045 pack .vpane.lower.commarea.buttons -side left -fill y
3047 ${NS}::button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
3048 -command ui_do_rescan
3049 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3050 lappend disable_on_lock \
3051 {.vpane.lower.commarea.buttons.rescan conf -state}
3053 ${NS}::button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
3055 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3056 lappend disable_on_lock \
3057 {.vpane.lower.commarea.buttons.incall conf -state}
3059 if {![is_enabled nocommitmsg]} {
3060 ${NS}::button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
3062 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3065 ${NS}::button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
3067 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3068 lappend disable_on_lock \
3069 {.vpane.lower.commarea.buttons.commit conf -state}
3071 if {![is_enabled nocommit]} {
3072 ${NS}::button .vpane.lower.commarea.buttons.push -text [mc Push] \
3073 -command do_push_anywhere
3074 pack .vpane.lower.commarea.buttons.push -side top -fill x
3077 # -- Commit Message Buffer
3079 ${NS}::frame .vpane.lower.commarea.buffer
3080 ${NS}::frame .vpane.lower.commarea.buffer.header
3081 set ui_comm .vpane.lower.commarea.buffer.t
3082 set ui_coml .vpane.lower.commarea.buffer.header.l
3084 if {![is_enabled nocommit]} {
3085 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \
3086 -text [mc "New Commit"] \
3087 -command do_select_commit_type \
3088 -variable selected_commit_type \
3090 lappend disable_on_lock \
3091 [list .vpane.lower.commarea.buffer.header.new conf -state]
3092 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \
3093 -text [mc "Amend Last Commit"] \
3094 -command do_select_commit_type \
3095 -variable selected_commit_type \
3097 lappend disable_on_lock \
3098 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3101 ${NS}::label $ui_coml \
3104 proc trace_commit_type {varname args} {
3105 global ui_coml commit_type
3106 switch -glob -- $commit_type {
3107 initial {set txt [mc "Initial Commit Message:"]}
3108 amend {set txt [mc "Amended Commit Message:"]}
3109 amend-initial {set txt [mc "Amended Initial Commit Message:"]}
3110 amend-merge {set txt [mc "Amended Merge Commit Message:"]}
3111 merge {set txt [mc "Merge Commit Message:"]}
3112 * {set txt [mc "Commit Message:"]}
3114 $ui_coml conf -text $txt
3116 trace add variable commit_type write trace_commit_type
3117 pack $ui_coml -side left -fill x
3119 if {![is_enabled nocommit]} {
3120 pack .vpane.lower.commarea.buffer.header.amend -side right
3121 pack .vpane.lower.commarea.buffer.header.new -side right
3124 text $ui_comm -background white -foreground black \
3128 -autoseparators true \
3130 -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
3132 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3133 ${NS}::scrollbar .vpane.lower.commarea.buffer.sby \
3134 -command [list $ui_comm yview]
3135 pack .vpane.lower.commarea.buffer.header -side top -fill x
3136 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3137 pack $ui_comm -side left -fill y
3138 pack .vpane.lower.commarea.buffer -side left -fill y
3140 # -- Commit Message Buffer Context Menu
3142 set ctxm .vpane.lower.commarea.buffer.ctxm
3143 menu $ctxm -tearoff 0
3146 -command {tk_textCut $ui_comm}
3149 -command {tk_textCopy $ui_comm}
3152 -command {tk_textPaste $ui_comm}
3154 -label [mc Delete] \
3155 -command {catch {$ui_comm delete sel.first sel.last}}
3158 -label [mc "Select All"] \
3159 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
3161 -label [mc "Copy All"] \
3163 $ui_comm tag add sel 0.0 end
3164 tk_textCopy $ui_comm
3165 $ui_comm tag remove sel 0.0 end
3169 -label [mc "Sign Off"] \
3171 set ui_comm_ctxm $ctxm
3175 proc trace_current_diff_path {varname args} {
3176 global current_diff_path diff_actions file_states
3177 if {$current_diff_path eq {}} {
3183 set p $current_diff_path
3184 set s [mapdesc [lindex $file_states($p) 0] $p]
3186 set p [escape_path $p]
3190 .vpane.lower.diff.header.status configure -text $s
3191 .vpane.lower.diff.header.file configure -text $f
3192 .vpane.lower.diff.header.path configure -text $p
3193 foreach w $diff_actions {
3197 trace add variable current_diff_path write trace_current_diff_path
3199 gold_frame .vpane.lower.diff.header
3200 tlabel .vpane.lower.diff.header.status \
3203 -width $max_status_desc \
3206 tlabel .vpane.lower.diff.header.file \
3211 tlabel .vpane.lower.diff.header.path \
3216 pack .vpane.lower.diff.header.status -side left
3217 pack .vpane.lower.diff.header.file -side left
3218 pack .vpane.lower.diff.header.path -fill x
3219 set ctxm .vpane.lower.diff.header.ctxm
3220 menu $ctxm -tearoff 0
3228 -- $current_diff_path
3230 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3231 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3235 ${NS}::frame .vpane.lower.diff.body
3236 set ui_diff .vpane.lower.diff.body.t
3237 text $ui_diff -background white -foreground black \
3239 -width 80 -height 5 -wrap none \
3241 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3242 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3244 ${NS}::scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3245 -command [list $ui_diff xview]
3246 ${NS}::scrollbar .vpane.lower.diff.body.sby -orient vertical \
3247 -command [list $ui_diff yview]
3248 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3249 pack .vpane.lower.diff.body.sby -side right -fill y
3250 pack $ui_diff -side left -fill both -expand 1
3251 pack .vpane.lower.diff.header -side top -fill x
3252 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3254 $ui_diff tag conf d_cr -elide true
3255 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
3256 $ui_diff tag conf d_+ -foreground {#00a000}
3257 $ui_diff tag conf d_- -foreground red
3259 $ui_diff tag conf d_++ -foreground {#00a000}
3260 $ui_diff tag conf d_-- -foreground red
3261 $ui_diff tag conf d_+s \
3262 -foreground {#00a000} \
3263 -background {#e2effa}
3264 $ui_diff tag conf d_-s \
3266 -background {#e2effa}
3267 $ui_diff tag conf d_s+ \
3268 -foreground {#00a000} \
3270 $ui_diff tag conf d_s- \
3274 $ui_diff tag conf d<<<<<<< \
3275 -foreground orange \
3277 $ui_diff tag conf d======= \
3278 -foreground orange \
3280 $ui_diff tag conf d>>>>>>> \
3281 -foreground orange \
3284 $ui_diff tag raise sel
3286 # -- Diff Body Context Menu
3289 proc create_common_diff_popup {ctxm} {
3291 -label [mc Refresh] \
3292 -command reshow_diff
3293 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3296 -command {tk_textCopy $ui_diff}
3297 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3299 -label [mc "Select All"] \
3300 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
3301 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3303 -label [mc "Copy All"] \
3305 $ui_diff tag add sel 0.0 end
3306 tk_textCopy $ui_diff
3307 $ui_diff tag remove sel 0.0 end
3309 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3312 -label [mc "Decrease Font Size"] \
3313 -command {incr_font_size font_diff -1}
3314 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3316 -label [mc "Increase Font Size"] \
3317 -command {incr_font_size font_diff 1}
3318 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3322 build_encoding_menu $emenu [list force_diff_encoding]
3324 -label [mc "Encoding"] \
3326 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3328 $ctxm add command -label [mc "Options..."] \
3332 set ctxm .vpane.lower.diff.body.ctxm
3333 menu $ctxm -tearoff 0
3335 -label [mc "Apply/Reverse Hunk"] \
3336 -command {apply_hunk $cursorX $cursorY}
3337 set ui_diff_applyhunk [$ctxm index last]
3338 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
3340 -label [mc "Apply/Reverse Line"] \
3341 -command {apply_range_or_line $cursorX $cursorY; do_rescan}
3342 set ui_diff_applyline [$ctxm index last]
3343 lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
3346 -label [mc "Show Less Context"] \
3347 -command show_less_context
3348 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3350 -label [mc "Show More Context"] \
3351 -command show_more_context
3352 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3354 create_common_diff_popup $ctxm
3356 set ctxmmg .vpane.lower.diff.body.ctxmmg
3357 menu $ctxmmg -tearoff 0
3358 $ctxmmg add command \
3359 -label [mc "Run Merge Tool"] \
3360 -command {merge_resolve_tool}
3361 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3362 $ctxmmg add separator
3363 $ctxmmg add command \
3364 -label [mc "Use Remote Version"] \
3365 -command {merge_resolve_one 3}
3366 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3367 $ctxmmg add command \
3368 -label [mc "Use Local Version"] \
3369 -command {merge_resolve_one 2}
3370 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3371 $ctxmmg add command \
3372 -label [mc "Revert To Base"] \
3373 -command {merge_resolve_one 1}
3374 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3375 $ctxmmg add separator
3376 $ctxmmg add command \
3377 -label [mc "Show Less Context"] \
3378 -command show_less_context
3379 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3380 $ctxmmg add command \
3381 -label [mc "Show More Context"] \
3382 -command show_more_context
3383 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3384 $ctxmmg add separator
3385 create_common_diff_popup $ctxmmg
3387 set ctxmsm .vpane.lower.diff.body.ctxmsm
3388 menu $ctxmsm -tearoff 0
3389 $ctxmsm add command \
3390 -label [mc "Visualize These Changes In The Submodule"] \
3391 -command {do_gitk -- true}
3392 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3393 $ctxmsm add command \
3394 -label [mc "Visualize Current Branch History In The Submodule"] \
3395 -command {do_gitk {} true}
3396 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3397 $ctxmsm add command \
3398 -label [mc "Visualize All Branch History In The Submodule"] \
3399 -command {do_gitk --all true}
3400 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3401 $ctxmsm add separator
3402 $ctxmsm add command \
3403 -label [mc "Start git gui In The Submodule"] \
3404 -command {do_git_gui}
3405 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3406 $ctxmsm add separator
3407 create_common_diff_popup $ctxmsm
3409 proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
3410 global current_diff_path file_states
3413 if {[info exists file_states($current_diff_path)]} {
3414 set state [lindex $file_states($current_diff_path) 0]
3418 if {[string first {U} $state] >= 0} {
3419 tk_popup $ctxmmg $X $Y
3420 } elseif {$::is_submodule_diff} {
3421 tk_popup $ctxmsm $X $Y
3423 set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}]
3424 if {$::ui_index eq $::current_diff_side} {
3425 set l [mc "Unstage Hunk From Commit"]
3427 set t [mc "Unstage Lines From Commit"]
3429 set t [mc "Unstage Line From Commit"]
3432 set l [mc "Stage Hunk For Commit"]
3434 set t [mc "Stage Lines For Commit"]
3436 set t [mc "Stage Line For Commit"]
3440 || $current_diff_path eq {}
3444 || {T_} eq $state} {
3449 $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
3450 $ctxm entryconf $::ui_diff_applyline -state $s -label $t
3451 tk_popup $ctxm $X $Y
3454 bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg $ctxmsm %x %y %X %Y]
3458 set main_status [::status_bar::new .status]
3459 pack .status -anchor w -side bottom -fill x
3460 $main_status show [mc "Initializing..."]
3465 set gm $repo_config(gui.geometry)
3466 wm geometry . [lindex $gm 0]
3468 .vpane sashpos 0 [lindex $gm 1]
3469 .vpane.files sashpos 0 [lindex $gm 2]
3471 .vpane sash place 0 \
3473 [lindex [.vpane sash coord 0] 1]
3474 .vpane.files sash place 0 \
3475 [lindex [.vpane.files sash coord 0] 0] \
3481 # -- Load window state
3484 set gws $repo_config(gui.wmstate)
3491 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3492 bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
3493 bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
3494 bind $ui_comm <$M1B-Key-u> {do_unstage_selection;break}
3495 bind $ui_comm <$M1B-Key-U> {do_unstage_selection;break}
3496 bind $ui_comm <$M1B-Key-j> {do_revert_selection;break}
3497 bind $ui_comm <$M1B-Key-J> {do_revert_selection;break}
3498 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3499 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3500 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3501 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3502 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3503 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3504 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3505 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3506 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3507 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3508 bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
3509 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
3510 bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
3511 bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
3512 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
3514 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3515 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3516 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3517 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3518 bind $ui_diff <$M1B-Key-v> {break}
3519 bind $ui_diff <$M1B-Key-V> {break}
3520 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3521 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3522 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3523 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3524 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3525 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3526 bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
3527 bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
3528 bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
3529 bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
3530 bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
3531 bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
3532 bind $ui_diff <Button-1> {focus %W}
3534 if {[is_enabled branch]} {
3535 bind . <$M1B-Key-n> branch_create::dialog
3536 bind . <$M1B-Key-N> branch_create::dialog
3537 bind . <$M1B-Key-o> branch_checkout::dialog
3538 bind . <$M1B-Key-O> branch_checkout::dialog
3539 bind . <$M1B-Key-m> merge::dialog
3540 bind . <$M1B-Key-M> merge::dialog
3542 if {[is_enabled transport]} {
3543 bind . <$M1B-Key-p> do_push_anywhere
3544 bind . <$M1B-Key-P> do_push_anywhere
3547 bind . <Key-F5> ui_do_rescan
3548 bind . <$M1B-Key-r> ui_do_rescan
3549 bind . <$M1B-Key-R> ui_do_rescan
3550 bind . <$M1B-Key-s> do_signoff
3551 bind . <$M1B-Key-S> do_signoff
3552 bind . <$M1B-Key-t> do_add_selection
3553 bind . <$M1B-Key-T> do_add_selection
3554 bind . <$M1B-Key-j> do_revert_selection
3555 bind . <$M1B-Key-J> do_revert_selection
3556 bind . <$M1B-Key-i> do_add_all
3557 bind . <$M1B-Key-I> do_add_all
3558 bind . <$M1B-Key-minus> {show_less_context;break}
3559 bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
3560 bind . <$M1B-Key-equal> {show_more_context;break}
3561 bind . <$M1B-Key-plus> {show_more_context;break}
3562 bind . <$M1B-Key-KP_Add> {show_more_context;break}
3563 bind . <$M1B-Key-Return> do_commit
3564 foreach i [list $ui_index $ui_workdir] {
3565 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3566 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3567 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3571 set file_lists($ui_index) [list]
3572 set file_lists($ui_workdir) [list]
3574 wm title . "[appname] ([reponame]) [file normalize $_gitworktree]"
3575 focus -force $ui_comm
3577 # -- Warn the user about environmental problems. Cygwin's Tcl
3578 # does *not* pass its env array onto any processes it spawns.
3579 # This means that git processes get none of our environment.
3584 set msg [mc "Possible environment issues exist.
3586 The following environment variables are probably
3587 going to be ignored by any Git subprocess run
3591 foreach name [array names env] {
3592 switch -regexp -- $name {
3593 {^GIT_INDEX_FILE$} -
3594 {^GIT_OBJECT_DIRECTORY$} -
3595 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3597 {^GIT_EXTERNAL_DIFF$} -
3601 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3602 append msg " - $name\n"
3605 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3606 append msg " - $name\n"
3608 set suggest_user $name
3612 if {$ignored_env > 0} {
3614 This is due to a known issue with the
3615 Tcl binary distributed by Cygwin."]
3617 if {$suggest_user ne {}} {
3620 A good replacement for %s
3621 is placing values for the user.name and
3622 user.email settings into your personal
3628 unset ignored_env msg suggest_user name
3631 # -- Only initialize complex UI if we are going to stay running.
3633 if {[is_enabled transport]} {
3636 set n [.mbar.remote index end]
3637 populate_remotes_menu
3638 set n [expr {[.mbar.remote index end] - $n}]
3640 if {[.mbar.remote type 0] eq "tearoff"} { incr n }
3641 .mbar.remote insert $n separator
3646 if {[winfo exists $ui_comm]} {
3647 set GITGUI_BCK_exists [load_message GITGUI_BCK]
3649 # -- If both our backup and message files exist use the
3650 # newer of the two files to initialize the buffer.
3652 if {$GITGUI_BCK_exists} {
3653 set m [gitdir GITGUI_MSG]
3654 if {[file isfile $m]} {
3655 if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
3656 catch {file delete [gitdir GITGUI_MSG]}
3658 $ui_comm delete 0.0 end
3660 $ui_comm edit modified false
3661 catch {file delete [gitdir GITGUI_BCK]}
3662 set GITGUI_BCK_exists 0
3668 proc backup_commit_buffer {} {
3669 global ui_comm GITGUI_BCK_exists
3671 set m [$ui_comm edit modified]
3672 if {$m || $GITGUI_BCK_exists} {
3673 set msg [string trim [$ui_comm get 0.0 end]]
3674 regsub -all -line {[ \r\t]+$} $msg {} msg
3677 if {$GITGUI_BCK_exists} {
3678 catch {file delete [gitdir GITGUI_BCK]}
3679 set GITGUI_BCK_exists 0
3683 set fd [open [gitdir GITGUI_BCK] w]
3684 puts -nonewline $fd $msg
3686 set GITGUI_BCK_exists 1
3690 $ui_comm edit modified false
3693 set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
3696 backup_commit_buffer
3698 # -- If the user has aspell available we can drive it
3699 # in pipe mode to spellcheck the commit message.
3701 set spell_cmd [list |]
3702 set spell_dict [get_config gui.spellingdictionary]
3703 lappend spell_cmd aspell
3704 if {$spell_dict ne {}} {
3705 lappend spell_cmd --master=$spell_dict
3707 lappend spell_cmd --mode=none
3708 lappend spell_cmd --encoding=utf-8
3709 lappend spell_cmd pipe
3710 if {$spell_dict eq {none}
3711 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
3712 bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
3714 set ui_comm_spell [spellcheck::init \
3720 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3723 lock_index begin-read
3724 if {![winfo ismapped .]} {
3728 if {[is_enabled initialamend]} {
3734 if {[is_enabled nocommitmsg]} {
3735 $ui_comm configure -state disabled -background gray
3738 if {[is_enabled multicommit]} {
3741 if {[is_enabled retcode]} {
3742 bind . <Destroy> {+terminate_me %W}
3744 if {$picked && [is_config_true gui.autoexplore]} {
3750 # indent-tabs-mode: t