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}
129 set _trace [lsearch -exact $argv --trace]
131 set argv [lreplace $argv $_trace $_trace]
147 return [eval [list file join $_gitdir] $args]
150 proc gitexec {args} {
152 if {$_gitexec eq {}} {
153 if {[catch {set _gitexec [git --exec-path]} err]} {
154 error "Git not installed?\n\n$err"
157 set _gitexec [exec cygpath \
162 set _gitexec [file normalize $_gitexec]
168 return [eval [list file join $_gitexec] $args]
176 if {[tk windowingsystem] eq {aqua}} {
183 if {$::tcl_platform(platform) eq {windows}} {
191 if {$_iscygwin eq {}} {
192 if {$::tcl_platform(platform) eq {windows}} {
193 if {[catch {set p [exec cygpath --windir]} err]} {
205 proc is_enabled {option} {
206 global enabled_options
207 if {[catch {set on $enabled_options($option)}]} {return 0}
211 proc enable_option {option} {
212 global enabled_options
213 set enabled_options($option) 1
216 proc disable_option {option} {
217 global enabled_options
218 set enabled_options($option) 0
221 ######################################################################
225 proc is_many_config {name} {
226 switch -glob -- $name {
236 proc is_config_true {name} {
238 if {[catch {set v $repo_config($name)}]} {
240 } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
247 proc get_config {name} {
249 if {[catch {set v $repo_config($name)}]} {
256 ######################################################################
260 proc _trace_exec {cmd} {
261 if {!$::_trace} return
267 if {[regexp {[ \t\r\n'"$?*]} $v]} {
275 proc _git_cmd {name} {
278 if {[catch {set v $_git_cmd_path($name)}]} {
282 --exec-path { return [list $::_git $name] }
285 set p [gitexec git-$name$::_search_exe]
286 if {[file exists $p]} {
288 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
289 # Try to determine what sort of magic will make
290 # git-$name go and do its thing, because native
291 # Tcl on Windows doesn't know it.
293 set p [gitexec git-$name]
298 switch -glob -- [lindex $s 0] {
300 #!*perl { set i perl }
301 #!*python { set i python }
302 default { error "git-$name is not supported: $s" }
306 if {![info exists interp]} {
307 set interp [_which $i]
310 error "git-$name requires $i (not in PATH)"
312 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
314 # Assume it is builtin to git somehow and we
315 # aren't actually able to see a file for it.
317 set v [list $::_git $name]
319 set _git_cmd_path($name) $v
324 proc _which {what args} {
325 global env _search_exe _search_path
327 if {$_search_path eq {}} {
328 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
329 set _search_path [split [exec cygpath \
335 } elseif {[is_Windows]} {
336 set gitguidir [file dirname [info script]]
337 regsub -all ";" $gitguidir "\\;" gitguidir
338 set env(PATH) "$gitguidir;$env(PATH)"
339 set _search_path [split $env(PATH) {;}]
342 set _search_path [split $env(PATH) :]
347 if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
350 set suffix $_search_exe
353 foreach p $_search_path {
354 set p [file join $p $what$suffix]
355 if {[file exists $p]} {
356 return [file normalize $p]
362 proc _lappend_nice {cmd_var} {
366 if {![info exists _nice]} {
367 set _nice [_which nice]
378 switch -- [lindex $args 0] {
389 set args [lrange $args 1 end]
392 set cmdp [_git_cmd [lindex $args 0]]
393 set args [lrange $args 1 end]
395 _trace_exec [concat $opt $cmdp $args]
396 set result [eval exec $opt $cmdp $args]
398 puts stderr "< $result"
403 proc _open_stdout_stderr {cmd} {
406 set fd [open [concat [list | ] $cmd] r]
408 if { [lindex $cmd end] eq {2>@1}
409 && $err eq {can not find channel named "1"}
411 # Older versions of Tcl 8.4 don't have this 2>@1 IO
412 # redirect operator. Fallback to |& cat for those.
413 # The command was not actually started, so its safe
414 # to try to start it a second time.
416 set fd [open [concat \
418 [lrange $cmd 0 end-1] \
425 fconfigure $fd -eofchar {}
429 proc git_read {args} {
433 switch -- [lindex $args 0] {
448 set args [lrange $args 1 end]
451 set cmdp [_git_cmd [lindex $args 0]]
452 set args [lrange $args 1 end]
454 return [_open_stdout_stderr [concat $opt $cmdp $args]]
457 proc git_write {args} {
461 switch -- [lindex $args 0] {
472 set args [lrange $args 1 end]
475 set cmdp [_git_cmd [lindex $args 0]]
476 set args [lrange $args 1 end]
478 _trace_exec [concat $opt $cmdp $args]
479 return [open [concat [list | ] $opt $cmdp $args] w]
482 proc githook_read {hook_name args} {
483 set pchook [gitdir hooks $hook_name]
486 # On Windows [file executable] might lie so we need to ask
487 # the shell if the hook is executable. Yes that's annoying.
491 if {![info exists interp]} {
492 set interp [_which sh]
495 error "hook execution requires sh (not in PATH)"
498 set scr {if test -x "$1";then exec "$@";fi}
499 set sh_c [list $interp -c $scr $interp $pchook]
500 return [_open_stdout_stderr [concat $sh_c $args]]
503 if {[file executable $pchook]} {
504 return [_open_stdout_stderr [concat [list $pchook] $args]]
510 proc kill_file_process {fd} {
511 set process [pid $fd]
515 # Use a Cygwin-specific flag to allow killing
516 # native Windows processes
517 exec kill -f $process
525 regsub -all ' $value "'\\''" value
529 proc load_current_branch {} {
530 global current_branch is_detached
532 set fd [open [gitdir HEAD] r]
533 if {[gets $fd ref] < 1} {
538 set pfx {ref: refs/heads/}
539 set len [string length $pfx]
540 if {[string equal -length $len $pfx $ref]} {
541 # We're on a branch. It might not exist. But
542 # HEAD looks good enough to be a branch.
544 set current_branch [string range $ref $len end]
547 # Assume this is a detached head.
549 set current_branch HEAD
554 auto_load tk_optionMenu
555 rename tk_optionMenu real__tkOptionMenu
556 proc tk_optionMenu {w varName args} {
557 set m [eval real__tkOptionMenu $w $varName $args]
558 $m configure -font font_ui
559 $w configure -font font_ui
563 proc rmsel_tag {text} {
565 -background [$text cget -background] \
566 -foreground [$text cget -foreground] \
568 $text tag conf in_sel -background lightgray
569 bind $text <Motion> break
574 bind . <Visibility> {
575 bind . <Visibility> {}
580 wm iconbitmap . -default $oguilib/git-gui.ico
583 ######################################################################
588 font create font_diff -family Courier -size 10
592 eval font configure font_ui [font actual [.dummy cget -font]]
596 font create font_uiitalic
597 font create font_uibold
598 font create font_diffbold
599 font create font_diffitalic
601 foreach class {Button Checkbutton Entry Label
602 Labelframe Listbox Menu Message
603 Radiobutton Spinbox Text} {
604 option add *$class.font font_ui
608 if {[is_Windows] || [is_MacOSX]} {
609 option add *Menu.tearOff 0
620 proc bind_button3 {w cmd} {
621 bind $w <Any-Button-3> $cmd
623 # Mac OS X sends Button-2 on right click through three-button mouse,
624 # or through trackpad right-clicking (two-finger touch + click).
625 bind $w <Any-Button-2> $cmd
626 bind $w <Control-Button-1> $cmd
630 proc apply_config {} {
631 global repo_config font_descs
633 foreach option $font_descs {
634 set name [lindex $option 0]
635 set font [lindex $option 1]
638 foreach {cn cv} $repo_config(gui.$name) {
639 if {$cn eq {-weight}} {
642 font configure $font $cn $cv
645 font configure $font -weight normal
648 error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
650 foreach {cn cv} [font configure $font] {
651 font configure ${font}bold $cn $cv
652 font configure ${font}italic $cn $cv
654 font configure ${font}bold -weight bold
655 font configure ${font}italic -slant italic
659 set default_config(branch.autosetupmerge) true
660 set default_config(merge.tool) {}
661 set default_config(merge.keepbackup) true
662 set default_config(merge.diffstat) true
663 set default_config(merge.summary) false
664 set default_config(merge.verbosity) 2
665 set default_config(user.name) {}
666 set default_config(user.email) {}
668 set default_config(gui.matchtrackingbranch) false
669 set default_config(gui.pruneduringfetch) false
670 set default_config(gui.trustmtime) false
671 set default_config(gui.fastcopyblame) false
672 set default_config(gui.copyblamethreshold) 40
673 set default_config(gui.blamehistoryctx) 7
674 set default_config(gui.diffcontext) 5
675 set default_config(gui.commitmsgwidth) 75
676 set default_config(gui.newbranchtemplate) {}
677 set default_config(gui.spellingdictionary) {}
678 set default_config(gui.fontui) [font configure font_ui]
679 set default_config(gui.fontdiff) [font configure font_diff]
681 {fontui font_ui {mc "Main Font"}}
682 {fontdiff font_diff {mc "Diff/Console Font"}}
685 ######################################################################
689 set _git [_which git]
691 catch {wm withdraw .}
695 -title [mc "git-gui: fatal error"] \
696 -message [mc "Cannot find git in PATH."]
700 ######################################################################
704 if {[catch {set _git_version [git --version]} err]} {
705 catch {wm withdraw .}
709 -title [mc "git-gui: fatal error"] \
710 -message "Cannot determine Git version:
714 [appname] requires Git 1.5.0 or later."
717 if {![regsub {^git version } $_git_version {} _git_version]} {
718 catch {wm withdraw .}
722 -title [mc "git-gui: fatal error"] \
723 -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
727 set _real_git_version $_git_version
728 regsub -- {[\-\.]dirty$} $_git_version {} _git_version
729 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
730 regsub {\.rc[0-9]+$} $_git_version {} _git_version
731 regsub {\.GIT$} $_git_version {} _git_version
732 regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version
734 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
735 catch {wm withdraw .}
740 -title "[appname]: warning" \
741 -message [mc "Git version cannot be determined.
743 %s claims it is version '%s'.
745 %s requires at least Git 1.5.0 or later.
747 Assume '%s' is version 1.5.0?
748 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
749 set _git_version 1.5.0
754 unset _real_git_version
756 proc git-version {args} {
759 switch [llength $args] {
765 set op [lindex $args 0]
766 set vr [lindex $args 1]
767 set cm [package vcompare $_git_version $vr]
768 return [expr $cm $op 0]
772 set type [lindex $args 0]
773 set name [lindex $args 1]
774 set parm [lindex $args 2]
775 set body [lindex $args 3]
777 if {($type ne {proc} && $type ne {method})} {
778 error "Invalid arguments to git-version"
780 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
781 error "Last arm of $type $name must be default"
784 foreach {op vr cb} [lrange $body 0 end-2] {
785 if {[git-version $op $vr]} {
786 return [uplevel [list $type $name $parm $cb]]
790 return [uplevel [list $type $name $parm [lindex $body end]]]
794 error "git-version >= x"
800 if {[git-version < 1.5]} {
801 catch {wm withdraw .}
805 -title [mc "git-gui: fatal error"] \
806 -message "[appname] requires Git 1.5.0 or later.
808 You are using [git-version]:
814 ######################################################################
816 ## configure our library
818 set idx [file join $oguilib tclIndex]
819 if {[catch {set fd [open $idx r]} err]} {
820 catch {wm withdraw .}
824 -title [mc "git-gui: fatal error"] \
828 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
830 while {[gets $fd n] >= 0} {
831 if {$n ne {} && ![string match #* $n]} {
843 if {[lsearch -exact $loaded $p] >= 0} continue
844 source [file join $oguilib $p]
849 set auto_path [concat [list $oguilib] $auto_path]
851 unset -nocomplain idx fd
853 ######################################################################
855 ## config file parsing
857 git-version proc _parse_config {arr_name args} {
864 [list git_read config] \
866 [list --null --list]]
867 fconfigure $fd_rc -translation binary
868 set buf [read $fd_rc]
871 foreach line [split $buf "\0"] {
872 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
873 if {[is_many_config $name]} {
874 lappend arr($name) $value
876 set arr($name) $value
885 set fd_rc [eval [list git_read config --list] $args]
886 while {[gets $fd_rc line] >= 0} {
887 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
888 if {[is_many_config $name]} {
889 lappend arr($name) $value
891 set arr($name) $value
900 proc load_config {include_global} {
901 global repo_config global_config default_config
903 if {$include_global} {
904 _parse_config global_config --global
906 _parse_config repo_config
908 foreach name [array names default_config] {
909 if {[catch {set v $global_config($name)}]} {
910 set global_config($name) $default_config($name)
912 if {[catch {set v $repo_config($name)}]} {
913 set repo_config($name) $default_config($name)
918 ######################################################################
920 ## feature option selection
922 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
927 if {$subcommand eq {gui.sh}} {
930 if {$subcommand eq {gui} && [llength $argv] > 0} {
931 set subcommand [lindex $argv 0]
932 set argv [lrange $argv 1 end]
935 enable_option multicommit
937 enable_option transport
940 switch -- $subcommand {
945 disable_option multicommit
946 disable_option branch
947 disable_option transport
950 enable_option singlecommit
952 disable_option multicommit
953 disable_option branch
954 disable_option transport
958 ######################################################################
963 set _gitdir $env(GIT_DIR)
967 set _gitdir [git rev-parse --git-dir]
968 set _prefix [git rev-parse --show-prefix]
972 choose_repository::pick
974 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
975 catch {set _gitdir [exec cygpath --windows $_gitdir]}
977 if {![file isdirectory $_gitdir]} {
978 catch {wm withdraw .}
979 error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
982 if {$_prefix ne {}} {
983 regsub -all {[^/]+/} $_prefix ../ cdup
984 if {[catch {cd $cdup} err]} {
985 catch {wm withdraw .}
986 error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
990 } elseif {![is_enabled bare]} {
991 if {[lindex [file split $_gitdir] end] ne {.git}} {
992 catch {wm withdraw .}
993 error_popup [strcat [mc "Cannot use funny .git directory:"] "\n\n$_gitdir"]
996 if {[catch {cd [file dirname $_gitdir]} err]} {
997 catch {wm withdraw .}
998 error_popup [strcat [mc "No working directory"] " [file dirname $_gitdir]:\n\n$err"]
1002 set _reponame [file split [file normalize $_gitdir]]
1003 if {[lindex $_reponame end] eq {.git}} {
1004 set _reponame [lindex $_reponame end-1]
1006 set _reponame [lindex $_reponame end]
1009 ######################################################################
1013 set current_diff_path {}
1014 set current_diff_side {}
1015 set diff_actions [list]
1019 set MERGE_HEAD [list]
1022 set current_branch {}
1024 set current_diff_path {}
1026 set selected_commit_type new
1028 ######################################################################
1036 set disable_on_lock [list]
1037 set index_lock_type none
1039 proc lock_index {type} {
1040 global index_lock_type disable_on_lock
1042 if {$index_lock_type eq {none}} {
1043 set index_lock_type $type
1044 foreach w $disable_on_lock {
1045 uplevel #0 $w disabled
1048 } elseif {$index_lock_type eq "begin-$type"} {
1049 set index_lock_type $type
1055 proc unlock_index {} {
1056 global index_lock_type disable_on_lock
1058 set index_lock_type none
1059 foreach w $disable_on_lock {
1060 uplevel #0 $w normal
1064 ######################################################################
1068 proc repository_state {ctvar hdvar mhvar} {
1069 global current_branch
1070 upvar $ctvar ct $hdvar hd $mhvar mh
1075 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1081 set merge_head [gitdir MERGE_HEAD]
1082 if {[file exists $merge_head]} {
1084 set fd_mh [open $merge_head r]
1085 while {[gets $fd_mh line] >= 0} {
1096 global PARENT empty_tree
1098 set p [lindex $PARENT 0]
1102 if {$empty_tree eq {}} {
1103 set empty_tree [git mktree << {}]
1108 proc rescan {after {honor_trustmtime 1}} {
1109 global HEAD PARENT MERGE_HEAD commit_type
1110 global ui_index ui_workdir ui_comm
1111 global rescan_active file_states
1114 if {$rescan_active > 0 || ![lock_index read]} return
1116 repository_state newType newHEAD newMERGE_HEAD
1117 if {[string match amend* $commit_type]
1118 && $newType eq {normal}
1119 && $newHEAD eq $HEAD} {
1123 set MERGE_HEAD $newMERGE_HEAD
1124 set commit_type $newType
1127 array unset file_states
1129 if {!$::GITGUI_BCK_exists &&
1130 (![$ui_comm edit modified]
1131 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1132 if {[string match amend* $commit_type]} {
1133 } elseif {[load_message GITGUI_MSG]} {
1134 } elseif {[load_message MERGE_MSG]} {
1135 } elseif {[load_message SQUASH_MSG]} {
1138 $ui_comm edit modified false
1141 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1142 rescan_stage2 {} $after
1145 ui_status [mc "Refreshing file status..."]
1146 set fd_rf [git_read update-index \
1152 fconfigure $fd_rf -blocking 0 -translation binary
1153 fileevent $fd_rf readable \
1154 [list rescan_stage2 $fd_rf $after]
1159 set is_git_info_exclude {}
1160 proc have_info_exclude {} {
1161 global is_git_info_exclude
1163 if {$is_git_info_exclude eq {}} {
1164 if {[catch {exec test -f [gitdir info exclude]}]} {
1165 set is_git_info_exclude 0
1167 set is_git_info_exclude 1
1170 return $is_git_info_exclude
1173 proc have_info_exclude {} {
1174 return [file readable [gitdir info exclude]]
1178 proc rescan_stage2 {fd after} {
1179 global rescan_active buf_rdi buf_rdf buf_rlo
1183 if {![eof $fd]} return
1187 set ls_others [list --exclude-per-directory=.gitignore]
1188 if {[have_info_exclude]} {
1189 lappend ls_others "--exclude-from=[gitdir info exclude]"
1191 set user_exclude [get_config core.excludesfile]
1192 if {$user_exclude ne {} && [file readable $user_exclude]} {
1193 lappend ls_others "--exclude-from=$user_exclude"
1201 ui_status [mc "Scanning for modified files ..."]
1202 set fd_di [git_read diff-index --cached -z [PARENT]]
1203 set fd_df [git_read diff-files -z]
1204 set fd_lo [eval git_read ls-files --others -z $ls_others]
1206 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1207 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1208 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1209 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1210 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1211 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1214 proc load_message {file} {
1217 set f [gitdir $file]
1218 if {[file isfile $f]} {
1219 if {[catch {set fd [open $f r]}]} {
1222 fconfigure $fd -eofchar {}
1223 set content [string trim [read $fd]]
1225 regsub -all -line {[ \r\t]+$} $content {} content
1226 $ui_comm delete 0.0 end
1227 $ui_comm insert end $content
1233 proc read_diff_index {fd after} {
1236 append buf_rdi [read $fd]
1238 set n [string length $buf_rdi]
1240 set z1 [string first "\0" $buf_rdi $c]
1241 if {$z1 == -1} break
1243 set z2 [string first "\0" $buf_rdi $z1]
1244 if {$z2 == -1} break
1247 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1248 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1250 [encoding convertfrom $p] \
1252 [list [lindex $i 0] [lindex $i 2]] \
1258 set buf_rdi [string range $buf_rdi $c end]
1263 rescan_done $fd buf_rdi $after
1266 proc read_diff_files {fd after} {
1269 append buf_rdf [read $fd]
1271 set n [string length $buf_rdf]
1273 set z1 [string first "\0" $buf_rdf $c]
1274 if {$z1 == -1} break
1276 set z2 [string first "\0" $buf_rdf $z1]
1277 if {$z2 == -1} break
1280 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1281 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1283 [encoding convertfrom $p] \
1286 [list [lindex $i 0] [lindex $i 2]]
1291 set buf_rdf [string range $buf_rdf $c end]
1296 rescan_done $fd buf_rdf $after
1299 proc read_ls_others {fd after} {
1302 append buf_rlo [read $fd]
1303 set pck [split $buf_rlo "\0"]
1304 set buf_rlo [lindex $pck end]
1305 foreach p [lrange $pck 0 end-1] {
1306 set p [encoding convertfrom $p]
1307 if {[string index $p end] eq {/}} {
1308 set p [string range $p 0 end-1]
1312 rescan_done $fd buf_rlo $after
1315 proc rescan_done {fd buf after} {
1316 global rescan_active current_diff_path
1317 global file_states repo_config
1320 if {![eof $fd]} return
1323 if {[incr rescan_active -1] > 0} return
1328 if {$current_diff_path ne {}} reshow_diff
1332 proc prune_selection {} {
1333 global file_states selected_paths
1335 foreach path [array names selected_paths] {
1336 if {[catch {set still_here $file_states($path)}]} {
1337 unset selected_paths($path)
1342 ######################################################################
1346 proc mapicon {w state path} {
1349 if {[catch {set r $all_icons($state$w)}]} {
1350 puts "error: no icon for $w state={$state} $path"
1356 proc mapdesc {state path} {
1359 if {[catch {set r $all_descs($state)}]} {
1360 puts "error: no desc for state={$state} $path"
1366 proc ui_status {msg} {
1368 if {[info exists main_status]} {
1369 $main_status show $msg
1373 proc ui_ready {{test {}}} {
1375 if {[info exists main_status]} {
1376 $main_status show [mc "Ready."] $test
1380 proc escape_path {path} {
1381 regsub -all {\\} $path "\\\\" path
1382 regsub -all "\n" $path "\\n" path
1386 proc short_path {path} {
1387 return [escape_path [lindex [file split $path] end]]
1391 set null_sha1 [string repeat 0 40]
1393 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1394 global file_states next_icon_id null_sha1
1396 set s0 [string index $new_state 0]
1397 set s1 [string index $new_state 1]
1399 if {[catch {set info $file_states($path)}]} {
1401 set icon n[incr next_icon_id]
1403 set state [lindex $info 0]
1404 set icon [lindex $info 1]
1405 if {$head_info eq {}} {set head_info [lindex $info 2]}
1406 if {$index_info eq {}} {set index_info [lindex $info 3]}
1409 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1410 elseif {$s0 eq {_}} {set s0 _}
1412 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1413 elseif {$s1 eq {_}} {set s1 _}
1415 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1416 set head_info [list 0 $null_sha1]
1417 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1418 && $head_info eq {}} {
1419 set head_info $index_info
1422 set file_states($path) [list $s0$s1 $icon \
1423 $head_info $index_info \
1428 proc display_file_helper {w path icon_name old_m new_m} {
1431 if {$new_m eq {_}} {
1432 set lno [lsearch -sorted -exact $file_lists($w) $path]
1434 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1436 $w conf -state normal
1437 $w delete $lno.0 [expr {$lno + 1}].0
1438 $w conf -state disabled
1440 } elseif {$old_m eq {_} && $new_m ne {_}} {
1441 lappend file_lists($w) $path
1442 set file_lists($w) [lsort -unique $file_lists($w)]
1443 set lno [lsearch -sorted -exact $file_lists($w) $path]
1445 $w conf -state normal
1446 $w image create $lno.0 \
1447 -align center -padx 5 -pady 1 \
1449 -image [mapicon $w $new_m $path]
1450 $w insert $lno.1 "[escape_path $path]\n"
1451 $w conf -state disabled
1452 } elseif {$old_m ne $new_m} {
1453 $w conf -state normal
1454 $w image conf $icon_name -image [mapicon $w $new_m $path]
1455 $w conf -state disabled
1459 proc display_file {path state} {
1460 global file_states selected_paths
1461 global ui_index ui_workdir
1463 set old_m [merge_state $path $state]
1464 set s $file_states($path)
1465 set new_m [lindex $s 0]
1466 set icon_name [lindex $s 1]
1468 set o [string index $old_m 0]
1469 set n [string index $new_m 0]
1476 display_file_helper $ui_index $path $icon_name $o $n
1478 if {[string index $old_m 0] eq {U}} {
1481 set o [string index $old_m 1]
1483 if {[string index $new_m 0] eq {U}} {
1486 set n [string index $new_m 1]
1488 display_file_helper $ui_workdir $path $icon_name $o $n
1490 if {$new_m eq {__}} {
1491 unset file_states($path)
1492 catch {unset selected_paths($path)}
1496 proc display_all_files_helper {w path icon_name m} {
1499 lappend file_lists($w) $path
1500 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1501 $w image create end \
1502 -align center -padx 5 -pady 1 \
1504 -image [mapicon $w $m $path]
1505 $w insert end "[escape_path $path]\n"
1508 proc display_all_files {} {
1509 global ui_index ui_workdir
1510 global file_states file_lists
1513 $ui_index conf -state normal
1514 $ui_workdir conf -state normal
1516 $ui_index delete 0.0 end
1517 $ui_workdir delete 0.0 end
1520 set file_lists($ui_index) [list]
1521 set file_lists($ui_workdir) [list]
1523 foreach path [lsort [array names file_states]] {
1524 set s $file_states($path)
1526 set icon_name [lindex $s 1]
1528 set s [string index $m 0]
1529 if {$s ne {U} && $s ne {_}} {
1530 display_all_files_helper $ui_index $path \
1534 if {[string index $m 0] eq {U}} {
1537 set s [string index $m 1]
1540 display_all_files_helper $ui_workdir $path \
1545 $ui_index conf -state disabled
1546 $ui_workdir conf -state disabled
1549 ######################################################################
1554 #define mask_width 14
1555 #define mask_height 15
1556 static unsigned char mask_bits[] = {
1557 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1558 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1559 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1562 image create bitmap file_plain -background white -foreground black -data {
1563 #define plain_width 14
1564 #define plain_height 15
1565 static unsigned char plain_bits[] = {
1566 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1567 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1568 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1569 } -maskdata $filemask
1571 image create bitmap file_mod -background white -foreground blue -data {
1572 #define mod_width 14
1573 #define mod_height 15
1574 static unsigned char mod_bits[] = {
1575 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1576 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1577 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1578 } -maskdata $filemask
1580 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1581 #define file_fulltick_width 14
1582 #define file_fulltick_height 15
1583 static unsigned char file_fulltick_bits[] = {
1584 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1585 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1586 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1587 } -maskdata $filemask
1589 image create bitmap file_parttick -background white -foreground "#005050" -data {
1590 #define parttick_width 14
1591 #define parttick_height 15
1592 static unsigned char parttick_bits[] = {
1593 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1594 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1595 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1596 } -maskdata $filemask
1598 image create bitmap file_question -background white -foreground black -data {
1599 #define file_question_width 14
1600 #define file_question_height 15
1601 static unsigned char file_question_bits[] = {
1602 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1603 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1604 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1605 } -maskdata $filemask
1607 image create bitmap file_removed -background white -foreground red -data {
1608 #define file_removed_width 14
1609 #define file_removed_height 15
1610 static unsigned char file_removed_bits[] = {
1611 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1612 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1613 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1614 } -maskdata $filemask
1616 image create bitmap file_merge -background white -foreground blue -data {
1617 #define file_merge_width 14
1618 #define file_merge_height 15
1619 static unsigned char file_merge_bits[] = {
1620 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1621 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1622 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1623 } -maskdata $filemask
1625 image create bitmap file_statechange -background white -foreground green -data {
1626 #define file_merge_width 14
1627 #define file_merge_height 15
1628 static unsigned char file_statechange_bits[] = {
1629 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
1630 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
1631 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1632 } -maskdata $filemask
1634 set ui_index .vpane.files.index.list
1635 set ui_workdir .vpane.files.workdir.list
1637 set all_icons(_$ui_index) file_plain
1638 set all_icons(A$ui_index) file_fulltick
1639 set all_icons(M$ui_index) file_fulltick
1640 set all_icons(D$ui_index) file_removed
1641 set all_icons(U$ui_index) file_merge
1642 set all_icons(T$ui_index) file_statechange
1644 set all_icons(_$ui_workdir) file_plain
1645 set all_icons(M$ui_workdir) file_mod
1646 set all_icons(D$ui_workdir) file_question
1647 set all_icons(U$ui_workdir) file_merge
1648 set all_icons(O$ui_workdir) file_plain
1649 set all_icons(T$ui_workdir) file_statechange
1651 set max_status_desc 0
1653 {__ {mc "Unmodified"}}
1655 {_M {mc "Modified, not staged"}}
1656 {M_ {mc "Staged for commit"}}
1657 {MM {mc "Portions staged for commit"}}
1658 {MD {mc "Staged for commit, missing"}}
1660 {_T {mc "File type changed, not staged"}}
1661 {T_ {mc "File type changed, staged"}}
1663 {_O {mc "Untracked, not staged"}}
1664 {A_ {mc "Staged for commit"}}
1665 {AM {mc "Portions staged for commit"}}
1666 {AD {mc "Staged for commit, missing"}}
1669 {D_ {mc "Staged for removal"}}
1670 {DO {mc "Staged for removal, still present"}}
1672 {U_ {mc "Requires merge resolution"}}
1673 {UU {mc "Requires merge resolution"}}
1674 {UM {mc "Requires merge resolution"}}
1675 {UD {mc "Requires merge resolution"}}
1677 set text [eval [lindex $i 1]]
1678 if {$max_status_desc < [string length $text]} {
1679 set max_status_desc [string length $text]
1681 set all_descs([lindex $i 0]) $text
1685 ######################################################################
1689 proc scrollbar2many {list mode args} {
1690 foreach w $list {eval $w $mode $args}
1693 proc many2scrollbar {list mode sb top bottom} {
1694 $sb set $top $bottom
1695 foreach w $list {$w $mode moveto $top}
1698 proc incr_font_size {font {amt 1}} {
1699 set sz [font configure $font -size]
1701 font configure $font -size $sz
1702 font configure ${font}bold -size $sz
1703 font configure ${font}italic -size $sz
1706 ######################################################################
1710 set starting_gitk_msg [mc "Starting gitk... please wait..."]
1712 proc do_gitk {revs} {
1713 # -- Always start gitk through whatever we were loaded with. This
1714 # lets us bypass using shell process on Windows systems.
1716 set exe [_which gitk -script]
1717 set cmd [list [info nameofexecutable] $exe]
1719 error_popup [mc "Couldn't find gitk in PATH"]
1723 if {[info exists env(GIT_DIR)]} {
1724 set old_GIT_DIR $env(GIT_DIR)
1730 cd [file dirname [gitdir]]
1731 set env(GIT_DIR) [file tail [gitdir]]
1733 eval exec $cmd $revs &
1735 if {$old_GIT_DIR eq {}} {
1738 set env(GIT_DIR) $old_GIT_DIR
1742 ui_status $::starting_gitk_msg
1744 ui_ready $starting_gitk_msg
1752 global ui_comm is_quitting repo_config commit_type
1753 global GITGUI_BCK_exists GITGUI_BCK_i
1754 global ui_comm_spell
1756 if {$is_quitting} return
1759 if {[winfo exists $ui_comm]} {
1760 # -- Stash our current commit buffer.
1762 set save [gitdir GITGUI_MSG]
1763 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
1764 file rename -force [gitdir GITGUI_BCK] $save
1765 set GITGUI_BCK_exists 0
1767 set msg [string trim [$ui_comm get 0.0 end]]
1768 regsub -all -line {[ \r\t]+$} $msg {} msg
1769 if {(![string match amend* $commit_type]
1770 || [$ui_comm edit modified])
1773 set fd [open $save w]
1774 puts -nonewline $fd $msg
1778 catch {file delete $save}
1782 # -- Cancel our spellchecker if its running.
1784 if {[info exists ui_comm_spell]} {
1788 # -- Remove our editor backup, its not needed.
1790 after cancel $GITGUI_BCK_i
1791 if {$GITGUI_BCK_exists} {
1792 catch {file delete [gitdir GITGUI_BCK]}
1795 # -- Stash our current window geometry into this repository.
1797 set cfg_geometry [list]
1798 lappend cfg_geometry [wm geometry .]
1799 lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
1800 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
1801 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
1804 if {$cfg_geometry ne $rc_geometry} {
1805 catch {git config gui.geometry $cfg_geometry}
1821 global next_diff_p next_diff_w next_diff_i
1822 show_diff $next_diff_p $next_diff_w $next_diff_i
1825 proc toggle_or_diff {w x y} {
1826 global file_states file_lists current_diff_path ui_index ui_workdir
1827 global last_clicked selected_paths
1829 set pos [split [$w index @$x,$y] .]
1830 set lno [lindex $pos 0]
1831 set col [lindex $pos 1]
1832 set path [lindex $file_lists($w) [expr {$lno - 1}]]
1838 set last_clicked [list $w $lno]
1839 array unset selected_paths
1840 $ui_index tag remove in_sel 0.0 end
1841 $ui_workdir tag remove in_sel 0.0 end
1843 if {$col == 0 && $y > 1} {
1844 set i [expr {$lno-1}]
1845 set ll [expr {[llength $file_lists($w)]-1}]
1847 if {$i == $ll && $i == 0} {
1848 set after {reshow_diff;}
1850 global next_diff_p next_diff_w next_diff_i
1855 set i [expr {$i + 1}]
1859 set i [expr {$i - 1}]
1862 set next_diff_p [lindex $file_lists($w) $i]
1864 if {$next_diff_p ne {} && $current_diff_path ne {}} {
1865 set after {next_diff;}
1871 if {$w eq $ui_index} {
1873 "Unstaging [short_path $path] from commit" \
1875 [concat $after [list ui_ready]]
1876 } elseif {$w eq $ui_workdir} {
1878 "Adding [short_path $path]" \
1880 [concat $after [list ui_ready]]
1883 show_diff $path $w $lno
1887 proc add_one_to_selection {w x y} {
1888 global file_lists last_clicked selected_paths
1890 set lno [lindex [split [$w index @$x,$y] .] 0]
1891 set path [lindex $file_lists($w) [expr {$lno - 1}]]
1897 if {$last_clicked ne {}
1898 && [lindex $last_clicked 0] ne $w} {
1899 array unset selected_paths
1900 [lindex $last_clicked 0] tag remove in_sel 0.0 end
1903 set last_clicked [list $w $lno]
1904 if {[catch {set in_sel $selected_paths($path)}]} {
1908 unset selected_paths($path)
1909 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
1911 set selected_paths($path) 1
1912 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
1916 proc add_range_to_selection {w x y} {
1917 global file_lists last_clicked selected_paths
1919 if {[lindex $last_clicked 0] ne $w} {
1920 toggle_or_diff $w $x $y
1924 set lno [lindex [split [$w index @$x,$y] .] 0]
1925 set lc [lindex $last_clicked 1]
1934 foreach path [lrange $file_lists($w) \
1935 [expr {$begin - 1}] \
1936 [expr {$end - 1}]] {
1937 set selected_paths($path) 1
1939 $w tag add in_sel $begin.0 [expr {$end + 1}].0
1942 proc show_more_context {} {
1944 if {$repo_config(gui.diffcontext) < 99} {
1945 incr repo_config(gui.diffcontext)
1950 proc show_less_context {} {
1952 if {$repo_config(gui.diffcontext) > 1} {
1953 incr repo_config(gui.diffcontext) -1
1958 ######################################################################
1968 menu .mbar -tearoff 0
1969 .mbar add cascade -label [mc Repository] -menu .mbar.repository
1970 .mbar add cascade -label [mc Edit] -menu .mbar.edit
1971 if {[is_enabled branch]} {
1972 .mbar add cascade -label [mc Branch] -menu .mbar.branch
1974 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
1975 .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
1977 if {[is_enabled transport]} {
1978 .mbar add cascade -label [mc Merge] -menu .mbar.merge
1979 .mbar add cascade -label [mc Remote] -menu .mbar.remote
1981 . configure -menu .mbar
1983 # -- Repository Menu
1985 menu .mbar.repository
1987 .mbar.repository add command \
1988 -label [mc "Browse Current Branch's Files"] \
1989 -command {browser::new $current_branch}
1990 set ui_browse_current [.mbar.repository index last]
1991 .mbar.repository add command \
1992 -label [mc "Browse Branch Files..."] \
1993 -command browser_open::dialog
1994 .mbar.repository add separator
1996 .mbar.repository add command \
1997 -label [mc "Visualize Current Branch's History"] \
1998 -command {do_gitk $current_branch}
1999 set ui_visualize_current [.mbar.repository index last]
2000 .mbar.repository add command \
2001 -label [mc "Visualize All Branch History"] \
2002 -command {do_gitk --all}
2003 .mbar.repository add separator
2005 proc current_branch_write {args} {
2006 global current_branch
2007 .mbar.repository entryconf $::ui_browse_current \
2008 -label [mc "Browse %s's Files" $current_branch]
2009 .mbar.repository entryconf $::ui_visualize_current \
2010 -label [mc "Visualize %s's History" $current_branch]
2012 trace add variable current_branch write current_branch_write
2014 if {[is_enabled multicommit]} {
2015 .mbar.repository add command -label [mc "Database Statistics"] \
2018 .mbar.repository add command -label [mc "Compress Database"] \
2021 .mbar.repository add command -label [mc "Verify Database"] \
2022 -command do_fsck_objects
2024 .mbar.repository add separator
2027 .mbar.repository add command \
2028 -label [mc "Create Desktop Icon"] \
2029 -command do_cygwin_shortcut
2030 } elseif {[is_Windows]} {
2031 .mbar.repository add command \
2032 -label [mc "Create Desktop Icon"] \
2033 -command do_windows_shortcut
2034 } elseif {[is_MacOSX]} {
2035 .mbar.repository add command \
2036 -label [mc "Create Desktop Icon"] \
2037 -command do_macosx_app
2042 proc ::tk::mac::Quit {args} { do_quit }
2044 .mbar.repository add command -label [mc Quit] \
2052 .mbar.edit add command -label [mc Undo] \
2053 -command {catch {[focus] edit undo}} \
2055 .mbar.edit add command -label [mc Redo] \
2056 -command {catch {[focus] edit redo}} \
2058 .mbar.edit add separator
2059 .mbar.edit add command -label [mc Cut] \
2060 -command {catch {tk_textCut [focus]}} \
2062 .mbar.edit add command -label [mc Copy] \
2063 -command {catch {tk_textCopy [focus]}} \
2065 .mbar.edit add command -label [mc Paste] \
2066 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2068 .mbar.edit add command -label [mc Delete] \
2069 -command {catch {[focus] delete sel.first sel.last}} \
2071 .mbar.edit add separator
2072 .mbar.edit add command -label [mc "Select All"] \
2073 -command {catch {[focus] tag add sel 0.0 end}} \
2078 if {[is_enabled branch]} {
2081 .mbar.branch add command -label [mc "Create..."] \
2082 -command branch_create::dialog \
2084 lappend disable_on_lock [list .mbar.branch entryconf \
2085 [.mbar.branch index last] -state]
2087 .mbar.branch add command -label [mc "Checkout..."] \
2088 -command branch_checkout::dialog \
2090 lappend disable_on_lock [list .mbar.branch entryconf \
2091 [.mbar.branch index last] -state]
2093 .mbar.branch add command -label [mc "Rename..."] \
2094 -command branch_rename::dialog
2095 lappend disable_on_lock [list .mbar.branch entryconf \
2096 [.mbar.branch index last] -state]
2098 .mbar.branch add command -label [mc "Delete..."] \
2099 -command branch_delete::dialog
2100 lappend disable_on_lock [list .mbar.branch entryconf \
2101 [.mbar.branch index last] -state]
2103 .mbar.branch add command -label [mc "Reset..."] \
2104 -command merge::reset_hard
2105 lappend disable_on_lock [list .mbar.branch entryconf \
2106 [.mbar.branch index last] -state]
2111 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2114 .mbar.commit add radiobutton \
2115 -label [mc "New Commit"] \
2116 -command do_select_commit_type \
2117 -variable selected_commit_type \
2119 lappend disable_on_lock \
2120 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2122 .mbar.commit add radiobutton \
2123 -label [mc "Amend Last Commit"] \
2124 -command do_select_commit_type \
2125 -variable selected_commit_type \
2127 lappend disable_on_lock \
2128 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2130 .mbar.commit add separator
2132 .mbar.commit add command -label [mc Rescan] \
2133 -command do_rescan \
2135 lappend disable_on_lock \
2136 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2138 .mbar.commit add command -label [mc "Stage To Commit"] \
2139 -command do_add_selection \
2141 lappend disable_on_lock \
2142 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2144 .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
2145 -command do_add_all \
2147 lappend disable_on_lock \
2148 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2150 .mbar.commit add command -label [mc "Unstage From Commit"] \
2151 -command do_unstage_selection
2152 lappend disable_on_lock \
2153 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2155 .mbar.commit add command -label [mc "Revert Changes"] \
2156 -command do_revert_selection
2157 lappend disable_on_lock \
2158 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2160 .mbar.commit add separator
2162 .mbar.commit add command -label [mc "Show Less Context"] \
2163 -command show_less_context \
2164 -accelerator $M1T-\-
2166 .mbar.commit add command -label [mc "Show More Context"] \
2167 -command show_more_context \
2170 .mbar.commit add separator
2172 .mbar.commit add command -label [mc "Sign Off"] \
2173 -command do_signoff \
2176 .mbar.commit add command -label [mc Commit@@verb] \
2177 -command do_commit \
2178 -accelerator $M1T-Return
2179 lappend disable_on_lock \
2180 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2185 if {[is_enabled branch]} {
2187 .mbar.merge add command -label [mc "Local Merge..."] \
2188 -command merge::dialog \
2190 lappend disable_on_lock \
2191 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2192 .mbar.merge add command -label [mc "Abort Merge..."] \
2193 -command merge::reset_hard
2194 lappend disable_on_lock \
2195 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2200 if {[is_enabled transport]} {
2203 .mbar.remote add command \
2204 -label [mc "Push..."] \
2205 -command do_push_anywhere \
2207 .mbar.remote add command \
2208 -label [mc "Delete..."] \
2209 -command remote_branch_delete::dialog
2213 # -- Apple Menu (Mac OS X only)
2215 .mbar add cascade -label Apple -menu .mbar.apple
2218 .mbar.apple add command -label [mc "About %s" [appname]] \
2220 .mbar.apple add separator
2221 .mbar.apple add command \
2222 -label [mc "Preferences..."] \
2223 -command do_options \
2225 bind . <$M1B-,> do_options
2229 .mbar.edit add separator
2230 .mbar.edit add command -label [mc "Options..."] \
2236 .mbar add cascade -label [mc Help] -menu .mbar.help
2240 .mbar.help add command -label [mc "About %s" [appname]] \
2245 catch {set browser $repo_config(instaweb.browser)}
2246 set doc_path [file dirname [gitexec]]
2247 set doc_path [file join $doc_path Documentation index.html]
2250 set doc_path [exec cygpath --mixed $doc_path]
2253 if {$browser eq {}} {
2256 } elseif {[is_Cygwin]} {
2257 set program_files [file dirname [exec cygpath --windir]]
2258 set program_files [file join $program_files {Program Files}]
2259 set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
2260 set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
2261 if {[file exists $firefox]} {
2262 set browser $firefox
2263 } elseif {[file exists $ie]} {
2266 unset program_files firefox ie
2270 if {[file isfile $doc_path]} {
2271 set doc_url "file:$doc_path"
2273 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
2276 if {$browser ne {}} {
2277 .mbar.help add command -label [mc "Online Documentation"] \
2278 -command [list exec $browser $doc_url &]
2280 unset browser doc_path doc_url
2282 # -- Standard bindings
2284 wm protocol . WM_DELETE_WINDOW do_quit
2285 bind all <$M1B-Key-q> do_quit
2286 bind all <$M1B-Key-Q> do_quit
2287 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2288 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
2290 set subcommand_args {}
2292 puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
2296 # -- Not a normal commit type invocation? Do that instead!
2298 switch -- $subcommand {
2301 if {$subcommand eq "blame"} {
2302 set subcommand_args {[--line=<num>] rev? path}
2304 set subcommand_args {rev? path}
2306 if {$argv eq {}} usage
2312 if {$is_path || [file exists $_prefix$a]} {
2313 if {$path ne {}} usage
2316 } elseif {$a eq {--}} {
2318 if {$head ne {}} usage
2323 } elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
2324 if {$jump_spec ne {} || $head ne {}} usage
2325 set jump_spec [list $lnum]
2326 } elseif {$head eq {}} {
2327 if {$head ne {}} usage
2336 if {$head ne {} && $path eq {}} {
2337 set path $_prefix$head
2344 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
2346 set head [git rev-parse --verify $head]
2352 set current_branch $head
2355 switch -- $subcommand {
2357 if {$jump_spec ne {}} usage
2359 if {$path ne {} && [file isdirectory $path]} {
2360 set head $current_branch
2366 browser::new $head $path
2369 if {$head eq {} && ![file exists $path]} {
2370 puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
2373 blame::new $head $path $jump_spec
2380 if {[llength $argv] != 0} {
2381 puts -nonewline stderr "usage: $argv0"
2382 if {$subcommand ne {gui}
2383 && [file tail $argv0] ne "git-$subcommand"} {
2384 puts -nonewline stderr " $subcommand"
2389 # fall through to setup UI for commits
2392 puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
2403 -text [mc "Current Branch:"] \
2407 -textvariable current_branch \
2410 pack .branch.l1 -side left
2411 pack .branch.cb -side left -fill x
2412 pack .branch -side top -fill x
2414 # -- Main Window Layout
2416 panedwindow .vpane -orient horizontal
2417 panedwindow .vpane.files -orient vertical
2418 .vpane add .vpane.files -sticky nsew -height 100 -width 200
2419 pack .vpane -anchor n -side top -fill both -expand 1
2421 # -- Index File List
2423 frame .vpane.files.index -height 100 -width 200
2424 label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \
2425 -background lightgreen -foreground black
2426 text $ui_index -background white -foreground black \
2428 -width 20 -height 10 \
2430 -cursor $cursor_ptr \
2431 -xscrollcommand {.vpane.files.index.sx set} \
2432 -yscrollcommand {.vpane.files.index.sy set} \
2434 scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
2435 scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
2436 pack .vpane.files.index.title -side top -fill x
2437 pack .vpane.files.index.sx -side bottom -fill x
2438 pack .vpane.files.index.sy -side right -fill y
2439 pack $ui_index -side left -fill both -expand 1
2441 # -- Working Directory File List
2443 frame .vpane.files.workdir -height 100 -width 200
2444 label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
2445 -background lightsalmon -foreground black
2446 text $ui_workdir -background white -foreground black \
2448 -width 20 -height 10 \
2450 -cursor $cursor_ptr \
2451 -xscrollcommand {.vpane.files.workdir.sx set} \
2452 -yscrollcommand {.vpane.files.workdir.sy set} \
2454 scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
2455 scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
2456 pack .vpane.files.workdir.title -side top -fill x
2457 pack .vpane.files.workdir.sx -side bottom -fill x
2458 pack .vpane.files.workdir.sy -side right -fill y
2459 pack $ui_workdir -side left -fill both -expand 1
2461 .vpane.files add .vpane.files.workdir -sticky nsew
2462 .vpane.files add .vpane.files.index -sticky nsew
2464 foreach i [list $ui_index $ui_workdir] {
2466 $i tag conf in_diff -background [$i tag cget in_sel -background]
2470 # -- Diff and Commit Area
2472 frame .vpane.lower -height 300 -width 400
2473 frame .vpane.lower.commarea
2474 frame .vpane.lower.diff -relief sunken -borderwidth 1
2475 pack .vpane.lower.diff -fill both -expand 1
2476 pack .vpane.lower.commarea -side bottom -fill x
2477 .vpane add .vpane.lower -sticky nsew
2479 # -- Commit Area Buttons
2481 frame .vpane.lower.commarea.buttons
2482 label .vpane.lower.commarea.buttons.l -text {} \
2485 pack .vpane.lower.commarea.buttons.l -side top -fill x
2486 pack .vpane.lower.commarea.buttons -side left -fill y
2488 button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
2490 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
2491 lappend disable_on_lock \
2492 {.vpane.lower.commarea.buttons.rescan conf -state}
2494 button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
2496 pack .vpane.lower.commarea.buttons.incall -side top -fill x
2497 lappend disable_on_lock \
2498 {.vpane.lower.commarea.buttons.incall conf -state}
2500 button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
2502 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
2504 button .vpane.lower.commarea.buttons.commit -text [mc Commit@@verb] \
2506 pack .vpane.lower.commarea.buttons.commit -side top -fill x
2507 lappend disable_on_lock \
2508 {.vpane.lower.commarea.buttons.commit conf -state}
2510 button .vpane.lower.commarea.buttons.push -text [mc Push] \
2511 -command do_push_anywhere
2512 pack .vpane.lower.commarea.buttons.push -side top -fill x
2514 # -- Commit Message Buffer
2516 frame .vpane.lower.commarea.buffer
2517 frame .vpane.lower.commarea.buffer.header
2518 set ui_comm .vpane.lower.commarea.buffer.t
2519 set ui_coml .vpane.lower.commarea.buffer.header.l
2520 radiobutton .vpane.lower.commarea.buffer.header.new \
2521 -text [mc "New Commit"] \
2522 -command do_select_commit_type \
2523 -variable selected_commit_type \
2525 lappend disable_on_lock \
2526 [list .vpane.lower.commarea.buffer.header.new conf -state]
2527 radiobutton .vpane.lower.commarea.buffer.header.amend \
2528 -text [mc "Amend Last Commit"] \
2529 -command do_select_commit_type \
2530 -variable selected_commit_type \
2532 lappend disable_on_lock \
2533 [list .vpane.lower.commarea.buffer.header.amend conf -state]
2537 proc trace_commit_type {varname args} {
2538 global ui_coml commit_type
2539 switch -glob -- $commit_type {
2540 initial {set txt [mc "Initial Commit Message:"]}
2541 amend {set txt [mc "Amended Commit Message:"]}
2542 amend-initial {set txt [mc "Amended Initial Commit Message:"]}
2543 amend-merge {set txt [mc "Amended Merge Commit Message:"]}
2544 merge {set txt [mc "Merge Commit Message:"]}
2545 * {set txt [mc "Commit Message:"]}
2547 $ui_coml conf -text $txt
2549 trace add variable commit_type write trace_commit_type
2550 pack $ui_coml -side left -fill x
2551 pack .vpane.lower.commarea.buffer.header.amend -side right
2552 pack .vpane.lower.commarea.buffer.header.new -side right
2554 text $ui_comm -background white -foreground black \
2558 -autoseparators true \
2560 -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
2562 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
2563 scrollbar .vpane.lower.commarea.buffer.sby \
2564 -command [list $ui_comm yview]
2565 pack .vpane.lower.commarea.buffer.header -side top -fill x
2566 pack .vpane.lower.commarea.buffer.sby -side right -fill y
2567 pack $ui_comm -side left -fill y
2568 pack .vpane.lower.commarea.buffer -side left -fill y
2570 # -- Commit Message Buffer Context Menu
2572 set ctxm .vpane.lower.commarea.buffer.ctxm
2573 menu $ctxm -tearoff 0
2576 -command {tk_textCut $ui_comm}
2579 -command {tk_textCopy $ui_comm}
2582 -command {tk_textPaste $ui_comm}
2584 -label [mc Delete] \
2585 -command {$ui_comm delete sel.first sel.last}
2588 -label [mc "Select All"] \
2589 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
2591 -label [mc "Copy All"] \
2593 $ui_comm tag add sel 0.0 end
2594 tk_textCopy $ui_comm
2595 $ui_comm tag remove sel 0.0 end
2599 -label [mc "Sign Off"] \
2601 set ui_comm_ctxm $ctxm
2605 proc trace_current_diff_path {varname args} {
2606 global current_diff_path diff_actions file_states
2607 if {$current_diff_path eq {}} {
2613 set p $current_diff_path
2614 set s [mapdesc [lindex $file_states($p) 0] $p]
2616 set p [escape_path $p]
2620 .vpane.lower.diff.header.status configure -text $s
2621 .vpane.lower.diff.header.file configure -text $f
2622 .vpane.lower.diff.header.path configure -text $p
2623 foreach w $diff_actions {
2627 trace add variable current_diff_path write trace_current_diff_path
2629 frame .vpane.lower.diff.header -background gold
2630 label .vpane.lower.diff.header.status \
2633 -width $max_status_desc \
2636 label .vpane.lower.diff.header.file \
2641 label .vpane.lower.diff.header.path \
2646 pack .vpane.lower.diff.header.status -side left
2647 pack .vpane.lower.diff.header.file -side left
2648 pack .vpane.lower.diff.header.path -fill x
2649 set ctxm .vpane.lower.diff.header.ctxm
2650 menu $ctxm -tearoff 0
2658 -- $current_diff_path
2660 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2661 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
2665 frame .vpane.lower.diff.body
2666 set ui_diff .vpane.lower.diff.body.t
2667 text $ui_diff -background white -foreground black \
2669 -width 80 -height 15 -wrap none \
2671 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
2672 -yscrollcommand {.vpane.lower.diff.body.sby set} \
2674 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
2675 -command [list $ui_diff xview]
2676 scrollbar .vpane.lower.diff.body.sby -orient vertical \
2677 -command [list $ui_diff yview]
2678 pack .vpane.lower.diff.body.sbx -side bottom -fill x
2679 pack .vpane.lower.diff.body.sby -side right -fill y
2680 pack $ui_diff -side left -fill both -expand 1
2681 pack .vpane.lower.diff.header -side top -fill x
2682 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
2684 $ui_diff tag conf d_cr -elide true
2685 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
2686 $ui_diff tag conf d_+ -foreground {#00a000}
2687 $ui_diff tag conf d_- -foreground red
2689 $ui_diff tag conf d_++ -foreground {#00a000}
2690 $ui_diff tag conf d_-- -foreground red
2691 $ui_diff tag conf d_+s \
2692 -foreground {#00a000} \
2693 -background {#e2effa}
2694 $ui_diff tag conf d_-s \
2696 -background {#e2effa}
2697 $ui_diff tag conf d_s+ \
2698 -foreground {#00a000} \
2700 $ui_diff tag conf d_s- \
2704 $ui_diff tag conf d<<<<<<< \
2705 -foreground orange \
2707 $ui_diff tag conf d======= \
2708 -foreground orange \
2710 $ui_diff tag conf d>>>>>>> \
2711 -foreground orange \
2714 $ui_diff tag raise sel
2716 # -- Diff Body Context Menu
2719 proc create_common_diff_popup {ctxm} {
2721 -label [mc "Show Less Context"] \
2722 -command show_less_context
2723 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2725 -label [mc "Show More Context"] \
2726 -command show_more_context
2727 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2730 -label [mc Refresh] \
2731 -command reshow_diff
2732 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2735 -command {tk_textCopy $ui_diff}
2736 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2738 -label [mc "Select All"] \
2739 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
2740 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2742 -label [mc "Copy All"] \
2744 $ui_diff tag add sel 0.0 end
2745 tk_textCopy $ui_diff
2746 $ui_diff tag remove sel 0.0 end
2748 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2751 -label [mc "Decrease Font Size"] \
2752 -command {incr_font_size font_diff -1}
2753 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2755 -label [mc "Increase Font Size"] \
2756 -command {incr_font_size font_diff 1}
2757 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2759 $ctxm add command -label [mc "Options..."] \
2763 set ctxm .vpane.lower.diff.body.ctxm
2764 menu $ctxm -tearoff 0
2766 -label [mc "Apply/Reverse Hunk"] \
2767 -command {apply_hunk $cursorX $cursorY}
2768 set ui_diff_applyhunk [$ctxm index last]
2769 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
2771 -label [mc "Apply/Reverse Line"] \
2772 -command {apply_line $cursorX $cursorY; do_rescan}
2773 set ui_diff_applyline [$ctxm index last]
2774 lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
2776 create_common_diff_popup $ctxm
2778 set ctxmmg .vpane.lower.diff.body.ctxmmg
2779 menu $ctxmmg -tearoff 0
2780 $ctxmmg add command \
2781 -label [mc "Run Merge Tool"] \
2782 -command {merge_resolve_tool}
2783 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
2784 $ctxmmg add separator
2785 $ctxmmg add command \
2786 -label [mc "Use Remote Version"] \
2787 -command {merge_resolve_one 3}
2788 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
2789 $ctxmmg add command \
2790 -label [mc "Use Local Version"] \
2791 -command {merge_resolve_one 2}
2792 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
2793 $ctxmmg add command \
2794 -label [mc "Revert To Base"] \
2795 -command {merge_resolve_one 1}
2796 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
2797 $ctxmmg add separator
2798 create_common_diff_popup $ctxmmg
2800 proc popup_diff_menu {ctxm ctxmmg x y X Y} {
2801 global current_diff_path file_states
2804 if {[info exists file_states($current_diff_path)]} {
2805 set state [lindex $file_states($current_diff_path) 0]
2809 if {[string index $state 0] eq {U}} {
2810 tk_popup $ctxmmg $X $Y
2812 if {$::ui_index eq $::current_diff_side} {
2813 set l [mc "Unstage Hunk From Commit"]
2814 set t [mc "Unstage Line From Commit"]
2816 set l [mc "Stage Hunk For Commit"]
2817 set t [mc "Stage Line For Commit"]
2820 || $current_diff_path eq {}
2824 || {T_} eq $state} {
2829 $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
2830 $ctxm entryconf $::ui_diff_applyline -state $s -label $t
2831 tk_popup $ctxm $X $Y
2834 bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg %x %y %X %Y]
2838 set main_status [::status_bar::new .status]
2839 pack .status -anchor w -side bottom -fill x
2840 $main_status show [mc "Initializing..."]
2845 set gm $repo_config(gui.geometry)
2846 wm geometry . [lindex $gm 0]
2847 .vpane sash place 0 \
2849 [lindex [.vpane sash coord 0] 1]
2850 .vpane.files sash place 0 \
2851 [lindex [.vpane.files sash coord 0] 0] \
2858 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
2859 bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
2860 bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
2861 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
2862 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
2863 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
2864 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
2865 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
2866 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
2867 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
2868 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
2869 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2870 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2871 bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
2872 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
2873 bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
2874 bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
2875 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
2877 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
2878 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
2879 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
2880 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
2881 bind $ui_diff <$M1B-Key-v> {break}
2882 bind $ui_diff <$M1B-Key-V> {break}
2883 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2884 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2885 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
2886 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
2887 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
2888 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
2889 bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
2890 bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
2891 bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
2892 bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
2893 bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
2894 bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
2895 bind $ui_diff <Button-1> {focus %W}
2897 if {[is_enabled branch]} {
2898 bind . <$M1B-Key-n> branch_create::dialog
2899 bind . <$M1B-Key-N> branch_create::dialog
2900 bind . <$M1B-Key-o> branch_checkout::dialog
2901 bind . <$M1B-Key-O> branch_checkout::dialog
2902 bind . <$M1B-Key-m> merge::dialog
2903 bind . <$M1B-Key-M> merge::dialog
2905 if {[is_enabled transport]} {
2906 bind . <$M1B-Key-p> do_push_anywhere
2907 bind . <$M1B-Key-P> do_push_anywhere
2910 bind . <Key-F5> do_rescan
2911 bind . <$M1B-Key-r> do_rescan
2912 bind . <$M1B-Key-R> do_rescan
2913 bind . <$M1B-Key-s> do_signoff
2914 bind . <$M1B-Key-S> do_signoff
2915 bind . <$M1B-Key-t> do_add_selection
2916 bind . <$M1B-Key-T> do_add_selection
2917 bind . <$M1B-Key-i> do_add_all
2918 bind . <$M1B-Key-I> do_add_all
2919 bind . <$M1B-Key-minus> {show_less_context;break}
2920 bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
2921 bind . <$M1B-Key-equal> {show_more_context;break}
2922 bind . <$M1B-Key-plus> {show_more_context;break}
2923 bind . <$M1B-Key-KP_Add> {show_more_context;break}
2924 bind . <$M1B-Key-Return> do_commit
2925 foreach i [list $ui_index $ui_workdir] {
2926 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
2927 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
2928 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
2932 set file_lists($ui_index) [list]
2933 set file_lists($ui_workdir) [list]
2935 wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
2936 focus -force $ui_comm
2938 # -- Warn the user about environmental problems. Cygwin's Tcl
2939 # does *not* pass its env array onto any processes it spawns.
2940 # This means that git processes get none of our environment.
2945 set msg [mc "Possible environment issues exist.
2947 The following environment variables are probably
2948 going to be ignored by any Git subprocess run
2952 foreach name [array names env] {
2953 switch -regexp -- $name {
2954 {^GIT_INDEX_FILE$} -
2955 {^GIT_OBJECT_DIRECTORY$} -
2956 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
2958 {^GIT_EXTERNAL_DIFF$} -
2962 {^GIT_CONFIG_LOCAL$} -
2963 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
2964 append msg " - $name\n"
2967 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
2968 append msg " - $name\n"
2970 set suggest_user $name
2974 if {$ignored_env > 0} {
2976 This is due to a known issue with the
2977 Tcl binary distributed by Cygwin."]
2979 if {$suggest_user ne {}} {
2982 A good replacement for %s
2983 is placing values for the user.name and
2984 user.email settings into your personal
2990 unset ignored_env msg suggest_user name
2993 # -- Only initialize complex UI if we are going to stay running.
2995 if {[is_enabled transport]} {
2998 set n [.mbar.remote index end]
3001 set n [expr {[.mbar.remote index end] - $n}]
3003 if {[.mbar.remote type 0] eq "tearoff"} { incr n }
3004 .mbar.remote insert $n separator
3009 if {[winfo exists $ui_comm]} {
3010 set GITGUI_BCK_exists [load_message GITGUI_BCK]
3012 # -- If both our backup and message files exist use the
3013 # newer of the two files to initialize the buffer.
3015 if {$GITGUI_BCK_exists} {
3016 set m [gitdir GITGUI_MSG]
3017 if {[file isfile $m]} {
3018 if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
3019 catch {file delete [gitdir GITGUI_MSG]}
3021 $ui_comm delete 0.0 end
3023 $ui_comm edit modified false
3024 catch {file delete [gitdir GITGUI_BCK]}
3025 set GITGUI_BCK_exists 0
3031 proc backup_commit_buffer {} {
3032 global ui_comm GITGUI_BCK_exists
3034 set m [$ui_comm edit modified]
3035 if {$m || $GITGUI_BCK_exists} {
3036 set msg [string trim [$ui_comm get 0.0 end]]
3037 regsub -all -line {[ \r\t]+$} $msg {} msg
3040 if {$GITGUI_BCK_exists} {
3041 catch {file delete [gitdir GITGUI_BCK]}
3042 set GITGUI_BCK_exists 0
3046 set fd [open [gitdir GITGUI_BCK] w]
3047 puts -nonewline $fd $msg
3049 set GITGUI_BCK_exists 1
3053 $ui_comm edit modified false
3056 set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
3059 backup_commit_buffer
3061 # -- If the user has aspell available we can drive it
3062 # in pipe mode to spellcheck the commit message.
3064 set spell_cmd [list |]
3065 set spell_dict [get_config gui.spellingdictionary]
3066 lappend spell_cmd aspell
3067 if {$spell_dict ne {}} {
3068 lappend spell_cmd --master=$spell_dict
3070 lappend spell_cmd --mode=none
3071 lappend spell_cmd --encoding=utf-8
3072 lappend spell_cmd pipe
3073 if {$spell_dict eq {none}
3074 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
3075 bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
3077 set ui_comm_spell [spellcheck::init \
3083 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3086 lock_index begin-read
3087 if {![winfo ismapped .]} {
3091 if {[is_enabled multicommit]} {