2 # Tcl ignores the next line -*- tcl -*- \
3 if test "z$*" = zversion \
4 || test "z$*" = z--version; \
6 echo 'git-gui version @@GITGUI_VERSION@@'; \
11 set appvers {@@GITGUI_VERSION@@}
13 Copyright © 2006, 2007 Shawn Pearce, et. al.
15 This program is free software; you can redistribute it and/or modify
16 it under the terms of the GNU General Public License as published by
17 the Free Software Foundation; either version 2 of the License, or
18 (at your option) any later version.
20 This program is distributed in the hope that it will be useful,
21 but WITHOUT ANY WARRANTY; without even the implied warranty of
22 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23 GNU General Public License for more details.
25 You should have received a copy of the GNU General Public License
26 along with this program; if not, write to the Free Software
27 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}
29 ######################################################################
31 ## Tcl/Tk sanity check
33 if {[catch {package require Tcl 8.4} err]
34 || [catch {package require Tk 8.4} err]
40 -title "git-gui: fatal error" \
45 catch {rename send {}} ; # What an evil concept...
47 ######################################################################
49 ## enable verbose loading?
51 if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
53 rename auto_load real__auto_load
54 proc auto_load {name args} {
55 puts stderr "auto_load $name"
56 return [uplevel 1 real__auto_load $name $args]
58 rename source real__source
60 puts stderr "source $name"
61 uplevel 1 real__source $name
65 ######################################################################
67 ## Fake internationalization to ease backporting of changes.
70 set cmk [string first @@ $fmt]
72 set fmt [string range $fmt 0 [expr {$cmk - 1}]]
74 return [eval [list format $fmt] $args]
77 ######################################################################
81 set _appname [lindex [file split $argv0] end]
98 return [eval [list file join $_gitdir] $args]
101 proc gitexec {args} {
103 if {$_gitexec eq {}} {
104 if {[catch {set _gitexec [git --exec-path]} err]} {
105 error "Git not installed?\n\n$err"
108 set _gitexec [exec cygpath \
113 set _gitexec [file normalize $_gitexec]
119 return [eval [list file join $_gitexec] $args]
127 if {[tk windowingsystem] eq {aqua}} {
134 if {$::tcl_platform(platform) eq {windows}} {
142 if {$_iscygwin eq {}} {
143 if {$::tcl_platform(platform) eq {windows}} {
144 if {[catch {set p [exec cygpath --windir]} err]} {
156 proc is_enabled {option} {
157 global enabled_options
158 if {[catch {set on $enabled_options($option)}]} {return 0}
162 proc enable_option {option} {
163 global enabled_options
164 set enabled_options($option) 1
167 proc disable_option {option} {
168 global enabled_options
169 set enabled_options($option) 0
172 ######################################################################
176 proc is_many_config {name} {
177 switch -glob -- $name {
186 proc is_config_true {name} {
188 if {[catch {set v $repo_config($name)}]} {
190 } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
197 proc get_config {name} {
199 if {[catch {set v $repo_config($name)}]} {
206 proc load_config {include_global} {
207 global repo_config global_config default_config
209 array unset global_config
210 if {$include_global} {
212 set fd_rc [git_read config --global --list]
213 while {[gets $fd_rc line] >= 0} {
214 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
215 if {[is_many_config $name]} {
216 lappend global_config($name) $value
218 set global_config($name) $value
226 array unset repo_config
228 set fd_rc [git_read config --list]
229 while {[gets $fd_rc line] >= 0} {
230 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
231 if {[is_many_config $name]} {
232 lappend repo_config($name) $value
234 set repo_config($name) $value
241 foreach name [array names default_config] {
242 if {[catch {set v $global_config($name)}]} {
243 set global_config($name) $default_config($name)
245 if {[catch {set v $repo_config($name)}]} {
246 set repo_config($name) $default_config($name)
251 ######################################################################
255 proc _git_cmd {name} {
258 if {[catch {set v $_git_cmd_path($name)}]} {
262 --exec-path { return [list $::_git $name] }
265 set p [gitexec git-$name$::_search_exe]
266 if {[file exists $p]} {
268 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
269 # Try to determine what sort of magic will make
270 # git-$name go and do its thing, because native
271 # Tcl on Windows doesn't know it.
273 set p [gitexec git-$name]
278 switch -glob -- [lindex $s 0] {
280 #!*perl { set i perl }
281 #!*python { set i python }
282 default { error "git-$name is not supported: $s" }
286 if {![info exists interp]} {
287 set interp [_which $i]
290 error "git-$name requires $i (not in PATH)"
292 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
294 # Assume it is builtin to git somehow and we
295 # aren't actually able to see a file for it.
297 set v [list $::_git $name]
299 set _git_cmd_path($name) $v
305 global env _search_exe _search_path
307 if {$_search_path eq {}} {
308 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
309 set _search_path [split [exec cygpath \
315 } elseif {[is_Windows]} {
316 set _search_path [split $env(PATH) {;}]
319 set _search_path [split $env(PATH) :]
324 foreach p $_search_path {
325 set p [file join $p $what$_search_exe]
326 if {[file exists $p]} {
327 return [file normalize $p]
333 proc _lappend_nice {cmd_var} {
337 if {![info exists _nice]} {
338 set _nice [_which nice]
349 switch -- [lindex $args 0] {
360 set args [lrange $args 1 end]
363 set cmdp [_git_cmd [lindex $args 0]]
364 set args [lrange $args 1 end]
366 return [eval $opt $cmdp $args]
369 proc _open_stdout_stderr {cmd} {
373 if { [lindex $cmd end] eq {2>@1}
374 && $err eq {can not find channel named "1"}
376 # Older versions of Tcl 8.4 don't have this 2>@1 IO
377 # redirect operator. Fallback to |& cat for those.
378 # The command was not actually started, so its safe
379 # to try to start it a second time.
381 set fd [open [concat \
382 [lrange $cmd 0 end-1] \
389 fconfigure $fd -eofchar {}
393 proc git_read {args} {
397 switch -- [lindex $args 0] {
412 set args [lrange $args 1 end]
415 set cmdp [_git_cmd [lindex $args 0]]
416 set args [lrange $args 1 end]
418 return [_open_stdout_stderr [concat $opt $cmdp $args]]
421 proc git_write {args} {
425 switch -- [lindex $args 0] {
436 set args [lrange $args 1 end]
439 set cmdp [_git_cmd [lindex $args 0]]
440 set args [lrange $args 1 end]
442 return [open [concat $opt $cmdp $args] w]
446 regsub -all ' $value "'\\''" value
450 proc load_current_branch {} {
451 global current_branch is_detached
453 set fd [open [gitdir HEAD] r]
454 if {[gets $fd ref] < 1} {
459 set pfx {ref: refs/heads/}
460 set len [string length $pfx]
461 if {[string equal -length $len $pfx $ref]} {
462 # We're on a branch. It might not exist. But
463 # HEAD looks good enough to be a branch.
465 set current_branch [string range $ref $len end]
468 # Assume this is a detached head.
470 set current_branch HEAD
475 auto_load tk_optionMenu
476 rename tk_optionMenu real__tkOptionMenu
477 proc tk_optionMenu {w varName args} {
478 set m [eval real__tkOptionMenu $w $varName $args]
479 $m configure -font font_ui
480 $w configure -font font_ui
484 proc rmsel_tag {text} {
486 -background [$text cget -background] \
487 -foreground [$text cget -foreground] \
489 $text tag conf in_sel -background lightgray
490 bind $text <Motion> break
494 ######################################################################
498 set _git [_which git]
500 catch {wm withdraw .}
504 -title [mc "git-gui: fatal error"] \
505 -message [mc "Cannot find git in PATH."]
509 ######################################################################
513 if {[catch {set _git_version [git --version]} err]} {
514 catch {wm withdraw .}
518 -title "git-gui: fatal error" \
519 -message "Cannot determine Git version:
523 [appname] requires Git 1.5.0 or later."
526 if {![regsub {^git version } $_git_version {} _git_version]} {
527 catch {wm withdraw .}
531 -title "git-gui: fatal error" \
532 -message "Cannot parse Git version string:\n\n$_git_version"
536 set _real_git_version $_git_version
537 regsub -- {-dirty$} $_git_version {} _git_version
538 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
539 regsub {\.rc[0-9]+$} $_git_version {} _git_version
540 regsub {\.GIT$} $_git_version {} _git_version
542 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
543 catch {wm withdraw .}
548 -title "[appname]: warning" \
549 -message "Git version cannot be determined.
551 $_git claims it is version '$_real_git_version'.
553 [appname] requires at least Git 1.5.0 or later.
555 Assume '$_real_git_version' is version 1.5.0?
557 set _git_version 1.5.0
562 unset _real_git_version
564 proc git-version {args} {
567 switch [llength $args] {
573 set op [lindex $args 0]
574 set vr [lindex $args 1]
575 set cm [package vcompare $_git_version $vr]
576 return [expr $cm $op 0]
580 set type [lindex $args 0]
581 set name [lindex $args 1]
582 set parm [lindex $args 2]
583 set body [lindex $args 3]
585 if {($type ne {proc} && $type ne {method})} {
586 error "Invalid arguments to git-version"
588 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
589 error "Last arm of $type $name must be default"
592 foreach {op vr cb} [lrange $body 0 end-2] {
593 if {[git-version $op $vr]} {
594 return [uplevel [list $type $name $parm $cb]]
598 return [uplevel [list $type $name $parm [lindex $body end]]]
602 error "git-version >= x"
608 if {[git-version < 1.5]} {
609 catch {wm withdraw .}
613 -title "git-gui: fatal error" \
614 -message "[appname] requires Git 1.5.0 or later.
616 You are using [git-version]:
622 ######################################################################
624 ## configure our library
626 set oguilib {@@GITGUI_LIBDIR@@}
627 set oguirel {@@GITGUI_RELATIVE@@}
628 if {$oguirel eq {1}} {
629 set oguilib [file dirname [file dirname [file normalize $argv0]]]
630 set oguilib [file join $oguilib share git-gui lib]
631 } elseif {[string match @@* $oguirel]} {
632 set oguilib [file join [file dirname [file normalize $argv0]] lib]
635 set idx [file join $oguilib tclIndex]
636 if {[catch {set fd [open $idx r]} err]} {
637 catch {wm withdraw .}
641 -title "git-gui: fatal error" \
645 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
647 while {[gets $fd n] >= 0} {
648 if {$n ne {} && ![string match #* $n]} {
660 if {[lsearch -exact $loaded $p] >= 0} continue
661 source [file join $oguilib $p]
666 set auto_path [concat [list $oguilib] $auto_path]
668 unset -nocomplain oguirel idx fd
670 ######################################################################
672 ## feature option selection
674 if {[regexp {^git-(.+)$} [appname] _junk subcommand]} {
679 if {$subcommand eq {gui.sh}} {
682 if {$subcommand eq {gui} && [llength $argv] > 0} {
683 set subcommand [lindex $argv 0]
684 set argv [lrange $argv 1 end]
687 enable_option multicommit
689 enable_option transport
692 switch -- $subcommand {
697 disable_option multicommit
698 disable_option branch
699 disable_option transport
702 enable_option singlecommit
704 disable_option multicommit
705 disable_option branch
706 disable_option transport
710 ######################################################################
715 set _gitdir $env(GIT_DIR)
719 set _gitdir [git rev-parse --git-dir]
720 set _prefix [git rev-parse --show-prefix]
722 catch {wm withdraw .}
723 error_popup "Cannot find the git directory:\n\n$err"
726 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
727 catch {set _gitdir [exec cygpath --unix $_gitdir]}
729 if {![file isdirectory $_gitdir]} {
730 catch {wm withdraw .}
731 error_popup "Git directory not found:\n\n$_gitdir"
734 if {$_prefix ne {}} {
735 regsub -all {[^/]+/} $_prefix ../ cdup
736 if {[catch {cd $cdup} err]} {
737 catch {wm withdraw .}
738 error_popup "Cannot move to top of working directory:\n\n$err"
742 } elseif {![is_enabled bare]} {
743 if {[lindex [file split $_gitdir] end] ne {.git}} {
744 catch {wm withdraw .}
745 error_popup "Cannot use funny .git directory:\n\n$_gitdir"
748 if {[catch {cd [file dirname $_gitdir]} err]} {
749 catch {wm withdraw .}
750 error_popup "No working directory [file dirname $_gitdir]:\n\n$err"
754 set _reponame [file split [file normalize $_gitdir]]
755 if {[lindex $_reponame end] eq {.git}} {
756 set _reponame [lindex $_reponame end-1]
758 set _reponame [lindex $_reponame end]
761 ######################################################################
765 set current_diff_path {}
766 set current_diff_side {}
767 set diff_actions [list]
771 set MERGE_HEAD [list]
774 set current_branch {}
776 set current_diff_path {}
778 set selected_commit_type new
780 ######################################################################
788 set disable_on_lock [list]
789 set index_lock_type none
791 proc lock_index {type} {
792 global index_lock_type disable_on_lock
794 if {$index_lock_type eq {none}} {
795 set index_lock_type $type
796 foreach w $disable_on_lock {
797 uplevel #0 $w disabled
800 } elseif {$index_lock_type eq "begin-$type"} {
801 set index_lock_type $type
807 proc unlock_index {} {
808 global index_lock_type disable_on_lock
810 set index_lock_type none
811 foreach w $disable_on_lock {
816 ######################################################################
820 proc repository_state {ctvar hdvar mhvar} {
821 global current_branch
822 upvar $ctvar ct $hdvar hd $mhvar mh
827 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
833 set merge_head [gitdir MERGE_HEAD]
834 if {[file exists $merge_head]} {
836 set fd_mh [open $merge_head r]
837 while {[gets $fd_mh line] >= 0} {
848 global PARENT empty_tree
850 set p [lindex $PARENT 0]
854 if {$empty_tree eq {}} {
855 set empty_tree [git mktree << {}]
860 proc rescan {after {honor_trustmtime 1}} {
861 global HEAD PARENT MERGE_HEAD commit_type
862 global ui_index ui_workdir ui_comm
863 global rescan_active file_states
866 if {$rescan_active > 0 || ![lock_index read]} return
868 repository_state newType newHEAD newMERGE_HEAD
869 if {[string match amend* $commit_type]
870 && $newType eq {normal}
871 && $newHEAD eq $HEAD} {
875 set MERGE_HEAD $newMERGE_HEAD
876 set commit_type $newType
879 array unset file_states
881 if {!$::GITGUI_BCK_exists &&
882 (![$ui_comm edit modified]
883 || [string trim [$ui_comm get 0.0 end]] eq {})} {
884 if {[string match amend* $commit_type]} {
885 } elseif {[load_message GITGUI_MSG]} {
886 } elseif {[load_message MERGE_MSG]} {
887 } elseif {[load_message SQUASH_MSG]} {
890 $ui_comm edit modified false
893 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
894 rescan_stage2 {} $after
897 ui_status {Refreshing file status...}
898 set fd_rf [git_read update-index \
904 fconfigure $fd_rf -blocking 0 -translation binary
905 fileevent $fd_rf readable \
906 [list rescan_stage2 $fd_rf $after]
911 set is_git_info_link {}
912 set is_git_info_exclude {}
913 proc have_info_exclude {} {
914 global is_git_info_link is_git_info_exclude
916 if {$is_git_info_link eq {}} {
917 set is_git_info_link [file isfile [gitdir info.lnk]]
920 if {$is_git_info_link} {
921 if {$is_git_info_exclude eq {}} {
922 if {[catch {exec test -f [gitdir info exclude]}]} {
923 set is_git_info_exclude 0
925 set is_git_info_exclude 1
928 return $is_git_info_exclude
930 return [file readable [gitdir info exclude]]
934 proc have_info_exclude {} {
935 return [file readable [gitdir info exclude]]
939 proc rescan_stage2 {fd after} {
940 global rescan_active buf_rdi buf_rdf buf_rlo
944 if {![eof $fd]} return
948 set ls_others [list --exclude-per-directory=.gitignore]
949 if {[have_info_exclude]} {
950 lappend ls_others "--exclude-from=[gitdir info exclude]"
952 set user_exclude [get_config core.excludesfile]
953 if {$user_exclude ne {} && [file readable $user_exclude]} {
954 lappend ls_others "--exclude-from=$user_exclude"
962 ui_status {Scanning for modified files ...}
963 set fd_di [git_read diff-index --cached -z [PARENT]]
964 set fd_df [git_read diff-files -z]
965 set fd_lo [eval git_read ls-files --others -z $ls_others]
967 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
968 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
969 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
970 fileevent $fd_di readable [list read_diff_index $fd_di $after]
971 fileevent $fd_df readable [list read_diff_files $fd_df $after]
972 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
975 proc load_message {file} {
979 if {[file isfile $f]} {
980 if {[catch {set fd [open $f r]}]} {
983 fconfigure $fd -eofchar {}
984 set content [string trim [read $fd]]
986 regsub -all -line {[ \r\t]+$} $content {} content
987 $ui_comm delete 0.0 end
988 $ui_comm insert end $content
994 proc read_diff_index {fd after} {
997 append buf_rdi [read $fd]
999 set n [string length $buf_rdi]
1001 set z1 [string first "\0" $buf_rdi $c]
1002 if {$z1 == -1} break
1004 set z2 [string first "\0" $buf_rdi $z1]
1005 if {$z2 == -1} break
1008 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1009 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1011 [encoding convertfrom $p] \
1013 [list [lindex $i 0] [lindex $i 2]] \
1019 set buf_rdi [string range $buf_rdi $c end]
1024 rescan_done $fd buf_rdi $after
1027 proc read_diff_files {fd after} {
1030 append buf_rdf [read $fd]
1032 set n [string length $buf_rdf]
1034 set z1 [string first "\0" $buf_rdf $c]
1035 if {$z1 == -1} break
1037 set z2 [string first "\0" $buf_rdf $z1]
1038 if {$z2 == -1} break
1041 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1042 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1044 [encoding convertfrom $p] \
1047 [list [lindex $i 0] [lindex $i 2]]
1052 set buf_rdf [string range $buf_rdf $c end]
1057 rescan_done $fd buf_rdf $after
1060 proc read_ls_others {fd after} {
1063 append buf_rlo [read $fd]
1064 set pck [split $buf_rlo "\0"]
1065 set buf_rlo [lindex $pck end]
1066 foreach p [lrange $pck 0 end-1] {
1067 set p [encoding convertfrom $p]
1068 if {[string index $p end] eq {/}} {
1069 set p [string range $p 0 end-1]
1073 rescan_done $fd buf_rlo $after
1076 proc rescan_done {fd buf after} {
1077 global rescan_active current_diff_path
1078 global file_states repo_config
1081 if {![eof $fd]} return
1084 if {[incr rescan_active -1] > 0} return
1089 if {$current_diff_path ne {}} reshow_diff
1093 proc prune_selection {} {
1094 global file_states selected_paths
1096 foreach path [array names selected_paths] {
1097 if {[catch {set still_here $file_states($path)}]} {
1098 unset selected_paths($path)
1103 ######################################################################
1107 proc mapicon {w state path} {
1110 if {[catch {set r $all_icons($state$w)}]} {
1111 puts "error: no icon for $w state={$state} $path"
1117 proc mapdesc {state path} {
1120 if {[catch {set r $all_descs($state)}]} {
1121 puts "error: no desc for state={$state} $path"
1127 proc ui_status {msg} {
1128 $::main_status show $msg
1131 proc ui_ready {{test {}}} {
1132 $::main_status show {Ready.} $test
1135 proc escape_path {path} {
1136 regsub -all {\\} $path "\\\\" path
1137 regsub -all "\n" $path "\\n" path
1141 proc short_path {path} {
1142 return [escape_path [lindex [file split $path] end]]
1146 set null_sha1 [string repeat 0 40]
1148 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1149 global file_states next_icon_id null_sha1
1151 set s0 [string index $new_state 0]
1152 set s1 [string index $new_state 1]
1154 if {[catch {set info $file_states($path)}]} {
1156 set icon n[incr next_icon_id]
1158 set state [lindex $info 0]
1159 set icon [lindex $info 1]
1160 if {$head_info eq {}} {set head_info [lindex $info 2]}
1161 if {$index_info eq {}} {set index_info [lindex $info 3]}
1164 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1165 elseif {$s0 eq {_}} {set s0 _}
1167 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1168 elseif {$s1 eq {_}} {set s1 _}
1170 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1171 set head_info [list 0 $null_sha1]
1172 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1173 && $head_info eq {}} {
1174 set head_info $index_info
1177 set file_states($path) [list $s0$s1 $icon \
1178 $head_info $index_info \
1183 proc display_file_helper {w path icon_name old_m new_m} {
1186 if {$new_m eq {_}} {
1187 set lno [lsearch -sorted -exact $file_lists($w) $path]
1189 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1191 $w conf -state normal
1192 $w delete $lno.0 [expr {$lno + 1}].0
1193 $w conf -state disabled
1195 } elseif {$old_m eq {_} && $new_m ne {_}} {
1196 lappend file_lists($w) $path
1197 set file_lists($w) [lsort -unique $file_lists($w)]
1198 set lno [lsearch -sorted -exact $file_lists($w) $path]
1200 $w conf -state normal
1201 $w image create $lno.0 \
1202 -align center -padx 5 -pady 1 \
1204 -image [mapicon $w $new_m $path]
1205 $w insert $lno.1 "[escape_path $path]\n"
1206 $w conf -state disabled
1207 } elseif {$old_m ne $new_m} {
1208 $w conf -state normal
1209 $w image conf $icon_name -image [mapicon $w $new_m $path]
1210 $w conf -state disabled
1214 proc display_file {path state} {
1215 global file_states selected_paths
1216 global ui_index ui_workdir
1218 set old_m [merge_state $path $state]
1219 set s $file_states($path)
1220 set new_m [lindex $s 0]
1221 set icon_name [lindex $s 1]
1223 set o [string index $old_m 0]
1224 set n [string index $new_m 0]
1231 display_file_helper $ui_index $path $icon_name $o $n
1233 if {[string index $old_m 0] eq {U}} {
1236 set o [string index $old_m 1]
1238 if {[string index $new_m 0] eq {U}} {
1241 set n [string index $new_m 1]
1243 display_file_helper $ui_workdir $path $icon_name $o $n
1245 if {$new_m eq {__}} {
1246 unset file_states($path)
1247 catch {unset selected_paths($path)}
1251 proc display_all_files_helper {w path icon_name m} {
1254 lappend file_lists($w) $path
1255 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1256 $w image create end \
1257 -align center -padx 5 -pady 1 \
1259 -image [mapicon $w $m $path]
1260 $w insert end "[escape_path $path]\n"
1263 proc display_all_files {} {
1264 global ui_index ui_workdir
1265 global file_states file_lists
1268 $ui_index conf -state normal
1269 $ui_workdir conf -state normal
1271 $ui_index delete 0.0 end
1272 $ui_workdir delete 0.0 end
1275 set file_lists($ui_index) [list]
1276 set file_lists($ui_workdir) [list]
1278 foreach path [lsort [array names file_states]] {
1279 set s $file_states($path)
1281 set icon_name [lindex $s 1]
1283 set s [string index $m 0]
1284 if {$s ne {U} && $s ne {_}} {
1285 display_all_files_helper $ui_index $path \
1289 if {[string index $m 0] eq {U}} {
1292 set s [string index $m 1]
1295 display_all_files_helper $ui_workdir $path \
1300 $ui_index conf -state disabled
1301 $ui_workdir conf -state disabled
1304 ######################################################################
1309 #define mask_width 14
1310 #define mask_height 15
1311 static unsigned char mask_bits[] = {
1312 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1313 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1314 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1317 image create bitmap file_plain -background white -foreground black -data {
1318 #define plain_width 14
1319 #define plain_height 15
1320 static unsigned char plain_bits[] = {
1321 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1322 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1323 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1324 } -maskdata $filemask
1326 image create bitmap file_mod -background white -foreground blue -data {
1327 #define mod_width 14
1328 #define mod_height 15
1329 static unsigned char mod_bits[] = {
1330 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1331 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1332 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1333 } -maskdata $filemask
1335 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1336 #define file_fulltick_width 14
1337 #define file_fulltick_height 15
1338 static unsigned char file_fulltick_bits[] = {
1339 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1340 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1341 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1342 } -maskdata $filemask
1344 image create bitmap file_parttick -background white -foreground "#005050" -data {
1345 #define parttick_width 14
1346 #define parttick_height 15
1347 static unsigned char parttick_bits[] = {
1348 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1349 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1350 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1351 } -maskdata $filemask
1353 image create bitmap file_question -background white -foreground black -data {
1354 #define file_question_width 14
1355 #define file_question_height 15
1356 static unsigned char file_question_bits[] = {
1357 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1358 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1359 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1360 } -maskdata $filemask
1362 image create bitmap file_removed -background white -foreground red -data {
1363 #define file_removed_width 14
1364 #define file_removed_height 15
1365 static unsigned char file_removed_bits[] = {
1366 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1367 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1368 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1369 } -maskdata $filemask
1371 image create bitmap file_merge -background white -foreground blue -data {
1372 #define file_merge_width 14
1373 #define file_merge_height 15
1374 static unsigned char file_merge_bits[] = {
1375 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1376 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1377 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1378 } -maskdata $filemask
1380 set ui_index .vpane.files.index.list
1381 set ui_workdir .vpane.files.workdir.list
1383 set all_icons(_$ui_index) file_plain
1384 set all_icons(A$ui_index) file_fulltick
1385 set all_icons(M$ui_index) file_fulltick
1386 set all_icons(D$ui_index) file_removed
1387 set all_icons(U$ui_index) file_merge
1389 set all_icons(_$ui_workdir) file_plain
1390 set all_icons(M$ui_workdir) file_mod
1391 set all_icons(D$ui_workdir) file_question
1392 set all_icons(U$ui_workdir) file_merge
1393 set all_icons(O$ui_workdir) file_plain
1395 set max_status_desc 0
1399 {_M "Modified, not staged"}
1400 {M_ "Staged for commit"}
1401 {MM "Portions staged for commit"}
1402 {MD "Staged for commit, missing"}
1404 {_O "Untracked, not staged"}
1405 {A_ "Staged for commit"}
1406 {AM "Portions staged for commit"}
1407 {AD "Staged for commit, missing"}
1410 {D_ "Staged for removal"}
1411 {DO "Staged for removal, still present"}
1413 {U_ "Requires merge resolution"}
1414 {UU "Requires merge resolution"}
1415 {UM "Requires merge resolution"}
1416 {UD "Requires merge resolution"}
1418 if {$max_status_desc < [string length [lindex $i 1]]} {
1419 set max_status_desc [string length [lindex $i 1]]
1421 set all_descs([lindex $i 0]) [lindex $i 1]
1425 ######################################################################
1429 proc bind_button3 {w cmd} {
1430 bind $w <Any-Button-3> $cmd
1432 # Mac OS X sends Button-2 on right click through three-button mouse,
1433 # or through trackpad right-clicking (two-finger touch + click).
1434 bind $w <Any-Button-2> $cmd
1435 bind $w <Control-Button-1> $cmd
1439 proc scrollbar2many {list mode args} {
1440 foreach w $list {eval $w $mode $args}
1443 proc many2scrollbar {list mode sb top bottom} {
1444 $sb set $top $bottom
1445 foreach w $list {$w $mode moveto $top}
1448 proc incr_font_size {font {amt 1}} {
1449 set sz [font configure $font -size]
1451 font configure $font -size $sz
1452 font configure ${font}bold -size $sz
1453 font configure ${font}italic -size $sz
1456 ######################################################################
1460 set starting_gitk_msg {Starting gitk... please wait...}
1462 proc do_gitk {revs} {
1463 # -- Always start gitk through whatever we were loaded with. This
1464 # lets us bypass using shell process on Windows systems.
1466 set exe [file join [file dirname $::_git] gitk]
1467 set cmd [list [info nameofexecutable] $exe]
1468 if {! [file exists $exe]} {
1469 error_popup "Unable to start gitk:\n\n$exe does not exist"
1471 eval exec $cmd $revs &
1472 ui_status $::starting_gitk_msg
1474 ui_ready $starting_gitk_msg
1482 global ui_comm is_quitting repo_config commit_type
1483 global GITGUI_BCK_exists GITGUI_BCK_i
1485 if {$is_quitting} return
1488 if {[winfo exists $ui_comm]} {
1489 # -- Stash our current commit buffer.
1491 set save [gitdir GITGUI_MSG]
1492 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
1493 file rename -force [gitdir GITGUI_BCK] $save
1494 set GITGUI_BCK_exists 0
1496 set msg [string trim [$ui_comm get 0.0 end]]
1497 regsub -all -line {[ \r\t]+$} $msg {} msg
1498 if {(![string match amend* $commit_type]
1499 || [$ui_comm edit modified])
1502 set fd [open $save w]
1503 puts -nonewline $fd $msg
1507 catch {file delete $save}
1511 # -- Remove our editor backup, its not needed.
1513 after cancel $GITGUI_BCK_i
1514 if {$GITGUI_BCK_exists} {
1515 catch {file delete [gitdir GITGUI_BCK]}
1518 # -- Stash our current window geometry into this repository.
1520 set cfg_geometry [list]
1521 lappend cfg_geometry [wm geometry .]
1522 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
1523 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
1524 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
1527 if {$cfg_geometry ne $rc_geometry} {
1528 catch {git config gui.geometry $cfg_geometry}
1543 proc toggle_or_diff {w x y} {
1544 global file_states file_lists current_diff_path ui_index ui_workdir
1545 global last_clicked selected_paths
1547 set pos [split [$w index @$x,$y] .]
1548 set lno [lindex $pos 0]
1549 set col [lindex $pos 1]
1550 set path [lindex $file_lists($w) [expr {$lno - 1}]]
1556 set last_clicked [list $w $lno]
1557 array unset selected_paths
1558 $ui_index tag remove in_sel 0.0 end
1559 $ui_workdir tag remove in_sel 0.0 end
1562 if {$current_diff_path eq $path} {
1563 set after {reshow_diff;}
1567 if {$w eq $ui_index} {
1569 "Unstaging [short_path $path] from commit" \
1571 [concat $after [list ui_ready]]
1572 } elseif {$w eq $ui_workdir} {
1574 "Adding [short_path $path]" \
1576 [concat $after [list ui_ready]]
1579 show_diff $path $w $lno
1583 proc add_one_to_selection {w x y} {
1584 global file_lists last_clicked selected_paths
1586 set lno [lindex [split [$w index @$x,$y] .] 0]
1587 set path [lindex $file_lists($w) [expr {$lno - 1}]]
1593 if {$last_clicked ne {}
1594 && [lindex $last_clicked 0] ne $w} {
1595 array unset selected_paths
1596 [lindex $last_clicked 0] tag remove in_sel 0.0 end
1599 set last_clicked [list $w $lno]
1600 if {[catch {set in_sel $selected_paths($path)}]} {
1604 unset selected_paths($path)
1605 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
1607 set selected_paths($path) 1
1608 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
1612 proc add_range_to_selection {w x y} {
1613 global file_lists last_clicked selected_paths
1615 if {[lindex $last_clicked 0] ne $w} {
1616 toggle_or_diff $w $x $y
1620 set lno [lindex [split [$w index @$x,$y] .] 0]
1621 set lc [lindex $last_clicked 1]
1630 foreach path [lrange $file_lists($w) \
1631 [expr {$begin - 1}] \
1632 [expr {$end - 1}]] {
1633 set selected_paths($path) 1
1635 $w tag add in_sel $begin.0 [expr {$end + 1}].0
1638 ######################################################################
1642 set cursor_ptr arrow
1643 font create font_diff -family Courier -size 10
1647 eval font configure font_ui [font actual [.dummy cget -font]]
1651 font create font_uiitalic
1652 font create font_uibold
1653 font create font_diffbold
1654 font create font_diffitalic
1656 foreach class {Button Checkbutton Entry Label
1657 Labelframe Listbox Menu Message
1658 Radiobutton Spinbox Text} {
1659 option add *$class.font font_ui
1663 if {[is_Windows] || [is_MacOSX]} {
1664 option add *Menu.tearOff 0
1675 proc apply_config {} {
1676 global repo_config font_descs
1678 foreach option $font_descs {
1679 set name [lindex $option 0]
1680 set font [lindex $option 1]
1682 foreach {cn cv} $repo_config(gui.$name) {
1683 font configure $font $cn $cv -weight normal
1686 error_popup "Invalid font specified in gui.$name:\n\n$err"
1688 foreach {cn cv} [font configure $font] {
1689 font configure ${font}bold $cn $cv
1690 font configure ${font}italic $cn $cv
1692 font configure ${font}bold -weight bold
1693 font configure ${font}italic -slant italic
1697 set default_config(merge.diffstat) true
1698 set default_config(merge.summary) false
1699 set default_config(merge.verbosity) 2
1700 set default_config(user.name) {}
1701 set default_config(user.email) {}
1703 set default_config(gui.matchtrackingbranch) false
1704 set default_config(gui.pruneduringfetch) false
1705 set default_config(gui.trustmtime) false
1706 set default_config(gui.diffcontext) 5
1707 set default_config(gui.newbranchtemplate) {}
1708 set default_config(gui.fontui) [font configure font_ui]
1709 set default_config(gui.fontdiff) [font configure font_diff]
1711 {fontui font_ui {Main Font}}
1712 {fontdiff font_diff {Diff/Console Font}}
1717 ######################################################################
1725 menu .mbar -tearoff 0
1726 .mbar add cascade -label Repository -menu .mbar.repository
1727 .mbar add cascade -label Edit -menu .mbar.edit
1728 if {[is_enabled branch]} {
1729 .mbar add cascade -label Branch -menu .mbar.branch
1731 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
1732 .mbar add cascade -label Commit -menu .mbar.commit
1734 if {[is_enabled transport]} {
1735 .mbar add cascade -label Merge -menu .mbar.merge
1736 .mbar add cascade -label Fetch -menu .mbar.fetch
1737 .mbar add cascade -label Push -menu .mbar.push
1739 . configure -menu .mbar
1741 # -- Repository Menu
1743 menu .mbar.repository
1745 .mbar.repository add command \
1746 -label {Browse Current Branch's Files} \
1747 -command {browser::new $current_branch}
1748 set ui_browse_current [.mbar.repository index last]
1749 .mbar.repository add command \
1750 -label {Browse Branch Files...} \
1751 -command browser_open::dialog
1752 .mbar.repository add separator
1754 .mbar.repository add command \
1755 -label {Visualize Current Branch's History} \
1756 -command {do_gitk $current_branch}
1757 set ui_visualize_current [.mbar.repository index last]
1758 .mbar.repository add command \
1759 -label {Visualize All Branch History} \
1760 -command {do_gitk --all}
1761 .mbar.repository add separator
1763 proc current_branch_write {args} {
1764 global current_branch
1765 .mbar.repository entryconf $::ui_browse_current \
1766 -label "Browse $current_branch's Files"
1767 .mbar.repository entryconf $::ui_visualize_current \
1768 -label "Visualize $current_branch's History"
1770 trace add variable current_branch write current_branch_write
1772 if {[is_enabled multicommit]} {
1773 .mbar.repository add command -label {Database Statistics} \
1776 .mbar.repository add command -label {Compress Database} \
1779 .mbar.repository add command -label {Verify Database} \
1780 -command do_fsck_objects
1782 .mbar.repository add separator
1785 .mbar.repository add command \
1786 -label {Create Desktop Icon} \
1787 -command do_cygwin_shortcut
1788 } elseif {[is_Windows]} {
1789 .mbar.repository add command \
1790 -label {Create Desktop Icon} \
1791 -command do_windows_shortcut
1792 } elseif {[is_MacOSX]} {
1793 .mbar.repository add command \
1794 -label {Create Desktop Icon} \
1795 -command do_macosx_app
1799 .mbar.repository add command -label Quit \
1806 .mbar.edit add command -label Undo \
1807 -command {catch {[focus] edit undo}} \
1809 .mbar.edit add command -label Redo \
1810 -command {catch {[focus] edit redo}} \
1812 .mbar.edit add separator
1813 .mbar.edit add command -label Cut \
1814 -command {catch {tk_textCut [focus]}} \
1816 .mbar.edit add command -label Copy \
1817 -command {catch {tk_textCopy [focus]}} \
1819 .mbar.edit add command -label Paste \
1820 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
1822 .mbar.edit add command -label Delete \
1823 -command {catch {[focus] delete sel.first sel.last}} \
1825 .mbar.edit add separator
1826 .mbar.edit add command -label {Select All} \
1827 -command {catch {[focus] tag add sel 0.0 end}} \
1832 if {[is_enabled branch]} {
1835 .mbar.branch add command -label {Create...} \
1836 -command branch_create::dialog \
1838 lappend disable_on_lock [list .mbar.branch entryconf \
1839 [.mbar.branch index last] -state]
1841 .mbar.branch add command -label {Checkout...} \
1842 -command branch_checkout::dialog \
1844 lappend disable_on_lock [list .mbar.branch entryconf \
1845 [.mbar.branch index last] -state]
1847 .mbar.branch add command -label {Rename...} \
1848 -command branch_rename::dialog
1849 lappend disable_on_lock [list .mbar.branch entryconf \
1850 [.mbar.branch index last] -state]
1852 .mbar.branch add command -label {Delete...} \
1853 -command branch_delete::dialog
1854 lappend disable_on_lock [list .mbar.branch entryconf \
1855 [.mbar.branch index last] -state]
1857 .mbar.branch add command -label {Reset...} \
1858 -command merge::reset_hard
1859 lappend disable_on_lock [list .mbar.branch entryconf \
1860 [.mbar.branch index last] -state]
1865 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
1868 .mbar.commit add radiobutton \
1869 -label {New Commit} \
1870 -command do_select_commit_type \
1871 -variable selected_commit_type \
1873 lappend disable_on_lock \
1874 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1876 .mbar.commit add radiobutton \
1877 -label {Amend Last Commit} \
1878 -command do_select_commit_type \
1879 -variable selected_commit_type \
1881 lappend disable_on_lock \
1882 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1884 .mbar.commit add separator
1886 .mbar.commit add command -label Rescan \
1887 -command do_rescan \
1889 lappend disable_on_lock \
1890 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1892 .mbar.commit add command -label {Stage To Commit} \
1893 -command do_add_selection
1894 lappend disable_on_lock \
1895 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1897 .mbar.commit add command -label {Stage Changed Files To Commit} \
1898 -command do_add_all \
1900 lappend disable_on_lock \
1901 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1903 .mbar.commit add command -label {Unstage From Commit} \
1904 -command do_unstage_selection
1905 lappend disable_on_lock \
1906 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1908 .mbar.commit add command -label {Revert Changes} \
1909 -command do_revert_selection
1910 lappend disable_on_lock \
1911 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1913 .mbar.commit add separator
1915 .mbar.commit add command -label {Sign Off} \
1916 -command do_signoff \
1919 .mbar.commit add command -label Commit \
1920 -command do_commit \
1921 -accelerator $M1T-Return
1922 lappend disable_on_lock \
1923 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1928 if {[is_enabled branch]} {
1930 .mbar.merge add command -label {Local Merge...} \
1931 -command merge::dialog \
1933 lappend disable_on_lock \
1934 [list .mbar.merge entryconf [.mbar.merge index last] -state]
1935 .mbar.merge add command -label {Abort Merge...} \
1936 -command merge::reset_hard
1937 lappend disable_on_lock \
1938 [list .mbar.merge entryconf [.mbar.merge index last] -state]
1943 if {[is_enabled transport]} {
1947 .mbar.push add command -label {Push...} \
1948 -command do_push_anywhere \
1950 .mbar.push add command -label {Delete...} \
1951 -command remote_branch_delete::dialog
1955 # -- Apple Menu (Mac OS X only)
1957 .mbar add cascade -label Apple -menu .mbar.apple
1960 .mbar.apple add command -label "About [appname]" \
1962 .mbar.apple add command -label "Options..." \
1967 .mbar.edit add separator
1968 .mbar.edit add command -label {Options...} \
1974 .mbar add cascade -label Help -menu .mbar.help
1978 .mbar.help add command -label "About [appname]" \
1983 catch {set browser $repo_config(instaweb.browser)}
1984 set doc_path [file dirname [gitexec]]
1985 set doc_path [file join $doc_path Documentation index.html]
1988 set doc_path [exec cygpath --mixed $doc_path]
1991 if {$browser eq {}} {
1994 } elseif {[is_Cygwin]} {
1995 set program_files [file dirname [exec cygpath --windir]]
1996 set program_files [file join $program_files {Program Files}]
1997 set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
1998 set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
1999 if {[file exists $firefox]} {
2000 set browser $firefox
2001 } elseif {[file exists $ie]} {
2004 unset program_files firefox ie
2008 if {[file isfile $doc_path]} {
2009 set doc_url "file:$doc_path"
2011 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
2014 if {$browser ne {}} {
2015 .mbar.help add command -label {Online Documentation} \
2016 -command [list exec $browser $doc_url &]
2018 unset browser doc_path doc_url
2021 bind . <Visibility> {
2022 bind . <Visibility> {}
2026 # -- Standard bindings
2028 wm protocol . WM_DELETE_WINDOW do_quit
2029 bind all <$M1B-Key-q> do_quit
2030 bind all <$M1B-Key-Q> do_quit
2031 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2032 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
2034 set subcommand_args {}
2036 puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
2040 # -- Not a normal commit type invocation? Do that instead!
2042 switch -- $subcommand {
2045 set subcommand_args {rev? path}
2046 if {$argv eq {}} usage
2051 if {$is_path || [file exists $_prefix$a]} {
2052 if {$path ne {}} usage
2055 } elseif {$a eq {--}} {
2057 if {$head ne {}} usage
2062 } elseif {$head eq {}} {
2063 if {$head ne {}} usage
2072 if {$head ne {} && $path eq {}} {
2073 set path $_prefix$head
2080 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
2082 set head [git rev-parse --verify $head]
2088 set current_branch $head
2091 switch -- $subcommand {
2094 if {$path ne {} && [file isdirectory $path]} {
2095 set head $current_branch
2101 browser::new $head $path
2104 if {$head eq {} && ![file exists $path]} {
2105 puts stderr "fatal: cannot stat path $path: No such file or directory"
2108 blame::new $head $path
2115 if {[llength $argv] != 0} {
2116 puts -nonewline stderr "usage: $argv0"
2117 if {$subcommand ne {gui} && [appname] ne "git-$subcommand"} {
2118 puts -nonewline stderr " $subcommand"
2123 # fall through to setup UI for commits
2126 puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
2137 -text {Current Branch:} \
2141 -textvariable current_branch \
2144 pack .branch.l1 -side left
2145 pack .branch.cb -side left -fill x
2146 pack .branch -side top -fill x
2148 # -- Main Window Layout
2150 panedwindow .vpane -orient vertical
2151 panedwindow .vpane.files -orient horizontal
2152 .vpane add .vpane.files -sticky nsew -height 100 -width 200
2153 pack .vpane -anchor n -side top -fill both -expand 1
2155 # -- Index File List
2157 frame .vpane.files.index -height 100 -width 200
2158 label .vpane.files.index.title -text {Staged Changes (Will Be Committed)} \
2159 -background lightgreen
2160 text $ui_index -background white -borderwidth 0 \
2161 -width 20 -height 10 \
2163 -cursor $cursor_ptr \
2164 -xscrollcommand {.vpane.files.index.sx set} \
2165 -yscrollcommand {.vpane.files.index.sy set} \
2167 scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
2168 scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
2169 pack .vpane.files.index.title -side top -fill x
2170 pack .vpane.files.index.sx -side bottom -fill x
2171 pack .vpane.files.index.sy -side right -fill y
2172 pack $ui_index -side left -fill both -expand 1
2173 .vpane.files add .vpane.files.index -sticky nsew
2175 # -- Working Directory File List
2177 frame .vpane.files.workdir -height 100 -width 200
2178 label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \
2179 -background lightsalmon
2180 text $ui_workdir -background white -borderwidth 0 \
2181 -width 20 -height 10 \
2183 -cursor $cursor_ptr \
2184 -xscrollcommand {.vpane.files.workdir.sx set} \
2185 -yscrollcommand {.vpane.files.workdir.sy set} \
2187 scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
2188 scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
2189 pack .vpane.files.workdir.title -side top -fill x
2190 pack .vpane.files.workdir.sx -side bottom -fill x
2191 pack .vpane.files.workdir.sy -side right -fill y
2192 pack $ui_workdir -side left -fill both -expand 1
2193 .vpane.files add .vpane.files.workdir -sticky nsew
2195 foreach i [list $ui_index $ui_workdir] {
2197 $i tag conf in_diff -background [$i tag cget in_sel -background]
2201 # -- Diff and Commit Area
2203 frame .vpane.lower -height 300 -width 400
2204 frame .vpane.lower.commarea
2205 frame .vpane.lower.diff -relief sunken -borderwidth 1
2206 pack .vpane.lower.commarea -side top -fill x
2207 pack .vpane.lower.diff -side bottom -fill both -expand 1
2208 .vpane add .vpane.lower -sticky nsew
2210 # -- Commit Area Buttons
2212 frame .vpane.lower.commarea.buttons
2213 label .vpane.lower.commarea.buttons.l -text {} \
2216 pack .vpane.lower.commarea.buttons.l -side top -fill x
2217 pack .vpane.lower.commarea.buttons -side left -fill y
2219 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
2221 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
2222 lappend disable_on_lock \
2223 {.vpane.lower.commarea.buttons.rescan conf -state}
2225 button .vpane.lower.commarea.buttons.incall -text {Stage Changed} \
2227 pack .vpane.lower.commarea.buttons.incall -side top -fill x
2228 lappend disable_on_lock \
2229 {.vpane.lower.commarea.buttons.incall conf -state}
2231 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
2233 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
2235 button .vpane.lower.commarea.buttons.commit -text {Commit} \
2237 pack .vpane.lower.commarea.buttons.commit -side top -fill x
2238 lappend disable_on_lock \
2239 {.vpane.lower.commarea.buttons.commit conf -state}
2241 button .vpane.lower.commarea.buttons.push -text {Push} \
2242 -command do_push_anywhere
2243 pack .vpane.lower.commarea.buttons.push -side top -fill x
2245 # -- Commit Message Buffer
2247 frame .vpane.lower.commarea.buffer
2248 frame .vpane.lower.commarea.buffer.header
2249 set ui_comm .vpane.lower.commarea.buffer.t
2250 set ui_coml .vpane.lower.commarea.buffer.header.l
2251 radiobutton .vpane.lower.commarea.buffer.header.new \
2252 -text {New Commit} \
2253 -command do_select_commit_type \
2254 -variable selected_commit_type \
2256 lappend disable_on_lock \
2257 [list .vpane.lower.commarea.buffer.header.new conf -state]
2258 radiobutton .vpane.lower.commarea.buffer.header.amend \
2259 -text {Amend Last Commit} \
2260 -command do_select_commit_type \
2261 -variable selected_commit_type \
2263 lappend disable_on_lock \
2264 [list .vpane.lower.commarea.buffer.header.amend conf -state]
2268 proc trace_commit_type {varname args} {
2269 global ui_coml commit_type
2270 switch -glob -- $commit_type {
2271 initial {set txt {Initial Commit Message:}}
2272 amend {set txt {Amended Commit Message:}}
2273 amend-initial {set txt {Amended Initial Commit Message:}}
2274 amend-merge {set txt {Amended Merge Commit Message:}}
2275 merge {set txt {Merge Commit Message:}}
2276 * {set txt {Commit Message:}}
2278 $ui_coml conf -text $txt
2280 trace add variable commit_type write trace_commit_type
2281 pack $ui_coml -side left -fill x
2282 pack .vpane.lower.commarea.buffer.header.amend -side right
2283 pack .vpane.lower.commarea.buffer.header.new -side right
2285 text $ui_comm -background white -borderwidth 1 \
2288 -autoseparators true \
2290 -width 75 -height 9 -wrap none \
2292 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
2293 scrollbar .vpane.lower.commarea.buffer.sby \
2294 -command [list $ui_comm yview]
2295 pack .vpane.lower.commarea.buffer.header -side top -fill x
2296 pack .vpane.lower.commarea.buffer.sby -side right -fill y
2297 pack $ui_comm -side left -fill y
2298 pack .vpane.lower.commarea.buffer -side left -fill y
2300 # -- Commit Message Buffer Context Menu
2302 set ctxm .vpane.lower.commarea.buffer.ctxm
2303 menu $ctxm -tearoff 0
2306 -command {tk_textCut $ui_comm}
2309 -command {tk_textCopy $ui_comm}
2312 -command {tk_textPaste $ui_comm}
2315 -command {$ui_comm delete sel.first sel.last}
2318 -label {Select All} \
2319 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
2323 $ui_comm tag add sel 0.0 end
2324 tk_textCopy $ui_comm
2325 $ui_comm tag remove sel 0.0 end
2331 bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
2335 proc trace_current_diff_path {varname args} {
2336 global current_diff_path diff_actions file_states
2337 if {$current_diff_path eq {}} {
2343 set p $current_diff_path
2344 set s [mapdesc [lindex $file_states($p) 0] $p]
2346 set p [escape_path $p]
2350 .vpane.lower.diff.header.status configure -text $s
2351 .vpane.lower.diff.header.file configure -text $f
2352 .vpane.lower.diff.header.path configure -text $p
2353 foreach w $diff_actions {
2357 trace add variable current_diff_path write trace_current_diff_path
2359 frame .vpane.lower.diff.header -background gold
2360 label .vpane.lower.diff.header.status \
2362 -width $max_status_desc \
2365 label .vpane.lower.diff.header.file \
2369 label .vpane.lower.diff.header.path \
2373 pack .vpane.lower.diff.header.status -side left
2374 pack .vpane.lower.diff.header.file -side left
2375 pack .vpane.lower.diff.header.path -fill x
2376 set ctxm .vpane.lower.diff.header.ctxm
2377 menu $ctxm -tearoff 0
2385 -- $current_diff_path
2387 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2388 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
2392 frame .vpane.lower.diff.body
2393 set ui_diff .vpane.lower.diff.body.t
2394 text $ui_diff -background white -borderwidth 0 \
2395 -width 80 -height 15 -wrap none \
2397 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
2398 -yscrollcommand {.vpane.lower.diff.body.sby set} \
2400 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
2401 -command [list $ui_diff xview]
2402 scrollbar .vpane.lower.diff.body.sby -orient vertical \
2403 -command [list $ui_diff yview]
2404 pack .vpane.lower.diff.body.sbx -side bottom -fill x
2405 pack .vpane.lower.diff.body.sby -side right -fill y
2406 pack $ui_diff -side left -fill both -expand 1
2407 pack .vpane.lower.diff.header -side top -fill x
2408 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
2410 $ui_diff tag conf d_cr -elide true
2411 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
2412 $ui_diff tag conf d_+ -foreground {#00a000}
2413 $ui_diff tag conf d_- -foreground red
2415 $ui_diff tag conf d_++ -foreground {#00a000}
2416 $ui_diff tag conf d_-- -foreground red
2417 $ui_diff tag conf d_+s \
2418 -foreground {#00a000} \
2419 -background {#e2effa}
2420 $ui_diff tag conf d_-s \
2422 -background {#e2effa}
2423 $ui_diff tag conf d_s+ \
2424 -foreground {#00a000} \
2426 $ui_diff tag conf d_s- \
2430 $ui_diff tag conf d<<<<<<< \
2431 -foreground orange \
2433 $ui_diff tag conf d======= \
2434 -foreground orange \
2436 $ui_diff tag conf d>>>>>>> \
2437 -foreground orange \
2440 $ui_diff tag raise sel
2442 # -- Diff Body Context Menu
2444 set ctxm .vpane.lower.diff.body.ctxm
2445 menu $ctxm -tearoff 0
2448 -command reshow_diff
2449 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2452 -command {tk_textCopy $ui_diff}
2453 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2455 -label {Select All} \
2456 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
2457 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2461 $ui_diff tag add sel 0.0 end
2462 tk_textCopy $ui_diff
2463 $ui_diff tag remove sel 0.0 end
2465 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2468 -label {Apply/Reverse Hunk} \
2469 -command {apply_hunk $cursorX $cursorY}
2470 set ui_diff_applyhunk [$ctxm index last]
2471 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
2474 -label {Decrease Font Size} \
2475 -command {incr_font_size font_diff -1}
2476 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2478 -label {Increase Font Size} \
2479 -command {incr_font_size font_diff 1}
2480 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2483 -label {Show Less Context} \
2484 -command {if {$repo_config(gui.diffcontext) >= 1} {
2485 incr repo_config(gui.diffcontext) -1
2488 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2490 -label {Show More Context} \
2491 -command {if {$repo_config(gui.diffcontext) < 99} {
2492 incr repo_config(gui.diffcontext)
2495 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2497 $ctxm add command -label {Options...} \
2499 proc popup_diff_menu {ctxm x y X Y} {
2500 global current_diff_path file_states
2503 if {$::ui_index eq $::current_diff_side} {
2504 set l "Unstage Hunk From Commit"
2506 set l "Stage Hunk For Commit"
2509 || $current_diff_path eq {}
2510 || ![info exists file_states($current_diff_path)]
2511 || {_O} eq [lindex $file_states($current_diff_path) 0]} {
2516 $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
2517 tk_popup $ctxm $X $Y
2519 bind_button3 $ui_diff [list popup_diff_menu $ctxm %x %y %X %Y]
2523 set main_status [::status_bar::new .status]
2524 pack .status -anchor w -side bottom -fill x
2525 $main_status show {Initializing...}
2530 set gm $repo_config(gui.geometry)
2531 wm geometry . [lindex $gm 0]
2532 .vpane sash place 0 \
2533 [lindex [.vpane sash coord 0] 0] \
2535 .vpane.files sash place 0 \
2537 [lindex [.vpane.files sash coord 0] 1]
2543 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
2544 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
2545 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
2546 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
2547 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
2548 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
2549 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
2550 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
2551 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
2552 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2553 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2555 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
2556 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
2557 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
2558 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
2559 bind $ui_diff <$M1B-Key-v> {break}
2560 bind $ui_diff <$M1B-Key-V> {break}
2561 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2562 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2563 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
2564 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
2565 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
2566 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
2567 bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
2568 bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
2569 bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
2570 bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
2571 bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
2572 bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
2573 bind $ui_diff <Button-1> {focus %W}
2575 if {[is_enabled branch]} {
2576 bind . <$M1B-Key-n> branch_create::dialog
2577 bind . <$M1B-Key-N> branch_create::dialog
2578 bind . <$M1B-Key-o> branch_checkout::dialog
2579 bind . <$M1B-Key-O> branch_checkout::dialog
2580 bind . <$M1B-Key-m> merge::dialog
2581 bind . <$M1B-Key-M> merge::dialog
2583 if {[is_enabled transport]} {
2584 bind . <$M1B-Key-p> do_push_anywhere
2585 bind . <$M1B-Key-P> do_push_anywhere
2588 bind . <Key-F5> do_rescan
2589 bind . <$M1B-Key-r> do_rescan
2590 bind . <$M1B-Key-R> do_rescan
2591 bind . <$M1B-Key-s> do_signoff
2592 bind . <$M1B-Key-S> do_signoff
2593 bind . <$M1B-Key-i> do_add_all
2594 bind . <$M1B-Key-I> do_add_all
2595 bind . <$M1B-Key-Return> do_commit
2596 foreach i [list $ui_index $ui_workdir] {
2597 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
2598 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
2599 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
2603 set file_lists($ui_index) [list]
2604 set file_lists($ui_workdir) [list]
2606 wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
2607 focus -force $ui_comm
2609 # -- Warn the user about environmental problems. Cygwin's Tcl
2610 # does *not* pass its env array onto any processes it spawns.
2611 # This means that git processes get none of our environment.
2616 set msg "Possible environment issues exist.
2618 The following environment variables are probably
2619 going to be ignored by any Git subprocess run
2623 foreach name [array names env] {
2624 switch -regexp -- $name {
2625 {^GIT_INDEX_FILE$} -
2626 {^GIT_OBJECT_DIRECTORY$} -
2627 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
2629 {^GIT_EXTERNAL_DIFF$} -
2633 {^GIT_CONFIG_LOCAL$} -
2634 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
2635 append msg " - $name\n"
2638 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
2639 append msg " - $name\n"
2641 set suggest_user $name
2645 if {$ignored_env > 0} {
2647 This is due to a known issue with the
2648 Tcl binary distributed by Cygwin."
2650 if {$suggest_user ne {}} {
2653 A good replacement for $suggest_user
2654 is placing values for the user.name and
2655 user.email settings into your personal
2661 unset ignored_env msg suggest_user name
2664 # -- Only initialize complex UI if we are going to stay running.
2666 if {[is_enabled transport]} {
2673 if {[winfo exists $ui_comm]} {
2674 set GITGUI_BCK_exists [load_message GITGUI_BCK]
2676 # -- If both our backup and message files exist use the
2677 # newer of the two files to initialize the buffer.
2679 if {$GITGUI_BCK_exists} {
2680 set m [gitdir GITGUI_MSG]
2681 if {[file isfile $m]} {
2682 if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
2683 catch {file delete [gitdir GITGUI_MSG]}
2685 $ui_comm delete 0.0 end
2687 $ui_comm edit modified false
2688 catch {file delete [gitdir GITGUI_BCK]}
2689 set GITGUI_BCK_exists 0
2695 proc backup_commit_buffer {} {
2696 global ui_comm GITGUI_BCK_exists
2698 set m [$ui_comm edit modified]
2699 if {$m || $GITGUI_BCK_exists} {
2700 set msg [string trim [$ui_comm get 0.0 end]]
2701 regsub -all -line {[ \r\t]+$} $msg {} msg
2704 if {$GITGUI_BCK_exists} {
2705 catch {file delete [gitdir GITGUI_BCK]}
2706 set GITGUI_BCK_exists 0
2710 set fd [open [gitdir GITGUI_BCK] w]
2711 puts -nonewline $fd $msg
2713 set GITGUI_BCK_exists 1
2717 $ui_comm edit modified false
2720 set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
2723 backup_commit_buffer
2726 lock_index begin-read
2727 if {![winfo ismapped .]} {
2731 if {[is_enabled multicommit]} {