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 ######################################################################
47 ## enable verbose loading?
49 if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
51 rename auto_load real__auto_load
52 proc auto_load {name args} {
53 puts stderr "auto_load $name"
54 return [uplevel 1 real__auto_load $name $args]
56 rename source real__source
58 puts stderr "source $name"
59 uplevel 1 real__source $name
63 ######################################################################
65 ## configure our library
67 set oguilib {@@GITGUI_LIBDIR@@}
68 set oguirel {@@GITGUI_RELATIVE@@}
69 if {$oguirel eq {1}} {
70 set oguilib [file dirname [file dirname [file normalize $argv0]]]
71 set oguilib [file join $oguilib share git-gui lib]
72 } elseif {[string match @@* $oguirel]} {
73 set oguilib [file join [file dirname [file normalize $argv0]] lib]
76 set idx [file join $oguilib tclIndex]
77 if {[catch {set fd [open $idx r]} err]} {
82 -title "git-gui: fatal error" \
86 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
88 while {[gets $fd n] >= 0} {
89 if {$n ne {} && ![string match #* $n]} {
101 if {[lsearch -exact $loaded $p] >= 0} continue
102 source [file join $oguilib $p]
107 set auto_path [concat [list $oguilib] $auto_path]
109 unset -nocomplain oguirel idx fd
111 ######################################################################
115 set _appname [lindex [file split $argv0] end]
132 return [eval [list file join $_gitdir] $args]
135 proc gitexec {args} {
137 if {$_gitexec eq {}} {
138 if {[catch {set _gitexec [git --exec-path]} err]} {
139 error "Git not installed?\n\n$err"
142 set _gitexec [exec cygpath \
147 set _gitexec [file normalize $_gitexec]
153 return [eval [list file join $_gitexec] $args]
161 if {[tk windowingsystem] eq {aqua}} {
168 if {$::tcl_platform(platform) eq {windows}} {
176 if {$_iscygwin eq {}} {
177 if {$::tcl_platform(platform) eq {windows}} {
178 if {[catch {set p [exec cygpath --windir]} err]} {
190 proc is_enabled {option} {
191 global enabled_options
192 if {[catch {set on $enabled_options($option)}]} {return 0}
196 proc enable_option {option} {
197 global enabled_options
198 set enabled_options($option) 1
201 proc disable_option {option} {
202 global enabled_options
203 set enabled_options($option) 0
206 ######################################################################
210 proc is_many_config {name} {
211 switch -glob -- $name {
220 proc is_config_true {name} {
222 if {[catch {set v $repo_config($name)}]} {
224 } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
231 proc get_config {name} {
233 if {[catch {set v $repo_config($name)}]} {
240 proc load_config {include_global} {
241 global repo_config global_config default_config
243 array unset global_config
244 if {$include_global} {
246 set fd_rc [git_read config --global --list]
247 while {[gets $fd_rc line] >= 0} {
248 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
249 if {[is_many_config $name]} {
250 lappend global_config($name) $value
252 set global_config($name) $value
260 array unset repo_config
262 set fd_rc [git_read config --list]
263 while {[gets $fd_rc line] >= 0} {
264 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
265 if {[is_many_config $name]} {
266 lappend repo_config($name) $value
268 set repo_config($name) $value
275 foreach name [array names default_config] {
276 if {[catch {set v $global_config($name)}]} {
277 set global_config($name) $default_config($name)
279 if {[catch {set v $repo_config($name)}]} {
280 set repo_config($name) $default_config($name)
285 ######################################################################
289 proc _git_cmd {name} {
292 if {[catch {set v $_git_cmd_path($name)}]} {
296 --exec-path { return [list $::_git $name] }
299 set p [gitexec git-$name$::_search_exe]
300 if {[file exists $p]} {
302 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
303 # Try to determine what sort of magic will make
304 # git-$name go and do its thing, because native
305 # Tcl on Windows doesn't know it.
307 set p [gitexec git-$name]
314 #!*perl { set i perl }
315 #!*python { set i python }
316 default { error "git-$name is not supported: $s" }
320 if {![info exists interp]} {
321 set interp [_which $i]
324 error "git-$name requires $i (not in PATH)"
326 set v [list $interp $p]
328 # Assume it is builtin to git somehow and we
329 # aren't actually able to see a file for it.
331 set v [list $::_git $name]
333 set _git_cmd_path($name) $v
339 global env _search_exe _search_path
341 if {$_search_path eq {}} {
343 set _search_path [split [exec cygpath \
349 } elseif {[is_Windows]} {
350 set _search_path [split $env(PATH) {;}]
353 set _search_path [split $env(PATH) :]
358 foreach p $_search_path {
359 set p [file join $p $what$_search_exe]
360 if {[file exists $p]} {
361 return [file normalize $p]
367 proc _lappend_nice {cmd_var} {
371 if {![info exists _nice]} {
372 set _nice [_which nice]
383 switch -- [lindex $args 0] {
394 set args [lrange $args 1 end]
397 set cmdp [_git_cmd [lindex $args 0]]
398 set args [lrange $args 1 end]
400 return [eval $opt $cmdp $args]
403 proc _open_stdout_stderr {cmd} {
407 if { [lindex $cmd end] eq {2>@1}
408 && $err eq {can not find channel named "1"}
410 # Older versions of Tcl 8.4 don't have this 2>@1 IO
411 # redirect operator. Fallback to |& cat for those.
412 # The command was not actually started, so its safe
413 # to try to start it a second time.
415 set fd [open [concat \
416 [lrange $cmd 0 end-1] \
423 fconfigure $fd -eofchar {}
427 proc git_read {args} {
431 switch -- [lindex $args 0] {
446 set args [lrange $args 1 end]
449 set cmdp [_git_cmd [lindex $args 0]]
450 set args [lrange $args 1 end]
452 return [_open_stdout_stderr [concat $opt $cmdp $args]]
455 proc git_write {args} {
459 switch -- [lindex $args 0] {
470 set args [lrange $args 1 end]
473 set cmdp [_git_cmd [lindex $args 0]]
474 set args [lrange $args 1 end]
476 return [open [concat $opt $cmdp $args] w]
480 regsub -all ' $value "'\\''" value
484 proc load_current_branch {} {
485 global current_branch is_detached
487 set fd [open [gitdir HEAD] r]
488 if {[gets $fd ref] < 1} {
493 set pfx {ref: refs/heads/}
494 set len [string length $pfx]
495 if {[string equal -length $len $pfx $ref]} {
496 # We're on a branch. It might not exist. But
497 # HEAD looks good enough to be a branch.
499 set current_branch [string range $ref $len end]
502 # Assume this is a detached head.
504 set current_branch HEAD
509 auto_load tk_optionMenu
510 rename tk_optionMenu real__tkOptionMenu
511 proc tk_optionMenu {w varName args} {
512 set m [eval real__tkOptionMenu $w $varName $args]
513 $m configure -font font_ui
514 $w configure -font font_ui
518 ######################################################################
522 set _git [_which git]
524 catch {wm withdraw .}
525 error_popup "Cannot find git in PATH."
529 ######################################################################
533 if {[catch {set _git_version [git --version]} err]} {
534 catch {wm withdraw .}
535 error_popup "Cannot determine Git version:
539 [appname] requires Git 1.5.0 or later."
542 if {![regsub {^git version } $_git_version {} _git_version]} {
543 catch {wm withdraw .}
544 error_popup "Cannot parse Git version string:\n\n$_git_version"
548 set _real_git_version $_git_version
549 regsub -- {-dirty$} $_git_version {} _git_version
550 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
551 regsub {\.rc[0-9]+$} $_git_version {} _git_version
552 regsub {\.GIT$} $_git_version {} _git_version
554 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
555 catch {wm withdraw .}
560 -title "[appname]: warning" \
561 -message "Git version cannot be determined.
563 $_git claims it is version '$_real_git_version'.
565 [appname] requires at least Git 1.5.0 or later.
567 Assume '$_real_git_version' is version 1.5.0?
569 set _git_version 1.5.0
574 unset _real_git_version
576 proc git-version {args} {
579 switch [llength $args] {
585 set op [lindex $args 0]
586 set vr [lindex $args 1]
587 set cm [package vcompare $_git_version $vr]
588 return [expr $cm $op 0]
592 set type [lindex $args 0]
593 set name [lindex $args 1]
594 set parm [lindex $args 2]
595 set body [lindex $args 3]
597 if {($type ne {proc} && $type ne {method})} {
598 error "Invalid arguments to git-version"
600 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
601 error "Last arm of $type $name must be default"
604 foreach {op vr cb} [lrange $body 0 end-2] {
605 if {[git-version $op $vr]} {
606 return [uplevel [list $type $name $parm $cb]]
610 return [uplevel [list $type $name $parm [lindex $body end]]]
614 error "git-version >= x"
620 if {[git-version < 1.5]} {
621 catch {wm withdraw .}
622 error_popup "[appname] requires Git 1.5.0 or later.
624 You are using [git-version]:
630 ######################################################################
632 ## feature option selection
634 if {[regexp {^git-(.+)$} [appname] _junk subcommand]} {
639 if {$subcommand eq {gui.sh}} {
642 if {$subcommand eq {gui} && [llength $argv] > 0} {
643 set subcommand [lindex $argv 0]
644 set argv [lrange $argv 1 end]
647 enable_option multicommit
649 enable_option transport
652 switch -- $subcommand {
657 disable_option multicommit
658 disable_option branch
659 disable_option transport
662 enable_option singlecommit
664 disable_option multicommit
665 disable_option branch
666 disable_option transport
670 ######################################################################
675 set _gitdir $env(GIT_DIR)
679 set _gitdir [git rev-parse --git-dir]
680 set _prefix [git rev-parse --show-prefix]
682 catch {wm withdraw .}
683 error_popup "Cannot find the git directory:\n\n$err"
686 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
687 catch {set _gitdir [exec cygpath --unix $_gitdir]}
689 if {![file isdirectory $_gitdir]} {
690 catch {wm withdraw .}
691 error_popup "Git directory not found:\n\n$_gitdir"
694 if {![is_enabled bare]} {
695 if {[lindex [file split $_gitdir] end] ne {.git}} {
696 catch {wm withdraw .}
697 error_popup "Cannot use funny .git directory:\n\n$_gitdir"
700 if {[catch {cd [file dirname $_gitdir]} err]} {
701 catch {wm withdraw .}
702 error_popup "No working directory [file dirname $_gitdir]:\n\n$err"
706 set _reponame [file split [file normalize $_gitdir]]
707 if {[lindex $_reponame end] eq {.git}} {
708 set _reponame [lindex $_reponame end-1]
710 set _reponame [lindex $_reponame end]
713 ######################################################################
717 set current_diff_path {}
718 set current_diff_side {}
719 set diff_actions [list]
723 set MERGE_HEAD [list]
726 set current_branch {}
728 set current_diff_path {}
729 set selected_commit_type new
731 ######################################################################
739 set disable_on_lock [list]
740 set index_lock_type none
742 proc lock_index {type} {
743 global index_lock_type disable_on_lock
745 if {$index_lock_type eq {none}} {
746 set index_lock_type $type
747 foreach w $disable_on_lock {
748 uplevel #0 $w disabled
751 } elseif {$index_lock_type eq "begin-$type"} {
752 set index_lock_type $type
758 proc unlock_index {} {
759 global index_lock_type disable_on_lock
761 set index_lock_type none
762 foreach w $disable_on_lock {
767 ######################################################################
771 proc repository_state {ctvar hdvar mhvar} {
772 global current_branch
773 upvar $ctvar ct $hdvar hd $mhvar mh
778 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
784 set merge_head [gitdir MERGE_HEAD]
785 if {[file exists $merge_head]} {
787 set fd_mh [open $merge_head r]
788 while {[gets $fd_mh line] >= 0} {
799 global PARENT empty_tree
801 set p [lindex $PARENT 0]
805 if {$empty_tree eq {}} {
806 set empty_tree [git mktree << {}]
811 proc rescan {after {honor_trustmtime 1}} {
812 global HEAD PARENT MERGE_HEAD commit_type
813 global ui_index ui_workdir ui_comm
814 global rescan_active file_states
817 if {$rescan_active > 0 || ![lock_index read]} return
819 repository_state newType newHEAD newMERGE_HEAD
820 if {[string match amend* $commit_type]
821 && $newType eq {normal}
822 && $newHEAD eq $HEAD} {
826 set MERGE_HEAD $newMERGE_HEAD
827 set commit_type $newType
830 array unset file_states
832 if {![$ui_comm edit modified]
833 || [string trim [$ui_comm get 0.0 end]] eq {}} {
834 if {[string match amend* $commit_type]} {
835 } elseif {[load_message GITGUI_MSG]} {
836 } elseif {[load_message MERGE_MSG]} {
837 } elseif {[load_message SQUASH_MSG]} {
840 $ui_comm edit modified false
843 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
844 rescan_stage2 {} $after
847 ui_status {Refreshing file status...}
848 set fd_rf [git_read update-index \
854 fconfigure $fd_rf -blocking 0 -translation binary
855 fileevent $fd_rf readable \
856 [list rescan_stage2 $fd_rf $after]
860 proc rescan_stage2 {fd after} {
861 global rescan_active buf_rdi buf_rdf buf_rlo
865 if {![eof $fd]} return
869 set ls_others [list --exclude-per-directory=.gitignore]
870 set info_exclude [gitdir info exclude]
871 if {[file readable $info_exclude]} {
872 lappend ls_others "--exclude-from=$info_exclude"
880 ui_status {Scanning for modified files ...}
881 set fd_di [git_read diff-index --cached -z [PARENT]]
882 set fd_df [git_read diff-files -z]
883 set fd_lo [eval git_read ls-files --others -z $ls_others]
885 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
886 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
887 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
888 fileevent $fd_di readable [list read_diff_index $fd_di $after]
889 fileevent $fd_df readable [list read_diff_files $fd_df $after]
890 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
893 proc load_message {file} {
897 if {[file isfile $f]} {
898 if {[catch {set fd [open $f r]}]} {
901 fconfigure $fd -eofchar {}
902 set content [string trim [read $fd]]
904 regsub -all -line {[ \r\t]+$} $content {} content
905 $ui_comm delete 0.0 end
906 $ui_comm insert end $content
912 proc read_diff_index {fd after} {
915 append buf_rdi [read $fd]
917 set n [string length $buf_rdi]
919 set z1 [string first "\0" $buf_rdi $c]
922 set z2 [string first "\0" $buf_rdi $z1]
926 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
927 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
929 [encoding convertfrom $p] \
931 [list [lindex $i 0] [lindex $i 2]] \
937 set buf_rdi [string range $buf_rdi $c end]
942 rescan_done $fd buf_rdi $after
945 proc read_diff_files {fd after} {
948 append buf_rdf [read $fd]
950 set n [string length $buf_rdf]
952 set z1 [string first "\0" $buf_rdf $c]
955 set z2 [string first "\0" $buf_rdf $z1]
959 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
960 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
962 [encoding convertfrom $p] \
965 [list [lindex $i 0] [lindex $i 2]]
970 set buf_rdf [string range $buf_rdf $c end]
975 rescan_done $fd buf_rdf $after
978 proc read_ls_others {fd after} {
981 append buf_rlo [read $fd]
982 set pck [split $buf_rlo "\0"]
983 set buf_rlo [lindex $pck end]
984 foreach p [lrange $pck 0 end-1] {
985 merge_state [encoding convertfrom $p] ?O
987 rescan_done $fd buf_rlo $after
990 proc rescan_done {fd buf after} {
991 global rescan_active current_diff_path
992 global file_states repo_config
995 if {![eof $fd]} return
998 if {[incr rescan_active -1] > 0} return
1003 if {$current_diff_path ne {}} reshow_diff
1007 proc prune_selection {} {
1008 global file_states selected_paths
1010 foreach path [array names selected_paths] {
1011 if {[catch {set still_here $file_states($path)}]} {
1012 unset selected_paths($path)
1017 ######################################################################
1021 proc mapicon {w state path} {
1024 if {[catch {set r $all_icons($state$w)}]} {
1025 puts "error: no icon for $w state={$state} $path"
1031 proc mapdesc {state path} {
1034 if {[catch {set r $all_descs($state)}]} {
1035 puts "error: no desc for state={$state} $path"
1041 proc ui_status {msg} {
1042 $::main_status show $msg
1045 proc ui_ready {{test {}}} {
1046 $::main_status show {Ready.} $test
1049 proc escape_path {path} {
1050 regsub -all {\\} $path "\\\\" path
1051 regsub -all "\n" $path "\\n" path
1055 proc short_path {path} {
1056 return [escape_path [lindex [file split $path] end]]
1060 set null_sha1 [string repeat 0 40]
1062 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1063 global file_states next_icon_id null_sha1
1065 set s0 [string index $new_state 0]
1066 set s1 [string index $new_state 1]
1068 if {[catch {set info $file_states($path)}]} {
1070 set icon n[incr next_icon_id]
1072 set state [lindex $info 0]
1073 set icon [lindex $info 1]
1074 if {$head_info eq {}} {set head_info [lindex $info 2]}
1075 if {$index_info eq {}} {set index_info [lindex $info 3]}
1078 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1079 elseif {$s0 eq {_}} {set s0 _}
1081 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1082 elseif {$s1 eq {_}} {set s1 _}
1084 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1085 set head_info [list 0 $null_sha1]
1086 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1087 && $head_info eq {}} {
1088 set head_info $index_info
1091 set file_states($path) [list $s0$s1 $icon \
1092 $head_info $index_info \
1097 proc display_file_helper {w path icon_name old_m new_m} {
1100 if {$new_m eq {_}} {
1101 set lno [lsearch -sorted -exact $file_lists($w) $path]
1103 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1105 $w conf -state normal
1106 $w delete $lno.0 [expr {$lno + 1}].0
1107 $w conf -state disabled
1109 } elseif {$old_m eq {_} && $new_m ne {_}} {
1110 lappend file_lists($w) $path
1111 set file_lists($w) [lsort -unique $file_lists($w)]
1112 set lno [lsearch -sorted -exact $file_lists($w) $path]
1114 $w conf -state normal
1115 $w image create $lno.0 \
1116 -align center -padx 5 -pady 1 \
1118 -image [mapicon $w $new_m $path]
1119 $w insert $lno.1 "[escape_path $path]\n"
1120 $w conf -state disabled
1121 } elseif {$old_m ne $new_m} {
1122 $w conf -state normal
1123 $w image conf $icon_name -image [mapicon $w $new_m $path]
1124 $w conf -state disabled
1128 proc display_file {path state} {
1129 global file_states selected_paths
1130 global ui_index ui_workdir
1132 set old_m [merge_state $path $state]
1133 set s $file_states($path)
1134 set new_m [lindex $s 0]
1135 set icon_name [lindex $s 1]
1137 set o [string index $old_m 0]
1138 set n [string index $new_m 0]
1145 display_file_helper $ui_index $path $icon_name $o $n
1147 if {[string index $old_m 0] eq {U}} {
1150 set o [string index $old_m 1]
1152 if {[string index $new_m 0] eq {U}} {
1155 set n [string index $new_m 1]
1157 display_file_helper $ui_workdir $path $icon_name $o $n
1159 if {$new_m eq {__}} {
1160 unset file_states($path)
1161 catch {unset selected_paths($path)}
1165 proc display_all_files_helper {w path icon_name m} {
1168 lappend file_lists($w) $path
1169 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1170 $w image create end \
1171 -align center -padx 5 -pady 1 \
1173 -image [mapicon $w $m $path]
1174 $w insert end "[escape_path $path]\n"
1177 proc display_all_files {} {
1178 global ui_index ui_workdir
1179 global file_states file_lists
1182 $ui_index conf -state normal
1183 $ui_workdir conf -state normal
1185 $ui_index delete 0.0 end
1186 $ui_workdir delete 0.0 end
1189 set file_lists($ui_index) [list]
1190 set file_lists($ui_workdir) [list]
1192 foreach path [lsort [array names file_states]] {
1193 set s $file_states($path)
1195 set icon_name [lindex $s 1]
1197 set s [string index $m 0]
1198 if {$s ne {U} && $s ne {_}} {
1199 display_all_files_helper $ui_index $path \
1203 if {[string index $m 0] eq {U}} {
1206 set s [string index $m 1]
1209 display_all_files_helper $ui_workdir $path \
1214 $ui_index conf -state disabled
1215 $ui_workdir conf -state disabled
1218 ######################################################################
1223 #define mask_width 14
1224 #define mask_height 15
1225 static unsigned char mask_bits[] = {
1226 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1227 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1228 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1231 image create bitmap file_plain -background white -foreground black -data {
1232 #define plain_width 14
1233 #define plain_height 15
1234 static unsigned char plain_bits[] = {
1235 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1236 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1237 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1238 } -maskdata $filemask
1240 image create bitmap file_mod -background white -foreground blue -data {
1241 #define mod_width 14
1242 #define mod_height 15
1243 static unsigned char mod_bits[] = {
1244 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1245 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1246 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1247 } -maskdata $filemask
1249 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1250 #define file_fulltick_width 14
1251 #define file_fulltick_height 15
1252 static unsigned char file_fulltick_bits[] = {
1253 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1254 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1255 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1256 } -maskdata $filemask
1258 image create bitmap file_parttick -background white -foreground "#005050" -data {
1259 #define parttick_width 14
1260 #define parttick_height 15
1261 static unsigned char parttick_bits[] = {
1262 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1263 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1264 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1265 } -maskdata $filemask
1267 image create bitmap file_question -background white -foreground black -data {
1268 #define file_question_width 14
1269 #define file_question_height 15
1270 static unsigned char file_question_bits[] = {
1271 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1272 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1273 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1274 } -maskdata $filemask
1276 image create bitmap file_removed -background white -foreground red -data {
1277 #define file_removed_width 14
1278 #define file_removed_height 15
1279 static unsigned char file_removed_bits[] = {
1280 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1281 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1282 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1283 } -maskdata $filemask
1285 image create bitmap file_merge -background white -foreground blue -data {
1286 #define file_merge_width 14
1287 #define file_merge_height 15
1288 static unsigned char file_merge_bits[] = {
1289 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1290 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1291 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1292 } -maskdata $filemask
1295 #define file_width 18
1296 #define file_height 18
1297 static unsigned char file_bits[] = {
1298 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x00,
1299 0x0c, 0x03, 0x00, 0x04, 0xfe, 0x00, 0x06, 0x80, 0x00, 0xff, 0x9f, 0x00,
1300 0x03, 0x98, 0x00, 0x02, 0x90, 0x00, 0x06, 0xb0, 0x00, 0x04, 0xa0, 0x00,
1301 0x0c, 0xe0, 0x00, 0x08, 0xc0, 0x00, 0xf8, 0xff, 0x00, 0x00, 0x00, 0x00,
1302 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
1304 image create bitmap file_dir -background white -foreground blue \
1305 -data $file_dir_data -maskdata $file_dir_data
1308 set file_uplevel_data {
1310 #define up_height 15
1311 static unsigned char up_bits[] = {
1312 0x80, 0x00, 0xc0, 0x01, 0xe0, 0x03, 0xf0, 0x07, 0xf8, 0x0f, 0xfc, 0x1f,
1313 0xfe, 0x3f, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
1314 0xc0, 0x01, 0xc0, 0x01, 0x00, 0x00};
1316 image create bitmap file_uplevel -background white -foreground red \
1317 -data $file_uplevel_data -maskdata $file_uplevel_data
1318 unset file_uplevel_data
1320 set ui_index .vpane.files.index.list
1321 set ui_workdir .vpane.files.workdir.list
1323 set all_icons(_$ui_index) file_plain
1324 set all_icons(A$ui_index) file_fulltick
1325 set all_icons(M$ui_index) file_fulltick
1326 set all_icons(D$ui_index) file_removed
1327 set all_icons(U$ui_index) file_merge
1329 set all_icons(_$ui_workdir) file_plain
1330 set all_icons(M$ui_workdir) file_mod
1331 set all_icons(D$ui_workdir) file_question
1332 set all_icons(U$ui_workdir) file_merge
1333 set all_icons(O$ui_workdir) file_plain
1335 set max_status_desc 0
1339 {_M "Modified, not staged"}
1340 {M_ "Staged for commit"}
1341 {MM "Portions staged for commit"}
1342 {MD "Staged for commit, missing"}
1344 {_O "Untracked, not staged"}
1345 {A_ "Staged for commit"}
1346 {AM "Portions staged for commit"}
1347 {AD "Staged for commit, missing"}
1350 {D_ "Staged for removal"}
1351 {DO "Staged for removal, still present"}
1353 {U_ "Requires merge resolution"}
1354 {UU "Requires merge resolution"}
1355 {UM "Requires merge resolution"}
1356 {UD "Requires merge resolution"}
1358 if {$max_status_desc < [string length [lindex $i 1]]} {
1359 set max_status_desc [string length [lindex $i 1]]
1361 set all_descs([lindex $i 0]) [lindex $i 1]
1365 ######################################################################
1369 proc bind_button3 {w cmd} {
1370 bind $w <Any-Button-3> $cmd
1372 bind $w <Control-Button-1> $cmd
1376 proc scrollbar2many {list mode args} {
1377 foreach w $list {eval $w $mode $args}
1380 proc many2scrollbar {list mode sb top bottom} {
1381 $sb set $top $bottom
1382 foreach w $list {$w $mode moveto $top}
1385 proc incr_font_size {font {amt 1}} {
1386 set sz [font configure $font -size]
1388 font configure $font -size $sz
1389 font configure ${font}bold -size $sz
1390 font configure ${font}italic -size $sz
1393 ######################################################################
1397 set starting_gitk_msg {Starting gitk... please wait...}
1399 proc do_gitk {revs} {
1400 # -- Always start gitk through whatever we were loaded with. This
1401 # lets us bypass using shell process on Windows systems.
1403 set exe [file join [file dirname $::_git] gitk]
1404 set cmd [list [info nameofexecutable] $exe]
1405 if {! [file exists $exe]} {
1406 error_popup "Unable to start gitk:\n\n$exe does not exist"
1408 eval exec $cmd $revs &
1409 ui_status $::starting_gitk_msg
1411 ui_ready $starting_gitk_msg
1419 global ui_comm is_quitting repo_config commit_type
1420 global GITGUI_BCK_exists GITGUI_BCK_i
1422 if {$is_quitting} return
1425 if {[winfo exists $ui_comm]} {
1426 # -- Stash our current commit buffer.
1428 set save [gitdir GITGUI_MSG]
1429 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
1430 file rename -force [gitdir GITGUI_BCK] $save
1431 set GITGUI_BCK_exists 0
1433 set msg [string trim [$ui_comm get 0.0 end]]
1434 regsub -all -line {[ \r\t]+$} $msg {} msg
1435 if {(![string match amend* $commit_type]
1436 || [$ui_comm edit modified])
1439 set fd [open $save w]
1440 puts -nonewline $fd $msg
1444 catch {file delete $save}
1448 # -- Remove our editor backup, its not needed.
1450 after cancel $GITGUI_BCK_i
1451 if {$GITGUI_BCK_exists} {
1452 catch {file delete [gitdir GITGUI_BCK]}
1455 # -- Stash our current window geometry into this repository.
1457 set cfg_geometry [list]
1458 lappend cfg_geometry [wm geometry .]
1459 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
1460 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
1461 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
1464 if {$cfg_geometry ne $rc_geometry} {
1465 catch {git config gui.geometry $cfg_geometry}
1480 proc toggle_or_diff {w x y} {
1481 global file_states file_lists current_diff_path ui_index ui_workdir
1482 global last_clicked selected_paths
1484 set pos [split [$w index @$x,$y] .]
1485 set lno [lindex $pos 0]
1486 set col [lindex $pos 1]
1487 set path [lindex $file_lists($w) [expr {$lno - 1}]]
1493 set last_clicked [list $w $lno]
1494 array unset selected_paths
1495 $ui_index tag remove in_sel 0.0 end
1496 $ui_workdir tag remove in_sel 0.0 end
1499 if {$current_diff_path eq $path} {
1500 set after {reshow_diff;}
1504 if {$w eq $ui_index} {
1506 "Unstaging [short_path $path] from commit" \
1508 [concat $after [list ui_ready]]
1509 } elseif {$w eq $ui_workdir} {
1511 "Adding [short_path $path]" \
1513 [concat $after [list ui_ready]]
1516 show_diff $path $w $lno
1520 proc add_one_to_selection {w x y} {
1521 global file_lists last_clicked selected_paths
1523 set lno [lindex [split [$w index @$x,$y] .] 0]
1524 set path [lindex $file_lists($w) [expr {$lno - 1}]]
1530 if {$last_clicked ne {}
1531 && [lindex $last_clicked 0] ne $w} {
1532 array unset selected_paths
1533 [lindex $last_clicked 0] tag remove in_sel 0.0 end
1536 set last_clicked [list $w $lno]
1537 if {[catch {set in_sel $selected_paths($path)}]} {
1541 unset selected_paths($path)
1542 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
1544 set selected_paths($path) 1
1545 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
1549 proc add_range_to_selection {w x y} {
1550 global file_lists last_clicked selected_paths
1552 if {[lindex $last_clicked 0] ne $w} {
1553 toggle_or_diff $w $x $y
1557 set lno [lindex [split [$w index @$x,$y] .] 0]
1558 set lc [lindex $last_clicked 1]
1567 foreach path [lrange $file_lists($w) \
1568 [expr {$begin - 1}] \
1569 [expr {$end - 1}]] {
1570 set selected_paths($path) 1
1572 $w tag add in_sel $begin.0 [expr {$end + 1}].0
1575 ######################################################################
1579 set cursor_ptr arrow
1580 font create font_diff -family Courier -size 10
1584 eval font configure font_ui [font actual [.dummy cget -font]]
1588 font create font_uiitalic
1589 font create font_uibold
1590 font create font_diffbold
1591 font create font_diffitalic
1593 foreach class {Button Checkbutton Entry Label
1594 Labelframe Listbox Menu Message
1595 Radiobutton Spinbox Text} {
1596 option add *$class.font font_ui
1600 if {[is_Windows] || [is_MacOSX]} {
1601 option add *Menu.tearOff 0
1612 proc apply_config {} {
1613 global repo_config font_descs
1615 foreach option $font_descs {
1616 set name [lindex $option 0]
1617 set font [lindex $option 1]
1619 foreach {cn cv} $repo_config(gui.$name) {
1620 font configure $font $cn $cv
1623 error_popup "Invalid font specified in gui.$name:\n\n$err"
1625 foreach {cn cv} [font configure $font] {
1626 font configure ${font}bold $cn $cv
1627 font configure ${font}italic $cn $cv
1629 font configure ${font}bold -weight bold
1630 font configure ${font}italic -slant italic
1634 set default_config(merge.diffstat) true
1635 set default_config(merge.summary) false
1636 set default_config(merge.verbosity) 2
1637 set default_config(user.name) {}
1638 set default_config(user.email) {}
1640 set default_config(gui.matchtrackingbranch) false
1641 set default_config(gui.pruneduringfetch) false
1642 set default_config(gui.trustmtime) false
1643 set default_config(gui.diffcontext) 5
1644 set default_config(gui.newbranchtemplate) {}
1645 set default_config(gui.fontui) [font configure font_ui]
1646 set default_config(gui.fontdiff) [font configure font_diff]
1648 {fontui font_ui {Main Font}}
1649 {fontdiff font_diff {Diff/Console Font}}
1654 ######################################################################
1662 menu .mbar -tearoff 0
1663 .mbar add cascade -label Repository -menu .mbar.repository
1664 .mbar add cascade -label Edit -menu .mbar.edit
1665 if {[is_enabled branch]} {
1666 .mbar add cascade -label Branch -menu .mbar.branch
1668 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
1669 .mbar add cascade -label Commit -menu .mbar.commit
1671 if {[is_enabled transport]} {
1672 .mbar add cascade -label Merge -menu .mbar.merge
1673 .mbar add cascade -label Fetch -menu .mbar.fetch
1674 .mbar add cascade -label Push -menu .mbar.push
1676 . configure -menu .mbar
1678 # -- Repository Menu
1680 menu .mbar.repository
1682 .mbar.repository add command \
1683 -label {Browse Current Branch's Files} \
1684 -command {browser::new $current_branch}
1685 trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Browse \$current_branch's Files\" ;#"
1686 .mbar.repository add command \
1687 -label {Browse Branch Files...} \
1688 -command browser_open::dialog
1689 .mbar.repository add separator
1691 .mbar.repository add command \
1692 -label {Visualize Current Branch's History} \
1693 -command {do_gitk $current_branch}
1694 trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Visualize \$current_branch's History\" ;#"
1695 .mbar.repository add command \
1696 -label {Visualize All Branch History} \
1697 -command {do_gitk --all}
1698 .mbar.repository add separator
1700 if {[is_enabled multicommit]} {
1701 .mbar.repository add command -label {Database Statistics} \
1704 .mbar.repository add command -label {Compress Database} \
1707 .mbar.repository add command -label {Verify Database} \
1708 -command do_fsck_objects
1710 .mbar.repository add separator
1713 .mbar.repository add command \
1714 -label {Create Desktop Icon} \
1715 -command do_cygwin_shortcut
1716 } elseif {[is_Windows]} {
1717 .mbar.repository add command \
1718 -label {Create Desktop Icon} \
1719 -command do_windows_shortcut
1720 } elseif {[is_MacOSX]} {
1721 .mbar.repository add command \
1722 -label {Create Desktop Icon} \
1723 -command do_macosx_app
1727 .mbar.repository add command -label Quit \
1734 .mbar.edit add command -label Undo \
1735 -command {catch {[focus] edit undo}} \
1737 .mbar.edit add command -label Redo \
1738 -command {catch {[focus] edit redo}} \
1740 .mbar.edit add separator
1741 .mbar.edit add command -label Cut \
1742 -command {catch {tk_textCut [focus]}} \
1744 .mbar.edit add command -label Copy \
1745 -command {catch {tk_textCopy [focus]}} \
1747 .mbar.edit add command -label Paste \
1748 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
1750 .mbar.edit add command -label Delete \
1751 -command {catch {[focus] delete sel.first sel.last}} \
1753 .mbar.edit add separator
1754 .mbar.edit add command -label {Select All} \
1755 -command {catch {[focus] tag add sel 0.0 end}} \
1760 if {[is_enabled branch]} {
1763 .mbar.branch add command -label {Create...} \
1764 -command branch_create::dialog \
1766 lappend disable_on_lock [list .mbar.branch entryconf \
1767 [.mbar.branch index last] -state]
1769 .mbar.branch add command -label {Checkout...} \
1770 -command branch_checkout::dialog \
1772 lappend disable_on_lock [list .mbar.branch entryconf \
1773 [.mbar.branch index last] -state]
1775 .mbar.branch add command -label {Rename...} \
1776 -command branch_rename::dialog
1777 lappend disable_on_lock [list .mbar.branch entryconf \
1778 [.mbar.branch index last] -state]
1780 .mbar.branch add command -label {Delete...} \
1781 -command branch_delete::dialog
1782 lappend disable_on_lock [list .mbar.branch entryconf \
1783 [.mbar.branch index last] -state]
1785 .mbar.branch add command -label {Reset...} \
1786 -command merge::reset_hard
1787 lappend disable_on_lock [list .mbar.branch entryconf \
1788 [.mbar.branch index last] -state]
1793 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
1796 .mbar.commit add radiobutton \
1797 -label {New Commit} \
1798 -command do_select_commit_type \
1799 -variable selected_commit_type \
1801 lappend disable_on_lock \
1802 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1804 .mbar.commit add radiobutton \
1805 -label {Amend Last Commit} \
1806 -command do_select_commit_type \
1807 -variable selected_commit_type \
1809 lappend disable_on_lock \
1810 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1812 .mbar.commit add separator
1814 .mbar.commit add command -label Rescan \
1815 -command do_rescan \
1817 lappend disable_on_lock \
1818 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1820 .mbar.commit add command -label {Add To Commit} \
1821 -command do_add_selection
1822 lappend disable_on_lock \
1823 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1825 .mbar.commit add command -label {Add Existing To Commit} \
1826 -command do_add_all \
1828 lappend disable_on_lock \
1829 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1831 .mbar.commit add command -label {Unstage From Commit} \
1832 -command do_unstage_selection
1833 lappend disable_on_lock \
1834 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1836 .mbar.commit add command -label {Revert Changes} \
1837 -command do_revert_selection
1838 lappend disable_on_lock \
1839 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1841 .mbar.commit add separator
1843 .mbar.commit add command -label {Sign Off} \
1844 -command do_signoff \
1847 .mbar.commit add command -label Commit \
1848 -command do_commit \
1849 -accelerator $M1T-Return
1850 lappend disable_on_lock \
1851 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1856 if {[is_enabled branch]} {
1858 .mbar.merge add command -label {Local Merge...} \
1859 -command merge::dialog \
1861 lappend disable_on_lock \
1862 [list .mbar.merge entryconf [.mbar.merge index last] -state]
1863 .mbar.merge add command -label {Abort Merge...} \
1864 -command merge::reset_hard
1865 lappend disable_on_lock \
1866 [list .mbar.merge entryconf [.mbar.merge index last] -state]
1871 if {[is_enabled transport]} {
1875 .mbar.push add command -label {Push...} \
1876 -command do_push_anywhere \
1878 .mbar.push add command -label {Delete...} \
1879 -command remote_branch_delete::dialog
1883 # -- Apple Menu (Mac OS X only)
1885 .mbar add cascade -label Apple -menu .mbar.apple
1888 .mbar.apple add command -label "About [appname]" \
1890 .mbar.apple add command -label "Options..." \
1895 .mbar.edit add separator
1896 .mbar.edit add command -label {Options...} \
1902 .mbar add cascade -label Help -menu .mbar.help
1906 .mbar.help add command -label "About [appname]" \
1911 catch {set browser $repo_config(instaweb.browser)}
1912 set doc_path [file dirname [gitexec]]
1913 set doc_path [file join $doc_path Documentation index.html]
1916 set doc_path [exec cygpath --mixed $doc_path]
1919 if {$browser eq {}} {
1922 } elseif {[is_Cygwin]} {
1923 set program_files [file dirname [exec cygpath --windir]]
1924 set program_files [file join $program_files {Program Files}]
1925 set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
1926 set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
1927 if {[file exists $firefox]} {
1928 set browser $firefox
1929 } elseif {[file exists $ie]} {
1932 unset program_files firefox ie
1936 if {[file isfile $doc_path]} {
1937 set doc_url "file:$doc_path"
1939 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
1942 if {$browser ne {}} {
1943 .mbar.help add command -label {Online Documentation} \
1944 -command [list exec $browser $doc_url &]
1946 unset browser doc_path doc_url
1948 # -- Standard bindings
1950 wm protocol . WM_DELETE_WINDOW do_quit
1951 bind all <$M1B-Key-q> do_quit
1952 bind all <$M1B-Key-Q> do_quit
1953 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
1954 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
1956 set subcommand_args {}
1958 puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
1962 # -- Not a normal commit type invocation? Do that instead!
1964 switch -- $subcommand {
1967 set subcommand_args {rev? path}
1968 if {$argv eq {}} usage
1973 if {$is_path || [file exists $_prefix$a]} {
1974 if {$path ne {}} usage
1977 } elseif {$a eq {--}} {
1979 if {$head ne {}} usage
1984 } elseif {$head eq {}} {
1985 if {$head ne {}} usage
1994 if {$head ne {} && $path eq {}} {
1995 set path $_prefix$head
2002 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
2004 set head [git rev-parse --verify $head]
2010 set current_branch $head
2013 switch -- $subcommand {
2016 if {$path ne {} && [file isdirectory $path]} {
2017 set head $current_branch
2023 browser::new $head $path
2026 if {$head eq {} && ![file exists $path]} {
2027 puts stderr "fatal: cannot stat path $path: No such file or directory"
2030 blame::new $head $path
2037 if {[llength $argv] != 0} {
2038 puts -nonewline stderr "usage: $argv0"
2039 if {$subcommand ne {gui} && [appname] ne "git-$subcommand"} {
2040 puts -nonewline stderr " $subcommand"
2045 # fall through to setup UI for commits
2048 puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
2059 -text {Current Branch:} \
2063 -textvariable current_branch \
2066 pack .branch.l1 -side left
2067 pack .branch.cb -side left -fill x
2068 pack .branch -side top -fill x
2070 # -- Main Window Layout
2072 panedwindow .vpane -orient vertical
2073 panedwindow .vpane.files -orient horizontal
2074 .vpane add .vpane.files -sticky nsew -height 100 -width 200
2075 pack .vpane -anchor n -side top -fill both -expand 1
2077 # -- Index File List
2079 frame .vpane.files.index -height 100 -width 200
2080 label .vpane.files.index.title -text {Staged Changes (Will Be Committed)} \
2081 -background lightgreen
2082 text $ui_index -background white -borderwidth 0 \
2083 -width 20 -height 10 \
2085 -cursor $cursor_ptr \
2086 -xscrollcommand {.vpane.files.index.sx set} \
2087 -yscrollcommand {.vpane.files.index.sy set} \
2089 scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
2090 scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
2091 pack .vpane.files.index.title -side top -fill x
2092 pack .vpane.files.index.sx -side bottom -fill x
2093 pack .vpane.files.index.sy -side right -fill y
2094 pack $ui_index -side left -fill both -expand 1
2095 .vpane.files add .vpane.files.index -sticky nsew
2097 # -- Working Directory File List
2099 frame .vpane.files.workdir -height 100 -width 200
2100 label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \
2101 -background lightsalmon
2102 text $ui_workdir -background white -borderwidth 0 \
2103 -width 20 -height 10 \
2105 -cursor $cursor_ptr \
2106 -xscrollcommand {.vpane.files.workdir.sx set} \
2107 -yscrollcommand {.vpane.files.workdir.sy set} \
2109 scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
2110 scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
2111 pack .vpane.files.workdir.title -side top -fill x
2112 pack .vpane.files.workdir.sx -side bottom -fill x
2113 pack .vpane.files.workdir.sy -side right -fill y
2114 pack $ui_workdir -side left -fill both -expand 1
2115 .vpane.files add .vpane.files.workdir -sticky nsew
2117 foreach i [list $ui_index $ui_workdir] {
2118 $i tag conf in_diff -background lightgray
2119 $i tag conf in_sel -background lightgray
2123 # -- Diff and Commit Area
2125 frame .vpane.lower -height 300 -width 400
2126 frame .vpane.lower.commarea
2127 frame .vpane.lower.diff -relief sunken -borderwidth 1
2128 pack .vpane.lower.commarea -side top -fill x
2129 pack .vpane.lower.diff -side bottom -fill both -expand 1
2130 .vpane add .vpane.lower -sticky nsew
2132 # -- Commit Area Buttons
2134 frame .vpane.lower.commarea.buttons
2135 label .vpane.lower.commarea.buttons.l -text {} \
2138 pack .vpane.lower.commarea.buttons.l -side top -fill x
2139 pack .vpane.lower.commarea.buttons -side left -fill y
2141 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
2143 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
2144 lappend disable_on_lock \
2145 {.vpane.lower.commarea.buttons.rescan conf -state}
2147 button .vpane.lower.commarea.buttons.incall -text {Add Existing} \
2149 pack .vpane.lower.commarea.buttons.incall -side top -fill x
2150 lappend disable_on_lock \
2151 {.vpane.lower.commarea.buttons.incall conf -state}
2153 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
2155 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
2157 button .vpane.lower.commarea.buttons.commit -text {Commit} \
2159 pack .vpane.lower.commarea.buttons.commit -side top -fill x
2160 lappend disable_on_lock \
2161 {.vpane.lower.commarea.buttons.commit conf -state}
2163 button .vpane.lower.commarea.buttons.push -text {Push} \
2164 -command do_push_anywhere
2165 pack .vpane.lower.commarea.buttons.push -side top -fill x
2167 # -- Commit Message Buffer
2169 frame .vpane.lower.commarea.buffer
2170 frame .vpane.lower.commarea.buffer.header
2171 set ui_comm .vpane.lower.commarea.buffer.t
2172 set ui_coml .vpane.lower.commarea.buffer.header.l
2173 radiobutton .vpane.lower.commarea.buffer.header.new \
2174 -text {New Commit} \
2175 -command do_select_commit_type \
2176 -variable selected_commit_type \
2178 lappend disable_on_lock \
2179 [list .vpane.lower.commarea.buffer.header.new conf -state]
2180 radiobutton .vpane.lower.commarea.buffer.header.amend \
2181 -text {Amend Last Commit} \
2182 -command do_select_commit_type \
2183 -variable selected_commit_type \
2185 lappend disable_on_lock \
2186 [list .vpane.lower.commarea.buffer.header.amend conf -state]
2190 proc trace_commit_type {varname args} {
2191 global ui_coml commit_type
2192 switch -glob -- $commit_type {
2193 initial {set txt {Initial Commit Message:}}
2194 amend {set txt {Amended Commit Message:}}
2195 amend-initial {set txt {Amended Initial Commit Message:}}
2196 amend-merge {set txt {Amended Merge Commit Message:}}
2197 merge {set txt {Merge Commit Message:}}
2198 * {set txt {Commit Message:}}
2200 $ui_coml conf -text $txt
2202 trace add variable commit_type write trace_commit_type
2203 pack $ui_coml -side left -fill x
2204 pack .vpane.lower.commarea.buffer.header.amend -side right
2205 pack .vpane.lower.commarea.buffer.header.new -side right
2207 text $ui_comm -background white -borderwidth 1 \
2210 -autoseparators true \
2212 -width 75 -height 9 -wrap none \
2214 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
2215 scrollbar .vpane.lower.commarea.buffer.sby \
2216 -command [list $ui_comm yview]
2217 pack .vpane.lower.commarea.buffer.header -side top -fill x
2218 pack .vpane.lower.commarea.buffer.sby -side right -fill y
2219 pack $ui_comm -side left -fill y
2220 pack .vpane.lower.commarea.buffer -side left -fill y
2222 # -- Commit Message Buffer Context Menu
2224 set ctxm .vpane.lower.commarea.buffer.ctxm
2225 menu $ctxm -tearoff 0
2228 -command {tk_textCut $ui_comm}
2231 -command {tk_textCopy $ui_comm}
2234 -command {tk_textPaste $ui_comm}
2237 -command {$ui_comm delete sel.first sel.last}
2240 -label {Select All} \
2241 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
2245 $ui_comm tag add sel 0.0 end
2246 tk_textCopy $ui_comm
2247 $ui_comm tag remove sel 0.0 end
2253 bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
2257 proc trace_current_diff_path {varname args} {
2258 global current_diff_path diff_actions file_states
2259 if {$current_diff_path eq {}} {
2265 set p $current_diff_path
2266 set s [mapdesc [lindex $file_states($p) 0] $p]
2268 set p [escape_path $p]
2272 .vpane.lower.diff.header.status configure -text $s
2273 .vpane.lower.diff.header.file configure -text $f
2274 .vpane.lower.diff.header.path configure -text $p
2275 foreach w $diff_actions {
2279 trace add variable current_diff_path write trace_current_diff_path
2281 frame .vpane.lower.diff.header -background gold
2282 label .vpane.lower.diff.header.status \
2284 -width $max_status_desc \
2287 label .vpane.lower.diff.header.file \
2291 label .vpane.lower.diff.header.path \
2295 pack .vpane.lower.diff.header.status -side left
2296 pack .vpane.lower.diff.header.file -side left
2297 pack .vpane.lower.diff.header.path -fill x
2298 set ctxm .vpane.lower.diff.header.ctxm
2299 menu $ctxm -tearoff 0
2307 -- $current_diff_path
2309 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2310 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
2314 frame .vpane.lower.diff.body
2315 set ui_diff .vpane.lower.diff.body.t
2316 text $ui_diff -background white -borderwidth 0 \
2317 -width 80 -height 15 -wrap none \
2319 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
2320 -yscrollcommand {.vpane.lower.diff.body.sby set} \
2322 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
2323 -command [list $ui_diff xview]
2324 scrollbar .vpane.lower.diff.body.sby -orient vertical \
2325 -command [list $ui_diff yview]
2326 pack .vpane.lower.diff.body.sbx -side bottom -fill x
2327 pack .vpane.lower.diff.body.sby -side right -fill y
2328 pack $ui_diff -side left -fill both -expand 1
2329 pack .vpane.lower.diff.header -side top -fill x
2330 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
2332 $ui_diff tag conf d_cr -elide true
2333 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
2334 $ui_diff tag conf d_+ -foreground {#00a000}
2335 $ui_diff tag conf d_- -foreground red
2337 $ui_diff tag conf d_++ -foreground {#00a000}
2338 $ui_diff tag conf d_-- -foreground red
2339 $ui_diff tag conf d_+s \
2340 -foreground {#00a000} \
2341 -background {#e2effa}
2342 $ui_diff tag conf d_-s \
2344 -background {#e2effa}
2345 $ui_diff tag conf d_s+ \
2346 -foreground {#00a000} \
2348 $ui_diff tag conf d_s- \
2352 $ui_diff tag conf d<<<<<<< \
2353 -foreground orange \
2355 $ui_diff tag conf d======= \
2356 -foreground orange \
2358 $ui_diff tag conf d>>>>>>> \
2359 -foreground orange \
2362 $ui_diff tag raise sel
2364 # -- Diff Body Context Menu
2366 set ctxm .vpane.lower.diff.body.ctxm
2367 menu $ctxm -tearoff 0
2370 -command reshow_diff
2371 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2374 -command {tk_textCopy $ui_diff}
2375 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2377 -label {Select All} \
2378 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
2379 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2383 $ui_diff tag add sel 0.0 end
2384 tk_textCopy $ui_diff
2385 $ui_diff tag remove sel 0.0 end
2387 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2390 -label {Apply/Reverse Hunk} \
2391 -command {apply_hunk $cursorX $cursorY}
2392 set ui_diff_applyhunk [$ctxm index last]
2393 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
2396 -label {Decrease Font Size} \
2397 -command {incr_font_size font_diff -1}
2398 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2400 -label {Increase Font Size} \
2401 -command {incr_font_size font_diff 1}
2402 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2405 -label {Show Less Context} \
2406 -command {if {$repo_config(gui.diffcontext) >= 1} {
2407 incr repo_config(gui.diffcontext) -1
2410 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2412 -label {Show More Context} \
2413 -command {if {$repo_config(gui.diffcontext) < 99} {
2414 incr repo_config(gui.diffcontext)
2417 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2419 $ctxm add command -label {Options...} \
2421 bind_button3 $ui_diff "
2424 if {\$ui_index eq \$current_diff_side} {
2425 $ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
2427 $ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
2429 tk_popup $ctxm %X %Y
2431 unset ui_diff_applyhunk
2435 set main_status [::status_bar::new .status]
2436 pack .status -anchor w -side bottom -fill x
2437 $main_status show {Initializing...}
2442 set gm $repo_config(gui.geometry)
2443 wm geometry . [lindex $gm 0]
2444 .vpane sash place 0 \
2445 [lindex [.vpane sash coord 0] 0] \
2447 .vpane.files sash place 0 \
2449 [lindex [.vpane.files sash coord 0] 1]
2455 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
2456 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
2457 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
2458 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
2459 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
2460 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
2461 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
2462 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
2463 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
2464 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2465 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2467 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
2468 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
2469 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
2470 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
2471 bind $ui_diff <$M1B-Key-v> {break}
2472 bind $ui_diff <$M1B-Key-V> {break}
2473 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2474 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2475 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
2476 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
2477 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
2478 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
2479 bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
2480 bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
2481 bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
2482 bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
2483 bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
2484 bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
2485 bind $ui_diff <Button-1> {focus %W}
2487 if {[is_enabled branch]} {
2488 bind . <$M1B-Key-n> branch_create::dialog
2489 bind . <$M1B-Key-N> branch_create::dialog
2490 bind . <$M1B-Key-o> branch_checkout::dialog
2491 bind . <$M1B-Key-O> branch_checkout::dialog
2492 bind . <$M1B-Key-m> merge::dialog
2493 bind . <$M1B-Key-M> merge::dialog
2495 if {[is_enabled transport]} {
2496 bind . <$M1B-Key-p> do_push_anywhere
2497 bind . <$M1B-Key-P> do_push_anywhere
2500 bind . <Key-F5> do_rescan
2501 bind . <$M1B-Key-r> do_rescan
2502 bind . <$M1B-Key-R> do_rescan
2503 bind . <$M1B-Key-s> do_signoff
2504 bind . <$M1B-Key-S> do_signoff
2505 bind . <$M1B-Key-i> do_add_all
2506 bind . <$M1B-Key-I> do_add_all
2507 bind . <$M1B-Key-Return> do_commit
2508 foreach i [list $ui_index $ui_workdir] {
2509 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
2510 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
2511 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
2515 set file_lists($ui_index) [list]
2516 set file_lists($ui_workdir) [list]
2518 wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
2519 focus -force $ui_comm
2521 # -- Warn the user about environmental problems. Cygwin's Tcl
2522 # does *not* pass its env array onto any processes it spawns.
2523 # This means that git processes get none of our environment.
2528 set msg "Possible environment issues exist.
2530 The following environment variables are probably
2531 going to be ignored by any Git subprocess run
2535 foreach name [array names env] {
2536 switch -regexp -- $name {
2537 {^GIT_INDEX_FILE$} -
2538 {^GIT_OBJECT_DIRECTORY$} -
2539 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
2541 {^GIT_EXTERNAL_DIFF$} -
2545 {^GIT_CONFIG_LOCAL$} -
2546 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
2547 append msg " - $name\n"
2550 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
2551 append msg " - $name\n"
2553 set suggest_user $name
2557 if {$ignored_env > 0} {
2559 This is due to a known issue with the
2560 Tcl binary distributed by Cygwin."
2562 if {$suggest_user ne {}} {
2565 A good replacement for $suggest_user
2566 is placing values for the user.name and
2567 user.email settings into your personal
2573 unset ignored_env msg suggest_user name
2576 # -- Only initialize complex UI if we are going to stay running.
2578 if {[is_enabled transport]} {
2585 if {[winfo exists $ui_comm]} {
2586 set GITGUI_BCK_exists [load_message GITGUI_BCK]
2588 # -- If both our backup and message files exist use the
2589 # newer of the two files to initialize the buffer.
2591 if {$GITGUI_BCK_exists} {
2592 set m [gitdir GITGUI_MSG]
2593 if {[file isfile $m]} {
2594 if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
2595 catch {file delete [gitdir GITGUI_MSG]}
2597 $ui_comm delete 0.0 end
2599 $ui_comm edit modified false
2600 catch {file delete [gitdir GITGUI_BCK]}
2601 set GITGUI_BCK_exists 0
2607 proc backup_commit_buffer {} {
2608 global ui_comm GITGUI_BCK_exists
2610 set m [$ui_comm edit modified]
2611 if {$m || $GITGUI_BCK_exists} {
2612 set msg [string trim [$ui_comm get 0.0 end]]
2613 regsub -all -line {[ \r\t]+$} $msg {} msg
2616 if {$GITGUI_BCK_exists} {
2617 catch {file delete [gitdir GITGUI_BCK]}
2618 set GITGUI_BCK_exists 0
2622 set fd [open [gitdir GITGUI_BCK] w]
2623 puts -nonewline $fd $msg
2625 set GITGUI_BCK_exists 1
2629 $ui_comm edit modified false
2632 set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
2635 backup_commit_buffer
2638 lock_index begin-read
2639 if {![winfo ismapped .]} {
2643 if {[is_enabled multicommit]} {