2 # Tcl ignores the next line -*- tcl -*- \
5 set appvers {@@GITGUI_VERSION@@}
7 Copyright © 2006, 2007 Shawn Pearce, et. al.
9 This program is free software; you can redistribute it and/or modify
10 it under the terms of the GNU General Public License as published by
11 the Free Software Foundation; either version 2 of the License, or
12 (at your option) any later version.
14 This program is distributed in the hope that it will be useful,
15 but WITHOUT ANY WARRANTY; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 GNU General Public License for more details.
19 You should have received a copy of the GNU General Public License
20 along with this program; if not, write to the Free Software
21 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}
23 ######################################################################
25 ## enable verbose loading?
27 if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
29 rename auto_load real__auto_load
30 proc auto_load {name args} {
31 puts stderr "auto_load $name"
32 return [uplevel 1 real__auto_load $name $args]
34 rename source real__source
36 puts stderr "source $name"
37 uplevel 1 real__source $name
41 ######################################################################
43 ## configure our library
45 set oguilib {@@GITGUI_LIBDIR@@}
46 set oguirel {@@GITGUI_RELATIVE@@}
47 if {$oguirel eq {1}} {
48 set oguilib [file dirname [file dirname [file normalize $argv0]]]
49 set oguilib [file join $oguilib share git-gui lib]
50 } elseif {[string match @@* $oguirel]} {
51 set oguilib [file join [file dirname [file normalize $argv0]] lib]
54 set idx [file join $oguilib tclIndex]
55 if {[catch {set fd [open $idx r]} err]} {
60 -title "git-gui: fatal error" \
64 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
66 while {[gets $fd n] >= 0} {
67 if {$n ne {} && ![string match #* $n]} {
79 if {[lsearch -exact $loaded $p] >= 0} continue
80 source [file join $oguilib $p]
85 set auto_path [concat [list $oguilib] $auto_path]
87 unset -nocomplain oguirel idx fd
89 ######################################################################
93 set _appname [lindex [file split $argv0] end]
109 return [eval [concat [list file join $_gitdir] $args]]
112 proc gitexec {args} {
114 if {$_gitexec eq {}} {
115 if {[catch {set _gitexec [git --exec-path]} err]} {
116 error "Git not installed?\n\n$err"
122 return [eval [concat [list file join $_gitexec] $args]]
131 global tcl_platform tk_library
132 if {[tk windowingsystem] eq {aqua}} {
140 if {$tcl_platform(platform) eq {windows}} {
147 global tcl_platform _iscygwin
148 if {$_iscygwin eq {}} {
149 if {$tcl_platform(platform) eq {windows}} {
150 if {[catch {set p [exec cygpath --windir]} err]} {
162 proc is_enabled {option} {
163 global enabled_options
164 if {[catch {set on $enabled_options($option)}]} {return 0}
168 proc enable_option {option} {
169 global enabled_options
170 set enabled_options($option) 1
173 proc disable_option {option} {
174 global enabled_options
175 set enabled_options($option) 0
178 ######################################################################
182 proc is_many_config {name} {
183 switch -glob -- $name {
192 proc is_config_true {name} {
194 if {[catch {set v $repo_config($name)}]} {
196 } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
203 proc load_config {include_global} {
204 global repo_config global_config default_config
206 array unset global_config
207 if {$include_global} {
209 set fd_rc [open "| git config --global --list" r]
210 while {[gets $fd_rc line] >= 0} {
211 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
212 if {[is_many_config $name]} {
213 lappend global_config($name) $value
215 set global_config($name) $value
223 array unset repo_config
225 set fd_rc [open "| git config --list" r]
226 while {[gets $fd_rc line] >= 0} {
227 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
228 if {[is_many_config $name]} {
229 lappend repo_config($name) $value
231 set repo_config($name) $value
238 foreach name [array names default_config] {
239 if {[catch {set v $global_config($name)}]} {
240 set global_config($name) $default_config($name)
242 if {[catch {set v $repo_config($name)}]} {
243 set repo_config($name) $default_config($name)
248 ######################################################################
253 return [eval exec git $args]
256 auto_load tk_optionMenu
257 rename tk_optionMenu real__tkOptionMenu
258 proc tk_optionMenu {w varName args} {
259 set m [eval real__tkOptionMenu $w $varName $args]
260 $m configure -font font_ui
261 $w configure -font font_ui
265 ######################################################################
269 if {{--version} eq $argv || {version} eq $argv} {
270 puts "git-gui version $appvers"
277 if {[catch {set v [git --version]} err]} {
278 catch {wm withdraw .}
279 error_popup "Cannot determine Git version:
283 [appname] requires Git $req_maj.$req_min or later."
286 if {[regexp {^git version (\d+)\.(\d+)} $v _junk act_maj act_min]} {
287 if {$act_maj < $req_maj
288 || ($act_maj == $req_maj && $act_min < $req_min)} {
289 catch {wm withdraw .}
290 error_popup "[appname] requires Git $req_maj.$req_min or later.
296 catch {wm withdraw .}
297 error_popup "Cannot parse Git version string:\n\n$v"
300 unset -nocomplain v _junk act_maj act_min req_maj req_min
302 ######################################################################
307 set _gitdir $env(GIT_DIR)
311 set _gitdir [git rev-parse --git-dir]
312 set _prefix [git rev-parse --show-prefix]
314 catch {wm withdraw .}
315 error_popup "Cannot find the git directory:\n\n$err"
318 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
319 catch {set _gitdir [exec cygpath --unix $_gitdir]}
321 if {![file isdirectory $_gitdir]} {
322 catch {wm withdraw .}
323 error_popup "Git directory not found:\n\n$_gitdir"
326 if {[lindex [file split $_gitdir] end] ne {.git}} {
327 catch {wm withdraw .}
328 error_popup "Cannot use funny .git directory:\n\n$_gitdir"
331 if {[catch {cd [file dirname $_gitdir]} err]} {
332 catch {wm withdraw .}
333 error_popup "No working directory [file dirname $_gitdir]:\n\n$err"
336 set _reponame [lindex [file split \
337 [file normalize [file dirname $_gitdir]]] \
340 ######################################################################
344 set current_diff_path {}
345 set current_diff_side {}
346 set diff_actions [list]
347 set ui_status_value {Initializing...}
351 set MERGE_HEAD [list]
354 set current_branch {}
355 set current_diff_path {}
356 set selected_commit_type new
358 ######################################################################
366 set disable_on_lock [list]
367 set index_lock_type none
369 proc lock_index {type} {
370 global index_lock_type disable_on_lock
372 if {$index_lock_type eq {none}} {
373 set index_lock_type $type
374 foreach w $disable_on_lock {
375 uplevel #0 $w disabled
378 } elseif {$index_lock_type eq "begin-$type"} {
379 set index_lock_type $type
385 proc unlock_index {} {
386 global index_lock_type disable_on_lock
388 set index_lock_type none
389 foreach w $disable_on_lock {
394 ######################################################################
398 proc repository_state {ctvar hdvar mhvar} {
399 global current_branch
400 upvar $ctvar ct $hdvar hd $mhvar mh
404 if {[catch {set current_branch [git symbolic-ref HEAD]}]} {
405 set current_branch {}
407 regsub ^refs/((heads|tags|remotes)/)? \
413 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
419 set merge_head [gitdir MERGE_HEAD]
420 if {[file exists $merge_head]} {
422 set fd_mh [open $merge_head r]
423 while {[gets $fd_mh line] >= 0} {
434 global PARENT empty_tree
436 set p [lindex $PARENT 0]
440 if {$empty_tree eq {}} {
441 set empty_tree [git mktree << {}]
446 proc rescan {after {honor_trustmtime 1}} {
447 global HEAD PARENT MERGE_HEAD commit_type
448 global ui_index ui_workdir ui_status_value ui_comm
449 global rescan_active file_states
452 if {$rescan_active > 0 || ![lock_index read]} return
454 repository_state newType newHEAD newMERGE_HEAD
455 if {[string match amend* $commit_type]
456 && $newType eq {normal}
457 && $newHEAD eq $HEAD} {
461 set MERGE_HEAD $newMERGE_HEAD
462 set commit_type $newType
465 array unset file_states
467 if {![$ui_comm edit modified]
468 || [string trim [$ui_comm get 0.0 end]] eq {}} {
469 if {[load_message GITGUI_MSG]} {
470 } elseif {[load_message MERGE_MSG]} {
471 } elseif {[load_message SQUASH_MSG]} {
474 $ui_comm edit modified false
477 if {[is_enabled branch]} {
482 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
483 rescan_stage2 {} $after
486 set ui_status_value {Refreshing file status...}
487 set cmd [list git update-index]
489 lappend cmd --unmerged
490 lappend cmd --ignore-missing
491 lappend cmd --refresh
492 set fd_rf [open "| $cmd" r]
493 fconfigure $fd_rf -blocking 0 -translation binary
494 fileevent $fd_rf readable \
495 [list rescan_stage2 $fd_rf $after]
499 proc rescan_stage2 {fd after} {
500 global ui_status_value
501 global rescan_active buf_rdi buf_rdf buf_rlo
505 if {![eof $fd]} return
509 set ls_others [list | git ls-files --others -z \
510 --exclude-per-directory=.gitignore]
511 set info_exclude [gitdir info exclude]
512 if {[file readable $info_exclude]} {
513 lappend ls_others "--exclude-from=$info_exclude"
521 set ui_status_value {Scanning for modified files ...}
522 set fd_di [open "| git diff-index --cached -z [PARENT]" r]
523 set fd_df [open "| git diff-files -z" r]
524 set fd_lo [open $ls_others r]
526 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
527 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
528 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
529 fileevent $fd_di readable [list read_diff_index $fd_di $after]
530 fileevent $fd_df readable [list read_diff_files $fd_df $after]
531 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
534 proc load_message {file} {
538 if {[file isfile $f]} {
539 if {[catch {set fd [open $f r]}]} {
542 set content [string trim [read $fd]]
544 regsub -all -line {[ \r\t]+$} $content {} content
545 $ui_comm delete 0.0 end
546 $ui_comm insert end $content
552 proc read_diff_index {fd after} {
555 append buf_rdi [read $fd]
557 set n [string length $buf_rdi]
559 set z1 [string first "\0" $buf_rdi $c]
562 set z2 [string first "\0" $buf_rdi $z1]
566 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
567 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
569 [encoding convertfrom $p] \
571 [list [lindex $i 0] [lindex $i 2]] \
577 set buf_rdi [string range $buf_rdi $c end]
582 rescan_done $fd buf_rdi $after
585 proc read_diff_files {fd after} {
588 append buf_rdf [read $fd]
590 set n [string length $buf_rdf]
592 set z1 [string first "\0" $buf_rdf $c]
595 set z2 [string first "\0" $buf_rdf $z1]
599 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
600 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
602 [encoding convertfrom $p] \
605 [list [lindex $i 0] [lindex $i 2]]
610 set buf_rdf [string range $buf_rdf $c end]
615 rescan_done $fd buf_rdf $after
618 proc read_ls_others {fd after} {
621 append buf_rlo [read $fd]
622 set pck [split $buf_rlo "\0"]
623 set buf_rlo [lindex $pck end]
624 foreach p [lrange $pck 0 end-1] {
625 merge_state [encoding convertfrom $p] ?O
627 rescan_done $fd buf_rlo $after
630 proc rescan_done {fd buf after} {
631 global rescan_active current_diff_path
632 global file_states repo_config
635 if {![eof $fd]} return
638 if {[incr rescan_active -1] > 0} return
643 if {$current_diff_path ne {}} reshow_diff
647 proc prune_selection {} {
648 global file_states selected_paths
650 foreach path [array names selected_paths] {
651 if {[catch {set still_here $file_states($path)}]} {
652 unset selected_paths($path)
657 ######################################################################
661 proc mapicon {w state path} {
664 if {[catch {set r $all_icons($state$w)}]} {
665 puts "error: no icon for $w state={$state} $path"
671 proc mapdesc {state path} {
674 if {[catch {set r $all_descs($state)}]} {
675 puts "error: no desc for state={$state} $path"
681 proc escape_path {path} {
682 regsub -all {\\} $path "\\\\" path
683 regsub -all "\n" $path "\\n" path
687 proc short_path {path} {
688 return [escape_path [lindex [file split $path] end]]
692 set null_sha1 [string repeat 0 40]
694 proc merge_state {path new_state {head_info {}} {index_info {}}} {
695 global file_states next_icon_id null_sha1
697 set s0 [string index $new_state 0]
698 set s1 [string index $new_state 1]
700 if {[catch {set info $file_states($path)}]} {
702 set icon n[incr next_icon_id]
704 set state [lindex $info 0]
705 set icon [lindex $info 1]
706 if {$head_info eq {}} {set head_info [lindex $info 2]}
707 if {$index_info eq {}} {set index_info [lindex $info 3]}
710 if {$s0 eq {?}} {set s0 [string index $state 0]} \
711 elseif {$s0 eq {_}} {set s0 _}
713 if {$s1 eq {?}} {set s1 [string index $state 1]} \
714 elseif {$s1 eq {_}} {set s1 _}
716 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
717 set head_info [list 0 $null_sha1]
718 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
719 && $head_info eq {}} {
720 set head_info $index_info
723 set file_states($path) [list $s0$s1 $icon \
724 $head_info $index_info \
729 proc display_file_helper {w path icon_name old_m new_m} {
733 set lno [lsearch -sorted -exact $file_lists($w) $path]
735 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
737 $w conf -state normal
738 $w delete $lno.0 [expr {$lno + 1}].0
739 $w conf -state disabled
741 } elseif {$old_m eq {_} && $new_m ne {_}} {
742 lappend file_lists($w) $path
743 set file_lists($w) [lsort -unique $file_lists($w)]
744 set lno [lsearch -sorted -exact $file_lists($w) $path]
746 $w conf -state normal
747 $w image create $lno.0 \
748 -align center -padx 5 -pady 1 \
750 -image [mapicon $w $new_m $path]
751 $w insert $lno.1 "[escape_path $path]\n"
752 $w conf -state disabled
753 } elseif {$old_m ne $new_m} {
754 $w conf -state normal
755 $w image conf $icon_name -image [mapicon $w $new_m $path]
756 $w conf -state disabled
760 proc display_file {path state} {
761 global file_states selected_paths
762 global ui_index ui_workdir
764 set old_m [merge_state $path $state]
765 set s $file_states($path)
766 set new_m [lindex $s 0]
767 set icon_name [lindex $s 1]
769 set o [string index $old_m 0]
770 set n [string index $new_m 0]
777 display_file_helper $ui_index $path $icon_name $o $n
779 if {[string index $old_m 0] eq {U}} {
782 set o [string index $old_m 1]
784 if {[string index $new_m 0] eq {U}} {
787 set n [string index $new_m 1]
789 display_file_helper $ui_workdir $path $icon_name $o $n
791 if {$new_m eq {__}} {
792 unset file_states($path)
793 catch {unset selected_paths($path)}
797 proc display_all_files_helper {w path icon_name m} {
800 lappend file_lists($w) $path
801 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
802 $w image create end \
803 -align center -padx 5 -pady 1 \
805 -image [mapicon $w $m $path]
806 $w insert end "[escape_path $path]\n"
809 proc display_all_files {} {
810 global ui_index ui_workdir
811 global file_states file_lists
814 $ui_index conf -state normal
815 $ui_workdir conf -state normal
817 $ui_index delete 0.0 end
818 $ui_workdir delete 0.0 end
821 set file_lists($ui_index) [list]
822 set file_lists($ui_workdir) [list]
824 foreach path [lsort [array names file_states]] {
825 set s $file_states($path)
827 set icon_name [lindex $s 1]
829 set s [string index $m 0]
830 if {$s ne {U} && $s ne {_}} {
831 display_all_files_helper $ui_index $path \
835 if {[string index $m 0] eq {U}} {
838 set s [string index $m 1]
841 display_all_files_helper $ui_workdir $path \
846 $ui_index conf -state disabled
847 $ui_workdir conf -state disabled
850 ######################################################################
855 #define mask_width 14
856 #define mask_height 15
857 static unsigned char mask_bits[] = {
858 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
859 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
860 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
863 image create bitmap file_plain -background white -foreground black -data {
864 #define plain_width 14
865 #define plain_height 15
866 static unsigned char plain_bits[] = {
867 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
868 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
869 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
870 } -maskdata $filemask
872 image create bitmap file_mod -background white -foreground blue -data {
874 #define mod_height 15
875 static unsigned char mod_bits[] = {
876 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
877 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
878 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
879 } -maskdata $filemask
881 image create bitmap file_fulltick -background white -foreground "#007000" -data {
882 #define file_fulltick_width 14
883 #define file_fulltick_height 15
884 static unsigned char file_fulltick_bits[] = {
885 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
886 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
887 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
888 } -maskdata $filemask
890 image create bitmap file_parttick -background white -foreground "#005050" -data {
891 #define parttick_width 14
892 #define parttick_height 15
893 static unsigned char parttick_bits[] = {
894 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
895 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
896 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
897 } -maskdata $filemask
899 image create bitmap file_question -background white -foreground black -data {
900 #define file_question_width 14
901 #define file_question_height 15
902 static unsigned char file_question_bits[] = {
903 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
904 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
905 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
906 } -maskdata $filemask
908 image create bitmap file_removed -background white -foreground red -data {
909 #define file_removed_width 14
910 #define file_removed_height 15
911 static unsigned char file_removed_bits[] = {
912 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
913 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
914 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
915 } -maskdata $filemask
917 image create bitmap file_merge -background white -foreground blue -data {
918 #define file_merge_width 14
919 #define file_merge_height 15
920 static unsigned char file_merge_bits[] = {
921 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
922 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
923 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
924 } -maskdata $filemask
927 #define file_width 18
928 #define file_height 18
929 static unsigned char file_bits[] = {
930 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x00,
931 0x0c, 0x03, 0x00, 0x04, 0xfe, 0x00, 0x06, 0x80, 0x00, 0xff, 0x9f, 0x00,
932 0x03, 0x98, 0x00, 0x02, 0x90, 0x00, 0x06, 0xb0, 0x00, 0x04, 0xa0, 0x00,
933 0x0c, 0xe0, 0x00, 0x08, 0xc0, 0x00, 0xf8, 0xff, 0x00, 0x00, 0x00, 0x00,
934 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
936 image create bitmap file_dir -background white -foreground blue \
937 -data $file_dir_data -maskdata $file_dir_data
940 set file_uplevel_data {
943 static unsigned char up_bits[] = {
944 0x80, 0x00, 0xc0, 0x01, 0xe0, 0x03, 0xf0, 0x07, 0xf8, 0x0f, 0xfc, 0x1f,
945 0xfe, 0x3f, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
946 0xc0, 0x01, 0xc0, 0x01, 0x00, 0x00};
948 image create bitmap file_uplevel -background white -foreground red \
949 -data $file_uplevel_data -maskdata $file_uplevel_data
950 unset file_uplevel_data
952 set ui_index .vpane.files.index.list
953 set ui_workdir .vpane.files.workdir.list
955 set all_icons(_$ui_index) file_plain
956 set all_icons(A$ui_index) file_fulltick
957 set all_icons(M$ui_index) file_fulltick
958 set all_icons(D$ui_index) file_removed
959 set all_icons(U$ui_index) file_merge
961 set all_icons(_$ui_workdir) file_plain
962 set all_icons(M$ui_workdir) file_mod
963 set all_icons(D$ui_workdir) file_question
964 set all_icons(U$ui_workdir) file_merge
965 set all_icons(O$ui_workdir) file_plain
967 set max_status_desc 0
971 {_M "Modified, not staged"}
972 {M_ "Staged for commit"}
973 {MM "Portions staged for commit"}
974 {MD "Staged for commit, missing"}
976 {_O "Untracked, not staged"}
977 {A_ "Staged for commit"}
978 {AM "Portions staged for commit"}
979 {AD "Staged for commit, missing"}
982 {D_ "Staged for removal"}
983 {DO "Staged for removal, still present"}
985 {U_ "Requires merge resolution"}
986 {UU "Requires merge resolution"}
987 {UM "Requires merge resolution"}
988 {UD "Requires merge resolution"}
990 if {$max_status_desc < [string length [lindex $i 1]]} {
991 set max_status_desc [string length [lindex $i 1]]
993 set all_descs([lindex $i 0]) [lindex $i 1]
997 ######################################################################
1001 proc bind_button3 {w cmd} {
1002 bind $w <Any-Button-3> $cmd
1004 bind $w <Control-Button-1> $cmd
1008 proc scrollbar2many {list mode args} {
1009 foreach w $list {eval $w $mode $args}
1012 proc many2scrollbar {list mode sb top bottom} {
1013 $sb set $top $bottom
1014 foreach w $list {$w $mode moveto $top}
1017 proc incr_font_size {font {amt 1}} {
1018 set sz [font configure $font -size]
1020 font configure $font -size $sz
1021 font configure ${font}bold -size $sz
1024 ######################################################################
1028 set starting_gitk_msg {Starting gitk... please wait...}
1030 proc do_gitk {revs} {
1031 global env ui_status_value starting_gitk_msg
1033 # -- Always start gitk through whatever we were loaded with. This
1034 # lets us bypass using shell process on Windows systems.
1036 set cmd [list [info nameofexecutable]]
1037 lappend cmd [gitexec gitk]
1043 if {[catch {eval exec $cmd &} err]} {
1044 error_popup "Failed to start gitk:\n\n$err"
1046 set ui_status_value $starting_gitk_msg
1048 if {$ui_status_value eq $starting_gitk_msg} {
1049 set ui_status_value {Ready.}
1058 global ui_comm is_quitting repo_config commit_type
1060 if {$is_quitting} return
1063 if {[winfo exists $ui_comm]} {
1064 # -- Stash our current commit buffer.
1066 set save [gitdir GITGUI_MSG]
1067 set msg [string trim [$ui_comm get 0.0 end]]
1068 regsub -all -line {[ \r\t]+$} $msg {} msg
1069 if {(![string match amend* $commit_type]
1070 || [$ui_comm edit modified])
1073 set fd [open $save w]
1074 puts -nonewline $fd $msg
1078 catch {file delete $save}
1081 # -- Stash our current window geometry into this repository.
1083 set cfg_geometry [list]
1084 lappend cfg_geometry [wm geometry .]
1085 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
1086 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
1087 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
1090 if {$cfg_geometry ne $rc_geometry} {
1091 catch {git config gui.geometry $cfg_geometry}
1099 rescan {set ui_status_value {Ready.}}
1106 proc toggle_or_diff {w x y} {
1107 global file_states file_lists current_diff_path ui_index ui_workdir
1108 global last_clicked selected_paths
1110 set pos [split [$w index @$x,$y] .]
1111 set lno [lindex $pos 0]
1112 set col [lindex $pos 1]
1113 set path [lindex $file_lists($w) [expr {$lno - 1}]]
1119 set last_clicked [list $w $lno]
1120 array unset selected_paths
1121 $ui_index tag remove in_sel 0.0 end
1122 $ui_workdir tag remove in_sel 0.0 end
1125 if {$current_diff_path eq $path} {
1126 set after {reshow_diff;}
1130 if {$w eq $ui_index} {
1132 "Unstaging [short_path $path] from commit" \
1134 [concat $after {set ui_status_value {Ready.}}]
1135 } elseif {$w eq $ui_workdir} {
1137 "Adding [short_path $path]" \
1139 [concat $after {set ui_status_value {Ready.}}]
1142 show_diff $path $w $lno
1146 proc add_one_to_selection {w x y} {
1147 global file_lists last_clicked selected_paths
1149 set lno [lindex [split [$w index @$x,$y] .] 0]
1150 set path [lindex $file_lists($w) [expr {$lno - 1}]]
1156 if {$last_clicked ne {}
1157 && [lindex $last_clicked 0] ne $w} {
1158 array unset selected_paths
1159 [lindex $last_clicked 0] tag remove in_sel 0.0 end
1162 set last_clicked [list $w $lno]
1163 if {[catch {set in_sel $selected_paths($path)}]} {
1167 unset selected_paths($path)
1168 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
1170 set selected_paths($path) 1
1171 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
1175 proc add_range_to_selection {w x y} {
1176 global file_lists last_clicked selected_paths
1178 if {[lindex $last_clicked 0] ne $w} {
1179 toggle_or_diff $w $x $y
1183 set lno [lindex [split [$w index @$x,$y] .] 0]
1184 set lc [lindex $last_clicked 1]
1193 foreach path [lrange $file_lists($w) \
1194 [expr {$begin - 1}] \
1195 [expr {$end - 1}]] {
1196 set selected_paths($path) 1
1198 $w tag add in_sel $begin.0 [expr {$end + 1}].0
1201 ######################################################################
1205 set cursor_ptr arrow
1206 font create font_diff -family Courier -size 10
1210 eval font configure font_ui [font actual [.dummy cget -font]]
1214 font create font_uibold
1215 font create font_diffbold
1217 foreach class {Button Checkbutton Entry Label
1218 Labelframe Listbox Menu Message
1220 option add *$class.font font_ui
1232 proc apply_config {} {
1233 global repo_config font_descs
1235 foreach option $font_descs {
1236 set name [lindex $option 0]
1237 set font [lindex $option 1]
1239 foreach {cn cv} $repo_config(gui.$name) {
1240 font configure $font $cn $cv
1243 error_popup "Invalid font specified in gui.$name:\n\n$err"
1245 foreach {cn cv} [font configure $font] {
1246 font configure ${font}bold $cn $cv
1248 font configure ${font}bold -weight bold
1252 set default_config(merge.summary) false
1253 set default_config(merge.verbosity) 2
1254 set default_config(user.name) {}
1255 set default_config(user.email) {}
1257 set default_config(gui.pruneduringfetch) false
1258 set default_config(gui.trustmtime) false
1259 set default_config(gui.diffcontext) 5
1260 set default_config(gui.newbranchtemplate) {}
1261 set default_config(gui.fontui) [font configure font_ui]
1262 set default_config(gui.fontdiff) [font configure font_diff]
1264 {fontui font_ui {Main Font}}
1265 {fontdiff font_diff {Diff/Console Font}}
1270 ######################################################################
1272 ## feature option selection
1274 if {[regexp {^git-(.+)$} [appname] _junk subcommand]} {
1279 if {$subcommand eq {gui.sh}} {
1282 if {$subcommand eq {gui} && [llength $argv] > 0} {
1283 set subcommand [lindex $argv 0]
1284 set argv [lrange $argv 1 end]
1287 enable_option multicommit
1288 enable_option branch
1289 enable_option transport
1291 switch -- $subcommand {
1294 disable_option multicommit
1295 disable_option branch
1296 disable_option transport
1299 enable_option singlecommit
1301 disable_option multicommit
1302 disable_option branch
1303 disable_option transport
1307 ######################################################################
1315 menu .mbar -tearoff 0
1316 .mbar add cascade -label Repository -menu .mbar.repository
1317 .mbar add cascade -label Edit -menu .mbar.edit
1318 if {[is_enabled branch]} {
1319 .mbar add cascade -label Branch -menu .mbar.branch
1321 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
1322 .mbar add cascade -label Commit -menu .mbar.commit
1324 if {[is_enabled transport]} {
1325 .mbar add cascade -label Merge -menu .mbar.merge
1326 .mbar add cascade -label Fetch -menu .mbar.fetch
1327 .mbar add cascade -label Push -menu .mbar.push
1329 . configure -menu .mbar
1331 # -- Repository Menu
1333 menu .mbar.repository
1335 .mbar.repository add command \
1336 -label {Browse Current Branch} \
1337 -command {browser::new $current_branch}
1338 trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Browse \$current_branch\" ;#"
1339 .mbar.repository add separator
1341 .mbar.repository add command \
1342 -label {Visualize Current Branch} \
1343 -command {do_gitk $current_branch}
1344 trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Visualize \$current_branch\" ;#"
1345 .mbar.repository add command \
1346 -label {Visualize All Branches} \
1347 -command {do_gitk --all}
1348 .mbar.repository add separator
1350 if {[is_enabled multicommit]} {
1351 .mbar.repository add command -label {Database Statistics} \
1354 .mbar.repository add command -label {Compress Database} \
1357 .mbar.repository add command -label {Verify Database} \
1358 -command do_fsck_objects
1360 .mbar.repository add separator
1363 .mbar.repository add command \
1364 -label {Create Desktop Icon} \
1365 -command do_cygwin_shortcut
1366 } elseif {[is_Windows]} {
1367 .mbar.repository add command \
1368 -label {Create Desktop Icon} \
1369 -command do_windows_shortcut
1370 } elseif {[is_MacOSX]} {
1371 .mbar.repository add command \
1372 -label {Create Desktop Icon} \
1373 -command do_macosx_app
1377 .mbar.repository add command -label Quit \
1384 .mbar.edit add command -label Undo \
1385 -command {catch {[focus] edit undo}} \
1387 .mbar.edit add command -label Redo \
1388 -command {catch {[focus] edit redo}} \
1390 .mbar.edit add separator
1391 .mbar.edit add command -label Cut \
1392 -command {catch {tk_textCut [focus]}} \
1394 .mbar.edit add command -label Copy \
1395 -command {catch {tk_textCopy [focus]}} \
1397 .mbar.edit add command -label Paste \
1398 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
1400 .mbar.edit add command -label Delete \
1401 -command {catch {[focus] delete sel.first sel.last}} \
1403 .mbar.edit add separator
1404 .mbar.edit add command -label {Select All} \
1405 -command {catch {[focus] tag add sel 0.0 end}} \
1410 if {[is_enabled branch]} {
1413 .mbar.branch add command -label {Create...} \
1414 -command do_create_branch \
1416 lappend disable_on_lock [list .mbar.branch entryconf \
1417 [.mbar.branch index last] -state]
1419 .mbar.branch add command -label {Delete...} \
1420 -command do_delete_branch
1421 lappend disable_on_lock [list .mbar.branch entryconf \
1422 [.mbar.branch index last] -state]
1424 .mbar.branch add command -label {Reset...} \
1425 -command merge::reset_hard
1426 lappend disable_on_lock [list .mbar.branch entryconf \
1427 [.mbar.branch index last] -state]
1432 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
1435 .mbar.commit add radiobutton \
1436 -label {New Commit} \
1437 -command do_select_commit_type \
1438 -variable selected_commit_type \
1440 lappend disable_on_lock \
1441 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1443 .mbar.commit add radiobutton \
1444 -label {Amend Last Commit} \
1445 -command do_select_commit_type \
1446 -variable selected_commit_type \
1448 lappend disable_on_lock \
1449 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1451 .mbar.commit add separator
1453 .mbar.commit add command -label Rescan \
1454 -command do_rescan \
1456 lappend disable_on_lock \
1457 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1459 .mbar.commit add command -label {Add To Commit} \
1460 -command do_add_selection
1461 lappend disable_on_lock \
1462 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1464 .mbar.commit add command -label {Add Existing To Commit} \
1465 -command do_add_all \
1467 lappend disable_on_lock \
1468 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1470 .mbar.commit add command -label {Unstage From Commit} \
1471 -command do_unstage_selection
1472 lappend disable_on_lock \
1473 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1475 .mbar.commit add command -label {Revert Changes} \
1476 -command do_revert_selection
1477 lappend disable_on_lock \
1478 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1480 .mbar.commit add separator
1482 .mbar.commit add command -label {Sign Off} \
1483 -command do_signoff \
1486 .mbar.commit add command -label Commit \
1487 -command do_commit \
1488 -accelerator $M1T-Return
1489 lappend disable_on_lock \
1490 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1495 if {[is_enabled branch]} {
1497 .mbar.merge add command -label {Local Merge...} \
1498 -command merge::dialog
1499 lappend disable_on_lock \
1500 [list .mbar.merge entryconf [.mbar.merge index last] -state]
1501 .mbar.merge add command -label {Abort Merge...} \
1502 -command merge::reset_hard
1503 lappend disable_on_lock \
1504 [list .mbar.merge entryconf [.mbar.merge index last] -state]
1510 if {[is_enabled transport]} {
1514 .mbar.push add command -label {Push...} \
1515 -command do_push_anywhere
1519 # -- Apple Menu (Mac OS X only)
1521 .mbar add cascade -label Apple -menu .mbar.apple
1524 .mbar.apple add command -label "About [appname]" \
1526 .mbar.apple add command -label "Options..." \
1531 .mbar.edit add separator
1532 .mbar.edit add command -label {Options...} \
1537 if {[file exists /usr/local/miga/lib/gui-miga]
1538 && [file exists .pvcsrc]} {
1540 global ui_status_value
1541 if {![lock_index update]} return
1542 set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
1543 set miga_fd [open "|$cmd" r]
1544 fconfigure $miga_fd -blocking 0
1545 fileevent $miga_fd readable [list miga_done $miga_fd]
1546 set ui_status_value {Running miga...}
1548 proc miga_done {fd} {
1553 rescan [list set ui_status_value {Ready.}]
1556 .mbar add cascade -label Tools -menu .mbar.tools
1558 .mbar.tools add command -label "Migrate" \
1560 lappend disable_on_lock \
1561 [list .mbar.tools entryconf [.mbar.tools index last] -state]
1567 .mbar add cascade -label Help -menu .mbar.help
1571 .mbar.help add command -label "About [appname]" \
1576 catch {set browser $repo_config(instaweb.browser)}
1577 set doc_path [file dirname [gitexec]]
1578 set doc_path [file join $doc_path Documentation index.html]
1581 set doc_path [exec cygpath --mixed $doc_path]
1584 if {$browser eq {}} {
1587 } elseif {[is_Cygwin]} {
1588 set program_files [file dirname [exec cygpath --windir]]
1589 set program_files [file join $program_files {Program Files}]
1590 set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
1591 set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
1592 if {[file exists $firefox]} {
1593 set browser $firefox
1594 } elseif {[file exists $ie]} {
1597 unset program_files firefox ie
1601 if {[file isfile $doc_path]} {
1602 set doc_url "file:$doc_path"
1604 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
1607 if {$browser ne {}} {
1608 .mbar.help add command -label {Online Documentation} \
1609 -command [list exec $browser $doc_url &]
1611 unset browser doc_path doc_url
1613 # -- Standard bindings
1615 bind . <Destroy> do_quit
1616 bind all <$M1B-Key-q> do_quit
1617 bind all <$M1B-Key-Q> do_quit
1618 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
1619 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
1621 set subcommand_args {}
1623 puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
1627 # -- Not a normal commit type invocation? Do that instead!
1629 switch -- $subcommand {
1631 set subcommand_args {rev?}
1632 switch [llength $argv] {
1634 set current_branch [git symbolic-ref HEAD]
1635 regsub ^refs/((heads|tags|remotes)/)? \
1636 $current_branch {} current_branch
1639 set current_branch [lindex $argv 0]
1643 browser::new $current_branch
1647 set subcommand_args {rev? path?}
1652 if {$is_path || [file exists $_prefix$a]} {
1653 if {$path ne {}} usage
1656 } elseif {$a eq {--}} {
1658 if {$head ne {}} usage
1663 } elseif {$head eq {}} {
1664 if {$head ne {}} usage
1673 set current_branch [git symbolic-ref HEAD]
1674 regsub ^refs/((heads|tags|remotes)/)? \
1675 $current_branch {} current_branch
1677 set current_branch $head
1680 if {$path eq {}} usage
1681 blame::new $head $path
1686 if {[llength $argv] != 0} {
1687 puts -nonewline stderr "usage: $argv0"
1688 if {$subcommand ne {gui} && [appname] ne "git-$subcommand"} {
1689 puts -nonewline stderr " $subcommand"
1694 # fall through to setup UI for commits
1697 puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
1708 -text {Current Branch:} \
1712 -textvariable current_branch \
1715 pack .branch.l1 -side left
1716 pack .branch.cb -side left -fill x
1717 pack .branch -side top -fill x
1719 # -- Main Window Layout
1721 panedwindow .vpane -orient vertical
1722 panedwindow .vpane.files -orient horizontal
1723 .vpane add .vpane.files -sticky nsew -height 100 -width 200
1724 pack .vpane -anchor n -side top -fill both -expand 1
1726 # -- Index File List
1728 frame .vpane.files.index -height 100 -width 200
1729 label .vpane.files.index.title -text {Staged Changes (Will Be Committed)} \
1731 text $ui_index -background white -borderwidth 0 \
1732 -width 20 -height 10 \
1734 -cursor $cursor_ptr \
1735 -xscrollcommand {.vpane.files.index.sx set} \
1736 -yscrollcommand {.vpane.files.index.sy set} \
1738 scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
1739 scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
1740 pack .vpane.files.index.title -side top -fill x
1741 pack .vpane.files.index.sx -side bottom -fill x
1742 pack .vpane.files.index.sy -side right -fill y
1743 pack $ui_index -side left -fill both -expand 1
1744 .vpane.files add .vpane.files.index -sticky nsew
1746 # -- Working Directory File List
1748 frame .vpane.files.workdir -height 100 -width 200
1749 label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \
1751 text $ui_workdir -background white -borderwidth 0 \
1752 -width 20 -height 10 \
1754 -cursor $cursor_ptr \
1755 -xscrollcommand {.vpane.files.workdir.sx set} \
1756 -yscrollcommand {.vpane.files.workdir.sy set} \
1758 scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
1759 scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
1760 pack .vpane.files.workdir.title -side top -fill x
1761 pack .vpane.files.workdir.sx -side bottom -fill x
1762 pack .vpane.files.workdir.sy -side right -fill y
1763 pack $ui_workdir -side left -fill both -expand 1
1764 .vpane.files add .vpane.files.workdir -sticky nsew
1766 foreach i [list $ui_index $ui_workdir] {
1767 $i tag conf in_diff -font font_uibold
1768 $i tag conf in_sel \
1769 -background [$i cget -foreground] \
1770 -foreground [$i cget -background]
1774 # -- Diff and Commit Area
1776 frame .vpane.lower -height 300 -width 400
1777 frame .vpane.lower.commarea
1778 frame .vpane.lower.diff -relief sunken -borderwidth 1
1779 pack .vpane.lower.commarea -side top -fill x
1780 pack .vpane.lower.diff -side bottom -fill both -expand 1
1781 .vpane add .vpane.lower -sticky nsew
1783 # -- Commit Area Buttons
1785 frame .vpane.lower.commarea.buttons
1786 label .vpane.lower.commarea.buttons.l -text {} \
1789 pack .vpane.lower.commarea.buttons.l -side top -fill x
1790 pack .vpane.lower.commarea.buttons -side left -fill y
1792 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
1794 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
1795 lappend disable_on_lock \
1796 {.vpane.lower.commarea.buttons.rescan conf -state}
1798 button .vpane.lower.commarea.buttons.incall -text {Add Existing} \
1800 pack .vpane.lower.commarea.buttons.incall -side top -fill x
1801 lappend disable_on_lock \
1802 {.vpane.lower.commarea.buttons.incall conf -state}
1804 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
1806 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
1808 button .vpane.lower.commarea.buttons.commit -text {Commit} \
1810 pack .vpane.lower.commarea.buttons.commit -side top -fill x
1811 lappend disable_on_lock \
1812 {.vpane.lower.commarea.buttons.commit conf -state}
1814 # -- Commit Message Buffer
1816 frame .vpane.lower.commarea.buffer
1817 frame .vpane.lower.commarea.buffer.header
1818 set ui_comm .vpane.lower.commarea.buffer.t
1819 set ui_coml .vpane.lower.commarea.buffer.header.l
1820 radiobutton .vpane.lower.commarea.buffer.header.new \
1821 -text {New Commit} \
1822 -command do_select_commit_type \
1823 -variable selected_commit_type \
1825 lappend disable_on_lock \
1826 [list .vpane.lower.commarea.buffer.header.new conf -state]
1827 radiobutton .vpane.lower.commarea.buffer.header.amend \
1828 -text {Amend Last Commit} \
1829 -command do_select_commit_type \
1830 -variable selected_commit_type \
1832 lappend disable_on_lock \
1833 [list .vpane.lower.commarea.buffer.header.amend conf -state]
1837 proc trace_commit_type {varname args} {
1838 global ui_coml commit_type
1839 switch -glob -- $commit_type {
1840 initial {set txt {Initial Commit Message:}}
1841 amend {set txt {Amended Commit Message:}}
1842 amend-initial {set txt {Amended Initial Commit Message:}}
1843 amend-merge {set txt {Amended Merge Commit Message:}}
1844 merge {set txt {Merge Commit Message:}}
1845 * {set txt {Commit Message:}}
1847 $ui_coml conf -text $txt
1849 trace add variable commit_type write trace_commit_type
1850 pack $ui_coml -side left -fill x
1851 pack .vpane.lower.commarea.buffer.header.amend -side right
1852 pack .vpane.lower.commarea.buffer.header.new -side right
1854 text $ui_comm -background white -borderwidth 1 \
1857 -autoseparators true \
1859 -width 75 -height 9 -wrap none \
1861 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
1862 scrollbar .vpane.lower.commarea.buffer.sby \
1863 -command [list $ui_comm yview]
1864 pack .vpane.lower.commarea.buffer.header -side top -fill x
1865 pack .vpane.lower.commarea.buffer.sby -side right -fill y
1866 pack $ui_comm -side left -fill y
1867 pack .vpane.lower.commarea.buffer -side left -fill y
1869 # -- Commit Message Buffer Context Menu
1871 set ctxm .vpane.lower.commarea.buffer.ctxm
1872 menu $ctxm -tearoff 0
1875 -command {tk_textCut $ui_comm}
1878 -command {tk_textCopy $ui_comm}
1881 -command {tk_textPaste $ui_comm}
1884 -command {$ui_comm delete sel.first sel.last}
1887 -label {Select All} \
1888 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
1892 $ui_comm tag add sel 0.0 end
1893 tk_textCopy $ui_comm
1894 $ui_comm tag remove sel 0.0 end
1900 bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
1904 proc trace_current_diff_path {varname args} {
1905 global current_diff_path diff_actions file_states
1906 if {$current_diff_path eq {}} {
1912 set p $current_diff_path
1913 set s [mapdesc [lindex $file_states($p) 0] $p]
1915 set p [escape_path $p]
1919 .vpane.lower.diff.header.status configure -text $s
1920 .vpane.lower.diff.header.file configure -text $f
1921 .vpane.lower.diff.header.path configure -text $p
1922 foreach w $diff_actions {
1926 trace add variable current_diff_path write trace_current_diff_path
1928 frame .vpane.lower.diff.header -background orange
1929 label .vpane.lower.diff.header.status \
1930 -background orange \
1931 -width $max_status_desc \
1934 label .vpane.lower.diff.header.file \
1935 -background orange \
1938 label .vpane.lower.diff.header.path \
1939 -background orange \
1942 pack .vpane.lower.diff.header.status -side left
1943 pack .vpane.lower.diff.header.file -side left
1944 pack .vpane.lower.diff.header.path -fill x
1945 set ctxm .vpane.lower.diff.header.ctxm
1946 menu $ctxm -tearoff 0
1954 -- $current_diff_path
1956 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
1957 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
1961 frame .vpane.lower.diff.body
1962 set ui_diff .vpane.lower.diff.body.t
1963 text $ui_diff -background white -borderwidth 0 \
1964 -width 80 -height 15 -wrap none \
1966 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
1967 -yscrollcommand {.vpane.lower.diff.body.sby set} \
1969 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
1970 -command [list $ui_diff xview]
1971 scrollbar .vpane.lower.diff.body.sby -orient vertical \
1972 -command [list $ui_diff yview]
1973 pack .vpane.lower.diff.body.sbx -side bottom -fill x
1974 pack .vpane.lower.diff.body.sby -side right -fill y
1975 pack $ui_diff -side left -fill both -expand 1
1976 pack .vpane.lower.diff.header -side top -fill x
1977 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
1979 $ui_diff tag conf d_cr -elide true
1980 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
1981 $ui_diff tag conf d_+ -foreground {#00a000}
1982 $ui_diff tag conf d_- -foreground red
1984 $ui_diff tag conf d_++ -foreground {#00a000}
1985 $ui_diff tag conf d_-- -foreground red
1986 $ui_diff tag conf d_+s \
1987 -foreground {#00a000} \
1988 -background {#e2effa}
1989 $ui_diff tag conf d_-s \
1991 -background {#e2effa}
1992 $ui_diff tag conf d_s+ \
1993 -foreground {#00a000} \
1995 $ui_diff tag conf d_s- \
1999 $ui_diff tag conf d<<<<<<< \
2000 -foreground orange \
2002 $ui_diff tag conf d======= \
2003 -foreground orange \
2005 $ui_diff tag conf d>>>>>>> \
2006 -foreground orange \
2009 $ui_diff tag raise sel
2011 # -- Diff Body Context Menu
2013 set ctxm .vpane.lower.diff.body.ctxm
2014 menu $ctxm -tearoff 0
2017 -command reshow_diff
2018 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2021 -command {tk_textCopy $ui_diff}
2022 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2024 -label {Select All} \
2025 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
2026 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2030 $ui_diff tag add sel 0.0 end
2031 tk_textCopy $ui_diff
2032 $ui_diff tag remove sel 0.0 end
2034 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2037 -label {Apply/Reverse Hunk} \
2038 -command {apply_hunk $cursorX $cursorY}
2039 set ui_diff_applyhunk [$ctxm index last]
2040 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
2043 -label {Decrease Font Size} \
2044 -command {incr_font_size font_diff -1}
2045 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2047 -label {Increase Font Size} \
2048 -command {incr_font_size font_diff 1}
2049 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2052 -label {Show Less Context} \
2053 -command {if {$repo_config(gui.diffcontext) >= 2} {
2054 incr repo_config(gui.diffcontext) -1
2057 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2059 -label {Show More Context} \
2061 incr repo_config(gui.diffcontext)
2064 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2066 $ctxm add command -label {Options...} \
2068 bind_button3 $ui_diff "
2071 if {\$ui_index eq \$current_diff_side} {
2072 $ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
2074 $ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
2076 tk_popup $ctxm %X %Y
2078 unset ui_diff_applyhunk
2082 label .status -textvariable ui_status_value \
2087 pack .status -anchor w -side bottom -fill x
2092 set gm $repo_config(gui.geometry)
2093 wm geometry . [lindex $gm 0]
2094 .vpane sash place 0 \
2095 [lindex [.vpane sash coord 0] 0] \
2097 .vpane.files sash place 0 \
2099 [lindex [.vpane.files sash coord 0] 1]
2105 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
2106 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
2107 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
2108 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
2109 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
2110 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
2111 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
2112 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
2113 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
2114 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2115 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2117 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
2118 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
2119 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
2120 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
2121 bind $ui_diff <$M1B-Key-v> {break}
2122 bind $ui_diff <$M1B-Key-V> {break}
2123 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2124 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2125 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
2126 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
2127 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
2128 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
2129 bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
2130 bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
2131 bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
2132 bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
2133 bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
2134 bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
2135 bind $ui_diff <Button-1> {focus %W}
2137 if {[is_enabled branch]} {
2138 bind . <$M1B-Key-n> do_create_branch
2139 bind . <$M1B-Key-N> do_create_branch
2142 bind all <Key-F5> do_rescan
2143 bind all <$M1B-Key-r> do_rescan
2144 bind all <$M1B-Key-R> do_rescan
2145 bind . <$M1B-Key-s> do_signoff
2146 bind . <$M1B-Key-S> do_signoff
2147 bind . <$M1B-Key-i> do_add_all
2148 bind . <$M1B-Key-I> do_add_all
2149 bind . <$M1B-Key-Return> do_commit
2150 foreach i [list $ui_index $ui_workdir] {
2151 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
2152 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
2153 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
2157 set file_lists($ui_index) [list]
2158 set file_lists($ui_workdir) [list]
2160 wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
2161 focus -force $ui_comm
2163 # -- Warn the user about environmental problems. Cygwin's Tcl
2164 # does *not* pass its env array onto any processes it spawns.
2165 # This means that git processes get none of our environment.
2170 set msg "Possible environment issues exist.
2172 The following environment variables are probably
2173 going to be ignored by any Git subprocess run
2177 foreach name [array names env] {
2178 switch -regexp -- $name {
2179 {^GIT_INDEX_FILE$} -
2180 {^GIT_OBJECT_DIRECTORY$} -
2181 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
2183 {^GIT_EXTERNAL_DIFF$} -
2187 {^GIT_CONFIG_LOCAL$} -
2188 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
2189 append msg " - $name\n"
2192 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
2193 append msg " - $name\n"
2195 set suggest_user $name
2199 if {$ignored_env > 0} {
2201 This is due to a known issue with the
2202 Tcl binary distributed by Cygwin."
2204 if {$suggest_user ne {}} {
2207 A good replacement for $suggest_user
2208 is placing values for the user.name and
2209 user.email settings into your personal
2215 unset ignored_env msg suggest_user name
2218 # -- Only initialize complex UI if we are going to stay running.
2220 if {[is_enabled transport]} {
2224 populate_branch_menu
2229 # -- Only suggest a gc run if we are going to stay running.
2231 if {[is_enabled multicommit]} {
2232 set object_limit 2000
2233 if {[is_Windows]} {set object_limit 200}
2234 regexp {^([0-9]+) objects,} [git count-objects] _junk objects_current
2235 if {$objects_current >= $object_limit} {
2237 "This repository currently has $objects_current loose objects.
2239 To maintain optimal performance it is strongly recommended that you compress the database when more than $object_limit loose objects exist.
2241 Compress the database now?"] eq yes} {
2245 unset object_limit _junk objects_current
2248 lock_index begin-read